From patchwork at patchwork.openembedded.org Sat Feb 1 00:02:31 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sat, 01 Feb 2020 00:02:31 -0000 Subject: [OE-core] =?utf-8?b?4pyXIHBhdGNodGVzdDogZmFpbHVyZSBmb3IgIlt2Ml0g?= =?utf-8?q?microblaze_tune=3A_Enable_6=2E=2E=2E=22_and_1_more?= In-Reply-To: <20200131233305.118454-1-mark.hatle@kernel.crashing.org> References: <20200131233305.118454-1-mark.hatle@kernel.crashing.org> Message-ID: <20200201000231.2277.98597@do> == Series Details == Series: "[v2] microblaze tune: Enable 6..." and 1 more Revision: 1 URL : https://patchwork.openembedded.org/series/22377/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at cd9006b202) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From akuster808 at gmail.com Sat Feb 1 00:41:40 2020 From: akuster808 at gmail.com (akuster808) Date: Fri, 31 Jan 2020 16:41:40 -0800 Subject: [OE-core] [PATCH v2 2/2] microblaze tune: cleanup += In-Reply-To: <20200131233305.118454-2-mark.hatle@kernel.crashing.org> References: <20200131233305.118454-1-mark.hatle@kernel.crashing.org> <20200131233305.118454-2-mark.hatle@kernel.crashing.org> Message-ID: On 1/31/20 3:33 PM, Mark Hatle wrote: > From: Mark Hatle > > Various += were used, refactor these to be either = or .= depending on > usuage. what is in version 2? > > CONFLICTS should be '=', as no leading space is required and they are not > amending any other conflict settings. > > The TUNE_CCARGS should be .= so that if the feature does not define a CCARG > blank spaces are not added to the CFLAGS. This is consistent to how the arm > tuning is implemented. > > Signed-off-by: Mark Hatle > Signed-off-by: Mark Hatle > --- > .../include/microblaze/arch-microblaze.inc | 22 +++++++++---------- > .../microblaze/feature-microblaze-math.inc | 12 +++++----- > .../feature-microblaze-versions.inc | 2 +- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index fb777d929c..19cc2b59b9 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -9,34 +9,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze > > # Endian > TUNEVALID[bigendian] = "Use Microblaze Big Endian" > -TUNECONFLICTS[bigendian] += "v10.0" > +TUNECONFLICTS[bigendian] = "v10.0" > > MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" > > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" > > # General features > TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" > TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" > TUNEVALID[reorder] = "Enable Reorder Instructions" > -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" > +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" > > # Core configuration tune optimizations > TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" > -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > > # Feature compiler args > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" > > # Disable reorder for v8.30 if pattern-compare is not enabled > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > bb.utils.contains("TUNE_FEATURES", "v8.30", \ > bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ > - "-mxl-reorder", "-mno-xl-reorder", d), \ > - "-mxl-reorder", d), "-mno-xl-reorder", d)}" > + " -mxl-reorder", " -mno-xl-reorder", d), \ > + " -mxl-reorder", d), " -mno-xl-reorder", d)}" > > # Feature package architecture formatting > MBPKGARCH_TUNE = "" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > index a31516659c..cba0ae67e3 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" > TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" > > # Compiler args > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" > > # Set target fpu (bitbake known target) to soft or hard (basic or extended) > TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > index 003fde3e07..6638accc98 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 > TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" > > # Version flags > -TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > +TUNE_CCARGS .= "${@' -mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > From akuster808 at gmail.com Sat Feb 1 00:47:11 2020 From: akuster808 at gmail.com (akuster808) Date: Fri, 31 Jan 2020 16:47:11 -0800 Subject: [OE-core] [PATCH 2/2] microblaze tune: cleanup += In-Reply-To: <20200131232331.117030-2-mark.hatle@kernel.crashing.org> References: <20200131232331.117030-1-mark.hatle@kernel.crashing.org> <20200131232331.117030-2-mark.hatle@kernel.crashing.org> Message-ID: <0a69a969-c20e-5273-0faa-a1f6dc5d29d7@gmail.com> On 1/31/20 3:23 PM, Mark Hatle wrote: > From: Mark Hatle > > Various += were used, refactor these to be either = or .= depending on > usuage. > > CONFLICTS should be '=', as no leading space is required and they are not > amending any other conflict settings. > > The TUNE_CCARGS should be .= so that if the feature does not define a CCARG > blank spaces are not added to the CFLAGS. This is consistent to how the arm > tuning is implemented. Does some form of this need to be in Zeus? - armin > Signed-off-by: Mark Hatle > Signed-off-by: Mark Hatle > --- > .../include/microblaze/arch-microblaze.inc | 22 +++++++++---------- > .../microblaze/feature-microblaze-math.inc | 12 +++++----- > .../feature-microblaze-versions.inc | 2 +- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index 55ce158f12..19cc2b59b9 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -9,34 +9,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze > > # Endian > TUNEVALID[bigendian] = "Use Microblaze Big Endian" > -TUNECONFLICTS[bigendian] += "v10.0" > +TUNECONFLICTS[bigendian] = "v10.0" > > MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" > > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" > > # General features > TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" > TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" > TUNEVALID[reorder] = "Enable Reorder Instructions" > -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" > +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" > > # Core configuration tune optimizations > TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" > -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > > # Feature compiler args > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "microblaze64", "-m64", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" > > # Disable reorder for v8.30 if pattern-compare is not enabled > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > bb.utils.contains("TUNE_FEATURES", "v8.30", \ > bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ > - "-mxl-reorder", "-mno-xl-reorder", d), \ > - "-mxl-reorder", d), "-mno-xl-reorder", d)}" > + " -mxl-reorder", " -mno-xl-reorder", d), \ > + " -mxl-reorder", d), " -mno-xl-reorder", d)}" > > # Feature package architecture formatting > MBPKGARCH_TUNE = "" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > index a31516659c..cba0ae67e3 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" > TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" > > # Compiler args > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" > > # Set target fpu (bitbake known target) to soft or hard (basic or extended) > TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > index 003fde3e07..6638accc98 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 > TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" > > # Version flags > -TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > +TUNE_CCARGS .= "${@' -mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > From nathan at nathanrossi.com Sat Feb 1 04:49:03 2020 From: nathan at nathanrossi.com (Nathan Rossi) Date: Sat, 1 Feb 2020 14:49:03 +1000 Subject: [OE-core] [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune In-Reply-To: <20200131220751.106516-1-mark.hatle@kernel.crashing.org> References: <20200131220751.106516-1-mark.hatle@kernel.crashing.org> Message-ID: On Sat, 1 Feb 2020 at 08:13, Mark Hatle wrote: > > From: Mark Hatle > > TUNE_ARCH - microblazeeb is not a valid architecture, microblaze is big > endian, microblazeel is the little endian version. > > Version arguments: > If a version feature is not defined, then we don't want to set either > TUNE_CCARGS or MBPKGARCH_VERSION. > > Signed-off-by: Mark Hatle > Signed-off-by: Mark Hatle > --- > meta/conf/machine/include/microblaze/arch-microblaze.inc | 2 +- > .../include/microblaze/feature-microblaze-versions.inc | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index eab7171cb2..265898b6b6 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -46,7 +46,7 @@ require conf/machine/include/microblaze/feature-microblaze-versions.inc > require conf/machine/include/microblaze/feature-microblaze-math.inc > > # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess Worth updating the comment at the same time. > -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" > +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" This change will break some things in oe-core (and probably meta-xilinx too). They should be updated at the same time. Might also be worth removing the microblazeeb references in siteinfo, and elf.py. Since they were added to support this. Regards, Nathan > > # Package Architecture formatting > TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > index 3221e2aab7..003fde3e07 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 > TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" > > # Version flags > -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}" > -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}" > +TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > +MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From nathan at nathanrossi.com Sat Feb 1 04:50:04 2020 From: nathan at nathanrossi.com (Nathan Rossi) Date: Sat, 1 Feb 2020 14:50:04 +1000 Subject: [OE-core] [PATCH v2 1/2] microblaze tune: Enable 64-bit In-Reply-To: <20200131233305.118454-1-mark.hatle@kernel.crashing.org> References: <20200131233305.118454-1-mark.hatle@kernel.crashing.org> Message-ID: On Sat, 1 Feb 2020 at 09:33, Mark Hatle wrote: > > From: Mark Hatle > > 64-bit is not yet available in Linux, but some non-Linux uses exist. > > Signed-off-by: Mark Hatle > Signed-off-by: Mark Hatle > --- > meta/conf/machine/include/microblaze/arch-microblaze.inc | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index 265898b6b6..fb777d929c 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -4,6 +4,9 @@ > TUNEVALID[microblaze] = "MicroBlaze" > MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" > > +TUNEVALID[64-bit] = "64-bit MicroBlaze" > +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" This should probably TUNECONFLICTS with all unsupported versions. Regards, Nathan > + > # Endian > TUNEVALID[bigendian] = "Use Microblaze Big Endian" > TUNECONFLICTS[bigendian] += "v10.0" > @@ -26,6 +29,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > > # Disable reorder for v8.30 if pattern-compare is not enabled > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > @@ -48,6 +52,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc > # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess > TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" > > +# Add 64-bit to the PKGARCH if enabled. > +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" > + > # Package Architecture formatting > -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From tanuk at iki.fi Sat Feb 1 08:15:45 2020 From: tanuk at iki.fi (Tanu Kaskinen) Date: Sat, 01 Feb 2020 10:15:45 +0200 Subject: [OE-core] [PATCH v2 2/5] alsa-ucm-conf: new recipe, version 1.2.1.2 In-Reply-To: References: <20200106091806.49129-1-tanuk@iki.fi> <20200106091806.49129-3-tanuk@iki.fi> Message-ID: <5259176251b3dcbf2c0600bb343b8484c4bdb53c.camel@iki.fi> On Thu, 2020-01-30 at 15:01 +0100, Nicolas Dechesne wrote: > hey, > > On Mon, Jan 6, 2020 at 10:18 AM Tanu Kaskinen wrote: > > The UCM configuration files were moved from the alsa-lib repository to a > > new alsa-ucm-conf repository. The move was accompanied by a license > > change from LGPL2.1 to BSD-3-Clause. > > > > Signed-off-by: Tanu Kaskinen > > --- > > meta/conf/distro/include/maintainers.inc | 1 + > > .../alsa/alsa-lib_1.2.1.2.bb | 2 +- > > .../alsa/alsa-ucm-conf_1.2.1.2.bb | 23 +++++++++++++++++++ > > 3 files changed, 25 insertions(+), 1 deletion(-) > > create mode 100644 meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb > > > > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc > > index 39eee9475c..c9fb373f52 100644 > > --- a/meta/conf/distro/include/maintainers.inc > > +++ b/meta/conf/distro/include/maintainers.inc > > @@ -35,6 +35,7 @@ RECIPE_MAINTAINER_pn-alsa-lib = "Tanu Kaskinen " > > RECIPE_MAINTAINER_pn-alsa-plugins = "Tanu Kaskinen " > > RECIPE_MAINTAINER_pn-alsa-state = "Tanu Kaskinen " > > RECIPE_MAINTAINER_pn-alsa-tools = "Tanu Kaskinen " > > +RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Tanu Kaskinen " > > RECIPE_MAINTAINER_pn-alsa-utils = "Tanu Kaskinen " > > RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Tanu Kaskinen " > > RECIPE_MAINTAINER_pn-apmd = "Anuj Mittal " > > diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.1.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.1.2.bb > > index 9565ad1b20..7bc78b8523 100644 > > --- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.1.2.bb > > +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.1.2.bb > > @@ -33,7 +33,7 @@ FILES_alsa-server = "${bindir}/*" > > FILES_alsa-conf = "${datadir}/alsa/" > > FILES_libatopology = "${libdir}/libatopology.so.*" > > > > -RDEPENDS_${PN}_class-target = "alsa-conf" > > +RDEPENDS_${PN}_class-target = "alsa-conf alsa-ucm-conf" > > > > # upgrade path > > RPROVIDES_${PN} = "libasound" > > diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb > > new file mode 100644 > > index 0000000000..469d1f7a95 > > --- /dev/null > > +++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb > > @@ -0,0 +1,23 @@ > > +SUMMARY = "ALSA Use Case Manager configuration" > > +HOMEPAGE = "https://alsa-project.org" > > +BUGTRACKER = "https://alsa-project.org/wiki/Bug_Tracking" > > +LICENSE = "BSD-3-Clause" > > +LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" > > + > > +# The tarball doesn't have any toplevel directory. The subdir option tells > > +# Bitbake to unpack the archive to the correct place. > > +SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2;subdir=${BP}" > > +SRC_URI[md5sum] = "b7fa43cfd79df978184a6333766d2a50" > > +SRC_URI[sha256sum] = "ea8a86875f4cf430d49a662a04a6d6c606c5c9d67e54cb944c4d77b24554062f" > > + > > +inherit allarch > > it's a bit late into the game.. but I have some questions about this > patch. now that the alsa-ucm-conf are allarch, how do we expect a BSP > layer to provide its own UCM config files? if i add a .bbappend file, > I can't change PACKAGE_ARCH to be 'machine' specific. If i create a > new recipe for my custom UCM files, then it's not obvious when I > should install them, since we need them only if alsa-ucm-conf is > installed in the first place.. > > I was thinking about adding an empty alsa-ucm-machine-conf recipe that > BSP could append, like gpsd, e.g.: > http://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb > > Is that a good idea? I was hoping someone else would answer this, since I have no experience with BSPs or .bbappend files... Since I don't know how this *should* be done, I'm not against creating alsa-ucm-machine-conf. However, my intuition would be that the BSP installs its configuration as a separate recipe whenever the BSP is used. I don't see the need to have conditions such as "install only if alsa-ucm-conf is installed". Is it just to save disk space? alsa-ucm-conf anyway installs a bunch of files that aren't relevant to most machines, so if you're worried about UCM disk consumption, the alsa-ucm-conf recipe would need work to somehow install only those files that are needed by the current machine. Another approach that would make sense to me (even more than creating a separate recipe) is to submit your UCM config to ALSA upstream. While waiting for the change to get accepted to upstream and then later incorporated in the main alsa-ucm-conf recipe, you could use .bbappend to add the configuration to the alsa-ucm-conf recipe as a patch. -- Tanu https://www.patreon.com/tanuk https://liberapay.com/tanuk From martin.jansa at gmail.com Sat Feb 1 10:31:54 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Sat, 1 Feb 2020 11:31:54 +0100 Subject: [OE-core] [PATCH v2 2/5] alsa-ucm-conf: new recipe, version 1.2.1.2 In-Reply-To: <5259176251b3dcbf2c0600bb343b8484c4bdb53c.camel@iki.fi> References: <20200106091806.49129-1-tanuk@iki.fi> <20200106091806.49129-3-tanuk@iki.fi> <5259176251b3dcbf2c0600bb343b8484c4bdb53c.camel@iki.fi> Message-ID: In LuneOS we have .bbappend in distro layer adding the UCM files for MACHINEs we support. It's not nice, but before this recipe we were adding the same in alsa-lib bbappend, so it's not worse than before for sure. BSP layer with .bbappend is a bit worse, because including BSP layer shouldn't change anything for other MACHINEs. For UCM it's on edge, because if the files are added correctly, then there won't be any change in behavior for other MACHINEs in practise, but still people won't be happy from even alsa-ucm-conf being rebuilt just by adding BSP layer to bblayers.conf. (In theory distro layers shouldn't influence anything when their supported DISTRO isn't selected as well, but this rule is much less enforced, because often it doesn't make much sense to include the distro layer without using that DISTRO - unlike BSP where multiple BSP layers will be included just to sequentially build the images for various MACHINEs in the same build directory). Maybe nobody replied, because there isn't really good way how to handle this :/. On Sat, Feb 1, 2020 at 9:21 AM Tanu Kaskinen wrote: > On Thu, 2020-01-30 at 15:01 +0100, Nicolas Dechesne wrote: > > hey, > > > > On Mon, Jan 6, 2020 at 10:18 AM Tanu Kaskinen wrote: > > > The UCM configuration files were moved from the alsa-lib repository to > a > > > new alsa-ucm-conf repository. The move was accompanied by a license > > > change from LGPL2.1 to BSD-3-Clause. > > > > > > Signed-off-by: Tanu Kaskinen > > > --- > > > meta/conf/distro/include/maintainers.inc | 1 + > > > .../alsa/alsa-lib_1.2.1.2.bb | 2 +- > > > .../alsa/alsa-ucm-conf_1.2.1.2.bb | 23 > +++++++++++++++++++ > > > 3 files changed, 25 insertions(+), 1 deletion(-) > > > create mode 100644 meta/recipes-multimedia/alsa/ > alsa-ucm-conf_1.2.1.2.bb > > > > > > diff --git a/meta/conf/distro/include/maintainers.inc > b/meta/conf/distro/include/maintainers.inc > > > index 39eee9475c..c9fb373f52 100644 > > > --- a/meta/conf/distro/include/maintainers.inc > > > +++ b/meta/conf/distro/include/maintainers.inc > > > @@ -35,6 +35,7 @@ RECIPE_MAINTAINER_pn-alsa-lib = "Tanu Kaskinen < > tanuk at iki.fi>" > > > RECIPE_MAINTAINER_pn-alsa-plugins = "Tanu Kaskinen " > > > RECIPE_MAINTAINER_pn-alsa-state = "Tanu Kaskinen " > > > RECIPE_MAINTAINER_pn-alsa-tools = "Tanu Kaskinen " > > > +RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Tanu Kaskinen " > > > RECIPE_MAINTAINER_pn-alsa-utils = "Tanu Kaskinen " > > > RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Tanu Kaskinen < > tanuk at iki.fi>" > > > RECIPE_MAINTAINER_pn-apmd = "Anuj Mittal " > > > diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.1.2.bb > b/meta/recipes-multimedia/alsa/alsa-lib_1.2.1.2.bb > > > index 9565ad1b20..7bc78b8523 100644 > > > --- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.1.2.bb > > > +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.1.2.bb > > > @@ -33,7 +33,7 @@ FILES_alsa-server = "${bindir}/*" > > > FILES_alsa-conf = "${datadir}/alsa/" > > > FILES_libatopology = "${libdir}/libatopology.so.*" > > > > > > -RDEPENDS_${PN}_class-target = "alsa-conf" > > > +RDEPENDS_${PN}_class-target = "alsa-conf alsa-ucm-conf" > > > > > > # upgrade path > > > RPROVIDES_${PN} = "libasound" > > > diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb > b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb > > > new file mode 100644 > > > index 0000000000..469d1f7a95 > > > --- /dev/null > > > +++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb > > > @@ -0,0 +1,23 @@ > > > +SUMMARY = "ALSA Use Case Manager configuration" > > > +HOMEPAGE = "https://alsa-project.org" > > > +BUGTRACKER = "https://alsa-project.org/wiki/Bug_Tracking" > > > +LICENSE = "BSD-3-Clause" > > > +LIC_FILES_CHKSUM = > "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" > > > + > > > +# The tarball doesn't have any toplevel directory. The subdir option > tells > > > +# Bitbake to unpack the archive to the correct place. > > > +SRC_URI = " > https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2;subdir=${BP}" > > > +SRC_URI[md5sum] = "b7fa43cfd79df978184a6333766d2a50" > > > +SRC_URI[sha256sum] = > "ea8a86875f4cf430d49a662a04a6d6c606c5c9d67e54cb944c4d77b24554062f" > > > + > > > +inherit allarch > > > > it's a bit late into the game.. but I have some questions about this > > patch. now that the alsa-ucm-conf are allarch, how do we expect a BSP > > layer to provide its own UCM config files? if i add a .bbappend file, > > I can't change PACKAGE_ARCH to be 'machine' specific. If i create a > > new recipe for my custom UCM files, then it's not obvious when I > > should install them, since we need them only if alsa-ucm-conf is > > installed in the first place.. > > > > I was thinking about adding an empty alsa-ucm-machine-conf recipe that > > BSP could append, like gpsd, e.g.: > > > http://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb > > > > Is that a good idea? > > I was hoping someone else would answer this, since I have no experience > with BSPs or .bbappend files... Since I don't know how this *should* be > done, I'm not against creating alsa-ucm-machine-conf. However, my > intuition would be that the BSP installs its configuration as a > separate recipe whenever the BSP is used. I don't see the need to have > conditions such as "install only if alsa-ucm-conf is installed". Is it > just to save disk space? alsa-ucm-conf anyway installs a bunch of files > that aren't relevant to most machines, so if you're worried about UCM > disk consumption, the alsa-ucm-conf recipe would need work to somehow > install only those files that are needed by the current machine. > > Another approach that would make sense to me (even more than creating a > separate recipe) is to submit your UCM config to ALSA upstream. While > waiting for the change to get accepted to upstream and then later > incorporated in the main alsa-ucm-conf recipe, you could use .bbappend > to add the configuration to the alsa-ucm-conf recipe as a patch. > > -- > Tanu > > https://www.patreon.com/tanuk > https://liberapay.com/tanuk > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sat Feb 1 10:42:13 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 1 Feb 2020 11:42:13 +0100 Subject: [OE-core] [PATCH 1/5] stress-ng: upgrade 0.10.15 -> 0.10.16 In-Reply-To: <2fa3f5b181b91e08037d3662fb48e26589c0a46f.camel@intel.com> References: <20200122054636.10681-1-anuj.mittal@intel.com> <2fa3f5b181b91e08037d3662fb48e26589c0a46f.camel@intel.com> Message-ID: I think the patches are in Ross's queue (ross/mut)? Hopefully it's not forgotten :) Alex On Fri, 31 Jan 2020 at 10:32, Mittal, Anuj wrote: > Ping > > On Wed, 2020-01-22 at 13:46 +0800, Anuj Mittal wrote: > > Signed-off-by: Anuj Mittal > > --- > > .../stress-ng/{stress-ng_0.10.15.bb => stress-ng_0.10.16.bb} | 4 > > ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > rename meta/recipes-extended/stress-ng/{stress-ng_0.10.15.bb => > > stress-ng_0.10.16.bb} (83%) > > > > diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb > > b/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb > > similarity index 83% > > rename from meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb > > rename to meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb > > index 5402130fda..e67b82a527 100644 > > --- a/meta/recipes-extended/stress-ng/stress-ng_0.10.15.bb > > +++ b/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb > > @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " > > file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > SRC_URI = " > > https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ > > file://0001-Do-not-preserve-ownership-when-installing- > > example-jo.patch \ > > " > > -SRC_URI[md5sum] = "303a7276e3a9e3dd03be6cabc9e84a75" > > -SRC_URI[sha256sum] = > > "1d0ca8a2f287e13c2d36c01e874d16d67bcb368d8d26563324c9aaf0ddb100c1" > > +SRC_URI[md5sum] = "a337cd5b1412c53c580e95ee2a9fc77b" > > +SRC_URI[sha256sum] = > > "eabfffcffcf53e67765181280456c204ad00214339cfdb3ee2769d58b4a7e304" > > > > DEPENDS = "coreutils-native" > > > > -- > > 2.21.1 > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sat Feb 1 10:58:22 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 1 Feb 2020 11:58:22 +0100 Subject: [OE-core] [PATCH] icu: update SRC_URI Message-ID: <20200201105823.16391-1-alex.kanavin@gmail.com> New releases of ICU are published on github. Signed-off-by: Alexander Kanavin --- meta/recipes-support/icu/icu_64.2.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index 10bac7aac08..44caa437bf7 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -6,13 +6,18 @@ def icu_download_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ @@ -26,5 +31,5 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" +UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- 2.25.0 From raj.khem at gmail.com Sat Feb 1 17:20:42 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 1 Feb 2020 09:20:42 -0800 Subject: [OE-core] [PATCH 0/2] Update to final glibc 2.31 Message-ID: recognise ppc64le build host for uninative The following changes since commit 18b6b2ae819cbf0ef3858944b4cd02ab74df6607: Adding memoriam to scottrif (2020-01-31 08:03:08 +0000) are available in the Git repository at: git://git.yoctoproject.org/poky-contrib kraj/pu http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kraj/pu Khem Raj (2): uninative: Recognise ppc64 host ldso glibc: Update to final 2.31 release meta/classes/uninative.bbclass | 2 +- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) -- 2.25.0 From raj.khem at gmail.com Sat Feb 1 17:27:40 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 1 Feb 2020 09:27:40 -0800 Subject: [OE-core] [PATCH 0/2] Update to final glibc 2.31 Message-ID: recognise ppc64le build host for uninative The following changes since commit 18b6b2ae819cbf0ef3858944b4cd02ab74df6607: Adding memoriam to scottrif (2020-01-31 08:03:08 +0000) are available in the Git repository at: git://git.yoctoproject.org/poky-contrib kraj/pu http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kraj/pu Khem Raj (2): uninative: Recognise ppc64 host ldso glibc: Update to final 2.31 release meta/classes/uninative.bbclass | 2 +- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) -- 2.25.0 From raj.khem at gmail.com Sat Feb 1 17:27:50 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 1 Feb 2020 09:27:50 -0800 Subject: [OE-core] [PATCH 1/2] uninative: Recognise ppc64 host ldso In-Reply-To: References: Message-ID: <96641614e47e14ecdcd494dc5bd86e679696f14b.1580577516.git.raj.khem@gmail.com> Signed-off-by: Khem Raj --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 9f8645a36a..70799bbf6d 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,4 +1,4 @@ -UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}" +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" UNINATIVE_URL ?= "unset" -- 2.25.0 From raj.khem at gmail.com Sat Feb 1 17:27:51 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 1 Feb 2020 09:27:51 -0800 Subject: [OE-core] [PATCH 2/2] glibc: Update to final 2.31 release In-Reply-To: References: Message-ID: Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index aba2baaaba..936db5ae16 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.30%" +GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.13%" diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 27534d999f..8d412cc857 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # COMPATIBLE_HOST_libc-musl_class-target = "null" -PV = "2.30.9000" +PV = "2.31" diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index c2cfb7e2f1..f489650f70 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "master" -PV = "2.30.9000" -SRCREV_glibc ?= "352bb99754ae7c83ff1b974f9c52244e974c9410" +SRCBRANCH ?= "release/2.31/master" +PV = "2.31" +SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- 2.25.0 From andrey.z at gmail.com Sat Feb 1 18:48:47 2020 From: andrey.z at gmail.com (Andrey Zhizhikin) Date: Sat, 1 Feb 2020 19:48:47 +0100 Subject: [OE-core] [PATCH] gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build In-Reply-To: <20200127104444.14102-1-andrey.zhizhikin@leica-geosystems.com> References: <20200127104444.14102-1-andrey.zhizhikin@leica-geosystems.com> Message-ID: A one gentle ping here. On Mon, Jan 27, 2020 at 11:45 AM Andrey Zhizhikin wrote: > > From: Andrey Zhizhikin > > When opencv is picked in PACKAGECONFIG, plugin fails to locate data > dirs. This is due to meson.build file uses 'test' utility to verify that > the data dirs path is present and not taking sysroot into prefix. > > Introduce additional patch, which picks up PKG_CONFIG_SYSROOT_DIR as > prefix for 'test' utility to verify the data dir is actually present. > > Signed-off-by: Andrey Zhizhikin > --- > ...issing-opencv-data-dir-in-yocto-buil.patch | 49 +++++++++++++++++++ > .../gstreamer1.0-plugins-bad_1.16.1.bb | 1 + > 2 files changed, 50 insertions(+) > create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch > new file mode 100644 > index 0000000000..4b6591c0d8 > --- /dev/null > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch > @@ -0,0 +1,49 @@ > +From f41caae14b618ab815ede3c408e7482b00316e3e Mon Sep 17 00:00:00 2001 > +From: Andrey Zhizhikin > +Date: Mon, 27 Jan 2020 10:22:35 +0000 > +Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build > + > +When Yocto build is performed, opencv searches for data dir using simple > +'test' command, this fails because pkg-config provides an absolute > +path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR > +in order for the 'test' utility to pick up the absolute path. > + > +Upstream-Status: Inappropriate [OE-specific] > + > +Signed-off-by: Andrey Zhizhikin > +--- > + ext/opencv/meson.build | 7 ++++--- > + 1 file changed, 4 insertions(+), 3 deletions(-) > + > +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build > +index f38b55dfe..a26403482 100644 > +--- a/ext/opencv/meson.build > ++++ b/ext/opencv/meson.build > +@@ -78,20 +78,21 @@ else > + endif > + > + if opencv_found > ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() > + opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') > + gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] > + > + # Check the data dir used by opencv for its xml data files > + # Use prefix from pkg-config to be compatible with cross-compilation > +- r = run_command('test', '-d', opencv_prefix + '/share/opencv') > ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') > + if r.returncode() == 0 > + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' > + else > +- r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') > ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') > + if r.returncode() == 0 > + gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' > + else > +- r = run_command('test', '-d', opencv_prefix + '/share/opencv4') > ++ r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') > + if r.returncode() == 0 > + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' > + else > +-- > +2.17.1 > + > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb > index 56ae7a179e..024277eeb1 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb > @@ -6,6 +6,7 @@ SRC_URI = " \ > file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ > file://avoid-including-sys-poll.h-directly.patch \ > file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ > + file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ > " > SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" > SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" > -- > 2.17.1 > From bruce.ashfield at gmail.com Sat Feb 1 22:47:11 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Sat, 1 Feb 2020 17:47:11 -0500 Subject: [OE-core] [PATCH 0/3][RFT]: kernel-yocto: v5.4 LTS kernel In-Reply-To: <4789b1f1-8dc1-dead-1a19-d18f17c0d709@gmail.com> References: <4789b1f1-8dc1-dead-1a19-d18f17c0d709@gmail.com> Message-ID: On Fri, Jan 31, 2020 at 1:25 PM Khem Raj wrote: > > On 1/29/20 4:48 AM, Bruce Ashfield wrote: > > On Wed, Jan 29, 2020 at 2:31 AM Alexander Kanavin > > wrote: > >> > >> Can these issues be bisected? That's how the two kernel regressions (both found last year via ptests) were tracked down to specific commits. > >> > > > > mips64 was already bisected, and reported upstream, not much help > > there .. I've already reached out to some more hardcore mips folks for > > more help, so hopefully that works :D > > > can you point to link where this thread is It was on the mips-kernel mailing list, but thanks to our friends at Cisco, I have a patch in hand for this issue now. They'll follow up to the original thread on the kernel mailing list with the detailed findings (also watch for it on the linux-yocto mailing list). > > > The musl one didn't bisect in my attempt(s), but in that config it is > > an easy issue to trigger. I'm out of time to debug it for the next two > > weeks, hence why I'm broadcasting to see if others want to take a > > look. > > > > As I saw, I do not see this with latest master-next ok, cool. I'll queue the mips fix and re-test. Hopefully it has been sorted out through the latest version bumps. Bruce > > > Bruce > > > >> Alex > >> > >> On Tue, 28 Jan 2020 at 23:14, wrote: > >>> > >>> From: Bruce Ashfield > >>> > >>> Hi all, > >>> > >>> I just wanted to send these to the list, so everyone could see the > >>> reference kernel that we are planning for the upcoming release. > >>> > >>> I have other patches to drop 4.19, 5.2 and make this the default > >>> kernel for the various reference platforms as well, but I'm not > >>> sending them, since we still have two outstanding issues: > >>> > >>> 1) mips64 init is segfaulting after / during some self tests. > >>> > >>> https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/1520/steps/8/logs/step6c > >>> > >>> 2) x86 musl is getting a gpf on many commands: > >>> > >>> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1501/steps/8/logs/step1c > >>> > >>> I've looked into both, and don't have any great ideas on how to debug > >>> or fix them. > >>> > >>> So if anyone has ideas, or wants to poke at these, feel free to follow up. > >>> But as of now, we still can't merge the v5.4 kernel as the reference due > >>> to these remaining problems. > >>> > >>> Bruce > >>> > >>> > >>> The following changes since commit ca3993cc4b13d4e661228cee6fb9448adfd0a4ba: > >>> > >>> bitbake: tests/fetch: Allow wget upgrade tests to run against a local server (2020-01-22 15:56:39 +0000) > >>> > >>> are available in the Git repository at: > >>> > >>> git://git.pokylinux.org/poky-contrib zedd/kernel-oe > >>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe > >>> > >>> Bruce Ashfield (3): > >>> linux-yocto: introduce 5.4 recipes > >>> kern-tools: update Kconfiglib to latest (for 5.4+ kernel) > >>> kernel-devsrc: update to v5.4+ > >>> > >>> .../kern-tools/kern-tools-native_git.bb | 2 +- > >>> meta/recipes-kernel/linux/kernel-devsrc.bb | 8 +-- > >>> .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ > >>> .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ > >>> meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ > >>> 5 files changed, 136 insertions(+), 4 deletions(-) > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > >>> > >>> -- > >>> 2.19.1 > >>> > >>> -- > >>> _______________________________________________ > >>> Openembedded-core mailing list > >>> Openembedded-core at lists.openembedded.org > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From richard.purdie at linuxfoundation.org Sat Feb 1 23:20:29 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 01 Feb 2020 23:20:29 +0000 Subject: [OE-core] [PATCH] gstreamer1.0-plugins-bad: resolve opencv pkg-config in meson build In-Reply-To: References: <20200127104444.14102-1-andrey.zhizhikin@leica-geosystems.com> Message-ID: <2875492fcb3e455aab53cccca7544794d9839663.camel@linuxfoundation.org> On Sat, 2020-02-01 at 19:48 +0100, Andrey Zhizhikin wrote: > A one gentle ping here. Sorry, autobuilder results are a complete wreak at the moment which is making review/testing of patches 'problematic'. Mailing list issues, lack of the SWAT team and a ton of other tangential issues are also not helping. There is a backlog building up and I'm quite depressed about it. Tests failed today, I see if I can do something more tomorrow to get things unblocked. Richard From alistair at alistair23.me Sun Feb 2 02:03:23 2020 From: alistair at alistair23.me (Alistair Francis) Date: Sat, 1 Feb 2020 18:03:23 -0800 Subject: [OE-core] [PATCH] libchamplain: Add support for building libchamplain Message-ID: <20200202020323.23609-1-alistair@alistair23.me> Signed-off-by: Alistair Francis --- .../libchamplain/libchamplain_0.12.20.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb diff --git a/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb new file mode 100644 index 0000000000..90e5533015 --- /dev/null +++ b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb @@ -0,0 +1,12 @@ +SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable maps" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" + +inherit meson gobject-introspection + +SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e" +SRC_URI = "git://github.com/gnome/libchamplain.git" + +S = "${WORKDIR}/git" + -- 2.25.0 From ticotimo at gmail.com Sun Feb 2 02:42:55 2020 From: ticotimo at gmail.com (Tim Orling) Date: Sat, 1 Feb 2020 18:42:55 -0800 Subject: [OE-core] [PATCH] libchamplain: Add support for building libchamplain In-Reply-To: <20200202020323.23609-1-alistair@alistair23.me> References: <20200202020323.23609-1-alistair@alistair23.me> Message-ID: On Sat, Feb 1, 2020 at 6:11 PM Alistair Francis wrote: Maybe some explanation of what is for and why we want it in core would be helpful here. Signed-off-by: Alistair Francis > --- > .../libchamplain/libchamplain_0.12.20.bb | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > create mode 100644 meta/recipes-gnome/libchamplain/ > libchamplain_0.12.20.bb > > diff --git a/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb > b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb > new file mode 100644 > index 0000000000..90e5533015 > --- /dev/null > +++ b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb > @@ -0,0 +1,12 @@ > +SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable > maps" > +LICENSE = "LGPLv2.1" > +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" > +DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 > libsoup-2.4" > + > +inherit meson gobject-introspection > + > +SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e" > +SRC_URI = "git://github.com/gnome/libchamplain.git" > + > +S = "${WORKDIR}/git" > + > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Sun Feb 2 16:52:48 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sun, 2 Feb 2020 16:52:48 +0000 Subject: [OE-core] [PATCH] reproducible: Allow configuration of saved debug output Message-ID: <20200202165248.21554-1-richard.purdie@linuxfoundation.org> If OEQA_DEBUGGING_SAVED_OUTPUT is set in the environment, use this location to store reproducibile build failure output. This aids debugging on the YP autobuilder in particular. Use a date in the directory name to make it easier to find failure output. Also clean up empty directories as they're unnecessary distracting noise. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 9c715ef8ebd..c2610766664 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -15,6 +15,7 @@ import tempfile import shutil import stat import os +import datetime MISSING = 'MISSING' DIFFERENT = 'DIFFERENT' @@ -80,6 +81,9 @@ class ReproducibleTests(OESelftestTestCase): package_classes = ['deb', 'ipk'] images = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline'] save_results = False + if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: + save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] + # This variable controls if one of the test builds is allowed to pull from # an sstate cache/mirror. The other build is always done clean as a point of # comparison. @@ -168,7 +172,9 @@ class ReproducibleTests(OESelftestTestCase): diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") if self.save_results: - save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') + os.makedirs(self.save_results, exist_ok=True) + datestr = datetime.datetime.now().strftime('%Y%m%d') + save_dir = tempfile.mkdtemp(prefix='oe-reproducible-%s-' % datestr, dir=self.save_results) os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) self.logger.info('Non-reproducible packages will be copied to %s', save_dir) @@ -204,3 +210,8 @@ class ReproducibleTests(OESelftestTestCase): self.fail("The following %s packages are missing or different: %s" % (c, ' '.join(r.test for r in (result.missing + result.different)))) + # Clean up empty directories + if self.save_results: + if not os.listdir(save_dir): + os.rmdir(save_dir) + -- 2.20.1 From patchwork at patchwork.openembedded.org Sun Feb 2 17:02:21 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sun, 02 Feb 2020 17:02:21 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_reproducib?= =?utf-8?q?le=3A_Allow_configuration_of_saved_debug_output?= In-Reply-To: <20200202165248.21554-1-richard.purdie@linuxfoundation.org> References: <20200202165248.21554-1-richard.purdie@linuxfoundation.org> Message-ID: <20200202170221.2276.94745@do> == Series Details == Series: reproducible: Allow configuration of saved debug output Revision: 1 URL : https://patchwork.openembedded.org/series/22387/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 138ed4aa96) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From raj.khem at gmail.com Sun Feb 2 18:34:48 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 2 Feb 2020 10:34:48 -0800 Subject: [OE-core] [PATCH 0/2] Update musl, netbase Message-ID: musl has few more commits fixing NAME_MAX The following changes since commit 2b9781da7c6d60f8d0ddb36de2666b1ba702f551: opensbi: Remove dependency on FDT (2020-02-02 16:57:21 +0000) are available in the Git repository at: git://git.yoctoproject.org/poky-contrib kraj/pu http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kraj/pu Khem Raj (2): netbase: Upgrade to 6.0 musl: Update to latest on master meta/recipes-core/musl/musl_git.bb | 2 +- .../netbase/{netbase_5.8.bb => netbase_6.0.bb} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-core/netbase/{netbase_5.8.bb => netbase_6.0.bb} (61%) -- 2.25.0 From raj.khem at gmail.com Sun Feb 2 18:34:58 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 2 Feb 2020 10:34:58 -0800 Subject: [OE-core] [PATCH 1/2] netbase: Upgrade to 6.0 In-Reply-To: References: Message-ID: adjust install to pick new files from S Signed-off-by: Khem Raj --- .../netbase/{netbase_5.8.bb => netbase_6.0.bb} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-core/netbase/{netbase_5.8.bb => netbase_6.0.bb} (61%) diff --git a/meta/recipes-core/netbase/netbase_5.8.bb b/meta/recipes-core/netbase/netbase_6.0.bb similarity index 61% rename from meta/recipes-core/netbase/netbase_5.8.bb rename to meta/recipes-core/netbase/netbase_6.0.bb index df617f4481..2fb5762b30 100644 --- a/meta/recipes-core/netbase/netbase_5.8.bb +++ b/meta/recipes-core/netbase/netbase_6.0.bb @@ -8,13 +8,13 @@ PE = "1" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz" -SRC_URI[md5sum] = "ca2e339861b64370779341b9696ee3df" -SRC_URI[sha256sum] = "4a9035eb379c4f7f7d424e5580b219b79566fa366c812542691ae337486cfb8e" +SRC_URI[md5sum] = "3417b0487161f1a2b070a3308cd7f957" +SRC_URI[sha256sum] = "692baeb7b76eba5580c7edbc97ce1784a06b5aa4b367c5ed0b39e0ce7a97d594" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () { install -d ${D}/${mandir}/man8 ${D}${sysconfdir} - install -m 0644 etc-rpc ${D}${sysconfdir}/rpc - install -m 0644 etc-protocols ${D}${sysconfdir}/protocols - install -m 0644 etc-services ${D}${sysconfdir}/services + install -m 0644 ${S}/etc/rpc ${D}${sysconfdir}/rpc + install -m 0644 ${S}/etc/protocols ${D}${sysconfdir}/protocols + install -m 0644 ${S}/etc/services ${D}${sysconfdir}/services } -- 2.25.0 From raj.khem at gmail.com Sun Feb 2 18:34:59 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 2 Feb 2020 10:34:59 -0800 Subject: [OE-core] [PATCH 2/2] musl: Update to latest on master In-Reply-To: References: Message-ID: Details on commit delta [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=83350eb17b9cb355e3f08b0340c4f1e8c437fac9..e6093b5a870a38ebfb3e54382acd48c698bde15d Signed-off-by: Khem Raj --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 629872050c..f4853b4f2e 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "83350eb17b9cb355e3f08b0340c4f1e8c437fac9" +SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" BASEVER = "1.1.24" -- 2.25.0 From alistair23 at gmail.com Sun Feb 2 19:04:11 2020 From: alistair23 at gmail.com (Alistair Francis) Date: Sun, 2 Feb 2020 11:04:11 -0800 Subject: [OE-core] [PATCH] libchamplain: Add support for building libchamplain In-Reply-To: References: <20200202020323.23609-1-alistair@alistair23.me> Message-ID: On Sat, Feb 1, 2020 at 6:43 PM Tim Orling wrote: > > > > On Sat, Feb 1, 2020 at 6:11 PM Alistair Francis wrote: > > Maybe some explanation of what is for and why we want it in core would be helpful here. On second thought it probably should go into meta-openembeded. I'll send a patch there. Alistair > >> Signed-off-by: Alistair Francis >> --- >> .../libchamplain/libchamplain_0.12.20.bb | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> create mode 100644 meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb >> >> diff --git a/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb >> new file mode 100644 >> index 0000000000..90e5533015 >> --- /dev/null >> +++ b/meta/recipes-gnome/libchamplain/libchamplain_0.12.20.bb >> @@ -0,0 +1,12 @@ >> +SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable maps" >> +LICENSE = "LGPLv2.1" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" >> +DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" >> + >> +inherit meson gobject-introspection >> + >> +SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e" >> +SRC_URI = "git://github.com/gnome/libchamplain.git" >> + >> +S = "${WORKDIR}/git" >> + >> -- >> 2.25.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From akuster808 at gmail.com Mon Feb 3 01:16:44 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 2 Feb 2020 17:16:44 -0800 Subject: [OE-core] [zeus][{ATCH] python2: add ntpath Message-ID: <20200203011644.29098-1-akuster808@gmail.com> python3 has this but python is missing this. [Yocto #13740] Signed-off-by: Armin Kuster --- meta/recipes-devtools/python/python/python2-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json index eb52e862ab..fd98774d00 100644 --- a/meta/recipes-devtools/python/python/python2-manifest.json +++ b/meta/recipes-devtools/python/python/python2-manifest.json @@ -267,6 +267,7 @@ "${libdir}/python2.7/lib-dynload/xreadlines.so", "${libdir}/python2.7/linecache.py", "${libdir}/python2.7/new.py", + "${libdir}/python2.7/ntpath.py", "${libdir}/python2.7/os.py", "${libdir}/python2.7/platform.py", "${libdir}/python2.7/posixpath.py", -- 2.17.1 From joel at jms.id.au Mon Feb 3 06:34:55 2020 From: joel at jms.id.au (Joel Stanley) Date: Mon, 3 Feb 2020 17:04:55 +1030 Subject: [OE-core] [PATCH] perf: Additional fixes for 5.5+ Message-ID: <20200203063455.417119-1-joel@jms.id.au> In e5c4f3127521 ("perf: fix build for v5.5+") this recipe was fixed for 5.5 kernels, however testing shows that there's a few other changes required. perf's build system uses a file from the scripts/ directory to generate a bpf header, so this must be added to the list of files to perform a replace on. Additionally the replacement would run on all occurrences of /usr/bin/python first, resulting in lines that contained "/usr/bin/env python32". This re-orders the sed lines to avoid that. This fixes warnings such the following: File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' Change-Id: I8d0011908c87d5fbcf1c3aefb362fe6beb64d22e Signed-off-by: Joel Stanley --- Found when attempting to use 5.5 with OpenBMC. The sed method of fixing this may be fragile, and moving to patching the source tree may be preferred in the future. meta/recipes-kernel/perf/perf.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b06693d26..1e0be467c024 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,11 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` scripts/bpf_helpers_doc.py; do sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- 2.24.1 From zhe.he at windriver.com Mon Feb 3 06:47:32 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Mon, 3 Feb 2020 14:47:32 +0800 Subject: [OE-core] [PATCH] lttng-modules: update to 2.11.1 Message-ID: <20200203064732.3923-1-zhe.he@windriver.com> From: He Zhe Fix build failure with kernel v5.5. Remove patch as issues fixed upstream. Signed-off-by: He Zhe --- ...modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb => lttng-modules_2.11.1.bb} (68%) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb similarity index 68% rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb index 3465a43d38..c833ff7009 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb @@ -11,14 +11,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ - file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ - file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ " -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4" -SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f" +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" +SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -35,13 +31,13 @@ python do_package_prepend() { } BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3" +LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" DEFAULT_PREFERENCE_class-devupstream = "-1" -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \ +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" -PV_class-devupstream = "2.10.10+git${SRCPV}" +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" +PV_class-devupstream = "2.11.1+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" SRCREV_FORMAT ?= "lttng_git" -- 2.17.1 From anuj.mittal at intel.com Mon Feb 3 06:45:42 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Mon, 3 Feb 2020 06:45:42 +0000 Subject: [OE-core] [PATCH] perf: Additional fixes for 5.5+ In-Reply-To: <20200203063455.417119-1-joel@jms.id.au> References: <20200203063455.417119-1-joel@jms.id.au> Message-ID: On Mon, 2020-02-03 at 17:04 +1030, Joel Stanley wrote: > # use /usr/bin/env instead of version specific python > - for s in `find ${S}/tools/perf/ -name '*.py'`; do > - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > + for s in `find ${S}/tools/perf/ -name '*.py'` > scripts/bpf_helpers_doc.py; do > sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" Can all these lines be replaced by: sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} Thanks, Anuj From joel at jms.id.au Mon Feb 3 06:53:10 2020 From: joel at jms.id.au (Joel Stanley) Date: Mon, 3 Feb 2020 06:53:10 +0000 Subject: [OE-core] [PATCH] perf: Additional fixes for 5.5+ In-Reply-To: References: <20200203063455.417119-1-joel@jms.id.au> Message-ID: On Mon, 3 Feb 2020 at 06:45, Mittal, Anuj wrote: > > On Mon, 2020-02-03 at 17:04 +1030, Joel Stanley wrote: > > # use /usr/bin/env instead of version specific python > > - for s in `find ${S}/tools/perf/ -name '*.py'`; do > > - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > > + for s in `find ${S}/tools/perf/ -name '*.py'` > > scripts/bpf_helpers_doc.py; do > > sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > > sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > > sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > > + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > > Can all these lines be replaced by: > > sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} This would have the same effect, yes. From andrey.z at gmail.com Mon Feb 3 07:07:40 2020 From: andrey.z at gmail.com (Andrey Zhizhikin) Date: Mon, 3 Feb 2020 08:07:40 +0100 Subject: [OE-core] [PATCH] perf: Additional fixes for 5.5+ In-Reply-To: <20200203063455.417119-1-joel@jms.id.au> References: <20200203063455.417119-1-joel@jms.id.au> Message-ID: On Mon, Feb 3, 2020 at 7:35 AM Joel Stanley wrote: > > In e5c4f3127521 ("perf: fix build for v5.5+") this recipe was fixed for > 5.5 kernels, however testing shows that there's a few other changes > required. > > perf's build system uses a file from the scripts/ directory to > generate a bpf header, so this must be added to the list of files to > perform a replace on. > > Additionally the replacement would run on all occurrences of > /usr/bin/python first, resulting in lines that contained > "/usr/bin/env python32". This re-orders the sed lines to avoid that. > > This fixes warnings such the following: > > File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix > _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) > ModuleNotFoundError: No module named '_sysconfigdata' > > Change-Id: I8d0011908c87d5fbcf1c3aefb362fe6beb64d22e > Signed-off-by: Joel Stanley > --- > Found when attempting to use 5.5 with OpenBMC. > > The sed method of fixing this may be fragile, and moving to patching the > source tree may be preferred in the future. > > meta/recipes-kernel/perf/perf.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > index 6d1b06693d26..1e0be467c024 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -239,11 +239,11 @@ do_configure_prepend () { > fi > > # use /usr/bin/env instead of version specific python > - for s in `find ${S}/tools/perf/ -name '*.py'`; do > - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > + for s in `find ${S}/tools/perf/ -name '*.py'` scripts/bpf_helpers_doc.py; do bpf_helpers_doc.py script is already python3, and according to the GIT [1] - it was created like that. Do we really need to include it in the list? Besides, provided this is really needed - does it make sense to check all scripts instead of explicitly supplying just one here? > sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > done > > # unistd.h can be out of sync between libc-headers and the captured version in the perf source > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/log/scripts/bpf_helpers_doc.py?h=v5.5 -- Regards, Andrey. From alex.kanavin at gmail.com Mon Feb 3 07:18:36 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 3 Feb 2020 08:18:36 +0100 Subject: [OE-core] [PATCH] lttng-modules: update to 2.11.1 In-Reply-To: <20200203064732.3923-1-zhe.he@windriver.com> References: <20200203064732.3923-1-zhe.he@windriver.com> Message-ID: The patch files should also be removed. Alex > On 3 Feb 2020, at 7.47, wrote: > > From: He Zhe > > Fix build failure with kernel v5.5. > Remove patch as issues fixed upstream. > > Signed-off-by: He Zhe > --- > ...modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb => lttng-modules_2.11.1.bb} (68%) > > diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb > similarity index 68% > rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb > rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb > index 3465a43d38..c833ff7009 100644 > --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb > +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb > @@ -11,14 +11,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' > SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ > file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ > file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ > - file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ > - file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ > - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ > - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ > " > > -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4" > -SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f" > +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" > +SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" > > export INSTALL_MOD_DIR="kernel/lttng-modules" > > @@ -35,13 +31,13 @@ python do_package_prepend() { > } > > BBCLASSEXTEND = "devupstream:target" > -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3" > +LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" > DEFAULT_PREFERENCE_class-devupstream = "-1" > -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \ > +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ > file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ > file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ > " > -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" > -PV_class-devupstream = "2.10.10+git${SRCPV}" > +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" > +PV_class-devupstream = "2.11.1+git${SRCPV}" > S_class-devupstream = "${WORKDIR}/git" > SRCREV_FORMAT ?= "lttng_git" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From bruce.ashfield at gmail.com Mon Feb 3 07:26:45 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Mon, 3 Feb 2020 02:26:45 -0500 Subject: [OE-core] [PATCH] perf: Additional fixes for 5.5+ In-Reply-To: <20200203063455.417119-1-joel@jms.id.au> References: <20200203063455.417119-1-joel@jms.id.au> Message-ID: On Mon, Feb 3, 2020 at 1:35 AM Joel Stanley wrote: > > In e5c4f3127521 ("perf: fix build for v5.5+") this recipe was fixed for > 5.5 kernels, however testing shows that there's a few other changes > required. > > perf's build system uses a file from the scripts/ directory to > generate a bpf header, so this must be added to the list of files to > perform a replace on. > > Additionally the replacement would run on all occurrences of > /usr/bin/python first, resulting in lines that contained > "/usr/bin/env python32". This re-orders the sed lines to avoid that. > > This fixes warnings such the following: > > File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix > _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) > ModuleNotFoundError: No module named '_sysconfigdata' > > Change-Id: I8d0011908c87d5fbcf1c3aefb362fe6beb64d22e > Signed-off-by: Joel Stanley > --- > Found when attempting to use 5.5 with OpenBMC. > > The sed method of fixing this may be fragile, and moving to patching the > source tree may be preferred in the future. unfortunately, we cannot do patches. Since perf is a copy of the code from the kernel source, you can't carry patches that apply everywhere. Bruce > > meta/recipes-kernel/perf/perf.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > index 6d1b06693d26..1e0be467c024 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -239,11 +239,11 @@ do_configure_prepend () { > fi > > # use /usr/bin/env instead of version specific python > - for s in `find ${S}/tools/perf/ -name '*.py'`; do > - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > + for s in `find ${S}/tools/perf/ -name '*.py'` scripts/bpf_helpers_doc.py; do > sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > done > > # unistd.h can be out of sync between libc-headers and the captured version in the perf source > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bruce.ashfield at gmail.com Mon Feb 3 07:33:42 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Mon, 3 Feb 2020 02:33:42 -0500 Subject: [OE-core] [PATCH 0/3][RFT]: kernel-yocto: v5.4 LTS kernel In-Reply-To: References: <4789b1f1-8dc1-dead-1a19-d18f17c0d709@gmail.com> Message-ID: On Sat, Feb 1, 2020 at 5:47 PM Bruce Ashfield wrote: > > On Fri, Jan 31, 2020 at 1:25 PM Khem Raj wrote: > > > > On 1/29/20 4:48 AM, Bruce Ashfield wrote: > > > On Wed, Jan 29, 2020 at 2:31 AM Alexander Kanavin > > > wrote: > > >> > > >> Can these issues be bisected? That's how the two kernel regressions (both found last year via ptests) were tracked down to specific commits. > > >> > > > > > > mips64 was already bisected, and reported upstream, not much help > > > there .. I've already reached out to some more hardcore mips folks for > > > more help, so hopefully that works :D > > > > > can you point to link where this thread is > > It was on the mips-kernel mailing list, but thanks to our friends at > Cisco, I have a patch in hand for this issue now. They'll follow up to > the original thread on the kernel mailing list with the detailed > findings (also watch for it on the linux-yocto mailing list). > > > > > > The musl one didn't bisect in my attempt(s), but in that config it is > > > an easy issue to trigger. I'm out of time to debug it for the next two > > > weeks, hence why I'm broadcasting to see if others want to take a > > > look. > > > > > > > As I saw, I do not see this with latest master-next > > ok, cool. I'll queue the mips fix and re-test. Hopefully it has been > sorted out through the latest version bumps. I'm unfortunately still seeing this on my AB run against master next. https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1520/steps/8/logs/step1c Which does imply that the kernel bump is triggering it (since master-next had 5.4, but it wasn't the default, my series makes it the default). I won't have any time to look at this until late next week, since I'm still traveling. Bruce > > Bruce > > > > > > Bruce > > > > > >> Alex > > >> > > >> On Tue, 28 Jan 2020 at 23:14, wrote: > > >>> > > >>> From: Bruce Ashfield > > >>> > > >>> Hi all, > > >>> > > >>> I just wanted to send these to the list, so everyone could see the > > >>> reference kernel that we are planning for the upcoming release. > > >>> > > >>> I have other patches to drop 4.19, 5.2 and make this the default > > >>> kernel for the various reference platforms as well, but I'm not > > >>> sending them, since we still have two outstanding issues: > > >>> > > >>> 1) mips64 init is segfaulting after / during some self tests. > > >>> > > >>> https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/1520/steps/8/logs/step6c > > >>> > > >>> 2) x86 musl is getting a gpf on many commands: > > >>> > > >>> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1501/steps/8/logs/step1c > > >>> > > >>> I've looked into both, and don't have any great ideas on how to debug > > >>> or fix them. > > >>> > > >>> So if anyone has ideas, or wants to poke at these, feel free to follow up. > > >>> But as of now, we still can't merge the v5.4 kernel as the reference due > > >>> to these remaining problems. > > >>> > > >>> Bruce > > >>> > > >>> > > >>> The following changes since commit ca3993cc4b13d4e661228cee6fb9448adfd0a4ba: > > >>> > > >>> bitbake: tests/fetch: Allow wget upgrade tests to run against a local server (2020-01-22 15:56:39 +0000) > > >>> > > >>> are available in the Git repository at: > > >>> > > >>> git://git.pokylinux.org/poky-contrib zedd/kernel-oe > > >>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe > > >>> > > >>> Bruce Ashfield (3): > > >>> linux-yocto: introduce 5.4 recipes > > >>> kern-tools: update Kconfiglib to latest (for 5.4+ kernel) > > >>> kernel-devsrc: update to v5.4+ > > >>> > > >>> .../kern-tools/kern-tools-native_git.bb | 2 +- > > >>> meta/recipes-kernel/linux/kernel-devsrc.bb | 8 +-- > > >>> .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ > > >>> .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ > > >>> meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ > > >>> 5 files changed, 136 insertions(+), 4 deletions(-) > > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >>> create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >>> > > >>> -- > > >>> 2.19.1 > > >>> > > >>> -- > > >>> _______________________________________________ > > >>> Openembedded-core mailing list > > >>> Openembedded-core at lists.openembedded.org > > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > > > > > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From zhe.he at windriver.com Mon Feb 3 07:44:27 2020 From: zhe.he at windriver.com (He Zhe) Date: Mon, 3 Feb 2020 15:44:27 +0800 Subject: [OE-core] [PATCH] lttng-modules: update to 2.11.1 In-Reply-To: References: <20200203064732.3923-1-zhe.he@windriver.com> Message-ID: <57015772-f68f-a3e3-5732-cb342b503661@windriver.com> Oops, sure. I'll send v2. Zhe On 2/3/20 3:18 PM, Alexander Kanavin wrote: > The patch files should also be removed. > > Alex > >> On 3 Feb 2020, at 7.47, wrote: >> >> From: He Zhe >> >> Fix build failure with kernel v5.5. >> Remove patch as issues fixed upstream. >> >> Signed-off-by: He Zhe >> --- >> ...modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 ++++++---------- >> 1 file changed, 6 insertions(+), 10 deletions(-) >> rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb => lttng-modules_2.11.1.bb} (68%) >> >> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >> similarity index 68% >> rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb >> rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >> index 3465a43d38..c833ff7009 100644 >> --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb >> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >> @@ -11,14 +11,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' >> SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ >> file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ >> file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ >> - file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ >> - file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ >> - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ >> - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ >> " >> >> -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4" >> -SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f" >> +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" >> +SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" >> >> export INSTALL_MOD_DIR="kernel/lttng-modules" >> >> @@ -35,13 +31,13 @@ python do_package_prepend() { >> } >> >> BBCLASSEXTEND = "devupstream:target" >> -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3" >> +LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" >> DEFAULT_PREFERENCE_class-devupstream = "-1" >> -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \ >> +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ >> file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ >> file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ >> " >> -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" >> -PV_class-devupstream = "2.10.10+git${SRCPV}" >> +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" >> +PV_class-devupstream = "2.11.1+git${SRCPV}" >> S_class-devupstream = "${WORKDIR}/git" >> SRCREV_FORMAT ?= "lttng_git" >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From zhe.he at windriver.com Mon Feb 3 07:47:42 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Mon, 3 Feb 2020 15:47:42 +0800 Subject: [OE-core] [PATCH v2] lttng-modules: update to 2.11.1 Message-ID: <20200203074742.12942-1-zhe.he@windriver.com> From: He Zhe Fix build failure with kernel v5.5. Remove patches as issues fixed upstream. Signed-off-by: He Zhe --- ...ops-when-trace-sunrpc_task-events-in.patch | 94 ------------- ...rpc_clnt-dereference-in-rpc_task_que.patch | 44 ------ ...rpc-use-signed-integer-for-client-id.patch | 105 -------------- ...nrpc-introduce-lttng_get_clid-helper.patch | 130 ------------------ ...ules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 +-- 5 files changed, 6 insertions(+), 383 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb => lttng-modules_2.11.1.bb} (68%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch deleted file mode 100644 index bdbc4f811e..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 1ff7013bcf7f068cf4371d12d758f9c0fd16a619 Mon Sep 17 00:00:00 2001 -From: Quanyang Wang -Date: Thu, 5 Dec 2019 15:35:32 +0800 -Subject: [PATCH 1/4] Fix: SUNRPC: Fix oops when trace sunrpc_task events in - nfs client - -See upstream commit : - - commit 2ca310fc4160ed0420da65534a21ae77b24326a8 - Author: Ditang Chen - Date: Fri, 7 Mar 2014 13:27:57 +0800 - Subject: SUNRPC: Fix oops when trace sunrpc_task events in nfs client - - When tracking sunrpc_task events in nfs client, the clnt pointer may be NULL. - - [ 139.269266] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004 - [ 139.269915] IP: [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] PGD 1d293067 PUD 1d294067 PMD 0 - [ 139.269915] Oops: 0000 [#1] SMP - [ 139.269915] Modules linked in: nfsv4 dns_resolver nfs lockd sunrpc fscache sg ppdev e1000 - serio_raw pcspkr parport_pc parport i2c_piix4 i2c_core microcode xfs libcrc32c sd_mod sr_mod - cdrom ata_generic crc_t10dif crct10dif_common pata_acpi ahci libahci ata_piix libata dm_mirror - dm_region_hash dm_log dm_mod - [ 139.269915] CPU: 0 PID: 59 Comm: kworker/0:2 Not tainted 3.10.0-84.el7.x86_64 #1 - [ 139.269915] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 - [ 139.269915] Workqueue: rpciod rpc_async_schedule [sunrpc] - [ 139.269915] task: ffff88001b598000 ti: ffff88001b632000 task.ti: ffff88001b632000 - [ 139.269915] RIP: 0010:[] [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] RSP: 0018:ffff88001b633d70 EFLAGS: 00010206 - [ 139.269915] RAX: ffff88001dfc5338 RBX: ffff88001cc37a00 RCX: ffff88001dfc5334 - [ 139.269915] RDX: ffff88001dfc5338 RSI: 0000000000000000 RDI: ffff88001dfc533c - [ 139.269915] RBP: ffff88001b633db0 R08: 000000000000002c R09: 000000000000000a - [ 139.269915] R10: 0000000000062180 R11: 00000020759fb9dc R12: ffffffffa0292c20 - [ 139.269915] R13: ffff88001dfc5334 R14: 0000000000000000 R15: 0000000000000000 - [ 139.269915] FS: 0000000000000000(0000) GS:ffff88001fc00000(0000) knlGS:0000000000000000 - [ 139.269915] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b - [ 139.269915] CR2: 0000000000000004 CR3: 000000001d290000 CR4: 00000000000006f0 - [ 139.269915] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 - [ 139.269915] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 - [ 139.269915] Stack: - [ 139.269915] 000000001b633d98 0000000000000246 ffff88001df1dc00 ffff88001cc37a00 - [ 139.269915] ffff88001bc35e60 0000000000000000 ffff88001ffa0a48 ffff88001bc35ee0 - [ 139.269915] ffff88001b633e08 ffffffffa02704b5 0000000000010000 ffff88001cc37a70 - [ 139.269915] Call Trace: - [ 139.269915] [] __rpc_execute+0x1d5/0x400 [sunrpc] - [ 139.269915] [] rpc_async_schedule+0x26/0x30 [sunrpc] - [ 139.269915] [] process_one_work+0x17b/0x460 - [ 139.269915] [] worker_thread+0x11b/0x400 - [ 139.269915] [] ? rescuer_thread+0x3e0/0x3e0 - [ 139.269915] [] kthread+0xc0/0xd0 - [ 139.269915] [] ? kthread_create_on_node+0x110/0x110 - [ 139.269915] [] ret_from_fork+0x7c/0xb0 - [ 139.269915] [] ? kthread_create_on_node+0x110/0x110 - [ 139.269915] Code: 4c 8b 45 c8 48 8d 7d d0 89 4d c4 41 89 c9 b9 28 00 00 00 e8 9d b4 e9 - e0 48 85 c0 49 89 c5 74 a2 48 89 c7 e8 9d 3f e9 e0 48 89 c2 <41> 8b 46 04 48 8b 7d d0 4c - 89 e9 4c 89 e6 89 42 0c 0f b7 83 d4 - [ 139.269915] RIP [] ftrace_raw_event_rpc_task_running+0x86/0xf0 [sunrpc] - [ 139.269915] RSP - [ 139.269915] CR2: 0000000000000004 - [ 140.946406] ---[ end trace ba486328b98d7622 ]--- - -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/2b228b503cad10bf0c5a99b42a908ca906eab5b9] - -Signed-off-by: Quanyang Wang -Signed-off-by: Mathieu Desnoyers ---- - instrumentation/events/lttng-module/rpc.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 3798e8e..fb13106 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -139,7 +139,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -208,7 +208,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch deleted file mode 100644 index 03264bac68..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 032a74d83b263c4faead8e4c25d497fb8ea07b6e Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:29:02 -0500 -Subject: [PATCH 2/4] Fix: sunrpc: null rpc_clnt dereference in rpc_task_queued - tracepoint - -Based on upstream Linux commit: - -commit 0be283f676a1e7b208db0c992283197ef8b52158 -Author: Benjamin Coddington -Date: Tue Jan 23 09:32:35 2018 -0500 - - SUNRPC: Fix null rpc_clnt dereference in rpc_task_queued tracepoint - - Backchannel tasks will not have a reference to the rpc_clnt. Return -1 for - cl_clid in that case. - - Signed-off-by: Benjamin Coddington - Signed-off-by: Trond Myklebust - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/8f83a9103dcdf4f6b73783427fc5ded4869309d5] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index fb13106..68c622c 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -176,7 +176,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(unsigned int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch deleted file mode 100644 index c7529f16dd..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-sunrpc-use-signed-integer-for-client-id.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 70389e422dd3146161089d454f525367c9046ecd Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:29:37 -0500 -Subject: [PATCH 3/4] Fix: sunrpc: use signed integer for client id - -Within include/linux/sunrpc/clnt.h:struct rpc_cltn, the cl_clid field -is an unsigned integer, which is the type expected by the tracepoint -signature. - -However, looking into net/sunrpc/clnt.c:rpc_alloc_clid(), its allocation -considers negative signed integer as errors. - -Therefore, in order to properly show "-1" in the trace output (rather -than MAX_INT) when called with a NULL task->tk_client, move to a -signed integer as backing type for the client_id field. - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/cc7bb0aa52cae22255581d67841449bb8ea36fda] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 68c622c..2d06e55 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -18,7 +18,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -43,7 +43,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -100,7 +100,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -112,7 +112,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client->cl_clid) - ctf_integer(int, status, status) - ) - ) -@@ -139,7 +139,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -176,7 +177,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? -+ ctf_integer(int, client_id, task->tk_client ? - task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) -@@ -209,7 +210,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -246,7 +248,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, task->tk_client ? -+ task->tk_client->cl_clid : -1) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch deleted file mode 100644 index 4dd726cf2c..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0004-sunrpc-introduce-lttng_get_clid-helper.patch +++ /dev/null @@ -1,130 +0,0 @@ -From b6903d57e4c3234ec5b1c7f72e232023cdee0fab Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 12 Dec 2019 10:39:38 -0500 -Subject: [PATCH 4/4] sunrpc: introduce lttng_get_clid helper - -Introduce the lttng_get_clid helper to always check for NULL pointer -when getting the client id. While not always strictly needed depending -on the tracepoint callsite, prefer robustness of instrumentation and -always check for NULL rather than play whack-a-mole. - -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/1330a091a687a406513c3a326c2fc2a0dbe75536] -Signed-off-by: Quanyang Wang ---- - instrumentation/events/lttng-module/rpc.h | 43 ++++++++++++++++------- - 1 file changed, 31 insertions(+), 12 deletions(-) - -diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h -index 2d06e55..ceaf9db 100644 ---- a/instrumentation/events/lttng-module/rpc.h -+++ b/instrumentation/events/lttng-module/rpc.h -@@ -9,6 +9,29 @@ - #include - #include - -+#ifndef ONCE_LTTNG_RPC_H -+#define ONCE_LTTNG_RPC_H -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) -+static inline -+int lttng_get_clid(const struct rpc_task *task) -+{ -+ struct rpc_clnt *tk_client; -+ -+ tk_client = task->tk_client; -+ if (!tk_client) -+ return -1; -+ /* -+ * The cl_clid field is always initialized to positive signed -+ * integers. Negative signed integer values are treated as -+ * errors. -+ */ -+ return (int) tk_client->cl_clid; -+} -+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ -+ -+#endif /* ONCE_LTTNG_RPC_H */ -+ - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - -@@ -18,7 +41,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -43,7 +66,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -100,7 +123,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, task->tk_status) - ) - ) -@@ -112,7 +135,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client->cl_clid) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(int, status, status) - ) - ) -@@ -139,8 +162,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -177,8 +199,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -210,8 +231,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer_hex(const void *, action, action) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) -@@ -248,8 +268,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, - - TP_FIELDS( - ctf_integer(unsigned int, task_id, task->tk_pid) -- ctf_integer(int, client_id, task->tk_client ? -- task->tk_client->cl_clid : -1) -+ ctf_integer(int, client_id, lttng_get_clid(task)) - ctf_integer(unsigned long, timeout, task->tk_timeout) - ctf_integer(unsigned long, runstate, task->tk_runstate) - ctf_integer(int, status, task->tk_status) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb similarity index 68% rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb index 3465a43d38..c833ff7009 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb @@ -11,14 +11,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ - file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ - file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ " -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4" -SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f" +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" +SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -35,13 +31,13 @@ python do_package_prepend() { } BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3" +LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" DEFAULT_PREFERENCE_class-devupstream = "-1" -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \ +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" -PV_class-devupstream = "2.10.10+git${SRCPV}" +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" +PV_class-devupstream = "2.11.1+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" SRCREV_FORMAT ?= "lttng_git" -- 2.17.1 From zhe.he at windriver.com Mon Feb 3 04:51:50 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Mon, 3 Feb 2020 12:51:50 +0800 Subject: [OE-core] [PATCH] lttng-modules: update to 2.11.1 Message-ID: <20200203045150.24875-1-zhe.he@windriver.com> From: He Zhe Fix build failure with kernel v5.5. Remove patch as issues fixed upstream. Signed-off-by: He Zhe --- ...modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb => lttng-modules_2.11.1.bb} (68%) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb similarity index 68% rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb index 3465a43d38..c833ff7009 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb @@ -11,14 +11,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ - file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ - file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ " -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4" -SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f" +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" +SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -35,13 +31,13 @@ python do_package_prepend() { } BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3" +LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" DEFAULT_PREFERENCE_class-devupstream = "-1" -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \ +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" -PV_class-devupstream = "2.10.10+git${SRCPV}" +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" +PV_class-devupstream = "2.11.1+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" SRCREV_FORMAT ?= "lttng_git" -- 2.17.1 From zhe.he at windriver.com Mon Feb 3 05:44:20 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Mon, 3 Feb 2020 13:44:20 +0800 Subject: [OE-core] [PATCH] lttng-modules: update to 2.11.1 Message-ID: <20200203054420.35875-1-zhe.he@windriver.com> From: He Zhe Fix build failure with kernel v5.5. Remove patch as issues fixed upstream. Signed-off-by: He Zhe --- ...modules_2.11.0.bb => lttng-modules_2.11.1.bb} | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.11.0.bb => lttng-modules_2.11.1.bb} (68%) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb similarity index 68% rename from meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb index 3465a43d38..c833ff7009 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb @@ -11,14 +11,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ - file://0001-Fix-SUNRPC-Fix-oops-when-trace-sunrpc_task-events-in.patch \ - file://0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch \ - file://0003-Fix-sunrpc-use-signed-integer-for-client-id.patch \ - file://0004-sunrpc-introduce-lttng_get_clid-helper.patch \ " -SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4" -SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f" +SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" +SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -35,13 +31,13 @@ python do_package_prepend() { } BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3" +LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" DEFAULT_PREFERENCE_class-devupstream = "-1" -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \ +SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" -PV_class-devupstream = "2.10.10+git${SRCPV}" +SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" +PV_class-devupstream = "2.11.1+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" SRCREV_FORMAT ?= "lttng_git" -- 2.17.1 From richard.purdie at linuxfoundation.org Mon Feb 3 08:55:24 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 03 Feb 2020 08:55:24 +0000 Subject: [OE-core] [PATCH 22/24] xserver-xorg: upgrade 1.20.6 -> 1.20.7 In-Reply-To: <20200129090738.1398-22-alex.kanavin@gmail.com> References: <20200129090738.1398-1-alex.kanavin@gmail.com> <20200129090738.1398-22-alex.kanavin@gmail.com> Message-ID: On Wed, 2020-01-29 at 10:07 +0100, Alexander Kanavin wrote: > Signed-off-by: Alexander Kanavin > --- > .../{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} (88%) > > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb > similarity index 88% > rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb > index a1cd490394f..2bd10adf078 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb > @@ -5,8 +5,8 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat > file://0001-test-xtest-Initialize-array-with-braces.patch \ > file://sdksyms-no-build-path.patch \ > " > -SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" > -SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" > +SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9" > +SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1" > > CFLAGS += "-fcommon" https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1534 nodistro build so probably GL distro features related: ../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c: In function 'drmmode_crtc_set_mode': ../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c:757:15: warning: unused variable 'screen' [-Wunused-variable] 757 | ScreenPtr screen = crtc->scrn->pScreen; | ^~~~~~ ../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c: In function 'drmmode_clear_pixmap': ../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c:1806:9: error: implicit declaration of function 'miClearDrawable'; did you mean 'drmCreateDrawable'? [-Werror=implicit-function-declaration] 1806 | miClearDrawable(&pixmap->drawable, gc); | ^~~~~~~~~~~~~~~ | drmCreateDrawable ../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c:1806:9: warning: nested extern declaration of 'miClearDrawable' [-Wnested-externs] cc1: some warnings being treated as errors make[5]: *** [Makefile:789: drmmode_display.lo] Error 1 Cheers, Richard From kai.kang at windriver.com Mon Feb 3 09:33:11 2020 From: kai.kang at windriver.com (kai.kang at windriver.com) Date: Mon, 3 Feb 2020 17:33:11 +0800 Subject: [OE-core] [PATCH] ifupdown: add ptest Message-ID: <20200203093311.9644-1-kai.kang@windriver.com> From: Kai Kang Add ptest for ifupdown with its own test cases. [Yocto #13736] Signed-off-by: Kai Kang --- meta/recipes-core/ifupdown/files/run-ptest | 4 ++ .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ifupdown/files/run-ptest create mode 100644 meta/recipes-core/ifupdown/files/tweak-ptest-script.patch diff --git a/meta/recipes-core/ifupdown/files/run-ptest b/meta/recipes-core/ifupdown/files/run-ptest new file mode 100644 index 0000000000..8694042392 --- /dev/null +++ b/meta/recipes-core/ifupdown/files/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh + +CURDIR=$(dirname `readlink -f $0`) +cd $CURDIR/tests && ./testbuild-linux diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file mode 100644 index 0000000000..d7600cf243 --- /dev/null +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch @@ -0,0 +1,49 @@ +Tweak tests of ifupdown to make it work with oe-core ptest framework. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Kai Kang + +diff --git a/tests/testbuild-linux b/tests/testbuild-linux +index 1181ea0..d5c1814 100755 +--- a/tests/testbuild-linux ++++ b/tests/testbuild-linux +@@ -1,6 +1,7 @@ + #!/bin/sh -e + +-dir=tests/linux ++curdir=$(dirname `readlink -f $0`) ++dir=$curdir/linux + + result=true + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "Testcase $test: $args" + + exitcode=0 +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test + + exitcode=0 +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test + + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then +- echo "(okay)" ++ echo "PASS: $test" + else +- echo "(failed)" ++ echo "FAIL: $test" + result=false + fi + echo "==========" diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb index 0de97fe372..53cb971d33 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb @@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ + file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ " SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" S = "${WORKDIR}/git" -inherit update-alternatives +inherit ptest update-alternatives do_compile () { chmod a+rx *.pl *.sh @@ -40,6 +42,12 @@ do_install () { cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ +} + ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "ifup ifdown" -- 2.17.1 From ross.burton at intel.com Mon Feb 3 10:19:55 2020 From: ross.burton at intel.com (Ross Burton) Date: Mon, 3 Feb 2020 10:19:55 +0000 Subject: [OE-core] [PATCH] podfix: remove Message-ID: <20200203101955.2448-1-ross.burton@intel.com> Now that we don't use the host pod2man (oe-core deda455) the podfix class is redundant and can be removed. Signed-off-by: Ross Burton --- meta/classes/podfix.bbclass | 35 ------------------- .../classes/reproducible_build_simple.bbclass | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 meta/classes/podfix.bbclass diff --git a/meta/classes/podfix.bbclass b/meta/classes/podfix.bbclass deleted file mode 100644 index cc8210a27e2..00000000000 --- a/meta/classes/podfix.bbclass +++ /dev/null @@ -1,35 +0,0 @@ -python pod_strip_version() { - import re - - def opener(filename, mode): - if filename.endswith(".gz"): - import gzip - return gzip.open(filename, mode) - elif filename.endswith(".bz2"): - import bz2 - return bz2.open(filename, mode) - else: - return open(filename, mode) - - bad_re = re.compile(rb"Automatically generated by Pod::Man( [0-9]+.+)") - - for root, dirs, files in os.walk(d.expand("${D}${mandir}")): - for filename in files: - filename = os.path.join(root, filename) - if not os.path.isfile(filename): - continue - - with opener(filename, "rb") as manfile: - manpage = manfile.read() - m = bad_re.search(manpage) - if not m: - continue - - bb.note("podfix: stripping version from %s" % filename) - os.unlink(filename) - with opener(filename, "wb") as manfile: - manfile.write(manpage[:m.start(1)]) - manfile.write(manpage[m.end(1):]) -} - -do_install[postfuncs] += "pod_strip_version" diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass index 153a0760721..3e5fd824328 100644 --- a/meta/classes/reproducible_build_simple.bbclass +++ b/meta/classes/reproducible_build_simple.bbclass @@ -8,5 +8,3 @@ export SOURCE_DATE_EPOCH ??= "1520598896" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" - -inherit podfix -- 2.20.1 From richard.purdie at linuxfoundation.org Mon Feb 3 10:26:12 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 03 Feb 2020 10:26:12 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: <20200127231306.46105-1-alex.kiernan@gmail.com> References: <20200127231306.46105-1-alex.kiernan@gmail.com> Message-ID: On Mon, 2020-01-27 at 23:13 +0000, Alex Kiernan wrote: > Update to latest on the 243 stable branch. This includes (amongst other > fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. > > systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. > > Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > > Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, > fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). > > Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, > fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). Unfortunately something in this causes: https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412 https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413 https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545 I've been blaming Trevor's patches until now but its this one (sorry Trevor!). Cheers, Richard From jupiter.hce at gmail.com Mon Feb 3 10:56:49 2020 From: jupiter.hce at gmail.com (JH) Date: Mon, 3 Feb 2020 21:56:49 +1100 Subject: [OE-core] Failed to add u-boot ubifs (not working) Message-ID: Hi, I added my local machine to ubifs, is it correct? UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_nand_config,ubifs" I built the u-boot.imx, but the ubi was still missing in u-boot. What I could be missing? => run nand-boot; Unknown command 'ubi' - try 'help' Unknown command 'ubi' - try 'help' Thank you. Kind regards, - jh From quentin.schulz at streamunlimited.com Mon Feb 3 11:08:20 2020 From: quentin.schulz at streamunlimited.com (Quentin Schulz) Date: Mon, 3 Feb 2020 12:08:20 +0100 Subject: [OE-core] Failed to add u-boot ubifs (not working) In-Reply-To: References: Message-ID: <20200203110820.kokz6qu4l74nyhlk@qschulz> Hi JH, On Mon, Feb 03, 2020 at 09:56:49PM +1100, JH wrote: > Hi, > > I added my local machine to ubifs, is it correct? > > UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_nand_config,ubifs" > Also, you need to select UBOOT_CONFIG somewhere, with the above line, you just say "if nand is selected as an UBOOT_CONFIG, do xyz". You still need to select it (with I assume, UBOOT_CONFIG += "nand" in a bbappend somewhere). What's in your mx6ull_14x14_evk_nand_config? I haven't used that option before but what's ,ubifs supposed to do? Are you sure this nand option for UBOOT_CONFIG would actually create a .imx and not a .ubifs for example or something along those lines. TL;DR: Make sure UBOOT_CONFIG has nand in it, check that .imx is built with your defconfig and check that you're actually enabling the UBI command in your defconfig. Also, it would be helpful if you could give links to the recipes you're using. I seem to recall in some other mail it was http://git.yoctoproject.org/cgit/cgit.cgi/meta-freescale/tree/recipes-bsp/u-boot/u-boot-imx_2017.03.bb?h=sumo but it could be thud version as well. BR, Quentin From kai.kang at windriver.com Mon Feb 3 09:14:06 2020 From: kai.kang at windriver.com (kai.kang at windriver.com) Date: Mon, 3 Feb 2020 17:14:06 +0800 Subject: [OE-core] [PATCH] ifupdown: add ptest Message-ID: <20200203091406.37643-1-kai.kang@windriver.com> From: Kai Kang Add ptest for ifupdown with its own test cases. [Yocto #13736] Signed-off-by: Kai Kang --- meta/recipes-core/ifupdown/files/run-ptest | 4 ++ .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ifupdown/files/run-ptest create mode 100644 meta/recipes-core/ifupdown/files/tweak-ptest-script.patch diff --git a/meta/recipes-core/ifupdown/files/run-ptest b/meta/recipes-core/ifupdown/files/run-ptest new file mode 100644 index 0000000000..8694042392 --- /dev/null +++ b/meta/recipes-core/ifupdown/files/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh + +CURDIR=$(dirname `readlink -f $0`) +cd $CURDIR/tests && ./testbuild-linux diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch new file mode 100644 index 0000000000..d7600cf243 --- /dev/null +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch @@ -0,0 +1,49 @@ +Tweak tests of ifupdown to make it work with oe-core ptest framework. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Kai Kang + +diff --git a/tests/testbuild-linux b/tests/testbuild-linux +index 1181ea0..d5c1814 100755 +--- a/tests/testbuild-linux ++++ b/tests/testbuild-linux +@@ -1,6 +1,7 @@ + #!/bin/sh -e + +-dir=tests/linux ++curdir=$(dirname `readlink -f $0`) ++dir=$curdir/linux + + result=true + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "Testcase $test: $args" + + exitcode=0 +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test + + exitcode=0 +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? + + (echo "exit code: $exitcode"; +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test + + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then +- echo "(okay)" ++ echo "PASS: $test" + else +- echo "(failed)" ++ echo "FAIL: $test" + result=false + fi + echo "==========" diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb index 0de97fe372..53cb971d33 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb @@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ + file://run-ptest \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ " SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" S = "${WORKDIR}/git" -inherit update-alternatives +inherit ptest update-alternatives do_compile () { chmod a+rx *.pl *.sh @@ -40,6 +42,12 @@ do_install () { cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ +} + ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "ifup ifdown" -- 2.17.1 From ross.burton at intel.com Mon Feb 3 12:32:25 2020 From: ross.burton at intel.com (Ross Burton) Date: Mon, 3 Feb 2020 12:32:25 +0000 Subject: [OE-core] [PATCH] piglit: don't stage the test suite Message-ID: <20200203123225.17038-1-ross.burton@intel.com> The Piglit test suite is approximately 2GB and because it's installed into $libdir is added to the sysroot archive. Nothing links against Piglit so there's no reason for this, so remove $libdir from Piglit's sysroot. Signed-off-by: Ross Burton --- meta/recipes-graphics/piglit/piglit_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index d0d83316977..58d10d6b9b1 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -44,6 +44,7 @@ do_configure_prepend() { fi } +# Forcibly strip because Piglit is *huge* OECMAKE_TARGET_INSTALL = "install/strip" RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ @@ -55,5 +56,9 @@ RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ INSANE_SKIP_${PN} += "dev-so already-stripped" +# As nothing builds against Piglit we don't need to have anything in the +# sysroot, especially when this is ~2GB of test suite +SYSROOT_DIRS_remove = "${libdir}" + # Can't be built with ccache CCACHE_DISABLE = "1" -- 2.20.1 From alex.kanavin at gmail.com Mon Feb 3 12:50:57 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 3 Feb 2020 13:50:57 +0100 Subject: [OE-core] [PATCH] ifupdown: add ptest In-Reply-To: <20200203091406.37643-1-kai.kang@windriver.com> References: <20200203091406.37643-1-kai.kang@windriver.com> Message-ID: I think a build configuration for this also needs to be enabled and tested as explained in the email thread from the bug (in magefeatures.py from selftest I think). Otherwise this wouldn?t be built or checked anywhere. Alex > On 3 Feb 2020, at 10.14, wrote: > > From: Kai Kang > > Add ptest for ifupdown with its own test cases. > > [Yocto #13736] > > Signed-off-by: Kai Kang > --- > meta/recipes-core/ifupdown/files/run-ptest | 4 ++ > .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ > meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- > 3 files changed, 62 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-core/ifupdown/files/run-ptest > create mode 100644 meta/recipes-core/ifupdown/files/tweak-ptest-script.patch > > diff --git a/meta/recipes-core/ifupdown/files/run-ptest b/meta/recipes-core/ifupdown/files/run-ptest > new file mode 100644 > index 0000000000..8694042392 > --- /dev/null > +++ b/meta/recipes-core/ifupdown/files/run-ptest > @@ -0,0 +1,4 @@ > +#!/bin/sh > + > +CURDIR=$(dirname `readlink -f $0`) > +cd $CURDIR/tests && ./testbuild-linux > diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch > new file mode 100644 > index 0000000000..d7600cf243 > --- /dev/null > +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch > @@ -0,0 +1,49 @@ > +Tweak tests of ifupdown to make it work with oe-core ptest framework. > + > +Upstream-Status: Inappropriate [oe-core specific] > + > +Signed-off-by: Kai Kang > + > +diff --git a/tests/testbuild-linux b/tests/testbuild-linux > +index 1181ea0..d5c1814 100755 > +--- a/tests/testbuild-linux > ++++ b/tests/testbuild-linux > +@@ -1,6 +1,7 @@ > + #!/bin/sh -e > + > +-dir=tests/linux > ++curdir=$(dirname `readlink -f $0`) > ++dir=$curdir/linux > + > + result=true > + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do > +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do > + echo "Testcase $test: $args" > + > + exitcode=0 > +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ > ++ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ > + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? > + > + (echo "exit code: $exitcode"; > +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do > + echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test > + > + exitcode=0 > +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ > ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ > + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? > + > + (echo "exit code: $exitcode"; > +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do > + echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test > + > + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then > +- echo "(okay)" > ++ echo "PASS: $test" > + else > +- echo "(failed)" > ++ echo "FAIL: $test" > + result=false > + fi > + echo "==========" > diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb > index 0de97fe372..53cb971d33 100644 > --- a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb > +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb > @@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ > file://99_network \ > file://0001-Define-FNM_EXTMATCH-for-musl.patch \ > file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ > + file://run-ptest \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ > " > SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" > > S = "${WORKDIR}/git" > > > -inherit update-alternatives > +inherit ptest update-alternatives > > do_compile () { > chmod a+rx *.pl *.sh > @@ -40,6 +42,12 @@ do_install () { > cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 > } > > +do_install_ptest () { > + install -d ${D}${PTEST_PATH}/tests > + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ > + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ > +} > + > ALTERNATIVE_PRIORITY = "100" > ALTERNATIVE_${PN} = "ifup ifdown" > > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kiernan at gmail.com Mon Feb 3 14:13:47 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Mon, 3 Feb 2020 14:13:47 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: References: <20200127231306.46105-1-alex.kiernan@gmail.com> Message-ID: On Mon, Feb 3, 2020 at 10:26 AM Richard Purdie wrote: > > On Mon, 2020-01-27 at 23:13 +0000, Alex Kiernan wrote: > > Update to latest on the 243 stable branch. This includes (amongst other > > fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. > > > > systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. > > > > Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > > > > Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, > > fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). > > > > Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, > > fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). > > Unfortunately something in this causes: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412 > https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413 > https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545 > That's disappointing... > I've been blaming Trevor's patches until now but its this one (sorry > Trevor!). > I'll start bisecting it out, though this looks like a likely candidate: commit 53d8feeb2334c396dcfa7106c78ce1791fb5d0c4 Author: Michal Suchanek Date: Mon Nov 4 21:23:15 2019 +0100 libblkid: open device in nonblock mode. When autoclose is set (kernel default but many distributions reverse the setting) opening a CD-rom device causes the tray to close. The function of blkid is to report the current state of the device and not to change it. Hence it should use O_NONBLOCK when opening the device to avoid closing a CD-rom tray. blkid is used liberally in scripts so it can potentially interfere with the user operating the CD-rom hardware. -- Alex Kiernan From richard.purdie at linuxfoundation.org Mon Feb 3 14:17:00 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 3 Feb 2020 14:17:00 +0000 Subject: [OE-core] [PATCH 1/2] sudo: Set vardir deterministically Message-ID: <20200203141701.18379-1-richard.purdie@linuxfoundation.org> Without setting this it will vary depending on which directories are present on the host. [YOCTO #13775] Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo_1.8.29.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/sudo/sudo_1.8.29.bb b/meta/recipes-extended/sudo/sudo_1.8.29.bb index 8da2d646318..7089e1a1d2e 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.29.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.29.bb @@ -17,6 +17,7 @@ EXTRA_OECONF += " \ ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ + --with-vardir=/var/lib/sudo \ " do_install_append () { -- 2.20.1 From richard.purdie at linuxfoundation.org Mon Feb 3 14:17:01 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 3 Feb 2020 14:17:01 +0000 Subject: [OE-core] [PATCH 2/2] libxshmfence: Set shm directory deterministically In-Reply-To: <20200203141701.18379-1-richard.purdie@linuxfoundation.org> References: <20200203141701.18379-1-richard.purdie@linuxfoundation.org> Message-ID: <20200203141701.18379-2-richard.purdie@linuxfoundation.org> Without setting this it will vary depending on which directories are present on the host. [YOCTO #13778] Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index 85a48e4c588..cc456965305 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" +EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" + BBCLASSEXTEND = "native nativesdk" SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" -- 2.20.1 From raj.khem at gmail.com Mon Feb 3 15:33:51 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 3 Feb 2020 07:33:51 -0800 Subject: [OE-core] [PATCH 06/24] bison: upgrade 3.4.2 -> 3.5 In-Reply-To: <20200129090738.1398-6-alex.kanavin@gmail.com> References: <20200129090738.1398-1-alex.kanavin@gmail.com> <20200129090738.1398-6-alex.kanavin@gmail.com> Message-ID: http://errors.yoctoproject.org/Errors/Details/368059/ On Fri, Jan 31, 2020 at 1:34 AM Alexander Kanavin wrote: > > Signed-off-by: Alexander Kanavin > --- > meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} (90%) > > diff --git a/meta/recipes-devtools/bison/bison_3.4.2.bb b/meta/recipes-devtools/bison/bison_3.5.bb > similarity index 90% > rename from meta/recipes-devtools/bison/bison_3.4.2.bb > rename to meta/recipes-devtools/bison/bison_3.5.bb > index 46f0f908dd4..3d8f6579b9e 100644 > --- a/meta/recipes-devtools/bison/bison_3.4.2.bb > +++ b/meta/recipes-devtools/bison/bison_3.5.bb > @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ > # No point in hardcoding path to m4, just use PATH > EXTRA_OECONF += "M4=m4" > > -SRC_URI[md5sum] = "d1ceb9dfde2d03b24a4c1137f7f1b572" > -SRC_URI[sha256sum] = "27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0" > +SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" > +SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" > > inherit autotools gettext texinfo > > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From martin.jansa at gmail.com Mon Feb 3 16:42:31 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Mon, 3 Feb 2020 17:42:31 +0100 Subject: [OE-core] [PATCH 1/3] linux-yocto: introduce 5.4 recipes In-Reply-To: References: Message-ID: It fails to build with gold enabled (ld-is-gold in DISTRO_FEATURES) First olddefconfig fails with "gold linker 'x86_64-oe-linux-ld' not supported" and then it fails with a bit misleading error about oldnoconfig (which is called only when oddefconfig fails) and then the whole log repeats itself again, whole log.do_configure.4075 follows: make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' GEN Makefile HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/confdata.o HOSTCC scripts/kconfig/expr.o HOSTCC scripts/kconfig/lexer.lex.o HOSTCC scripts/kconfig/parser.tab.o HOSTCC scripts/kconfig/preprocess.o HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --olddefconfig Kconfig scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' make: *** [Makefile:179: sub-make] Error 2 make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' NOTE: make HOSTCC=gcc -isystem/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,--enable-new-dtags -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/OE/build/oe-core/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 HOSTCPP=gcc -E -C /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source O=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build CC=x86_64-oe-linux-gcc -fuse-ld=bfd -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source=/usr/src/kernel oldnoconfig make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' GEN Makefile make[2]: *** No rule to make target 'oldnoconfig'. Stop. make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' make: *** [Makefile:179: sub-make] Error 2 make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' ERROR: oe_runmake failed WARNING: exit code 1 from a shell command. ERROR: Execution of '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/run.do_configure.4075' failed with exit code 1: make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' GEN Makefile HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/confdata.o HOSTCC scripts/kconfig/expr.o HOSTCC scripts/kconfig/lexer.lex.o HOSTCC scripts/kconfig/parser.tab.o HOSTCC scripts/kconfig/preprocess.o HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --olddefconfig Kconfig scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' make: *** [Makefile:179: sub-make] Error 2 make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' GEN Makefile make[2]: *** No rule to make target 'oldnoconfig'. Stop. make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' make: *** [Makefile:179: sub-make] Error 2 make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' WARNING: exit code 1 from a shell command. On Fri, Jan 31, 2020 at 10:37 AM Khem Raj wrote: > kernel-seltest fails now to build > > https://errors.yoctoproject.org/Errors/Details/308578/ > > On Tue, Jan 28, 2020 at 2:14 PM wrote: > > > > From: Bruce Ashfield > > > > This creates recipes for the v5.4/* branches of the linux-yocto > > reference kernel. > > > > preempt-rt, yaffs2, aufs5 and reference board specific patches are > > part of these branches. All major architectures: x86,x86-64,ARM, > > ARM64,ppc,mips and mips64 have been feature tested against this > > reference. > > > > 5.4 is a LTS release, and as such will receive -stable updates > > for the duration of upstream korg support. > > > > Signed-off-by: Bruce Ashfield > > --- > > .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ > > .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ > > meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ > > 3 files changed, 130 insertions(+) > > create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > new file mode 100644 > > index 0000000000..52f0e3b833 > > --- /dev/null > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > @@ -0,0 +1,44 @@ > > +KBRANCH ?= "v5.4/standard/preempt-rt/base" > > + > > +require recipes-kernel/linux/linux-yocto.inc > > + > > +# Skip processing of this recipe if it is not explicitly specified as > the > > +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying > > +# to build multiple virtual/kernel providers, e.g. as dependency of > > +# core-image-rt-sdk, core-image-rt. > > +python () { > > + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and > d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": > > + raise bb.parse.SkipRecipe("Set > PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > > +} > > + > > +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" > > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > + > > +SRC_URI = "git:// > git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine > > \ > > + git:// > git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > > " > > + > > +LINUX_VERSION ?= "5.4.15" > > + > > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > + > > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > d)}" > > +DEPENDS += "openssl-native util-linux-native" > > + > > +PV = "5.4.15" > > + > > +KMETA = "kernel-meta" > > +KCONF_BSP_AUDIT_LEVEL = "2" > > + > > +LINUX_KERNEL_TYPE = "preempt-rt" > > + > > +COMPATIBLE_MACHINE = > "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" > > + > > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > + > > +# Functionality flags > > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc > features/taskstats/taskstats.scc" > > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc > features/drm-bochs/drm-bochs.scc" > > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", > "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > new file mode 100644 > > index 0000000000..a028b37548 > > --- /dev/null > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > @@ -0,0 +1,32 @@ > > +KBRANCH ?= "v5.4/standard/tiny/base" > > +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" > > + > > +LINUX_KERNEL_TYPE = "tiny" > > +KCONFIG_MODE = "--allnoconfig" > > + > > +require recipes-kernel/linux/linux-yocto.inc > > + > > +LINUX_VERSION ?= "5.4.15" > > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > + > > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > d)}" > > +DEPENDS += "openssl-native util-linux-native" > > + > > +KMETA = "kernel-meta" > > +KCONF_BSP_AUDIT_LEVEL = "2" > > + > > +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" > > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > + > > +PV = "5.4.15" > > + > > +SRC_URI = "git:// > git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine > > \ > > + git:// > git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > > " > > + > > +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" > > + > > +# Functionality flags > > +KERNEL_FEATURES = "" > > + > > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb > b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > new file mode 100644 > > index 0000000000..9fbc47d79e > > --- /dev/null > > +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > @@ -0,0 +1,54 @@ > > +KBRANCH ?= "v5.4/standard/base" > > + > > +require recipes-kernel/linux/linux-yocto.inc > > + > > +# board specific branches > > +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" > > +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" > > +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" > > +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" > > +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" > > +KBRANCH_qemux86 ?= "v5.4/standard/base" > > +KBRANCH_qemux86-64 ?= "v5.4/standard/base" > > +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" > > + > > +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" > > +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" > > +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > +SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" > > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > + > > +# remap qemuarm to qemuarma15 for the 5.4 kernel > > +# KMACHINE_qemuarm ?= "qemuarma15" > > + > > +SRC_URI = "git:// > git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH} > ; > \ > > + git:// > git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > > " > > + > > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > +LINUX_VERSION ?= "5.4.15" > > + > > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > d)}" > > +DEPENDS += "openssl-native util-linux-native" > > + > > +PV = "5.4.15" > > + > > +KMETA = "kernel-meta" > > +KCONF_BSP_AUDIT_LEVEL = "2" > > + > > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > + > > +COMPATIBLE_MACHINE = > "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" > > + > > +# Functionality flags > > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" > > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc > features/drm-bochs/drm-bochs.scc" > > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > > +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", > "mx32", " cfg/x32.scc", "" ,d)}" > > +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", > "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > > -- > > 2.19.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Mon Feb 3 16:45:40 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 3 Feb 2020 08:45:40 -0800 Subject: [OE-core] [PATCH 1/3] linux-yocto: introduce 5.4 recipes In-Reply-To: References: Message-ID: On Mon, Feb 3, 2020 at 8:42 AM Martin Jansa wrote: > It fails to build with gold enabled (ld-is-gold in DISTRO_FEATURES) > > First olddefconfig fails with "gold linker 'x86_64-oe-linux-ld' not > supported" and then it fails with a bit misleading error about oldnoconfig > (which is called only when oddefconfig fails) and then the whole log > repeats itself again, whole log.do_configure.4075 follows: > Since it?s a kernel piece I think asking for gold might be out of scope perhaps I have staged a fix in master next which helps a bit with eg mips I had to disable bpf > > make[1]: Entering directory > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > GEN Makefile > HOSTCC scripts/basic/fixdep > HOSTCC scripts/kconfig/conf.o > HOSTCC scripts/kconfig/confdata.o > HOSTCC scripts/kconfig/expr.o > HOSTCC scripts/kconfig/lexer.lex.o > HOSTCC scripts/kconfig/parser.tab.o > HOSTCC scripts/kconfig/preprocess.o > HOSTCC scripts/kconfig/symbol.o > HOSTLD scripts/kconfig/conf > scripts/kconfig/conf --olddefconfig Kconfig > scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > make[2]: *** > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: > olddefconfig] Error 1 > make[1]: *** > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > olddefconfig] Error 2 > make[1]: Leaving directory > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > make: *** [Makefile:179: sub-make] Error 2 > make: Leaving directory > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > NOTE: make HOSTCC=gcc > -isystem/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/include > -O2 -pipe > -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > -Wl,--enable-new-dtags > -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > > -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > -Wl,-O1 -Wl,--allow-shlib-undefined > -Wl,--dynamic-linker=/OE/build/oe-core/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 > HOSTCPP=gcc -E -C > /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source > O=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build > CC=x86_64-oe-linux-gcc -fuse-ld=bfd > -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot= > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native= > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source=/usr/src/kernel > oldnoconfig > make: Entering directory > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > make[1]: Entering directory > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > GEN Makefile > make[2]: *** No rule to make target 'oldnoconfig'. Stop. > make[1]: *** > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > oldnoconfig] Error 2 > make[1]: Leaving directory > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > make: *** [Makefile:179: sub-make] Error 2 > make: Leaving directory > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > ERROR: oe_runmake failed > WARNING: exit code 1 from a shell command. > ERROR: Execution of > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/run.do_configure.4075' > failed with exit code 1: > make: Entering directory > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > make[1]: Entering directory > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > GEN Makefile > HOSTCC scripts/basic/fixdep > HOSTCC scripts/kconfig/conf.o > HOSTCC scripts/kconfig/confdata.o > HOSTCC scripts/kconfig/expr.o > HOSTCC scripts/kconfig/lexer.lex.o > HOSTCC scripts/kconfig/parser.tab.o > HOSTCC scripts/kconfig/preprocess.o > HOSTCC scripts/kconfig/symbol.o > HOSTLD scripts/kconfig/conf > scripts/kconfig/conf --olddefconfig Kconfig > scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > make[2]: *** > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: > olddefconfig] Error 1 > make[1]: *** > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > olddefconfig] Error 2 > make[1]: Leaving directory > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > make: *** [Makefile:179: sub-make] Error 2 > make: Leaving directory > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > make: Entering directory > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > make[1]: Entering directory > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > GEN Makefile > make[2]: *** No rule to make target 'oldnoconfig'. Stop. > make[1]: *** > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > oldnoconfig] Error 2 > make[1]: Leaving directory > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > make: *** [Makefile:179: sub-make] Error 2 > make: Leaving directory > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > WARNING: exit code 1 from a shell command. > > On Fri, Jan 31, 2020 at 10:37 AM Khem Raj wrote: > >> kernel-seltest fails now to build >> >> https://errors.yoctoproject.org/Errors/Details/308578/ >> >> On Tue, Jan 28, 2020 at 2:14 PM wrote: >> > >> > From: Bruce Ashfield >> > >> > This creates recipes for the v5.4/* branches of the linux-yocto >> > reference kernel. >> > >> > preempt-rt, yaffs2, aufs5 and reference board specific patches are >> > part of these branches. All major architectures: x86,x86-64,ARM, >> > ARM64,ppc,mips and mips64 have been feature tested against this >> > reference. >> > >> > 5.4 is a LTS release, and as such will receive -stable updates >> > for the duration of upstream korg support. >> > >> > Signed-off-by: Bruce Ashfield >> > --- >> > .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ >> > .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ >> > meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ >> > 3 files changed, 130 insertions(+) >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb >> > >> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb >> b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb >> > new file mode 100644 >> > index 0000000000..52f0e3b833 >> > --- /dev/null >> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb >> > @@ -0,0 +1,44 @@ >> > +KBRANCH ?= "v5.4/standard/preempt-rt/base" >> > + >> > +require recipes-kernel/linux/linux-yocto.inc >> > + >> > +# Skip processing of this recipe if it is not explicitly specified as >> the >> > +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying >> > +# to build multiple virtual/kernel providers, e.g. as dependency of >> > +# core-image-rt-sdk, core-image-rt. >> > +python () { >> > + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and >> d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": >> > + raise bb.parse.SkipRecipe("Set >> PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") >> > +} >> > + >> > +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" >> > + >> > +SRC_URI = "git:// >> git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine >> >> \ >> > + git:// >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} >> >> " >> > + >> > +LINUX_VERSION ?= "5.4.15" >> > + >> > +LIC_FILES_CHKSUM = >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" >> > + >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', >> d)}" >> > +DEPENDS += "openssl-native util-linux-native" >> > + >> > +PV = "5.4.15" >> > + >> > +KMETA = "kernel-meta" >> > +KCONF_BSP_AUDIT_LEVEL = "2" >> > + >> > +LINUX_KERNEL_TYPE = "preempt-rt" >> > + >> > +COMPATIBLE_MACHINE = >> "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" >> > + >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" >> > + >> > +# Functionality flags >> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc >> features/taskstats/taskstats.scc" >> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" >> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc >> features/drm-bochs/drm-bochs.scc" >> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" >> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" >> > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", >> "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" >> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb >> b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb >> > new file mode 100644 >> > index 0000000000..a028b37548 >> > --- /dev/null >> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb >> > @@ -0,0 +1,32 @@ >> > +KBRANCH ?= "v5.4/standard/tiny/base" >> > +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" >> > + >> > +LINUX_KERNEL_TYPE = "tiny" >> > +KCONFIG_MODE = "--allnoconfig" >> > + >> > +require recipes-kernel/linux/linux-yocto.inc >> > + >> > +LINUX_VERSION ?= "5.4.15" >> > +LIC_FILES_CHKSUM = >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" >> > + >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', >> d)}" >> > +DEPENDS += "openssl-native util-linux-native" >> > + >> > +KMETA = "kernel-meta" >> > +KCONF_BSP_AUDIT_LEVEL = "2" >> > + >> > +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" >> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" >> > + >> > +PV = "5.4.15" >> > + >> > +SRC_URI = "git:// >> git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine >> >> \ >> > + git:// >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} >> >> " >> > + >> > +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" >> > + >> > +# Functionality flags >> > +KERNEL_FEATURES = "" >> > + >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" >> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb >> b/meta/recipes-kernel/linux/linux-yocto_5.4.bb >> > new file mode 100644 >> > index 0000000000..9fbc47d79e >> > --- /dev/null >> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb >> > @@ -0,0 +1,54 @@ >> > +KBRANCH ?= "v5.4/standard/base" >> > + >> > +require recipes-kernel/linux/linux-yocto.inc >> > + >> > +# board specific branches >> > +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" >> > +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" >> > +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" >> > +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" >> > +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" >> > +KBRANCH_qemux86 ?= "v5.4/standard/base" >> > +KBRANCH_qemux86-64 ?= "v5.4/standard/base" >> > +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" >> > + >> > +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" >> > +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" >> > +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" >> > +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" >> > +SRCREV_machine_qemuriscv64 ?= >> "cdda35317561d2741b396efa623ace0bd2212c16" >> > +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" >> > +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" >> > +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" >> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" >> > + >> > +# remap qemuarm to qemuarma15 for the 5.4 kernel >> > +# KMACHINE_qemuarm ?= "qemuarma15" >> > + >> > +SRC_URI = "git:// >> git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH} >> ; >> \ >> > + git:// >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} >> >> " >> > + >> > +LIC_FILES_CHKSUM = >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" >> > +LINUX_VERSION ?= "5.4.15" >> > + >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', >> d)}" >> > +DEPENDS += "openssl-native util-linux-native" >> > + >> > +PV = "5.4.15" >> > + >> > +KMETA = "kernel-meta" >> > +KCONF_BSP_AUDIT_LEVEL = "2" >> > + >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" >> > + >> > +COMPATIBLE_MACHINE = >> "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" >> > + >> > +# Functionality flags >> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" >> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" >> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc >> features/drm-bochs/drm-bochs.scc" >> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" >> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" >> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", >> "mx32", " cfg/x32.scc", "" ,d)}" >> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", >> "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" >> > -- >> > 2.19.1 >> > >> > -- >> > _______________________________________________ >> > Openembedded-core mailing list >> > Openembedded-core at lists.openembedded.org >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bruce.ashfield at gmail.com Mon Feb 3 17:11:31 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Mon, 3 Feb 2020 12:11:31 -0500 Subject: [OE-core] [PATCH 1/3] linux-yocto: introduce 5.4 recipes In-Reply-To: References: Message-ID: On Mon, Feb 3, 2020 at 11:45 AM Khem Raj wrote: > > > > On Mon, Feb 3, 2020 at 8:42 AM Martin Jansa wrote: >> >> It fails to build with gold enabled (ld-is-gold in DISTRO_FEATURES) >> >> First olddefconfig fails with "gold linker 'x86_64-oe-linux-ld' not supported" and then it fails with a bit misleading error about oldnoconfig (which is called only when oddefconfig fails) and then the whole log repeats itself again, whole log.do_configure.4075 follows: > > > Since it?s a kernel piece I think asking for gold might be out of scope perhaps > Yah, there's not much we can do to fix that, but I suppose it could be detected in the bbclass and a better error thrown ? > I have staged a fix in master next which helps a bit with eg mips I had to disable bpf Is that the one with the missing header for on-target module build ? If so, i have a similar patch here. Bruce >> >> >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' >> GEN Makefile >> HOSTCC scripts/basic/fixdep >> HOSTCC scripts/kconfig/conf.o >> HOSTCC scripts/kconfig/confdata.o >> HOSTCC scripts/kconfig/expr.o >> HOSTCC scripts/kconfig/lexer.lex.o >> HOSTCC scripts/kconfig/parser.tab.o >> HOSTCC scripts/kconfig/preprocess.o >> HOSTCC scripts/kconfig/symbol.o >> HOSTLD scripts/kconfig/conf >> scripts/kconfig/conf --olddefconfig Kconfig >> scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported >> make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' >> make: *** [Makefile:179: sub-make] Error 2 >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' >> NOTE: make HOSTCC=gcc -isystem/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,--enable-new-dtags -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/OE/build/oe-core/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 HOSTCPP=gcc -E -C /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source O=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build CC=x86_64-oe-linux-gcc -fuse-ld=bfd -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source=/usr/src/kernel oldnoconfig >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' >> GEN Makefile >> make[2]: *** No rule to make target 'oldnoconfig'. Stop. >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' >> make: *** [Makefile:179: sub-make] Error 2 >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' >> ERROR: oe_runmake failed >> WARNING: exit code 1 from a shell command. >> ERROR: Execution of '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/run.do_configure.4075' failed with exit code 1: >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' >> GEN Makefile >> HOSTCC scripts/basic/fixdep >> HOSTCC scripts/kconfig/conf.o >> HOSTCC scripts/kconfig/confdata.o >> HOSTCC scripts/kconfig/expr.o >> HOSTCC scripts/kconfig/lexer.lex.o >> HOSTCC scripts/kconfig/parser.tab.o >> HOSTCC scripts/kconfig/preprocess.o >> HOSTCC scripts/kconfig/symbol.o >> HOSTLD scripts/kconfig/conf >> scripts/kconfig/conf --olddefconfig Kconfig >> scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported >> make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' >> make: *** [Makefile:179: sub-make] Error 2 >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' >> GEN Makefile >> make[2]: *** No rule to make target 'oldnoconfig'. Stop. >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' >> make: *** [Makefile:179: sub-make] Error 2 >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' >> WARNING: exit code 1 from a shell command. >> >> On Fri, Jan 31, 2020 at 10:37 AM Khem Raj wrote: >>> >>> kernel-seltest fails now to build >>> >>> https://errors.yoctoproject.org/Errors/Details/308578/ >>> >>> On Tue, Jan 28, 2020 at 2:14 PM wrote: >>> > >>> > From: Bruce Ashfield >>> > >>> > This creates recipes for the v5.4/* branches of the linux-yocto >>> > reference kernel. >>> > >>> > preempt-rt, yaffs2, aufs5 and reference board specific patches are >>> > part of these branches. All major architectures: x86,x86-64,ARM, >>> > ARM64,ppc,mips and mips64 have been feature tested against this >>> > reference. >>> > >>> > 5.4 is a LTS release, and as such will receive -stable updates >>> > for the duration of upstream korg support. >>> > >>> > Signed-off-by: Bruce Ashfield >>> > --- >>> > .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ >>> > .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ >>> > meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ >>> > 3 files changed, 130 insertions(+) >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb >>> > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb >>> > new file mode 100644 >>> > index 0000000000..52f0e3b833 >>> > --- /dev/null >>> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb >>> > @@ -0,0 +1,44 @@ >>> > +KBRANCH ?= "v5.4/standard/preempt-rt/base" >>> > + >>> > +require recipes-kernel/linux/linux-yocto.inc >>> > + >>> > +# Skip processing of this recipe if it is not explicitly specified as the >>> > +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying >>> > +# to build multiple virtual/kernel providers, e.g. as dependency of >>> > +# core-image-rt-sdk, core-image-rt. >>> > +python () { >>> > + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": >>> > + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") >>> > +} >>> > + >>> > +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" >>> > + >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" >>> > + >>> > +LINUX_VERSION ?= "5.4.15" >>> > + >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" >>> > + >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" >>> > +DEPENDS += "openssl-native util-linux-native" >>> > + >>> > +PV = "5.4.15" >>> > + >>> > +KMETA = "kernel-meta" >>> > +KCONF_BSP_AUDIT_LEVEL = "2" >>> > + >>> > +LINUX_KERNEL_TYPE = "preempt-rt" >>> > + >>> > +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" >>> > + >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" >>> > + >>> > +# Functionality flags >>> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" >>> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" >>> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" >>> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" >>> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" >>> > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb >>> > new file mode 100644 >>> > index 0000000000..a028b37548 >>> > --- /dev/null >>> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb >>> > @@ -0,0 +1,32 @@ >>> > +KBRANCH ?= "v5.4/standard/tiny/base" >>> > +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" >>> > + >>> > +LINUX_KERNEL_TYPE = "tiny" >>> > +KCONFIG_MODE = "--allnoconfig" >>> > + >>> > +require recipes-kernel/linux/linux-yocto.inc >>> > + >>> > +LINUX_VERSION ?= "5.4.15" >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" >>> > + >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" >>> > +DEPENDS += "openssl-native util-linux-native" >>> > + >>> > +KMETA = "kernel-meta" >>> > +KCONF_BSP_AUDIT_LEVEL = "2" >>> > + >>> > +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" >>> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" >>> > + >>> > +PV = "5.4.15" >>> > + >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" >>> > + >>> > +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" >>> > + >>> > +# Functionality flags >>> > +KERNEL_FEATURES = "" >>> > + >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb >>> > new file mode 100644 >>> > index 0000000000..9fbc47d79e >>> > --- /dev/null >>> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb >>> > @@ -0,0 +1,54 @@ >>> > +KBRANCH ?= "v5.4/standard/base" >>> > + >>> > +require recipes-kernel/linux/linux-yocto.inc >>> > + >>> > +# board specific branches >>> > +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" >>> > +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" >>> > +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" >>> > +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" >>> > +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" >>> > +KBRANCH_qemux86 ?= "v5.4/standard/base" >>> > +KBRANCH_qemux86-64 ?= "v5.4/standard/base" >>> > +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" >>> > + >>> > +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" >>> > +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" >>> > +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" >>> > +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" >>> > +SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" >>> > +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" >>> > +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" >>> > +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" >>> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" >>> > + >>> > +# remap qemuarm to qemuarma15 for the 5.4 kernel >>> > +# KMACHINE_qemuarm ?= "qemuarma15" >>> > + >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" >>> > + >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" >>> > +LINUX_VERSION ?= "5.4.15" >>> > + >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" >>> > +DEPENDS += "openssl-native util-linux-native" >>> > + >>> > +PV = "5.4.15" >>> > + >>> > +KMETA = "kernel-meta" >>> > +KCONF_BSP_AUDIT_LEVEL = "2" >>> > + >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" >>> > + >>> > +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" >>> > + >>> > +# Functionality flags >>> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" >>> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" >>> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" >>> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" >>> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" >>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" >>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" >>> > -- >>> > 2.19.1 >>> > >>> > -- >>> > _______________________________________________ >>> > Openembedded-core mailing list >>> > Openembedded-core at lists.openembedded.org >>> > http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From git at andred.net Mon Feb 3 17:28:12 2020 From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=) Date: Mon, 3 Feb 2020 17:28:12 +0000 Subject: [OE-core] [PATCH 1/2] oeqa: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True Message-ID: <20200203172813.12800-1-git@andred.net> start_new_session was added to python3 subprocess in v3.2 and is meant to take the place of the common use of preexec_fn to call os.setsid() in the child - as done here. Update to use the new equivalent. Signed-off-by: Andr? Draszik --- meta/lib/oeqa/controllers/masterimage.py | 2 +- meta/lib/oeqa/core/target/ssh.py | 2 +- meta/lib/oeqa/utils/sshcontrol.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py index 0435dfa125..0bf5917e48 100644 --- a/meta/lib/oeqa/controllers/masterimage.py +++ b/meta/lib/oeqa/controllers/masterimage.py @@ -97,7 +97,7 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta if self.powercontrol_cmd: cmd = "%s %s" % (self.powercontrol_cmd, msg) try: - commands.runCmd(cmd, assert_error=False, preexec_fn=os.setsid, env=self.origenv) + commands.runCmd(cmd, assert_error=False, start_new_session=True, env=self.origenv) except CommandError as e: bb.fatal(str(e)) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 63fc9468b3..090b40a814 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -247,7 +247,7 @@ def SSHCall(command, logger, timeout=None, **opts): "stdin": None, "shell": False, "bufsize": -1, - "preexec_fn": os.setsid, + "start_new_session": True, } options.update(opts) output = '' diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py index 49a07264c6..36c2ecb3db 100644 --- a/meta/lib/oeqa/utils/sshcontrol.py +++ b/meta/lib/oeqa/utils/sshcontrol.py @@ -23,7 +23,7 @@ class SSHProcess(object): "stdin": None, "shell": False, "bufsize": -1, - "preexec_fn": os.setsid, + "start_new_session": True, } self.options = dict(self.defaultopts) self.options.update(options) -- 2.23.0.rc1 From git at andred.net Mon Feb 3 17:28:13 2020 From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=) Date: Mon, 3 Feb 2020 17:28:13 +0000 Subject: [OE-core] [PATCH 2/2] rt-tests: modernise subprocess: preexec_fn=os.setsid -> start_new_session=True In-Reply-To: <20200203172813.12800-1-git@andred.net> References: <20200203172813.12800-1-git@andred.net> Message-ID: <20200203172813.12800-2-git@andred.net> start_new_session was added to python3 subprocess in v3.2 and is meant to take the place of the common use of preexec_fn to call os.setsid() in the child - as done here. Update to use the new equivalent. Signed-off-by: Andr? Draszik --- meta/recipes-rt/rt-tests/files/rt_bmark.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-rt/rt-tests/files/rt_bmark.py b/meta/recipes-rt/rt-tests/files/rt_bmark.py index 57b39b52a1..3b84447a0f 100755 --- a/meta/recipes-rt/rt-tests/files/rt_bmark.py +++ b/meta/recipes-rt/rt-tests/files/rt_bmark.py @@ -166,12 +166,12 @@ def start_stress(*args): log(" Command: '", stress_cmd_str, "'") log() - # preexec_fn=os.setsid causes stress to be executed in a separate + # start_new_session causes stress to be executed in a separate # session, => it gets a new process group (incl. children). It # can then be terminated using os.killpg in end_stress without # terminating this script. - p = subprocess.Popen(stress_cmd, preexec_fn=os.setsid) + p = subprocess.Popen(stress_cmd, start_new_session=True) return p -- 2.23.0.rc1 From sjolley.yp.pm at gmail.com Mon Feb 3 17:28:33 2020 From: sjolley.yp.pm at gmail.com (sjolley.yp.pm at gmail.com) Date: Mon, 3 Feb 2020 09:28:33 -0800 Subject: [OE-core] Yocto Project Newcomer & Unassigned Bugs - Help Needed Message-ID: <073e01d5dab7$5c1a8590$144f90b0$@gmail.com> All, The triage team is starting to try and collect up and classify bugs which a newcomer to the project would be able to work on in a way which means people can find them. They're being listed on the triage page under the appropriate heading: https://wiki.yoctoproject.org/wiki/Bug_Triage#Newcomer_Bugs The idea is these bugs should be straight forward for a person to help work on who doesn't have deep experience with the project. If anyone can help, please take ownership of the bug and send patches! If anyone needs help/advice there are people on irc who can likely do so, or some of the more experienced contributors will likely be happy to help too. Also, the triage team meets weekly and does its best to handle the bugs reported into the Bugzilla. The number of people attending that meeting has fallen, as have the number of people available to help fix bugs. One of the things we hear users report is they don't know how to help. We (the triage team) are therefore going to start reporting out the currently 299 unassigned or newcomer bugs. We're hoping people may be able to spare some time now and again to help out with these. Bugs are split into two types, "true bugs" where things don't work as they should and "enhancements" which are features we'd want to add to the system. There are also roughly four different "priority" classes right now, "3.1", "3.2, "3.99" and "Future", the more pressing/urgent issues being in "3.1" and then "3.2". Please review this link and if a bug is something you would be able to help with either take ownership of the bug, or send me (sjolley.yp.pm at gmail.com ) an e-mail with the bug number you would like and I will assign it to you (please make sure you have a Bugzilla account). The list is at: https://wiki.yoctoproject.org/wiki/Bug_Triage_Archive#Unassigned_or_Newcomer _Bugs Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From martin.jansa at gmail.com Mon Feb 3 17:32:32 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Mon, 3 Feb 2020 18:32:32 +0100 Subject: [OE-core] [PATCH 1/3] linux-yocto: introduce 5.4 recipes In-Reply-To: References: Message-ID: <20200203173232.yal36errexiq3dn4@jama> On Mon, Feb 03, 2020 at 08:45:40AM -0800, Khem Raj wrote: > On Mon, Feb 3, 2020 at 8:42 AM Martin Jansa wrote: > > > It fails to build with gold enabled (ld-is-gold in DISTRO_FEATURES) > > > > First olddefconfig fails with "gold linker 'x86_64-oe-linux-ld' not > > supported" and then it fails with a bit misleading error about oldnoconfig > > (which is called only when oddefconfig fails) and then the whole log > > repeats itself again, whole log.do_configure.4075 follows: > > > > Since it?s a kernel piece I think asking for gold might be out of scope > perhaps > > I have staged a fix in master next which helps a bit with eg mips I had to > disable bpf I haven't found your fix in either oe-core/master-next nor yoe/master-next. But I'll send my own fix. > > > > > make[1]: Entering directory > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > GEN Makefile > > HOSTCC scripts/basic/fixdep > > HOSTCC scripts/kconfig/conf.o > > HOSTCC scripts/kconfig/confdata.o > > HOSTCC scripts/kconfig/expr.o > > HOSTCC scripts/kconfig/lexer.lex.o > > HOSTCC scripts/kconfig/parser.tab.o > > HOSTCC scripts/kconfig/preprocess.o > > HOSTCC scripts/kconfig/symbol.o > > HOSTLD scripts/kconfig/conf > > scripts/kconfig/conf --olddefconfig Kconfig > > scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > > make[2]: *** > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: > > olddefconfig] Error 1 > > make[1]: *** > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > > olddefconfig] Error 2 > > make[1]: Leaving directory > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > make: *** [Makefile:179: sub-make] Error 2 > > make: Leaving directory > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > NOTE: make HOSTCC=gcc > > -isystem/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/include > > -O2 -pipe > > -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > > > -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > > -Wl,--enable-new-dtags > > -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > > > -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > > > > -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > > > -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > > -Wl,-O1 -Wl,--allow-shlib-undefined > > -Wl,--dynamic-linker=/OE/build/oe-core/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 > > HOSTCPP=gcc -E -C > > /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source > > O=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build > > CC=x86_64-oe-linux-gcc -fuse-ld=bfd > > -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 > > > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 > > > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot= > > > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native= > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source=/usr/src/kernel > > oldnoconfig > > make: Entering directory > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > make[1]: Entering directory > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > GEN Makefile > > make[2]: *** No rule to make target 'oldnoconfig'. Stop. > > make[1]: *** > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > > oldnoconfig] Error 2 > > make[1]: Leaving directory > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > make: *** [Makefile:179: sub-make] Error 2 > > make: Leaving directory > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > ERROR: oe_runmake failed > > WARNING: exit code 1 from a shell command. > > ERROR: Execution of > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/run.do_configure.4075' > > failed with exit code 1: > > make: Entering directory > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > make[1]: Entering directory > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > GEN Makefile > > HOSTCC scripts/basic/fixdep > > HOSTCC scripts/kconfig/conf.o > > HOSTCC scripts/kconfig/confdata.o > > HOSTCC scripts/kconfig/expr.o > > HOSTCC scripts/kconfig/lexer.lex.o > > HOSTCC scripts/kconfig/parser.tab.o > > HOSTCC scripts/kconfig/preprocess.o > > HOSTCC scripts/kconfig/symbol.o > > HOSTLD scripts/kconfig/conf > > scripts/kconfig/conf --olddefconfig Kconfig > > scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > > make[2]: *** > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: > > olddefconfig] Error 1 > > make[1]: *** > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > > olddefconfig] Error 2 > > make[1]: Leaving directory > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > make: *** [Makefile:179: sub-make] Error 2 > > make: Leaving directory > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > make: Entering directory > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > make[1]: Entering directory > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > GEN Makefile > > make[2]: *** No rule to make target 'oldnoconfig'. Stop. > > make[1]: *** > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > > oldnoconfig] Error 2 > > make[1]: Leaving directory > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > make: *** [Makefile:179: sub-make] Error 2 > > make: Leaving directory > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > WARNING: exit code 1 from a shell command. > > > > On Fri, Jan 31, 2020 at 10:37 AM Khem Raj wrote: > > > >> kernel-seltest fails now to build > >> > >> https://errors.yoctoproject.org/Errors/Details/308578/ > >> > >> On Tue, Jan 28, 2020 at 2:14 PM wrote: > >> > > >> > From: Bruce Ashfield > >> > > >> > This creates recipes for the v5.4/* branches of the linux-yocto > >> > reference kernel. > >> > > >> > preempt-rt, yaffs2, aufs5 and reference board specific patches are > >> > part of these branches. All major architectures: x86,x86-64,ARM, > >> > ARM64,ppc,mips and mips64 have been feature tested against this > >> > reference. > >> > > >> > 5.4 is a LTS release, and as such will receive -stable updates > >> > for the duration of upstream korg support. > >> > > >> > Signed-off-by: Bruce Ashfield > >> > --- > >> > .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ > >> > .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ > >> > meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ > >> > 3 files changed, 130 insertions(+) > >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > >> > > >> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > >> b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > >> > new file mode 100644 > >> > index 0000000000..52f0e3b833 > >> > --- /dev/null > >> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > >> > @@ -0,0 +1,44 @@ > >> > +KBRANCH ?= "v5.4/standard/preempt-rt/base" > >> > + > >> > +require recipes-kernel/linux/linux-yocto.inc > >> > + > >> > +# Skip processing of this recipe if it is not explicitly specified as > >> the > >> > +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying > >> > +# to build multiple virtual/kernel providers, e.g. as dependency of > >> > +# core-image-rt-sdk, core-image-rt. > >> > +python () { > >> > + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and > >> d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": > >> > + raise bb.parse.SkipRecipe("Set > >> PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > >> > +} > >> > + > >> > +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" > >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > >> > + > >> > +SRC_URI = "git:// > >> git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine > >> > >> \ > >> > + git:// > >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > >> > >> " > >> > + > >> > +LINUX_VERSION ?= "5.4.15" > >> > + > >> > +LIC_FILES_CHKSUM = > >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > >> > + > >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > >> d)}" > >> > +DEPENDS += "openssl-native util-linux-native" > >> > + > >> > +PV = "5.4.15" > >> > + > >> > +KMETA = "kernel-meta" > >> > +KCONF_BSP_AUDIT_LEVEL = "2" > >> > + > >> > +LINUX_KERNEL_TYPE = "preempt-rt" > >> > + > >> > +COMPATIBLE_MACHINE = > >> "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" > >> > + > >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > >> > + > >> > +# Functionality flags > >> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc > >> features/taskstats/taskstats.scc" > >> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > >> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc > >> features/drm-bochs/drm-bochs.scc" > >> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > >> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > >> > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", > >> "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > >> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > >> b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > >> > new file mode 100644 > >> > index 0000000000..a028b37548 > >> > --- /dev/null > >> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > >> > @@ -0,0 +1,32 @@ > >> > +KBRANCH ?= "v5.4/standard/tiny/base" > >> > +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" > >> > + > >> > +LINUX_KERNEL_TYPE = "tiny" > >> > +KCONFIG_MODE = "--allnoconfig" > >> > + > >> > +require recipes-kernel/linux/linux-yocto.inc > >> > + > >> > +LINUX_VERSION ?= "5.4.15" > >> > +LIC_FILES_CHKSUM = > >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > >> > + > >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > >> d)}" > >> > +DEPENDS += "openssl-native util-linux-native" > >> > + > >> > +KMETA = "kernel-meta" > >> > +KCONF_BSP_AUDIT_LEVEL = "2" > >> > + > >> > +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" > >> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > >> > + > >> > +PV = "5.4.15" > >> > + > >> > +SRC_URI = "git:// > >> git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine > >> > >> \ > >> > + git:// > >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > >> > >> " > >> > + > >> > +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" > >> > + > >> > +# Functionality flags > >> > +KERNEL_FEATURES = "" > >> > + > >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > >> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb > >> b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > >> > new file mode 100644 > >> > index 0000000000..9fbc47d79e > >> > --- /dev/null > >> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > >> > @@ -0,0 +1,54 @@ > >> > +KBRANCH ?= "v5.4/standard/base" > >> > + > >> > +require recipes-kernel/linux/linux-yocto.inc > >> > + > >> > +# board specific branches > >> > +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" > >> > +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" > >> > +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" > >> > +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" > >> > +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" > >> > +KBRANCH_qemux86 ?= "v5.4/standard/base" > >> > +KBRANCH_qemux86-64 ?= "v5.4/standard/base" > >> > +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" > >> > + > >> > +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" > >> > +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >> > +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" > >> > +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >> > +SRCREV_machine_qemuriscv64 ?= > >> "cdda35317561d2741b396efa623ace0bd2212c16" > >> > +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >> > +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >> > +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" > >> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > >> > + > >> > +# remap qemuarm to qemuarma15 for the 5.4 kernel > >> > +# KMACHINE_qemuarm ?= "qemuarma15" > >> > + > >> > +SRC_URI = "git:// > >> git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH} > >> ; > >> \ > >> > + git:// > >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > >> > >> " > >> > + > >> > +LIC_FILES_CHKSUM = > >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > >> > +LINUX_VERSION ?= "5.4.15" > >> > + > >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > >> d)}" > >> > +DEPENDS += "openssl-native util-linux-native" > >> > + > >> > +PV = "5.4.15" > >> > + > >> > +KMETA = "kernel-meta" > >> > +KCONF_BSP_AUDIT_LEVEL = "2" > >> > + > >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > >> > + > >> > +COMPATIBLE_MACHINE = > >> "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" > >> > + > >> > +# Functionality flags > >> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" > >> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > >> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc > >> features/drm-bochs/drm-bochs.scc" > >> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > >> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > >> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", > >> "mx32", " cfg/x32.scc", "" ,d)}" > >> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", > >> "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > >> > -- > >> > 2.19.1 > >> > > >> > -- > >> > _______________________________________________ > >> > Openembedded-core mailing list > >> > Openembedded-core at lists.openembedded.org > >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > >> > > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From martin.jansa at gmail.com Mon Feb 3 17:33:11 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Mon, 3 Feb 2020 18:33:11 +0100 Subject: [OE-core] [PATCH] kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled In-Reply-To: References: Message-ID: <20200203173311.32208-1-Martin.Jansa@gmail.com> * with 5.4 kernel the do_configure fails when gold is enabled (with ld-is-gold in DISTRO_FEATURES) * bfd is already being set in KERNEL_LD: kernel-arch.bbclass:KERNEL_LD = "${CCACHE}${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}" but KERNEL_LD is currently respected only by do_compile and do_compile_kernel modules and new kernel which contains a check for gold in Kbuild: https://lore.kernel.org/lkml/alpine.DEB.2.21.1907161434260.1767 at nanos.tec.linutronix.de/ more details: https://lore.kernel.org/r/CAMe9rOqMqkQ0LNpm25yE_Yt0FKp05WmHOrwc0aRDb53miFKM+w at mail.gmail.com will fail during the configuration even when gold wouldn't be used to build it in the end, add LD setting to KERNEL_CONFIG_COMMAND to prevent premature error when configuring scripts/kconfig/conf --olddefconfig Kconfig scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 Signed-off-by: Martin Jansa --- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index ebe5378301..1a953dca35 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -507,7 +507,7 @@ sysroot_stage_all () { : } -KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" oldnoconfig" +KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" LD="${KERNEL_LD}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" LD="${KERNEL_LD}" oldnoconfig" python check_oldest_kernel() { oldest_kernel = d.getVar('OLDEST_KERNEL') -- 2.20.1 From sjolley.yp.pm at gmail.com Mon Feb 3 17:37:39 2020 From: sjolley.yp.pm at gmail.com (sjolley.yp.pm at gmail.com) Date: Mon, 3 Feb 2020 09:37:39 -0800 Subject: [OE-core] Reminder: Yocto Project Technical Team Meeting @ Monthly from 8am on the first Tuesday (PDT) Message-ID: <077f01d5dab8$a17a92a0$e46fb7e0$@gmail.com> All, Just a reminder we will hold the monthly Yocto Project Technical Meeting at 8am PST tomorrow. (2/4) Yocto Project Technical Team Meeting: We encourage people attending the meeting to logon and announce themselves on the Yocto Project IRC chancel during the meeting (optional): Yocto IRC: http://webchat.freenode.net/?channels=#yocto Wiki: https://www.yoctoproject.org/public-virtual-meetings/ When Monthly from 8am to 8:30am on the first Tuesday Pacific Time Where Zoom Meeting: https://zoom.us/j/990892712 I am tracking the minutes at: https://docs.google.com/document/d/1Y5IIuE-z0Ykdl-DwuzUJh52flOZuhN_TSAfw2tdU 9pg/edit?ts=5c06b22d Please request access if you want to assist in editing them. The world should have view access. Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From martin.jansa at gmail.com Mon Feb 3 17:37:53 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Mon, 3 Feb 2020 18:37:53 +0100 Subject: [OE-core] [PATCH 1/3] linux-yocto: introduce 5.4 recipes In-Reply-To: References: Message-ID: <20200203173753.dcrz2qokzecl4bsx@jama> On Mon, Feb 03, 2020 at 12:11:31PM -0500, Bruce Ashfield wrote: > On Mon, Feb 3, 2020 at 11:45 AM Khem Raj wrote: > > > > > > > > On Mon, Feb 3, 2020 at 8:42 AM Martin Jansa wrote: > >> > >> It fails to build with gold enabled (ld-is-gold in DISTRO_FEATURES) > >> > >> First olddefconfig fails with "gold linker 'x86_64-oe-linux-ld' not supported" and then it fails with a bit misleading error about oldnoconfig (which is called only when oddefconfig fails) and then the whole log repeats itself again, whole log.do_configure.4075 follows: > > > > > > Since it?s a kernel piece I think asking for gold might be out of scope perhaps > > > > Yah, there's not much we can do to fix that, but I suppose it could be > detected in the bbclass and a better error thrown ? > > > I have staged a fix in master next which helps a bit with eg mips I had to disable bpf > > Is that the one with the missing header for on-target module build ? > If so, i have a similar patch here. Do you have a fix for do_kernel_configcheck as well somewhere? I'm seeing a lot of warnings in default linux-yocto build for qemux86-64 and the log.do_kernel_configcheck starts with long list of missing python since python was removed from HOSTTOOLS. DEBUG: Executing python function do_kernel_configcheck /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory /usr/bin/env: 'python': No such file or directory [mismatch (291)]: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/cfg/mismatch.txt There were hardware options requested that do not have a corresponding value present in the final ".config" file. This probably means you aren't getting the config you wanted. WARNING: [kernel config]: specified values did not make it into the kernel's final configuration: ---------- CONFIG_MCORE2 ----------------- Config: CONFIG_MCORE2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg Requested value: CONFIG_MCORE2=y Actual value: # CONFIG_MCORE2 is not set ---------- CONFIG_ATA ----------------- Config: CONFIG_ATA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA=y Actual value: # CONFIG_ATA is not set Config: CONFIG_ATA_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_ACPI=y Actual value: Config: CONFIG_ATA_SFF From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_SFF=y Actual value: Config: CONFIG_ATA_BMDMA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_BMDMA=y Actual value: Config: CONFIG_ATA_PIIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_PIIX=m Actual value: ---------- CONFIG_ATA_ACPI ----------------- Config: CONFIG_ATA_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_ACPI=y Actual value: ---------- CONFIG_ATA_SFF ----------------- Config: CONFIG_ATA_SFF From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_SFF=y Actual value: ---------- CONFIG_ATA_BMDMA ----------------- Config: CONFIG_ATA_BMDMA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_BMDMA=y Actual value: ---------- CONFIG_ATA_PIIX ----------------- Config: CONFIG_ATA_PIIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_PIIX=m Actual value: ---------- CONFIG_PATA_SCH ----------------- Config: CONFIG_PATA_SCH From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PATA_SCH=y Actual value: ---------- CONFIG_INPUT_MOUSEDEV ----------------- Config: CONFIG_INPUT_MOUSEDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_INPUT_MOUSEDEV=y Actual value: # CONFIG_INPUT_MOUSEDEV is not set ---------- CONFIG_INPUT_EVDEV ----------------- Config: CONFIG_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/input/input.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_INPUT_EVDEV=y Actual value: # CONFIG_INPUT_EVDEV is not set ---------- CONFIG_INPUT_TABLET ----------------- Config: CONFIG_INPUT_TABLET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_INPUT_TABLET=y Actual value: # CONFIG_INPUT_TABLET is not set ---------- CONFIG_HID_WACOM ----------------- Config: CONFIG_HID_WACOM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_HID_WACOM=y Actual value: ---------- CONFIG_RTC_CLASS ----------------- Config: CONFIG_RTC_CLASS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_RTC_CLASS=y Actual value: # CONFIG_RTC_CLASS is not set ---------- CONFIG_RTC_DRV_CMOS ----------------- Config: CONFIG_RTC_DRV_CMOS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_RTC_DRV_CMOS=y Actual value: ---------- CONFIG_SERIAL_8250_PNP ----------------- Config: CONFIG_SERIAL_8250_PNP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_SERIAL_8250_PNP=y Actual value: ---------- CONFIG_PARPORT ----------------- Config: CONFIG_PARPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PARPORT=m Actual value: # CONFIG_PARPORT is not set Config: CONFIG_PARPORT_PC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PARPORT_PC=m Actual value: ---------- CONFIG_PARPORT_PC ----------------- Config: CONFIG_PARPORT_PC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PARPORT_PC=m Actual value: ---------- CONFIG_PRINTER ----------------- Config: CONFIG_PRINTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PRINTER=m Actual value: ---------- CONFIG_USB_HID ----------------- Config: CONFIG_USB_HID From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_HID=y Actual value: Config: CONFIG_USB_HIDDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_HIDDEV=y Actual value: ---------- CONFIG_USB_HIDDEV ----------------- Config: CONFIG_USB_HIDDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_HIDDEV=y Actual value: ---------- CONFIG_USB_SERIAL ----------------- Config: CONFIG_USB_SERIAL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL=y Actual value: Config: CONFIG_USB_SERIAL_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_CONSOLE=y Actual value: -- Config: CONFIG_USB_SERIAL_GENERIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_GENERIC=y Actual value: Config: CONFIG_USB_SERIAL_FTDI_SIO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_FTDI_SIO=y Actual value: Config: CONFIG_USB_SERIAL_PL2303 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_PL2303=y Actual value: ---------- CONFIG_USB_SERIAL_CONSOLE ----------------- Config: CONFIG_USB_SERIAL_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_CONSOLE=y Actual value: ---------- CONFIG_USB_EZUSB_FX2 ----------------- Config: CONFIG_USB_EZUSB_FX2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_EZUSB_FX2=y Actual value: ---------- CONFIG_USB_SERIAL_GENERIC ----------------- Config: CONFIG_USB_SERIAL_GENERIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_GENERIC=y Actual value: ---------- CONFIG_USB_SERIAL_FTDI_SIO ----------------- Config: CONFIG_USB_SERIAL_FTDI_SIO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_FTDI_SIO=y Actual value: ---------- CONFIG_USB_SERIAL_PL2303 ----------------- Config: CONFIG_USB_SERIAL_PL2303 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_PL2303=y Actual value: ---------- CONFIG_I2C_I801 ----------------- Config: CONFIG_I2C_I801 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_I2C_I801=y Actual value: ---------- CONFIG_IDE ----------------- Config: CONFIG_IDE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE=y Actual value: # CONFIG_IDE is not set Config: CONFIG_IDE_GD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD=y Actual value: Config: CONFIG_IDE_GD_ATA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD_ATA=y Actual value: ---------- CONFIG_IDE_GD ----------------- Config: CONFIG_IDE_GD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD=y Actual value: Config: CONFIG_IDE_GD_ATA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD_ATA=y Actual value: ---------- CONFIG_IDE_GD_ATA ----------------- Config: CONFIG_IDE_GD_ATA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD_ATA=y Actual value: ---------- CONFIG_BLK_DEV_PIIX ----------------- Config: CONFIG_BLK_DEV_PIIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_BLK_DEV_PIIX=y Actual value: ---------- CONFIG_SATA_AHCI ----------------- Config: CONFIG_SATA_AHCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_SATA_AHCI=y Actual value: ---------- CONFIG_BLK_DEV_FD ----------------- Config: CONFIG_BLK_DEV_FD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_BLK_DEV_FD=m Actual value: # CONFIG_BLK_DEV_FD is not set ---------- CONFIG_EEPROM_AT24 ----------------- Config: CONFIG_EEPROM_AT24 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_EEPROM_AT24=m Actual value: ---------- CONFIG_NVME_CORE ----------------- Config: CONFIG_NVME_CORE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_NVME_CORE=y Actual value: ---------- CONFIG_BLK_DEV_NVME ----------------- Config: CONFIG_BLK_DEV_NVME From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_BLK_DEV_NVME=y Actual value: ---------- CONFIG_NET_CORE ----------------- Config: CONFIG_NET_CORE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_CORE=y Actual value: ---------- CONFIG_ETHERNET ----------------- Config: CONFIG_ETHERNET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ETHERNET=y Actual value: ---------- CONFIG_NET_VENDOR_3COM ----------------- Config: CONFIG_NET_VENDOR_3COM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_3COM=y Actual value: ---------- CONFIG_TYPHOON ----------------- Config: CONFIG_TYPHOON From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_TYPHOON=m Actual value: ---------- CONFIG_NET_VENDOR_BROADCOM ----------------- Config: CONFIG_NET_VENDOR_BROADCOM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_BROADCOM=y Actual value: ---------- CONFIG_TIGON3 ----------------- Config: CONFIG_TIGON3 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_TIGON3=m Actual value: ---------- CONFIG_BNX2X ----------------- Config: CONFIG_BNX2X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNX2X=m Actual value: Config: CONFIG_BNX2X_SRIOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNX2X_SRIOV=y Actual value: ---------- CONFIG_BNX2X_SRIOV ----------------- Config: CONFIG_BNX2X_SRIOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNX2X_SRIOV=y Actual value: ---------- CONFIG_BNXT ----------------- Config: CONFIG_BNXT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNXT=m Actual value: Config: CONFIG_BNXT_SRIOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNXT_SRIOV=y Actual value: ---------- CONFIG_BNXT_SRIOV ----------------- Config: CONFIG_BNXT_SRIOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNXT_SRIOV=y Actual value: ---------- CONFIG_NET_VENDOR_ATHEROS ----------------- Config: CONFIG_NET_VENDOR_ATHEROS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_ATHEROS=y Actual value: ---------- CONFIG_ATL1 ----------------- Config: CONFIG_ATL1 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1=m Actual value: Config: CONFIG_ATL1C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1C=m Actual value: Config: CONFIG_ATL1E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1E=m Actual value: ---------- CONFIG_ATL1C ----------------- Config: CONFIG_ATL1C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1C=m Actual value: ---------- CONFIG_ATL1E ----------------- Config: CONFIG_ATL1E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1E=m Actual value: ---------- CONFIG_ATL2 ----------------- Config: CONFIG_ATL2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL2=m Actual value: ---------- CONFIG_ALX ----------------- Config: CONFIG_ALX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ALX=m Actual value: ---------- CONFIG_NET_VENDOR_INTEL ----------------- Config: CONFIG_NET_VENDOR_INTEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_INTEL=y Actual value: ---------- CONFIG_NET_VENDOR_AMD ----------------- Config: CONFIG_NET_VENDOR_AMD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_AMD=y Actual value: ---------- CONFIG_PCNET32 ----------------- Config: CONFIG_PCNET32 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_PCNET32=m Actual value: ---------- CONFIG_NET_VENDOR_REALTEK ----------------- Config: CONFIG_NET_VENDOR_REALTEK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_REALTEK=y Actual value: ---------- CONFIG_8139CP ----------------- Config: CONFIG_8139CP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_8139CP=m Actual value: ---------- CONFIG_8139TOO ----------------- Config: CONFIG_8139TOO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_8139TOO=m Actual value: ---------- CONFIG_R8169 ----------------- Config: CONFIG_R8169 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_R8169=m Actual value: ---------- CONFIG_NET_VENDOR_DLINK ----------------- Config: CONFIG_NET_VENDOR_DLINK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_DLINK=y Actual value: ---------- CONFIG_DL2K ----------------- Config: CONFIG_DL2K From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_DL2K=m Actual value: ---------- CONFIG_NET_VENDOR_MARVELL ----------------- Config: CONFIG_NET_VENDOR_MARVELL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_MARVELL=y Actual value: ---------- CONFIG_SKGE ----------------- Config: CONFIG_SKGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_SKGE=m Actual value: ---------- CONFIG_SKY2 ----------------- Config: CONFIG_SKY2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_SKY2=m Actual value: ---------- CONFIG_JME ----------------- Config: CONFIG_JME From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_JME=m Actual value: ---------- CONFIG_FB_MODE_HELPERS ----------------- Config: CONFIG_FB_MODE_HELPERS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_FB_MODE_HELPERS=y Actual value: ---------- CONFIG_CONNECTOR ----------------- Config: CONFIG_CONNECTOR From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_CONNECTOR=y Actual value: ---------- CONFIG_FB_UVESA ----------------- Config: CONFIG_FB_UVESA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_FB_UVESA=m Actual value: ---------- CONFIG_DRM_CIRRUS_QEMU ----------------- Config: CONFIG_DRM_CIRRUS_QEMU From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_DRM_CIRRUS_QEMU=m Actual value: ---------- CONFIG_WIRELESS ----------------- Config: CONFIG_WIRELESS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WIRELESS=y Actual value: ---------- CONFIG_WLAN ----------------- Config: CONFIG_WLAN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WLAN=y Actual value: -- Config: CONFIG_WLAN_VENDOR_ATH From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WLAN_VENDOR_ATH=y Actual value: ---------- CONFIG_MAC80211 ----------------- Config: CONFIG_MAC80211 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_MAC80211=m Actual value: ---------- CONFIG_CFG80211 ----------------- Config: CONFIG_CFG80211 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CFG80211=m Actual value: -- Config: CONFIG_CFG80211_WEXT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CFG80211_WEXT=y Actual value: ---------- CONFIG_ATH_COMMON ----------------- Config: CONFIG_ATH_COMMON From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_ATH_COMMON=m Actual value: ---------- CONFIG_WLAN_VENDOR_ATH ----------------- Config: CONFIG_WLAN_VENDOR_ATH From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WLAN_VENDOR_ATH=y Actual value: ---------- CONFIG_ATH5K ----------------- Config: CONFIG_ATH5K From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_ATH5K=m Actual value: ---------- CONFIG_ATH9K ----------------- Config: CONFIG_ATH9K From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_ATH9K=m Actual value: ---------- CONFIG_WEXT_CORE ----------------- Config: CONFIG_WEXT_CORE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WEXT_CORE=y Actual value: ---------- CONFIG_WEXT_PROC ----------------- Config: CONFIG_WEXT_PROC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WEXT_PROC=y Actual value: ---------- CONFIG_CFG80211_WEXT ----------------- Config: CONFIG_CFG80211_WEXT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CFG80211_WEXT=y Actual value: ---------- CONFIG_BCMA ----------------- Config: CONFIG_BCMA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA=m Actual value: # CONFIG_BCMA is not set Config: CONFIG_BCMA_HOST_PCI_POSSIBLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y Actual value: Config: CONFIG_BCMA_HOST_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI=y Actual value: Config: CONFIG_BCMA_DRIVER_GMAC_CMN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_DRIVER_GMAC_CMN=y Actual value: ---------- CONFIG_BCMA_HOST_PCI_POSSIBLE ----------------- Config: CONFIG_BCMA_HOST_PCI_POSSIBLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y Actual value: ---------- CONFIG_BCMA_HOST_PCI ----------------- Config: CONFIG_BCMA_HOST_PCI_POSSIBLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y Actual value: Config: CONFIG_BCMA_HOST_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI=y Actual value: ---------- CONFIG_BCMA_DRIVER_GMAC_CMN ----------------- Config: CONFIG_BCMA_DRIVER_GMAC_CMN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_DRIVER_GMAC_CMN=y Actual value: ---------- CONFIG_CRC8 ----------------- Config: CONFIG_CRC8 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CRC8=m Actual value: # CONFIG_CRC8 is not set ---------- CONFIG_CORDIC ----------------- Config: CONFIG_CORDIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CORDIC=m Actual value: # CONFIG_CORDIC is not set ---------- CONFIG_PARTITION_ADVANCED ----------------- Config: CONFIG_PARTITION_ADVANCED From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_PARTITION_ADVANCED=y Actual value: # CONFIG_PARTITION_ADVANCED is not set ---------- CONFIG_FB_EFI ----------------- Config: CONFIG_FB_EFI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_FB_EFI=y Actual value: ---------- CONFIG_EFI_VARS ----------------- Config: CONFIG_EFI_VARS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_EFI_VARS=m Actual value: ---------- CONFIG_EFI ----------------- Config: CONFIG_EFI_VARS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_EFI_VARS=m Actual value: Config: CONFIG_EFI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFI=y Actual value: # CONFIG_EFI is not set Config: CONFIG_EFI_STUB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFI_STUB=y Actual value: Config: CONFIG_EFIVAR_FS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFIVAR_FS=y Actual value: -- Config: CONFIG_EFI_EARLYCON From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/debug/printk.cfg Requested value: CONFIG_EFI_EARLYCON=y Actual value: ---------- CONFIG_EFI_STUB ----------------- Config: CONFIG_EFI_STUB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFI_STUB=y Actual value: ---------- CONFIG_EFIVAR_FS ----------------- Config: CONFIG_EFIVAR_FS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFIVAR_FS=y Actual value: ---------- CONFIG_HPET_EMULATE_RTC ----------------- Config: CONFIG_HPET_EMULATE_RTC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET_EMULATE_RTC=y Actual value: ---------- CONFIG_HPET ----------------- Config: CONFIG_HPET_EMULATE_RTC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET_EMULATE_RTC=y Actual value: Config: CONFIG_HPET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET=y Actual value: # CONFIG_HPET is not set Config: CONFIG_HPET_MMAP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET_MMAP=y Actual value: ---------- CONFIG_HPET_MMAP ----------------- Config: CONFIG_HPET_MMAP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET_MMAP=y Actual value: ---------- CONFIG_X86_MSR ----------------- Config: CONFIG_X86_MSR From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Requested value: CONFIG_X86_MSR=y Actual value: # CONFIG_X86_MSR is not set ---------- CONFIG_X86_CPUID ----------------- Config: CONFIG_X86_CPUID From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Requested value: CONFIG_X86_CPUID=y Actual value: # CONFIG_X86_CPUID is not set ---------- CONFIG_X86_CHECK_BIOS_CORRUPTION ----------------- Config: CONFIG_X86_CHECK_BIOS_CORRUPTION From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Requested value: CONFIG_X86_CHECK_BIOS_CORRUPTION=y Actual value: # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set ---------- CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK ----------------- Config: CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Requested value: CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y Actual value: ---------- CONFIG_SMP ----------------- Config: CONFIG_SMP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg Requested value: CONFIG_SMP=y Actual value: # CONFIG_SMP is not set ---------- CONFIG_SCHED_SMT ----------------- Config: CONFIG_SCHED_SMT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg Requested value: CONFIG_SCHED_SMT=y Actual value: ---------- CONFIG_NR_CPUS ----------------- Config: CONFIG_NR_CPUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg Requested value: CONFIG_NR_CPUS=64 Actual value: CONFIG_NR_CPUS=1 ---------- CONFIG_IA32_EMULATION ----------------- Config: CONFIG_IA32_EMULATION From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Requested value: CONFIG_IA32_EMULATION=y Actual value: # CONFIG_IA32_EMULATION is not set ---------- CONFIG_COMPAT ----------------- Config: CONFIG_COMPAT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Requested value: CONFIG_COMPAT=y Actual value: ---------- CONFIG_UNWINDER_ORC ----------------- Config: CONFIG_UNWINDER_ORC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Requested value: # CONFIG_UNWINDER_ORC is not set Actual value: CONFIG_UNWINDER_ORC=y ---------- CONFIG_UNWINDER_FRAME_POINTER ----------------- Config: CONFIG_UNWINDER_FRAME_POINTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Requested value: CONFIG_UNWINDER_FRAME_POINTER=y Actual value: # CONFIG_UNWINDER_FRAME_POINTER is not set ---------- CONFIG_X86_AMD_PLATFORM_DEVICE ----------------- Config: CONFIG_X86_AMD_PLATFORM_DEVICE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg Requested value: CONFIG_X86_AMD_PLATFORM_DEVICE=y Actual value: # CONFIG_X86_AMD_PLATFORM_DEVICE is not set ---------- CONFIG_MICROCODE_AMD ----------------- Config: CONFIG_MICROCODE_AMD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg Requested value: CONFIG_MICROCODE_AMD=y Actual value: # CONFIG_MICROCODE_AMD is not set ---------- CONFIG_X86_MCE_AMD ----------------- Config: CONFIG_X86_MCE_AMD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg Requested value: CONFIG_X86_MCE_AMD=y Actual value: ---------- CONFIG_PCI ----------------- Config: CONFIG_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI=y Actual value: # CONFIG_PCI is not set Config: CONFIG_PCI_MMCONFIG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI_MMCONFIG=y Actual value: Config: CONFIG_PCI_MSI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI_MSI=y Actual value: Config: CONFIG_PCIEPORTBUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCIEPORTBUS=y Actual value: -- Config: CONFIG_PCI_IOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg Requested value: CONFIG_PCI_IOV=y Actual value: ---------- CONFIG_PCI_MMCONFIG ----------------- Config: CONFIG_PCI_MMCONFIG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI_MMCONFIG=y Actual value: ---------- CONFIG_PCI_MSI ----------------- Config: CONFIG_PCI_MSI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI_MSI=y Actual value: ---------- CONFIG_PCIEPORTBUS ----------------- Config: CONFIG_PCIEPORTBUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCIEPORTBUS=y Actual value: ---------- CONFIG_HOTPLUG_PCI ----------------- Config: CONFIG_HOTPLUG_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_HOTPLUG_PCI=y Actual value: ---------- CONFIG_PCI_IOV ----------------- Config: CONFIG_PCI_IOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg Requested value: CONFIG_PCI_IOV=y Actual value: ---------- CONFIG_MMC ----------------- Config: CONFIG_MMC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-base.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC=y Actual value: # CONFIG_MMC is not set Config: CONFIG_MMC_SDHCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI=y Actual value: Config: CONFIG_MMC_SDHCI_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PCI=y Actual value: Config: CONFIG_MMC_SDHCI_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_ACPI=y Actual value: Config: CONFIG_MMC_SDHCI_PLTFM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PLTFM=y Actual value: Config: CONFIG_MMC_RICOH_MMC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_RICOH_MMC=y Actual value: ---------- CONFIG_MMC_SDHCI ----------------- Config: CONFIG_MMC_SDHCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI=y Actual value: Config: CONFIG_MMC_SDHCI_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PCI=y Actual value: Config: CONFIG_MMC_SDHCI_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_ACPI=y Actual value: Config: CONFIG_MMC_SDHCI_PLTFM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PLTFM=y Actual value: ---------- CONFIG_MMC_SDHCI_PCI ----------------- Config: CONFIG_MMC_SDHCI_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PCI=y Actual value: ---------- CONFIG_MMC_SDHCI_ACPI ----------------- Config: CONFIG_MMC_SDHCI_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_ACPI=y Actual value: ---------- CONFIG_MMC_SDHCI_PLTFM ----------------- Config: CONFIG_MMC_SDHCI_PLTFM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PLTFM=y Actual value: ---------- CONFIG_MMC_RICOH_MMC ----------------- Config: CONFIG_MMC_RICOH_MMC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_RICOH_MMC=y Actual value: ---------- CONFIG_USB_EHCI_HCD ----------------- Config: CONFIG_USB_EHCI_HCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg Requested value: CONFIG_USB_EHCI_HCD=y Actual value: ---------- CONFIG_USB_EHCI_ROOT_HUB_TT ----------------- Config: CONFIG_USB_EHCI_ROOT_HUB_TT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg Requested value: CONFIG_USB_EHCI_ROOT_HUB_TT=y Actual value: ---------- CONFIG_USB_OHCI_HCD ----------------- Config: CONFIG_USB_OHCI_HCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ohci-hcd.cfg Requested value: CONFIG_USB_OHCI_HCD=y Actual value: ---------- CONFIG_USB_XHCI_HCD ----------------- Config: CONFIG_USB_XHCI_HCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/xhci-hcd.cfg Requested value: CONFIG_USB_XHCI_HCD=y Actual value: ---------- CONFIG_INPUT_TOUCHSCREEN ----------------- Config: CONFIG_INPUT_TOUCHSCREEN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/input/touchscreen.cfg Requested value: CONFIG_INPUT_TOUCHSCREEN=y Actual value: # CONFIG_INPUT_TOUCHSCREEN is not set ---------- CONFIG_TOUCHSCREEN_USB_COMPOSITE ----------------- Config: CONFIG_TOUCHSCREEN_USB_COMPOSITE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/touchscreen-composite.cfg Requested value: CONFIG_TOUCHSCREEN_USB_COMPOSITE=m Actual value: ---------- CONFIG_USB_USBNET ----------------- Config: CONFIG_USB_USBNET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_USBNET=m Actual value: ---------- CONFIG_USB_NET_DRIVERS ----------------- Config: CONFIG_USB_NET_DRIVERS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_DRIVERS=m Actual value: ---------- CONFIG_USB_KAWETH ----------------- Config: CONFIG_USB_KAWETH From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_KAWETH=m Actual value: ---------- CONFIG_USB_PEGASUS ----------------- Config: CONFIG_USB_PEGASUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_PEGASUS=m Actual value: ---------- CONFIG_USB_RTL8150 ----------------- Config: CONFIG_USB_RTL8150 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_RTL8150=m Actual value: ---------- CONFIG_USB_RTL8152 ----------------- Config: CONFIG_USB_RTL8152 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_RTL8152=m Actual value: ---------- CONFIG_USB_NET_AX8817X ----------------- Config: CONFIG_USB_NET_AX8817X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_AX8817X=m Actual value: ---------- CONFIG_USB_NET_AX88179_178A ----------------- Config: CONFIG_USB_NET_AX88179_178A From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_AX88179_178A=m Actual value: ---------- CONFIG_USB_NET_CDCETHER ----------------- Config: CONFIG_USB_NET_CDCETHER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDCETHER=m Actual value: ---------- CONFIG_USB_NET_CDC_EEM ----------------- Config: CONFIG_USB_NET_CDC_EEM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_EEM=m Actual value: ---------- CONFIG_USB_NET_CDC_NCM ----------------- Config: CONFIG_USB_NET_CDC_NCM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_NCM=m Actual value: ---------- CONFIG_USB_NET_DM9601 ----------------- Config: CONFIG_USB_NET_DM9601 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_DM9601=m Actual value: ---------- CONFIG_USB_NET_SMSC75XX ----------------- Config: CONFIG_USB_NET_SMSC75XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_SMSC75XX=m Actual value: ---------- CONFIG_USB_NET_SMSC95XX ----------------- Config: CONFIG_USB_NET_SMSC95XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_SMSC95XX=m Actual value: ---------- CONFIG_USB_NET_MCS7830 ----------------- Config: CONFIG_USB_NET_MCS7830 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_MCS7830=m Actual value: ---------- CONFIG_USB_NET_RNDIS_HOST ----------------- Config: CONFIG_USB_NET_RNDIS_HOST From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_RNDIS_HOST=m Actual value: ---------- CONFIG_USB_NET_CDC_SUBSET_ENABLE ----------------- Config: CONFIG_USB_NET_CDC_SUBSET_ENABLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_SUBSET_ENABLE=m Actual value: ---------- CONFIG_USB_NET_CDC_SUBSET ----------------- Config: CONFIG_USB_NET_CDC_SUBSET_ENABLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_SUBSET_ENABLE=m Actual value: Config: CONFIG_USB_NET_CDC_SUBSET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_SUBSET=m Actual value: ---------- CONFIG_USB_ALI_M5632 ----------------- Config: CONFIG_USB_ALI_M5632 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_ALI_M5632=y Actual value: ---------- CONFIG_USB_AN2720 ----------------- Config: CONFIG_USB_AN2720 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_AN2720=y Actual value: ---------- CONFIG_USB_BELKIN ----------------- Config: CONFIG_USB_BELKIN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_BELKIN=y Actual value: ---------- CONFIG_USB_ARMLINUX ----------------- Config: CONFIG_USB_ARMLINUX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_ARMLINUX=y Actual value: ---------- CONFIG_USB_KC2190 ----------------- Config: CONFIG_USB_KC2190 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_KC2190=y Actual value: ---------- CONFIG_E100 ----------------- Config: CONFIG_E100 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e100.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E100=y Actual value: Config: CONFIG_E1000E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000E=y Actual value: Config: CONFIG_E1000 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000=y Actual value: ---------- CONFIG_E1000E ----------------- Config: CONFIG_E1000E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000E=y Actual value: ---------- CONFIG_E1000 ----------------- Config: CONFIG_E1000E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000E=y Actual value: Config: CONFIG_E1000 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000=y Actual value: ---------- CONFIG_IGB ----------------- Config: CONFIG_IGB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg Requested value: CONFIG_IGB=y Actual value: Config: CONFIG_IGBVF From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg Requested value: CONFIG_IGBVF=m Actual value: ---------- CONFIG_IGBVF ----------------- Config: CONFIG_IGBVF From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg Requested value: CONFIG_IGBVF=m Actual value: ---------- CONFIG_IRQ_REMAP ----------------- Config: CONFIG_IRQ_REMAP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg Requested value: CONFIG_IRQ_REMAP=y Actual value: ---------- CONFIG_X86_X2APIC ----------------- Config: CONFIG_X86_X2APIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg Requested value: CONFIG_X86_X2APIC=y Actual value: ---------- CONFIG_ISDN ----------------- Config: CONFIG_ISDN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_ISDN=y Actual value: Config: CONFIG_ISDN_CAPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_ISDN_CAPI=m Actual value: ---------- CONFIG_ISDN_CAPI ----------------- Config: CONFIG_ISDN_CAPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_ISDN_CAPI=m Actual value: ---------- CONFIG_BT_6LOWPAN ----------------- Config: CONFIG_BT_6LOWPAN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_6LOWPAN=m Actual value: ---------- CONFIG_BT_RFCOMM ----------------- Config: CONFIG_BT_RFCOMM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_RFCOMM=m Actual value: Config: CONFIG_BT_RFCOMM_TTY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_RFCOMM_TTY=y Actual value: ---------- CONFIG_BT_RFCOMM_TTY ----------------- Config: CONFIG_BT_RFCOMM_TTY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_RFCOMM_TTY=y Actual value: ---------- CONFIG_BT_BNEP ----------------- Config: CONFIG_BT_BNEP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP=m Actual value: Config: CONFIG_BT_BNEP_MC_FILTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP_MC_FILTER=y Actual value: Config: CONFIG_BT_BNEP_PROTO_FILTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP_PROTO_FILTER=y Actual value: ---------- CONFIG_BT_BNEP_MC_FILTER ----------------- Config: CONFIG_BT_BNEP_MC_FILTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP_MC_FILTER=y Actual value: ---------- CONFIG_BT_BNEP_PROTO_FILTER ----------------- Config: CONFIG_BT_BNEP_PROTO_FILTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP_PROTO_FILTER=y Actual value: ---------- CONFIG_BT_CMTP ----------------- Config: CONFIG_BT_CMTP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_CMTP=m Actual value: ---------- CONFIG_BT_HIDP ----------------- Config: CONFIG_BT_HIDP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_HIDP=m Actual value: ---------- CONFIG_BT_LE ----------------- Config: CONFIG_BT_LE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_LE=y Actual value: ---------- CONFIG_BT_BREDR ----------------- Config: CONFIG_BT_BREDR From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BREDR=y Actual value: ---------- CONFIG_6LOWPAN ----------------- Config: CONFIG_6LOWPAN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/6lowpan/6lowpan.cfg Requested value: CONFIG_6LOWPAN=m Actual value: ---------- CONFIG_SERIAL_8250 ----------------- Config: CONFIG_SERIAL_8250_PNP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_SERIAL_8250_PNP=y Actual value: -- Config: CONFIG_SERIAL_8250 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250=y Actual value: # CONFIG_SERIAL_8250 is not set Config: CONFIG_SERIAL_8250_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_CONSOLE=y Actual value: Config: CONFIG_SERIAL_8250_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_PCI=y Actual value: Config: CONFIG_SERIAL_8250_NR_UARTS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_NR_UARTS=4 Actual value: Config: CONFIG_SERIAL_8250_RUNTIME_UARTS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_RUNTIME_UARTS=4 Actual value: ---------- CONFIG_SERIAL_8250_CONSOLE ----------------- Config: CONFIG_SERIAL_8250_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_CONSOLE=y Actual value: ---------- CONFIG_SERIAL_8250_PCI ----------------- Config: CONFIG_SERIAL_8250_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_PCI=y Actual value: ---------- CONFIG_SERIAL_8250_NR_UARTS ----------------- Config: CONFIG_SERIAL_8250_NR_UARTS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_NR_UARTS=4 Actual value: ---------- CONFIG_SERIAL_8250_RUNTIME_UARTS ----------------- Config: CONFIG_SERIAL_8250_RUNTIME_UARTS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_RUNTIME_UARTS=4 Actual value: ---------- CONFIG_SERIAL_CORE ----------------- Config: CONFIG_SERIAL_CORE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_CORE=y Actual value: Config: CONFIG_SERIAL_CORE_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_CORE_CONSOLE=y Actual value: ---------- CONFIG_SERIAL_CORE_CONSOLE ----------------- Config: CONFIG_SERIAL_CORE_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_CORE_CONSOLE=y Actual value: ---------- CONFIG_AGP ----------------- Config: CONFIG_AGP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_AGP=y Actual value: Config: CONFIG_AGP_INTEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_AGP_INTEL=y Actual value: ---------- CONFIG_AGP_INTEL ----------------- Config: CONFIG_AGP_INTEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_AGP_INTEL=y Actual value: ---------- CONFIG_DRM_I915 ----------------- Config: CONFIG_DRM_I915 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915=m Actual value: Config: CONFIG_DRM_I915_ALPHA_SUPPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y Actual value: ---------- CONFIG_DRM_I915_ALPHA_SUPPORT ----------------- Config: CONFIG_DRM_I915_ALPHA_SUPPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y Actual value: ---------- CONFIG_BLK_DEV_SD ----------------- Config: CONFIG_BLK_DEV_SD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/disk.cfg Requested value: CONFIG_BLK_DEV_SD=y Actual value: ---------- CONFIG_USB_VIDEO_CLASS ----------------- Config: CONFIG_USB_VIDEO_CLASS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_VIDEO_CLASS=m Actual value: Config: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y Actual value: ---------- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV ----------------- Config: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y Actual value: ---------- CONFIG_USB_GSPCA ----------------- Config: CONFIG_USB_GSPCA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA=m Actual value: -- Config: CONFIG_USB_GSPCA_BENQ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_BENQ=m Actual value: Config: CONFIG_USB_GSPCA_CONEX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_CONEX=m Actual value: Config: CONFIG_USB_GSPCA_CPIA1 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_CPIA1=m Actual value: Config: CONFIG_USB_GSPCA_ETOMS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_ETOMS=m Actual value: Config: CONFIG_USB_GSPCA_FINEPIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_FINEPIX=m Actual value: Config: CONFIG_USB_GSPCA_JEILINJ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_JEILINJ=m Actual value: Config: CONFIG_USB_GSPCA_JL2005BCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_JL2005BCD=m Actual value: Config: CONFIG_USB_GSPCA_KINECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_KINECT=m Actual value: Config: CONFIG_USB_GSPCA_KONICA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_KONICA=m Actual value: Config: CONFIG_USB_GSPCA_MARS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_MARS=m Actual value: Config: CONFIG_USB_GSPCA_MR97310A From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_MR97310A=m Actual value: Config: CONFIG_USB_GSPCA_NW80X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_NW80X=m Actual value: Config: CONFIG_USB_GSPCA_OV519 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV519=m Actual value: Config: CONFIG_USB_GSPCA_OV534 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534=m Actual value: Config: CONFIG_USB_GSPCA_OV534_9 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534_9=m Actual value: Config: CONFIG_USB_GSPCA_PAC207 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC207=m Actual value: Config: CONFIG_USB_GSPCA_PAC7302 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC7302=m Actual value: Config: CONFIG_USB_GSPCA_PAC7311 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC7311=m Actual value: Config: CONFIG_USB_GSPCA_SE401 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SE401=m Actual value: Config: CONFIG_USB_GSPCA_SN9C2028 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SN9C2028=m Actual value: Config: CONFIG_USB_GSPCA_SN9C20X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SN9C20X=m Actual value: Config: CONFIG_USB_GSPCA_SONIXB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SONIXB=m Actual value: Config: CONFIG_USB_GSPCA_SONIXJ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SONIXJ=m Actual value: Config: CONFIG_USB_GSPCA_SPCA500 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA500=m Actual value: Config: CONFIG_USB_GSPCA_SPCA501 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA501=m Actual value: Config: CONFIG_USB_GSPCA_SPCA505 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA505=m Actual value: Config: CONFIG_USB_GSPCA_SPCA506 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA506=m Actual value: Config: CONFIG_USB_GSPCA_SPCA508 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA508=m Actual value: Config: CONFIG_USB_GSPCA_SPCA561 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA561=m Actual value: Config: CONFIG_USB_GSPCA_SPCA1528 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA1528=m Actual value: Config: CONFIG_USB_GSPCA_SQ905 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905=m Actual value: Config: CONFIG_USB_GSPCA_SQ905C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905C=m Actual value: Config: CONFIG_USB_GSPCA_SQ930X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ930X=m Actual value: Config: CONFIG_USB_GSPCA_STK014 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_STK014=m Actual value: Config: CONFIG_USB_GSPCA_STV0680 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_STV0680=m Actual value: Config: CONFIG_USB_GSPCA_SUNPLUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SUNPLUS=m Actual value: Config: CONFIG_USB_GSPCA_T613 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_T613=m Actual value: Config: CONFIG_USB_GSPCA_TOPRO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_TOPRO=m Actual value: Config: CONFIG_USB_GSPCA_TV8532 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_TV8532=m Actual value: Config: CONFIG_USB_GSPCA_VC032X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_VC032X=m Actual value: Config: CONFIG_USB_GSPCA_VICAM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_VICAM=m Actual value: Config: CONFIG_USB_GSPCA_XIRLINK_CIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_XIRLINK_CIT=m Actual value: Config: CONFIG_USB_GSPCA_ZC3XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_ZC3XX=m Actual value: ---------- CONFIG_USB_M5602 ----------------- Config: CONFIG_USB_M5602 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_M5602=m Actual value: ---------- CONFIG_USB_STV06XX ----------------- Config: CONFIG_USB_STV06XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_STV06XX=m Actual value: ---------- CONFIG_USB_GL860 ----------------- Config: CONFIG_USB_GL860 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GL860=m Actual value: ---------- CONFIG_USB_GSPCA_BENQ ----------------- Config: CONFIG_USB_GSPCA_BENQ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_BENQ=m Actual value: ---------- CONFIG_USB_GSPCA_CONEX ----------------- Config: CONFIG_USB_GSPCA_CONEX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_CONEX=m Actual value: ---------- CONFIG_USB_GSPCA_CPIA1 ----------------- Config: CONFIG_USB_GSPCA_CPIA1 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_CPIA1=m Actual value: ---------- CONFIG_USB_GSPCA_ETOMS ----------------- Config: CONFIG_USB_GSPCA_ETOMS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_ETOMS=m Actual value: ---------- CONFIG_USB_GSPCA_FINEPIX ----------------- Config: CONFIG_USB_GSPCA_FINEPIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_FINEPIX=m Actual value: ---------- CONFIG_USB_GSPCA_JEILINJ ----------------- Config: CONFIG_USB_GSPCA_JEILINJ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_JEILINJ=m Actual value: ---------- CONFIG_USB_GSPCA_JL2005BCD ----------------- Config: CONFIG_USB_GSPCA_JL2005BCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_JL2005BCD=m Actual value: ---------- CONFIG_USB_GSPCA_KINECT ----------------- Config: CONFIG_USB_GSPCA_KINECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_KINECT=m Actual value: ---------- CONFIG_USB_GSPCA_KONICA ----------------- Config: CONFIG_USB_GSPCA_KONICA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_KONICA=m Actual value: ---------- CONFIG_USB_GSPCA_MARS ----------------- Config: CONFIG_USB_GSPCA_MARS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_MARS=m Actual value: ---------- CONFIG_USB_GSPCA_MR97310A ----------------- Config: CONFIG_USB_GSPCA_MR97310A From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_MR97310A=m Actual value: ---------- CONFIG_USB_GSPCA_NW80X ----------------- Config: CONFIG_USB_GSPCA_NW80X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_NW80X=m Actual value: ---------- CONFIG_USB_GSPCA_OV519 ----------------- Config: CONFIG_USB_GSPCA_OV519 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV519=m Actual value: ---------- CONFIG_USB_GSPCA_OV534 ----------------- Config: CONFIG_USB_GSPCA_OV534 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534=m Actual value: Config: CONFIG_USB_GSPCA_OV534_9 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534_9=m Actual value: ---------- CONFIG_USB_GSPCA_OV534_9 ----------------- Config: CONFIG_USB_GSPCA_OV534_9 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534_9=m Actual value: ---------- CONFIG_USB_GSPCA_PAC207 ----------------- Config: CONFIG_USB_GSPCA_PAC207 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC207=m Actual value: ---------- CONFIG_USB_GSPCA_PAC7302 ----------------- Config: CONFIG_USB_GSPCA_PAC7302 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC7302=m Actual value: ---------- CONFIG_USB_GSPCA_PAC7311 ----------------- Config: CONFIG_USB_GSPCA_PAC7311 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC7311=m Actual value: ---------- CONFIG_USB_GSPCA_SE401 ----------------- Config: CONFIG_USB_GSPCA_SE401 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SE401=m Actual value: ---------- CONFIG_USB_GSPCA_SN9C2028 ----------------- Config: CONFIG_USB_GSPCA_SN9C2028 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SN9C2028=m Actual value: ---------- CONFIG_USB_GSPCA_SN9C20X ----------------- Config: CONFIG_USB_GSPCA_SN9C20X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SN9C20X=m Actual value: ---------- CONFIG_USB_GSPCA_SONIXB ----------------- Config: CONFIG_USB_GSPCA_SONIXB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SONIXB=m Actual value: ---------- CONFIG_USB_GSPCA_SONIXJ ----------------- Config: CONFIG_USB_GSPCA_SONIXJ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SONIXJ=m Actual value: ---------- CONFIG_USB_GSPCA_SPCA500 ----------------- Config: CONFIG_USB_GSPCA_SPCA500 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA500=m Actual value: ---------- CONFIG_USB_GSPCA_SPCA501 ----------------- Config: CONFIG_USB_GSPCA_SPCA501 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA501=m Actual value: ---------- CONFIG_USB_GSPCA_SPCA505 ----------------- Config: CONFIG_USB_GSPCA_SPCA505 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA505=m Actual value: ---------- CONFIG_USB_GSPCA_SPCA506 ----------------- Config: CONFIG_USB_GSPCA_SPCA506 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA506=m Actual value: ---------- CONFIG_USB_GSPCA_SPCA508 ----------------- Config: CONFIG_USB_GSPCA_SPCA508 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA508=m Actual value: ---------- CONFIG_USB_GSPCA_SPCA561 ----------------- Config: CONFIG_USB_GSPCA_SPCA561 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA561=m Actual value: ---------- CONFIG_USB_GSPCA_SPCA1528 ----------------- Config: CONFIG_USB_GSPCA_SPCA1528 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA1528=m Actual value: ---------- CONFIG_USB_GSPCA_SQ905 ----------------- Config: CONFIG_USB_GSPCA_SQ905 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905=m Actual value: Config: CONFIG_USB_GSPCA_SQ905C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905C=m Actual value: ---------- CONFIG_USB_GSPCA_SQ905C ----------------- Config: CONFIG_USB_GSPCA_SQ905C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905C=m Actual value: ---------- CONFIG_USB_GSPCA_SQ930X ----------------- Config: CONFIG_USB_GSPCA_SQ930X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ930X=m Actual value: ---------- CONFIG_USB_GSPCA_STK014 ----------------- Config: CONFIG_USB_GSPCA_STK014 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_STK014=m Actual value: ---------- CONFIG_USB_GSPCA_STV0680 ----------------- Config: CONFIG_USB_GSPCA_STV0680 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_STV0680=m Actual value: ---------- CONFIG_USB_GSPCA_SUNPLUS ----------------- Config: CONFIG_USB_GSPCA_SUNPLUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SUNPLUS=m Actual value: ---------- CONFIG_USB_GSPCA_T613 ----------------- Config: CONFIG_USB_GSPCA_T613 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_T613=m Actual value: ---------- CONFIG_USB_GSPCA_TOPRO ----------------- Config: CONFIG_USB_GSPCA_TOPRO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_TOPRO=m Actual value: ---------- CONFIG_USB_GSPCA_TV8532 ----------------- Config: CONFIG_USB_GSPCA_TV8532 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_TV8532=m Actual value: ---------- CONFIG_USB_GSPCA_VC032X ----------------- Config: CONFIG_USB_GSPCA_VC032X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_VC032X=m Actual value: ---------- CONFIG_USB_GSPCA_VICAM ----------------- Config: CONFIG_USB_GSPCA_VICAM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_VICAM=m Actual value: ---------- CONFIG_USB_GSPCA_XIRLINK_CIT ----------------- Config: CONFIG_USB_GSPCA_XIRLINK_CIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_XIRLINK_CIT=m Actual value: ---------- CONFIG_USB_GSPCA_ZC3XX ----------------- Config: CONFIG_USB_GSPCA_ZC3XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_ZC3XX=m Actual value: ---------- CONFIG_USB_PWC ----------------- Config: CONFIG_USB_PWC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_PWC=m Actual value: Config: CONFIG_USB_PWC_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_PWC_INPUT_EVDEV=y Actual value: ---------- CONFIG_USB_PWC_INPUT_EVDEV ----------------- Config: CONFIG_USB_PWC_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_PWC_INPUT_EVDEV=y Actual value: ---------- CONFIG_VIDEO_CPIA2 ----------------- Config: CONFIG_VIDEO_CPIA2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_VIDEO_CPIA2=m Actual value: ---------- CONFIG_USB_STKWEBCAM ----------------- Config: CONFIG_USB_STKWEBCAM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_STKWEBCAM=m Actual value: ---------- CONFIG_USB_S2255 ----------------- Config: CONFIG_USB_S2255 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_S2255=m Actual value: ---------- CONFIG_SND_PCI ----------------- Config: CONFIG_SND_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_PCI=y Actual value: ---------- CONFIG_SND_HDA_INTEL ----------------- Config: CONFIG_SND_HDA_INTEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_INTEL=m Actual value: ---------- CONFIG_SND_HDA_GENERIC ----------------- Config: CONFIG_SND_HDA_GENERIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_GENERIC=m Actual value: ---------- CONFIG_SND_HDA_CODEC_HDMI ----------------- Config: CONFIG_SND_HDA_CODEC_HDMI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_HDMI=m Actual value: ---------- CONFIG_SND_HDA_CODEC_ANALOG ----------------- Config: CONFIG_SND_HDA_CODEC_ANALOG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_ANALOG=m Actual value: ---------- CONFIG_SND_HDA_CODEC_REALTEK ----------------- Config: CONFIG_SND_HDA_CODEC_REALTEK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_REALTEK=m Actual value: ---------- CONFIG_SND_HDA_CODEC_SIGMATEL ----------------- Config: CONFIG_SND_HDA_CODEC_SIGMATEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_SIGMATEL=m Actual value: ---------- CONFIG_SND_HDA_CODEC_CIRRUS ----------------- Config: CONFIG_SND_HDA_CODEC_CIRRUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CIRRUS=m Actual value: ---------- CONFIG_SND_HDA_CODEC_CONEXANT ----------------- Config: CONFIG_SND_HDA_CODEC_CONEXANT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CONEXANT=m Actual value: ---------- CONFIG_SND_HDA_CODEC_CA0110 ----------------- Config: CONFIG_SND_HDA_CODEC_CA0110 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CA0110=m Actual value: ---------- CONFIG_SND_HDA_CODEC_CA0132 ----------------- Config: CONFIG_SND_HDA_CODEC_CA0132 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CA0132=m Actual value: ---------- CONFIG_SND_HDA_CODEC_CMEDIA ----------------- Config: CONFIG_SND_HDA_CODEC_CMEDIA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CMEDIA=m Actual value: ---------- CONFIG_SND_HDA_CODEC_SI3054 ----------------- Config: CONFIG_SND_HDA_CODEC_SI3054 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_SI3054=m Actual value: ---------- CONFIG_DMA_SHARED_BUFFER ----------------- Config: CONFIG_DMA_SHARED_BUFFER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DMA_SHARED_BUFFER=y Actual value: ---------- CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS ----------------- Config: CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y Actual value: ---------- CONFIG_MOUSE_PS2_SMBUS ----------------- Config: CONFIG_MOUSE_PS2_SMBUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_MOUSE_PS2_SMBUS=y Actual value: ---------- CONFIG_VT_HW_CONSOLE_BINDING ----------------- Config: CONFIG_VT_HW_CONSOLE_BINDING From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_VT_HW_CONSOLE_BINDING=y Actual value: # CONFIG_VT_HW_CONSOLE_BINDING is not set ---------- CONFIG_I2C ----------------- Config: CONFIG_I2C_I801 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_I2C_I801=y Actual value: -- Config: CONFIG_I2C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C=y Actual value: # CONFIG_I2C is not set Config: CONFIG_I2C_BOARDINFO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_BOARDINFO=y Actual value: Config: CONFIG_I2C_COMPAT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_COMPAT=y Actual value: Config: CONFIG_I2C_HELPER_AUTO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_HELPER_AUTO=y Actual value: Config: CONFIG_I2C_ALGOBIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_ALGOBIT=y Actual value: ---------- CONFIG_I2C_BOARDINFO ----------------- Config: CONFIG_I2C_BOARDINFO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_BOARDINFO=y Actual value: ---------- CONFIG_I2C_COMPAT ----------------- Config: CONFIG_I2C_COMPAT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_COMPAT=y Actual value: ---------- CONFIG_I2C_HELPER_AUTO ----------------- Config: CONFIG_I2C_HELPER_AUTO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_HELPER_AUTO=y Actual value: ---------- CONFIG_I2C_ALGOBIT ----------------- Config: CONFIG_I2C_ALGOBIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_ALGOBIT=y Actual value: ---------- CONFIG_DRM ----------------- Config: CONFIG_DRM_CIRRUS_QEMU From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_DRM_CIRRUS_QEMU=m Actual value: -- Config: CONFIG_DRM_I915 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915=m Actual value: Config: CONFIG_DRM_I915_ALPHA_SUPPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y Actual value: -- Config: CONFIG_DRM_VIRTIO_GPU From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg Requested value: CONFIG_DRM_VIRTIO_GPU=y Actual value: -- Config: CONFIG_DRM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM=y Actual value: # CONFIG_DRM is not set Config: CONFIG_DRM_KMS_HELPER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_KMS_HELPER=y Actual value: Config: CONFIG_DRM_KMS_FB_HELPER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_KMS_FB_HELPER=y Actual value: Config: CONFIG_DRM_FBDEV_EMULATION From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_FBDEV_EMULATION=y Actual value: Config: CONFIG_DRM_FBDEV_OVERALLOC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_FBDEV_OVERALLOC=100 Actual value: Config: CONFIG_DRM_TTM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_TTM=y Actual value: Config: CONFIG_DRM_BOCHS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_BOCHS=y Actual value: Config: CONFIG_DRM_PANEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL=y Actual value: Config: CONFIG_DRM_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_BRIDGE=y Actual value: Config: CONFIG_DRM_PANEL_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_BRIDGE=y Actual value: Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y Actual value: ---------- CONFIG_DRM_FBDEV_EMULATION ----------------- Config: CONFIG_DRM_FBDEV_EMULATION From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_FBDEV_EMULATION=y Actual value: ---------- CONFIG_DRM_FBDEV_OVERALLOC ----------------- Config: CONFIG_DRM_FBDEV_OVERALLOC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_FBDEV_OVERALLOC=100 Actual value: ---------- CONFIG_DRM_TTM ----------------- Config: CONFIG_DRM_TTM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_TTM=y Actual value: ---------- CONFIG_DRM_BOCHS ----------------- Config: CONFIG_DRM_BOCHS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_BOCHS=y Actual value: ---------- CONFIG_DRM_PANEL ----------------- Config: CONFIG_DRM_PANEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL=y Actual value: -- Config: CONFIG_DRM_PANEL_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_BRIDGE=y Actual value: Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y Actual value: ---------- CONFIG_DRM_BRIDGE ----------------- Config: CONFIG_DRM_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_BRIDGE=y Actual value: ---------- CONFIG_DRM_PANEL_BRIDGE ----------------- Config: CONFIG_DRM_PANEL_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_BRIDGE=y Actual value: ---------- CONFIG_DRM_PANEL_ORIENTATION_QUIRKS ----------------- Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y Actual value: ---------- CONFIG_FB_CMDLINE ----------------- Config: CONFIG_FB_CMDLINE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CMDLINE=y Actual value: ---------- CONFIG_FB_NOTIFY ----------------- Config: CONFIG_FB_NOTIFY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_NOTIFY=y Actual value: ---------- CONFIG_FB ----------------- Config: CONFIG_FB_MODE_HELPERS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_FB_MODE_HELPERS=y Actual value: -- Config: CONFIG_FB_UVESA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_FB_UVESA=m Actual value: -- Config: CONFIG_FB_EFI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_FB_EFI=y Actual value: -- Config: CONFIG_FB_CMDLINE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CMDLINE=y Actual value: Config: CONFIG_FB_NOTIFY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_NOTIFY=y Actual value: Config: CONFIG_FB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB=y Actual value: # CONFIG_FB is not set Config: CONFIG_FB_CFB_FILLRECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_FILLRECT=y Actual value: Config: CONFIG_FB_CFB_COPYAREA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_COPYAREA=y Actual value: Config: CONFIG_FB_CFB_IMAGEBLIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_IMAGEBLIT=y Actual value: Config: CONFIG_FB_SYS_FILLRECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_FILLRECT=y Actual value: Config: CONFIG_FB_SYS_COPYAREA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_COPYAREA=y Actual value: Config: CONFIG_FB_SYS_IMAGEBLIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_IMAGEBLIT=y Actual value: Config: CONFIG_FB_SYS_FOPS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_FOPS=y Actual value: Config: CONFIG_FB_DEFERRED_IO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_DEFERRED_IO=y Actual value: Config: CONFIG_FB_SIMPLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SIMPLE=y Actual value: ---------- CONFIG_FB_CFB_FILLRECT ----------------- Config: CONFIG_FB_CFB_FILLRECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_FILLRECT=y Actual value: ---------- CONFIG_FB_CFB_COPYAREA ----------------- Config: CONFIG_FB_CFB_COPYAREA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_COPYAREA=y Actual value: ---------- CONFIG_FB_CFB_IMAGEBLIT ----------------- Config: CONFIG_FB_CFB_IMAGEBLIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_IMAGEBLIT=y Actual value: ---------- CONFIG_FB_SYS_FILLRECT ----------------- Config: CONFIG_FB_SYS_FILLRECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_FILLRECT=y Actual value: ---------- CONFIG_FB_SYS_COPYAREA ----------------- Config: CONFIG_FB_SYS_COPYAREA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_COPYAREA=y Actual value: ---------- CONFIG_FB_SYS_IMAGEBLIT ----------------- Config: CONFIG_FB_SYS_IMAGEBLIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_IMAGEBLIT=y Actual value: ---------- CONFIG_FB_SYS_FOPS ----------------- Config: CONFIG_FB_SYS_FOPS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_FOPS=y Actual value: ---------- CONFIG_FB_DEFERRED_IO ----------------- Config: CONFIG_FB_DEFERRED_IO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_DEFERRED_IO=y Actual value: ---------- CONFIG_FB_SIMPLE ----------------- Config: CONFIG_FB_SIMPLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SIMPLE=y Actual value: ---------- CONFIG_HDMI ----------------- Config: CONFIG_HDMI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_HDMI=y Actual value: ---------- CONFIG_FRAMEBUFFER_CONSOLE ----------------- Config: CONFIG_FRAMEBUFFER_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FRAMEBUFFER_CONSOLE=y Actual value: Config: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y Actual value: ---------- CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY ----------------- Config: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y Actual value: ---------- CONFIG_SYNC_FILE ----------------- Config: CONFIG_SYNC_FILE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_SYNC_FILE=y Actual value: # CONFIG_SYNC_FILE is not set ---------- CONFIG_FONT_SUPPORT ----------------- Config: CONFIG_FONT_SUPPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FONT_SUPPORT=y Actual value: ---------- CONFIG_FONT_8x8 ----------------- Config: CONFIG_FONT_8x8 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FONT_8x8=y Actual value: ---------- CONFIG_FONT_8x16 ----------------- Config: CONFIG_FONT_8x16 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FONT_8x16=y Actual value: ---------- CONFIG_HYPERVISOR_GUEST ----------------- Config: CONFIG_HYPERVISOR_GUEST From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/hv-guest.cfg Requested value: CONFIG_HYPERVISOR_GUEST=y Actual value: # CONFIG_HYPERVISOR_GUEST is not set ---------- CONFIG_KVM_GUEST ----------------- Config: CONFIG_KVM_GUEST From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Requested value: CONFIG_KVM_GUEST=y Actual value: ---------- CONFIG_PARAVIRT ----------------- Config: CONFIG_PARAVIRT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Requested value: CONFIG_PARAVIRT=y Actual value: Config: CONFIG_PARAVIRT_CLOCK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Requested value: CONFIG_PARAVIRT_CLOCK=y Actual value: ---------- CONFIG_PARAVIRT_CLOCK ----------------- Config: CONFIG_PARAVIRT_CLOCK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Requested value: CONFIG_PARAVIRT_CLOCK=y Actual value: ---------- CONFIG_SCSI ----------------- Config: CONFIG_SCSI_VIRTIO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg Requested value: CONFIG_SCSI_VIRTIO=y Actual value: -- Config: CONFIG_SCSI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg Requested value: CONFIG_SCSI=y Actual value: # CONFIG_SCSI is not set Config: CONFIG_SCSI_DEBUG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg Requested value: CONFIG_SCSI_DEBUG=m Actual value: ---------- CONFIG_SCSI_DEBUG ----------------- Config: CONFIG_SCSI_DEBUG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg Requested value: CONFIG_SCSI_DEBUG=m Actual value: DEBUG: Python function do_kernel_configcheck finished > > Bruce > > >> > >> > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > >> GEN Makefile > >> HOSTCC scripts/basic/fixdep > >> HOSTCC scripts/kconfig/conf.o > >> HOSTCC scripts/kconfig/confdata.o > >> HOSTCC scripts/kconfig/expr.o > >> HOSTCC scripts/kconfig/lexer.lex.o > >> HOSTCC scripts/kconfig/parser.tab.o > >> HOSTCC scripts/kconfig/preprocess.o > >> HOSTCC scripts/kconfig/symbol.o > >> HOSTLD scripts/kconfig/conf > >> scripts/kconfig/conf --olddefconfig Kconfig > >> scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > >> make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > >> make: *** [Makefile:179: sub-make] Error 2 > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > >> NOTE: make HOSTCC=gcc -isystem/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,--enable-new-dtags -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/OE/build/oe-core/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 HOSTCPP=gcc -E -C /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source O=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build CC=x86_64-oe-linux-gcc -fuse-ld=bfd -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source=/usr/src/kernel oldnoconfig > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > >> GEN Makefile > >> make[2]: *** No rule to make target 'oldnoconfig'. Stop. > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > >> make: *** [Makefile:179: sub-make] Error 2 > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > >> ERROR: oe_runmake failed > >> WARNING: exit code 1 from a shell command. > >> ERROR: Execution of '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/run.do_configure.4075' failed with exit code 1: > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > >> GEN Makefile > >> HOSTCC scripts/basic/fixdep > >> HOSTCC scripts/kconfig/conf.o > >> HOSTCC scripts/kconfig/confdata.o > >> HOSTCC scripts/kconfig/expr.o > >> HOSTCC scripts/kconfig/lexer.lex.o > >> HOSTCC scripts/kconfig/parser.tab.o > >> HOSTCC scripts/kconfig/preprocess.o > >> HOSTCC scripts/kconfig/symbol.o > >> HOSTLD scripts/kconfig/conf > >> scripts/kconfig/conf --olddefconfig Kconfig > >> scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > >> make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > >> make: *** [Makefile:179: sub-make] Error 2 > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > >> GEN Makefile > >> make[2]: *** No rule to make target 'oldnoconfig'. Stop. > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > >> make: *** [Makefile:179: sub-make] Error 2 > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > >> WARNING: exit code 1 from a shell command. > >> > >> On Fri, Jan 31, 2020 at 10:37 AM Khem Raj wrote: > >>> > >>> kernel-seltest fails now to build > >>> > >>> https://errors.yoctoproject.org/Errors/Details/308578/ > >>> > >>> On Tue, Jan 28, 2020 at 2:14 PM wrote: > >>> > > >>> > From: Bruce Ashfield > >>> > > >>> > This creates recipes for the v5.4/* branches of the linux-yocto > >>> > reference kernel. > >>> > > >>> > preempt-rt, yaffs2, aufs5 and reference board specific patches are > >>> > part of these branches. All major architectures: x86,x86-64,ARM, > >>> > ARM64,ppc,mips and mips64 have been feature tested against this > >>> > reference. > >>> > > >>> > 5.4 is a LTS release, and as such will receive -stable updates > >>> > for the duration of upstream korg support. > >>> > > >>> > Signed-off-by: Bruce Ashfield > >>> > --- > >>> > .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ > >>> > .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ > >>> > meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ > >>> > 3 files changed, 130 insertions(+) > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > >>> > > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > >>> > new file mode 100644 > >>> > index 0000000000..52f0e3b833 > >>> > --- /dev/null > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > >>> > @@ -0,0 +1,44 @@ > >>> > +KBRANCH ?= "v5.4/standard/preempt-rt/base" > >>> > + > >>> > +require recipes-kernel/linux/linux-yocto.inc > >>> > + > >>> > +# Skip processing of this recipe if it is not explicitly specified as the > >>> > +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying > >>> > +# to build multiple virtual/kernel providers, e.g. as dependency of > >>> > +# core-image-rt-sdk, core-image-rt. > >>> > +python () { > >>> > + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": > >>> > + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > >>> > +} > >>> > + > >>> > +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > >>> > + > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > >>> > + > >>> > +LINUX_VERSION ?= "5.4.15" > >>> > + > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > >>> > + > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > >>> > +DEPENDS += "openssl-native util-linux-native" > >>> > + > >>> > +PV = "5.4.15" > >>> > + > >>> > +KMETA = "kernel-meta" > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > >>> > + > >>> > +LINUX_KERNEL_TYPE = "preempt-rt" > >>> > + > >>> > +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" > >>> > + > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > >>> > + > >>> > +# Functionality flags > >>> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" > >>> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > >>> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" > >>> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > >>> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > >>> > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > >>> > new file mode 100644 > >>> > index 0000000000..a028b37548 > >>> > --- /dev/null > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > >>> > @@ -0,0 +1,32 @@ > >>> > +KBRANCH ?= "v5.4/standard/tiny/base" > >>> > +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" > >>> > + > >>> > +LINUX_KERNEL_TYPE = "tiny" > >>> > +KCONFIG_MODE = "--allnoconfig" > >>> > + > >>> > +require recipes-kernel/linux/linux-yocto.inc > >>> > + > >>> > +LINUX_VERSION ?= "5.4.15" > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > >>> > + > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > >>> > +DEPENDS += "openssl-native util-linux-native" > >>> > + > >>> > +KMETA = "kernel-meta" > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > >>> > + > >>> > +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" > >>> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > >>> > + > >>> > +PV = "5.4.15" > >>> > + > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > >>> > + > >>> > +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" > >>> > + > >>> > +# Functionality flags > >>> > +KERNEL_FEATURES = "" > >>> > + > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > >>> > new file mode 100644 > >>> > index 0000000000..9fbc47d79e > >>> > --- /dev/null > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > >>> > @@ -0,0 +1,54 @@ > >>> > +KBRANCH ?= "v5.4/standard/base" > >>> > + > >>> > +require recipes-kernel/linux/linux-yocto.inc > >>> > + > >>> > +# board specific branches > >>> > +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" > >>> > +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" > >>> > +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" > >>> > +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" > >>> > +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" > >>> > +KBRANCH_qemux86 ?= "v5.4/standard/base" > >>> > +KBRANCH_qemux86-64 ?= "v5.4/standard/base" > >>> > +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" > >>> > + > >>> > +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" > >>> > +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >>> > +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" > >>> > +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >>> > +SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >>> > +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >>> > +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >>> > +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" > >>> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > >>> > + > >>> > +# remap qemuarm to qemuarma15 for the 5.4 kernel > >>> > +# KMACHINE_qemuarm ?= "qemuarma15" > >>> > + > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > >>> > + > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > >>> > +LINUX_VERSION ?= "5.4.15" > >>> > + > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > >>> > +DEPENDS += "openssl-native util-linux-native" > >>> > + > >>> > +PV = "5.4.15" > >>> > + > >>> > +KMETA = "kernel-meta" > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > >>> > + > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > >>> > + > >>> > +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" > >>> > + > >>> > +# Functionality flags > >>> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" > >>> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > >>> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" > >>> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > >>> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > >>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" > >>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > >>> > -- > >>> > 2.19.1 > >>> > > >>> > -- > >>> > _______________________________________________ > >>> > Openembedded-core mailing list > >>> > Openembedded-core at lists.openembedded.org > >>> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > >>> -- > >>> _______________________________________________ > >>> Openembedded-core mailing list > >>> Openembedded-core at lists.openembedded.org > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From raj.khem at gmail.com Mon Feb 3 17:37:33 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 3 Feb 2020 09:37:33 -0800 Subject: [OE-core] [PATCH 1/3] linux-yocto: introduce 5.4 recipes In-Reply-To: <20200203173232.yal36errexiq3dn4@jama> References: <20200203173232.yal36errexiq3dn4@jama> Message-ID: On Mon, Feb 3, 2020 at 9:32 AM Martin Jansa wrote: > > On Mon, Feb 03, 2020 at 08:45:40AM -0800, Khem Raj wrote: > > On Mon, Feb 3, 2020 at 8:42 AM Martin Jansa wrote: > > > > > It fails to build with gold enabled (ld-is-gold in DISTRO_FEATURES) > > > > > > First olddefconfig fails with "gold linker 'x86_64-oe-linux-ld' not > > > supported" and then it fails with a bit misleading error about oldnoconfig > > > (which is called only when oddefconfig fails) and then the whole log > > > repeats itself again, whole log.do_configure.4075 follows: > > > > > > > Since it?s a kernel piece I think asking for gold might be out of scope > > perhaps > > > > I have staged a fix in master next which helps a bit with eg mips I had to > > disable bpf > > I haven't found your fix in either oe-core/master-next nor > yoe/master-next. But I'll send my own fix. > Had it for kernel-selftest here https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=6e936c45d498825aacbac3d8945f7727cfa68061 > > > > > > > > make[1]: Entering directory > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > GEN Makefile > > > HOSTCC scripts/basic/fixdep > > > HOSTCC scripts/kconfig/conf.o > > > HOSTCC scripts/kconfig/confdata.o > > > HOSTCC scripts/kconfig/expr.o > > > HOSTCC scripts/kconfig/lexer.lex.o > > > HOSTCC scripts/kconfig/parser.tab.o > > > HOSTCC scripts/kconfig/preprocess.o > > > HOSTCC scripts/kconfig/symbol.o > > > HOSTLD scripts/kconfig/conf > > > scripts/kconfig/conf --olddefconfig Kconfig > > > scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > > > make[2]: *** > > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: > > > olddefconfig] Error 1 > > > make[1]: *** > > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > > > olddefconfig] Error 2 > > > make[1]: Leaving directory > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > make: *** [Makefile:179: sub-make] Error 2 > > > make: Leaving directory > > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > NOTE: make HOSTCC=gcc > > > -isystem/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/include > > > -O2 -pipe > > > -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > > > > > -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > > > -Wl,--enable-new-dtags > > > -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > > > > > -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > > > > > > -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib > > > > > > -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib > > > -Wl,-O1 -Wl,--allow-shlib-undefined > > > -Wl,--dynamic-linker=/OE/build/oe-core/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 > > > HOSTCPP=gcc -E -C > > > /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source > > > O=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build > > > CC=x86_64-oe-linux-gcc -fuse-ld=bfd > > > -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 > > > > > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 > > > > > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot= > > > > > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native= > > > -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source=/usr/src/kernel > > > oldnoconfig > > > make: Entering directory > > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > make[1]: Entering directory > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > GEN Makefile > > > make[2]: *** No rule to make target 'oldnoconfig'. Stop. > > > make[1]: *** > > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > > > oldnoconfig] Error 2 > > > make[1]: Leaving directory > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > make: *** [Makefile:179: sub-make] Error 2 > > > make: Leaving directory > > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > ERROR: oe_runmake failed > > > WARNING: exit code 1 from a shell command. > > > ERROR: Execution of > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/run.do_configure.4075' > > > failed with exit code 1: > > > make: Entering directory > > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > make[1]: Entering directory > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > GEN Makefile > > > HOSTCC scripts/basic/fixdep > > > HOSTCC scripts/kconfig/conf.o > > > HOSTCC scripts/kconfig/confdata.o > > > HOSTCC scripts/kconfig/expr.o > > > HOSTCC scripts/kconfig/lexer.lex.o > > > HOSTCC scripts/kconfig/parser.tab.o > > > HOSTCC scripts/kconfig/preprocess.o > > > HOSTCC scripts/kconfig/symbol.o > > > HOSTLD scripts/kconfig/conf > > > scripts/kconfig/conf --olddefconfig Kconfig > > > scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > > > make[2]: *** > > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: > > > olddefconfig] Error 1 > > > make[1]: *** > > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > > > olddefconfig] Error 2 > > > make[1]: Leaving directory > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > make: *** [Makefile:179: sub-make] Error 2 > > > make: Leaving directory > > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > make: Entering directory > > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > make[1]: Entering directory > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > GEN Makefile > > > make[2]: *** No rule to make target 'oldnoconfig'. Stop. > > > make[1]: *** > > > [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: > > > oldnoconfig] Error 2 > > > make[1]: Leaving directory > > > '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > make: *** [Makefile:179: sub-make] Error 2 > > > make: Leaving directory > > > '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > WARNING: exit code 1 from a shell command. > > > > > > On Fri, Jan 31, 2020 at 10:37 AM Khem Raj wrote: > > > > > >> kernel-seltest fails now to build > > >> > > >> https://errors.yoctoproject.org/Errors/Details/308578/ > > >> > > >> On Tue, Jan 28, 2020 at 2:14 PM wrote: > > >> > > > >> > From: Bruce Ashfield > > >> > > > >> > This creates recipes for the v5.4/* branches of the linux-yocto > > >> > reference kernel. > > >> > > > >> > preempt-rt, yaffs2, aufs5 and reference board specific patches are > > >> > part of these branches. All major architectures: x86,x86-64,ARM, > > >> > ARM64,ppc,mips and mips64 have been feature tested against this > > >> > reference. > > >> > > > >> > 5.4 is a LTS release, and as such will receive -stable updates > > >> > for the duration of upstream korg support. > > >> > > > >> > Signed-off-by: Bruce Ashfield > > >> > --- > > >> > .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ > > >> > .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ > > >> > meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ > > >> > 3 files changed, 130 insertions(+) > > >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >> > create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >> > > > >> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >> b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >> > new file mode 100644 > > >> > index 0000000000..52f0e3b833 > > >> > --- /dev/null > > >> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >> > @@ -0,0 +1,44 @@ > > >> > +KBRANCH ?= "v5.4/standard/preempt-rt/base" > > >> > + > > >> > +require recipes-kernel/linux/linux-yocto.inc > > >> > + > > >> > +# Skip processing of this recipe if it is not explicitly specified as > > >> the > > >> > +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying > > >> > +# to build multiple virtual/kernel providers, e.g. as dependency of > > >> > +# core-image-rt-sdk, core-image-rt. > > >> > +python () { > > >> > + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and > > >> d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": > > >> > + raise bb.parse.SkipRecipe("Set > > >> PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > > >> > +} > > >> > + > > >> > +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" > > >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > >> > + > > >> > +SRC_URI = "git:// > > >> git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine > > >> > > >> \ > > >> > + git:// > > >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > > >> > > >> " > > >> > + > > >> > +LINUX_VERSION ?= "5.4.15" > > >> > + > > >> > +LIC_FILES_CHKSUM = > > >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > >> > + > > >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > > >> d)}" > > >> > +DEPENDS += "openssl-native util-linux-native" > > >> > + > > >> > +PV = "5.4.15" > > >> > + > > >> > +KMETA = "kernel-meta" > > >> > +KCONF_BSP_AUDIT_LEVEL = "2" > > >> > + > > >> > +LINUX_KERNEL_TYPE = "preempt-rt" > > >> > + > > >> > +COMPATIBLE_MACHINE = > > >> "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" > > >> > + > > >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > >> > + > > >> > +# Functionality flags > > >> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc > > >> features/taskstats/taskstats.scc" > > >> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > > >> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc > > >> features/drm-bochs/drm-bochs.scc" > > >> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > > >> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > > >> > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", > > >> "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > > >> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >> b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >> > new file mode 100644 > > >> > index 0000000000..a028b37548 > > >> > --- /dev/null > > >> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >> > @@ -0,0 +1,32 @@ > > >> > +KBRANCH ?= "v5.4/standard/tiny/base" > > >> > +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" > > >> > + > > >> > +LINUX_KERNEL_TYPE = "tiny" > > >> > +KCONFIG_MODE = "--allnoconfig" > > >> > + > > >> > +require recipes-kernel/linux/linux-yocto.inc > > >> > + > > >> > +LINUX_VERSION ?= "5.4.15" > > >> > +LIC_FILES_CHKSUM = > > >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > >> > + > > >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > > >> d)}" > > >> > +DEPENDS += "openssl-native util-linux-native" > > >> > + > > >> > +KMETA = "kernel-meta" > > >> > +KCONF_BSP_AUDIT_LEVEL = "2" > > >> > + > > >> > +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" > > >> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > >> > + > > >> > +PV = "5.4.15" > > >> > + > > >> > +SRC_URI = "git:// > > >> git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine > > >> > > >> \ > > >> > + git:// > > >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > > >> > > >> " > > >> > + > > >> > +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" > > >> > + > > >> > +# Functionality flags > > >> > +KERNEL_FEATURES = "" > > >> > + > > >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > >> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >> b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >> > new file mode 100644 > > >> > index 0000000000..9fbc47d79e > > >> > --- /dev/null > > >> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >> > @@ -0,0 +1,54 @@ > > >> > +KBRANCH ?= "v5.4/standard/base" > > >> > + > > >> > +require recipes-kernel/linux/linux-yocto.inc > > >> > + > > >> > +# board specific branches > > >> > +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" > > >> > +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" > > >> > +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" > > >> > +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" > > >> > +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" > > >> > +KBRANCH_qemux86 ?= "v5.4/standard/base" > > >> > +KBRANCH_qemux86-64 ?= "v5.4/standard/base" > > >> > +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" > > >> > + > > >> > +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" > > >> > +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >> > +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" > > >> > +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >> > +SRCREV_machine_qemuriscv64 ?= > > >> "cdda35317561d2741b396efa623ace0bd2212c16" > > >> > +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >> > +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >> > +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" > > >> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > >> > + > > >> > +# remap qemuarm to qemuarma15 for the 5.4 kernel > > >> > +# KMACHINE_qemuarm ?= "qemuarma15" > > >> > + > > >> > +SRC_URI = "git:// > > >> git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH} > > >> ; > > >> \ > > >> > + git:// > > >> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA} > > >> > > >> " > > >> > + > > >> > +LIC_FILES_CHKSUM = > > >> "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > >> > +LINUX_VERSION ?= "5.4.15" > > >> > + > > >> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', > > >> d)}" > > >> > +DEPENDS += "openssl-native util-linux-native" > > >> > + > > >> > +PV = "5.4.15" > > >> > + > > >> > +KMETA = "kernel-meta" > > >> > +KCONF_BSP_AUDIT_LEVEL = "2" > > >> > + > > >> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > >> > + > > >> > +COMPATIBLE_MACHINE = > > >> "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" > > >> > + > > >> > +# Functionality flags > > >> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" > > >> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > > >> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc > > >> features/drm-bochs/drm-bochs.scc" > > >> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > > >> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > > >> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", > > >> "mx32", " cfg/x32.scc", "" ,d)}" > > >> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", > > >> "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > > >> > -- > > >> > 2.19.1 > > >> > > > >> > -- > > >> > _______________________________________________ > > >> > Openembedded-core mailing list > > >> > Openembedded-core at lists.openembedded.org > > >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > >> -- > > >> _______________________________________________ > > >> Openembedded-core mailing list > > >> Openembedded-core at lists.openembedded.org > > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > >> > > > From bruce.ashfield at gmail.com Mon Feb 3 17:51:49 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Mon, 3 Feb 2020 12:51:49 -0500 Subject: [OE-core] [PATCH 1/3] linux-yocto: introduce 5.4 recipes In-Reply-To: <20200203173753.dcrz2qokzecl4bsx@jama> References: <20200203173753.dcrz2qokzecl4bsx@jama> Message-ID: On Mon, Feb 3, 2020 at 12:37 PM Martin Jansa wrote: > > On Mon, Feb 03, 2020 at 12:11:31PM -0500, Bruce Ashfield wrote: > > On Mon, Feb 3, 2020 at 11:45 AM Khem Raj wrote: > > > > > > > > > > > > On Mon, Feb 3, 2020 at 8:42 AM Martin Jansa wrote: > > >> > > >> It fails to build with gold enabled (ld-is-gold in DISTRO_FEATURES) > > >> > > >> First olddefconfig fails with "gold linker 'x86_64-oe-linux-ld' not supported" and then it fails with a bit misleading error about oldnoconfig (which is called only when oddefconfig fails) and then the whole log repeats itself again, whole log.do_configure.4075 follows: > > > > > > > > > Since it?s a kernel piece I think asking for gold might be out of scope perhaps > > > > > > > Yah, there's not much we can do to fix that, but I suppose it could be > > detected in the bbclass and a better error thrown ? > > > > > I have staged a fix in master next which helps a bit with eg mips I had to disable bpf > > > > Is that the one with the missing header for on-target module build ? > > If so, i have a similar patch here. > > Do you have a fix for do_kernel_configcheck as well somewhere? > > I'm seeing a lot of warnings in default linux-yocto build for > qemux86-64 and the log.do_kernel_configcheck starts with long list of > missing python since python was removed from HOSTTOOLS. > I do yes. But it is only local, since I'm @ FOSDEM and have terrible access, and have been spending my extra time bisecting the remaining boot / runtime issues with 5.4 I'll try and get some of the independent fixes out tonight before I travel tomorrow. Bruce > > DEBUG: Executing python function do_kernel_configcheck > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > /usr/bin/env: 'python': No such file or directory > [mismatch (291)]: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/cfg/mismatch.txt > There were hardware options requested that do not > have a corresponding value present in the final ".config" file. > This probably means you aren't getting the config you wanted. > > WARNING: [kernel config]: specified values did not make it into the kernel's final configuration: > > ---------- CONFIG_MCORE2 ----------------- > Config: CONFIG_MCORE2 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg > Requested value: CONFIG_MCORE2=y > Actual value: # CONFIG_MCORE2 is not set > > > ---------- CONFIG_ATA ----------------- > Config: CONFIG_ATA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA=y > Actual value: # CONFIG_ATA is not set > > Config: CONFIG_ATA_ACPI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA_ACPI=y > Actual value: > > Config: CONFIG_ATA_SFF > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA_SFF=y > Actual value: > > Config: CONFIG_ATA_BMDMA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA_BMDMA=y > Actual value: > > Config: CONFIG_ATA_PIIX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA_PIIX=m > Actual value: > > > ---------- CONFIG_ATA_ACPI ----------------- > Config: CONFIG_ATA_ACPI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA_ACPI=y > Actual value: > > > ---------- CONFIG_ATA_SFF ----------------- > Config: CONFIG_ATA_SFF > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA_SFF=y > Actual value: > > > ---------- CONFIG_ATA_BMDMA ----------------- > Config: CONFIG_ATA_BMDMA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA_BMDMA=y > Actual value: > > > ---------- CONFIG_ATA_PIIX ----------------- > Config: CONFIG_ATA_PIIX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_ATA_PIIX=m > Actual value: > > > ---------- CONFIG_PATA_SCH ----------------- > Config: CONFIG_PATA_SCH > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_PATA_SCH=y > Actual value: > > > ---------- CONFIG_INPUT_MOUSEDEV ----------------- > Config: CONFIG_INPUT_MOUSEDEV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_INPUT_MOUSEDEV=y > Actual value: # CONFIG_INPUT_MOUSEDEV is not set > > > ---------- CONFIG_INPUT_EVDEV ----------------- > Config: CONFIG_INPUT_EVDEV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/input/input.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_INPUT_EVDEV=y > Actual value: # CONFIG_INPUT_EVDEV is not set > > > ---------- CONFIG_INPUT_TABLET ----------------- > Config: CONFIG_INPUT_TABLET > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_INPUT_TABLET=y > Actual value: # CONFIG_INPUT_TABLET is not set > > > ---------- CONFIG_HID_WACOM ----------------- > Config: CONFIG_HID_WACOM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_HID_WACOM=y > Actual value: > > > ---------- CONFIG_RTC_CLASS ----------------- > Config: CONFIG_RTC_CLASS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_RTC_CLASS=y > Actual value: # CONFIG_RTC_CLASS is not set > > > ---------- CONFIG_RTC_DRV_CMOS ----------------- > Config: CONFIG_RTC_DRV_CMOS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_RTC_DRV_CMOS=y > Actual value: > > > ---------- CONFIG_SERIAL_8250_PNP ----------------- > Config: CONFIG_SERIAL_8250_PNP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_SERIAL_8250_PNP=y > Actual value: > > > ---------- CONFIG_PARPORT ----------------- > Config: CONFIG_PARPORT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_PARPORT=m > Actual value: # CONFIG_PARPORT is not set > > Config: CONFIG_PARPORT_PC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_PARPORT_PC=m > Actual value: > > > ---------- CONFIG_PARPORT_PC ----------------- > Config: CONFIG_PARPORT_PC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_PARPORT_PC=m > Actual value: > > > ---------- CONFIG_PRINTER ----------------- > Config: CONFIG_PRINTER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_PRINTER=m > Actual value: > > > ---------- CONFIG_USB_HID ----------------- > Config: CONFIG_USB_HID > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_HID=y > Actual value: > > Config: CONFIG_USB_HIDDEV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_HIDDEV=y > Actual value: > > > ---------- CONFIG_USB_HIDDEV ----------------- > Config: CONFIG_USB_HIDDEV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_HIDDEV=y > Actual value: > > > ---------- CONFIG_USB_SERIAL ----------------- > Config: CONFIG_USB_SERIAL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL=y > Actual value: > > Config: CONFIG_USB_SERIAL_CONSOLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL_CONSOLE=y > Actual value: > > -- > Config: CONFIG_USB_SERIAL_GENERIC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL_GENERIC=y > Actual value: > > Config: CONFIG_USB_SERIAL_FTDI_SIO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL_FTDI_SIO=y > Actual value: > > Config: CONFIG_USB_SERIAL_PL2303 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL_PL2303=y > Actual value: > > > ---------- CONFIG_USB_SERIAL_CONSOLE ----------------- > Config: CONFIG_USB_SERIAL_CONSOLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL_CONSOLE=y > Actual value: > > > ---------- CONFIG_USB_EZUSB_FX2 ----------------- > Config: CONFIG_USB_EZUSB_FX2 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_EZUSB_FX2=y > Actual value: > > > ---------- CONFIG_USB_SERIAL_GENERIC ----------------- > Config: CONFIG_USB_SERIAL_GENERIC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL_GENERIC=y > Actual value: > > > ---------- CONFIG_USB_SERIAL_FTDI_SIO ----------------- > Config: CONFIG_USB_SERIAL_FTDI_SIO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL_FTDI_SIO=y > Actual value: > > > ---------- CONFIG_USB_SERIAL_PL2303 ----------------- > Config: CONFIG_USB_SERIAL_PL2303 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_USB_SERIAL_PL2303=y > Actual value: > > > ---------- CONFIG_I2C_I801 ----------------- > Config: CONFIG_I2C_I801 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_I2C_I801=y > Actual value: > > > ---------- CONFIG_IDE ----------------- > Config: CONFIG_IDE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_IDE=y > Actual value: # CONFIG_IDE is not set > > Config: CONFIG_IDE_GD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_IDE_GD=y > Actual value: > > Config: CONFIG_IDE_GD_ATA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_IDE_GD_ATA=y > Actual value: > > > ---------- CONFIG_IDE_GD ----------------- > Config: CONFIG_IDE_GD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_IDE_GD=y > Actual value: > > Config: CONFIG_IDE_GD_ATA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_IDE_GD_ATA=y > Actual value: > > > ---------- CONFIG_IDE_GD_ATA ----------------- > Config: CONFIG_IDE_GD_ATA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_IDE_GD_ATA=y > Actual value: > > > ---------- CONFIG_BLK_DEV_PIIX ----------------- > Config: CONFIG_BLK_DEV_PIIX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_BLK_DEV_PIIX=y > Actual value: > > > ---------- CONFIG_SATA_AHCI ----------------- > Config: CONFIG_SATA_AHCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_SATA_AHCI=y > Actual value: > > > ---------- CONFIG_BLK_DEV_FD ----------------- > Config: CONFIG_BLK_DEV_FD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_BLK_DEV_FD=m > Actual value: # CONFIG_BLK_DEV_FD is not set > > > ---------- CONFIG_EEPROM_AT24 ----------------- > Config: CONFIG_EEPROM_AT24 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_EEPROM_AT24=m > Actual value: > > > ---------- CONFIG_NVME_CORE ----------------- > Config: CONFIG_NVME_CORE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_NVME_CORE=y > Actual value: > > > ---------- CONFIG_BLK_DEV_NVME ----------------- > Config: CONFIG_BLK_DEV_NVME > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_BLK_DEV_NVME=y > Actual value: > > > ---------- CONFIG_NET_CORE ----------------- > Config: CONFIG_NET_CORE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_CORE=y > Actual value: > > > ---------- CONFIG_ETHERNET ----------------- > Config: CONFIG_ETHERNET > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_ETHERNET=y > Actual value: > > > ---------- CONFIG_NET_VENDOR_3COM ----------------- > Config: CONFIG_NET_VENDOR_3COM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_VENDOR_3COM=y > Actual value: > > > ---------- CONFIG_TYPHOON ----------------- > Config: CONFIG_TYPHOON > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_TYPHOON=m > Actual value: > > > ---------- CONFIG_NET_VENDOR_BROADCOM ----------------- > Config: CONFIG_NET_VENDOR_BROADCOM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_VENDOR_BROADCOM=y > Actual value: > > > ---------- CONFIG_TIGON3 ----------------- > Config: CONFIG_TIGON3 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_TIGON3=m > Actual value: > > > ---------- CONFIG_BNX2X ----------------- > Config: CONFIG_BNX2X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_BNX2X=m > Actual value: > > Config: CONFIG_BNX2X_SRIOV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_BNX2X_SRIOV=y > Actual value: > > > ---------- CONFIG_BNX2X_SRIOV ----------------- > Config: CONFIG_BNX2X_SRIOV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_BNX2X_SRIOV=y > Actual value: > > > ---------- CONFIG_BNXT ----------------- > Config: CONFIG_BNXT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_BNXT=m > Actual value: > > Config: CONFIG_BNXT_SRIOV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_BNXT_SRIOV=y > Actual value: > > > ---------- CONFIG_BNXT_SRIOV ----------------- > Config: CONFIG_BNXT_SRIOV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_BNXT_SRIOV=y > Actual value: > > > ---------- CONFIG_NET_VENDOR_ATHEROS ----------------- > Config: CONFIG_NET_VENDOR_ATHEROS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_VENDOR_ATHEROS=y > Actual value: > > > ---------- CONFIG_ATL1 ----------------- > Config: CONFIG_ATL1 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_ATL1=m > Actual value: > > Config: CONFIG_ATL1C > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_ATL1C=m > Actual value: > > Config: CONFIG_ATL1E > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_ATL1E=m > Actual value: > > > ---------- CONFIG_ATL1C ----------------- > Config: CONFIG_ATL1C > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_ATL1C=m > Actual value: > > > ---------- CONFIG_ATL1E ----------------- > Config: CONFIG_ATL1E > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_ATL1E=m > Actual value: > > > ---------- CONFIG_ATL2 ----------------- > Config: CONFIG_ATL2 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_ATL2=m > Actual value: > > > ---------- CONFIG_ALX ----------------- > Config: CONFIG_ALX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_ALX=m > Actual value: > > > ---------- CONFIG_NET_VENDOR_INTEL ----------------- > Config: CONFIG_NET_VENDOR_INTEL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_VENDOR_INTEL=y > Actual value: > > > ---------- CONFIG_NET_VENDOR_AMD ----------------- > Config: CONFIG_NET_VENDOR_AMD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_VENDOR_AMD=y > Actual value: > > > ---------- CONFIG_PCNET32 ----------------- > Config: CONFIG_PCNET32 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_PCNET32=m > Actual value: > > > ---------- CONFIG_NET_VENDOR_REALTEK ----------------- > Config: CONFIG_NET_VENDOR_REALTEK > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_VENDOR_REALTEK=y > Actual value: > > > ---------- CONFIG_8139CP ----------------- > Config: CONFIG_8139CP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_8139CP=m > Actual value: > > > ---------- CONFIG_8139TOO ----------------- > Config: CONFIG_8139TOO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_8139TOO=m > Actual value: > > > ---------- CONFIG_R8169 ----------------- > Config: CONFIG_R8169 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_R8169=m > Actual value: > > > ---------- CONFIG_NET_VENDOR_DLINK ----------------- > Config: CONFIG_NET_VENDOR_DLINK > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_VENDOR_DLINK=y > Actual value: > > > ---------- CONFIG_DL2K ----------------- > Config: CONFIG_DL2K > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_DL2K=m > Actual value: > > > ---------- CONFIG_NET_VENDOR_MARVELL ----------------- > Config: CONFIG_NET_VENDOR_MARVELL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_NET_VENDOR_MARVELL=y > Actual value: > > > ---------- CONFIG_SKGE ----------------- > Config: CONFIG_SKGE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_SKGE=m > Actual value: > > > ---------- CONFIG_SKY2 ----------------- > Config: CONFIG_SKY2 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_SKY2=m > Actual value: > > > ---------- CONFIG_JME ----------------- > Config: CONFIG_JME > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Requested value: CONFIG_JME=m > Actual value: > > > ---------- CONFIG_FB_MODE_HELPERS ----------------- > Config: CONFIG_FB_MODE_HELPERS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > Requested value: CONFIG_FB_MODE_HELPERS=y > Actual value: > > > ---------- CONFIG_CONNECTOR ----------------- > Config: CONFIG_CONNECTOR > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > Requested value: CONFIG_CONNECTOR=y > Actual value: > > > ---------- CONFIG_FB_UVESA ----------------- > Config: CONFIG_FB_UVESA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > Requested value: CONFIG_FB_UVESA=m > Actual value: > > > ---------- CONFIG_DRM_CIRRUS_QEMU ----------------- > Config: CONFIG_DRM_CIRRUS_QEMU > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > Requested value: CONFIG_DRM_CIRRUS_QEMU=m > Actual value: > > > ---------- CONFIG_WIRELESS ----------------- > Config: CONFIG_WIRELESS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_WIRELESS=y > Actual value: > > > ---------- CONFIG_WLAN ----------------- > Config: CONFIG_WLAN > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_WLAN=y > Actual value: > > -- > Config: CONFIG_WLAN_VENDOR_ATH > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_WLAN_VENDOR_ATH=y > Actual value: > > > ---------- CONFIG_MAC80211 ----------------- > Config: CONFIG_MAC80211 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_MAC80211=m > Actual value: > > > ---------- CONFIG_CFG80211 ----------------- > Config: CONFIG_CFG80211 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_CFG80211=m > Actual value: > > -- > Config: CONFIG_CFG80211_WEXT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_CFG80211_WEXT=y > Actual value: > > > ---------- CONFIG_ATH_COMMON ----------------- > Config: CONFIG_ATH_COMMON > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_ATH_COMMON=m > Actual value: > > > ---------- CONFIG_WLAN_VENDOR_ATH ----------------- > Config: CONFIG_WLAN_VENDOR_ATH > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_WLAN_VENDOR_ATH=y > Actual value: > > > ---------- CONFIG_ATH5K ----------------- > Config: CONFIG_ATH5K > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_ATH5K=m > Actual value: > > > ---------- CONFIG_ATH9K ----------------- > Config: CONFIG_ATH9K > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_ATH9K=m > Actual value: > > > ---------- CONFIG_WEXT_CORE ----------------- > Config: CONFIG_WEXT_CORE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_WEXT_CORE=y > Actual value: > > > ---------- CONFIG_WEXT_PROC ----------------- > Config: CONFIG_WEXT_PROC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_WEXT_PROC=y > Actual value: > > > ---------- CONFIG_CFG80211_WEXT ----------------- > Config: CONFIG_CFG80211_WEXT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_CFG80211_WEXT=y > Actual value: > > > ---------- CONFIG_BCMA ----------------- > Config: CONFIG_BCMA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_BCMA=m > Actual value: # CONFIG_BCMA is not set > > Config: CONFIG_BCMA_HOST_PCI_POSSIBLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y > Actual value: > > Config: CONFIG_BCMA_HOST_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_BCMA_HOST_PCI=y > Actual value: > > Config: CONFIG_BCMA_DRIVER_GMAC_CMN > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_BCMA_DRIVER_GMAC_CMN=y > Actual value: > > > ---------- CONFIG_BCMA_HOST_PCI_POSSIBLE ----------------- > Config: CONFIG_BCMA_HOST_PCI_POSSIBLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y > Actual value: > > > ---------- CONFIG_BCMA_HOST_PCI ----------------- > Config: CONFIG_BCMA_HOST_PCI_POSSIBLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y > Actual value: > > Config: CONFIG_BCMA_HOST_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_BCMA_HOST_PCI=y > Actual value: > > > ---------- CONFIG_BCMA_DRIVER_GMAC_CMN ----------------- > Config: CONFIG_BCMA_DRIVER_GMAC_CMN > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_BCMA_DRIVER_GMAC_CMN=y > Actual value: > > > ---------- CONFIG_CRC8 ----------------- > Config: CONFIG_CRC8 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_CRC8=m > Actual value: # CONFIG_CRC8 is not set > > > ---------- CONFIG_CORDIC ----------------- > Config: CONFIG_CORDIC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Requested value: CONFIG_CORDIC=m > Actual value: # CONFIG_CORDIC is not set > > > ---------- CONFIG_PARTITION_ADVANCED ----------------- > Config: CONFIG_PARTITION_ADVANCED > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > Requested value: CONFIG_PARTITION_ADVANCED=y > Actual value: # CONFIG_PARTITION_ADVANCED is not set > > > ---------- CONFIG_FB_EFI ----------------- > Config: CONFIG_FB_EFI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > Requested value: CONFIG_FB_EFI=y > Actual value: > > > ---------- CONFIG_EFI_VARS ----------------- > Config: CONFIG_EFI_VARS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > Requested value: CONFIG_EFI_VARS=m > Actual value: > > > ---------- CONFIG_EFI ----------------- > Config: CONFIG_EFI_VARS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > Requested value: CONFIG_EFI_VARS=m > Actual value: > > Config: CONFIG_EFI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > Requested value: CONFIG_EFI=y > Actual value: # CONFIG_EFI is not set > > Config: CONFIG_EFI_STUB > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > Requested value: CONFIG_EFI_STUB=y > Actual value: > > Config: CONFIG_EFIVAR_FS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > Requested value: CONFIG_EFIVAR_FS=y > Actual value: > > -- > Config: CONFIG_EFI_EARLYCON > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/debug/printk.cfg > Requested value: CONFIG_EFI_EARLYCON=y > Actual value: > > > ---------- CONFIG_EFI_STUB ----------------- > Config: CONFIG_EFI_STUB > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > Requested value: CONFIG_EFI_STUB=y > Actual value: > > > ---------- CONFIG_EFIVAR_FS ----------------- > Config: CONFIG_EFIVAR_FS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > Requested value: CONFIG_EFIVAR_FS=y > Actual value: > > > ---------- CONFIG_HPET_EMULATE_RTC ----------------- > Config: CONFIG_HPET_EMULATE_RTC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > Requested value: CONFIG_HPET_EMULATE_RTC=y > Actual value: > > > ---------- CONFIG_HPET ----------------- > Config: CONFIG_HPET_EMULATE_RTC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > Requested value: CONFIG_HPET_EMULATE_RTC=y > Actual value: > > Config: CONFIG_HPET > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > Requested value: CONFIG_HPET=y > Actual value: # CONFIG_HPET is not set > > Config: CONFIG_HPET_MMAP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > Requested value: CONFIG_HPET_MMAP=y > Actual value: > > > ---------- CONFIG_HPET_MMAP ----------------- > Config: CONFIG_HPET_MMAP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > Requested value: CONFIG_HPET_MMAP=y > Actual value: > > > ---------- CONFIG_X86_MSR ----------------- > Config: CONFIG_X86_MSR > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > Requested value: CONFIG_X86_MSR=y > Actual value: # CONFIG_X86_MSR is not set > > > ---------- CONFIG_X86_CPUID ----------------- > Config: CONFIG_X86_CPUID > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > Requested value: CONFIG_X86_CPUID=y > Actual value: # CONFIG_X86_CPUID is not set > > > ---------- CONFIG_X86_CHECK_BIOS_CORRUPTION ----------------- > Config: CONFIG_X86_CHECK_BIOS_CORRUPTION > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > Requested value: CONFIG_X86_CHECK_BIOS_CORRUPTION=y > Actual value: # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set > > > ---------- CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK ----------------- > Config: CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > Requested value: CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y > Actual value: > > > ---------- CONFIG_SMP ----------------- > Config: CONFIG_SMP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg > Requested value: CONFIG_SMP=y > Actual value: # CONFIG_SMP is not set > > > ---------- CONFIG_SCHED_SMT ----------------- > Config: CONFIG_SCHED_SMT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg > Requested value: CONFIG_SCHED_SMT=y > Actual value: > > > ---------- CONFIG_NR_CPUS ----------------- > Config: CONFIG_NR_CPUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg > Requested value: CONFIG_NR_CPUS=64 > Actual value: CONFIG_NR_CPUS=1 > > > ---------- CONFIG_IA32_EMULATION ----------------- > Config: CONFIG_IA32_EMULATION > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > Requested value: CONFIG_IA32_EMULATION=y > Actual value: # CONFIG_IA32_EMULATION is not set > > > ---------- CONFIG_COMPAT ----------------- > Config: CONFIG_COMPAT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > Requested value: CONFIG_COMPAT=y > Actual value: > > > ---------- CONFIG_UNWINDER_ORC ----------------- > Config: CONFIG_UNWINDER_ORC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > Requested value: # CONFIG_UNWINDER_ORC is not set > Actual value: CONFIG_UNWINDER_ORC=y > > > ---------- CONFIG_UNWINDER_FRAME_POINTER ----------------- > Config: CONFIG_UNWINDER_FRAME_POINTER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > Requested value: CONFIG_UNWINDER_FRAME_POINTER=y > Actual value: # CONFIG_UNWINDER_FRAME_POINTER is not set > > > ---------- CONFIG_X86_AMD_PLATFORM_DEVICE ----------------- > Config: CONFIG_X86_AMD_PLATFORM_DEVICE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg > Requested value: CONFIG_X86_AMD_PLATFORM_DEVICE=y > Actual value: # CONFIG_X86_AMD_PLATFORM_DEVICE is not set > > > ---------- CONFIG_MICROCODE_AMD ----------------- > Config: CONFIG_MICROCODE_AMD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg > Requested value: CONFIG_MICROCODE_AMD=y > Actual value: # CONFIG_MICROCODE_AMD is not set > > > ---------- CONFIG_X86_MCE_AMD ----------------- > Config: CONFIG_X86_MCE_AMD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg > Requested value: CONFIG_X86_MCE_AMD=y > Actual value: > > > ---------- CONFIG_PCI ----------------- > Config: CONFIG_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Requested value: CONFIG_PCI=y > Actual value: # CONFIG_PCI is not set > > Config: CONFIG_PCI_MMCONFIG > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Requested value: CONFIG_PCI_MMCONFIG=y > Actual value: > > Config: CONFIG_PCI_MSI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Requested value: CONFIG_PCI_MSI=y > Actual value: > > Config: CONFIG_PCIEPORTBUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Requested value: CONFIG_PCIEPORTBUS=y > Actual value: > > -- > Config: CONFIG_PCI_IOV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg > Requested value: CONFIG_PCI_IOV=y > Actual value: > > > ---------- CONFIG_PCI_MMCONFIG ----------------- > Config: CONFIG_PCI_MMCONFIG > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Requested value: CONFIG_PCI_MMCONFIG=y > Actual value: > > > ---------- CONFIG_PCI_MSI ----------------- > Config: CONFIG_PCI_MSI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Requested value: CONFIG_PCI_MSI=y > Actual value: > > > ---------- CONFIG_PCIEPORTBUS ----------------- > Config: CONFIG_PCIEPORTBUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Requested value: CONFIG_PCIEPORTBUS=y > Actual value: > > > ---------- CONFIG_HOTPLUG_PCI ----------------- > Config: CONFIG_HOTPLUG_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Requested value: CONFIG_HOTPLUG_PCI=y > Actual value: > > > ---------- CONFIG_PCI_IOV ----------------- > Config: CONFIG_PCI_IOV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg > Requested value: CONFIG_PCI_IOV=y > Actual value: > > > ---------- CONFIG_MMC ----------------- > Config: CONFIG_MMC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-base.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC=y > Actual value: # CONFIG_MMC is not set > > Config: CONFIG_MMC_SDHCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI=y > Actual value: > > Config: CONFIG_MMC_SDHCI_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_PCI=y > Actual value: > > Config: CONFIG_MMC_SDHCI_ACPI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_ACPI=y > Actual value: > > Config: CONFIG_MMC_SDHCI_PLTFM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_PLTFM=y > Actual value: > > Config: CONFIG_MMC_RICOH_MMC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_RICOH_MMC=y > Actual value: > > > ---------- CONFIG_MMC_SDHCI ----------------- > Config: CONFIG_MMC_SDHCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI=y > Actual value: > > Config: CONFIG_MMC_SDHCI_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_PCI=y > Actual value: > > Config: CONFIG_MMC_SDHCI_ACPI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_ACPI=y > Actual value: > > Config: CONFIG_MMC_SDHCI_PLTFM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_PLTFM=y > Actual value: > > > ---------- CONFIG_MMC_SDHCI_PCI ----------------- > Config: CONFIG_MMC_SDHCI_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_PCI=y > Actual value: > > > ---------- CONFIG_MMC_SDHCI_ACPI ----------------- > Config: CONFIG_MMC_SDHCI_ACPI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_ACPI=y > Actual value: > > > ---------- CONFIG_MMC_SDHCI_PLTFM ----------------- > Config: CONFIG_MMC_SDHCI_PLTFM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_SDHCI_PLTFM=y > Actual value: > > > ---------- CONFIG_MMC_RICOH_MMC ----------------- > Config: CONFIG_MMC_RICOH_MMC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Requested value: CONFIG_MMC_RICOH_MMC=y > Actual value: > > > ---------- CONFIG_USB_EHCI_HCD ----------------- > Config: CONFIG_USB_EHCI_HCD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg > Requested value: CONFIG_USB_EHCI_HCD=y > Actual value: > > > ---------- CONFIG_USB_EHCI_ROOT_HUB_TT ----------------- > Config: CONFIG_USB_EHCI_ROOT_HUB_TT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg > Requested value: CONFIG_USB_EHCI_ROOT_HUB_TT=y > Actual value: > > > ---------- CONFIG_USB_OHCI_HCD ----------------- > Config: CONFIG_USB_OHCI_HCD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ohci-hcd.cfg > Requested value: CONFIG_USB_OHCI_HCD=y > Actual value: > > > ---------- CONFIG_USB_XHCI_HCD ----------------- > Config: CONFIG_USB_XHCI_HCD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/xhci-hcd.cfg > Requested value: CONFIG_USB_XHCI_HCD=y > Actual value: > > > ---------- CONFIG_INPUT_TOUCHSCREEN ----------------- > Config: CONFIG_INPUT_TOUCHSCREEN > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/input/touchscreen.cfg > Requested value: CONFIG_INPUT_TOUCHSCREEN=y > Actual value: # CONFIG_INPUT_TOUCHSCREEN is not set > > > ---------- CONFIG_TOUCHSCREEN_USB_COMPOSITE ----------------- > Config: CONFIG_TOUCHSCREEN_USB_COMPOSITE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/touchscreen-composite.cfg > Requested value: CONFIG_TOUCHSCREEN_USB_COMPOSITE=m > Actual value: > > > ---------- CONFIG_USB_USBNET ----------------- > Config: CONFIG_USB_USBNET > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_USBNET=m > Actual value: > > > ---------- CONFIG_USB_NET_DRIVERS ----------------- > Config: CONFIG_USB_NET_DRIVERS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_DRIVERS=m > Actual value: > > > ---------- CONFIG_USB_KAWETH ----------------- > Config: CONFIG_USB_KAWETH > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_KAWETH=m > Actual value: > > > ---------- CONFIG_USB_PEGASUS ----------------- > Config: CONFIG_USB_PEGASUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_PEGASUS=m > Actual value: > > > ---------- CONFIG_USB_RTL8150 ----------------- > Config: CONFIG_USB_RTL8150 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_RTL8150=m > Actual value: > > > ---------- CONFIG_USB_RTL8152 ----------------- > Config: CONFIG_USB_RTL8152 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_RTL8152=m > Actual value: > > > ---------- CONFIG_USB_NET_AX8817X ----------------- > Config: CONFIG_USB_NET_AX8817X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_AX8817X=m > Actual value: > > > ---------- CONFIG_USB_NET_AX88179_178A ----------------- > Config: CONFIG_USB_NET_AX88179_178A > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_AX88179_178A=m > Actual value: > > > ---------- CONFIG_USB_NET_CDCETHER ----------------- > Config: CONFIG_USB_NET_CDCETHER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_CDCETHER=m > Actual value: > > > ---------- CONFIG_USB_NET_CDC_EEM ----------------- > Config: CONFIG_USB_NET_CDC_EEM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_CDC_EEM=m > Actual value: > > > ---------- CONFIG_USB_NET_CDC_NCM ----------------- > Config: CONFIG_USB_NET_CDC_NCM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_CDC_NCM=m > Actual value: > > > ---------- CONFIG_USB_NET_DM9601 ----------------- > Config: CONFIG_USB_NET_DM9601 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_DM9601=m > Actual value: > > > ---------- CONFIG_USB_NET_SMSC75XX ----------------- > Config: CONFIG_USB_NET_SMSC75XX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_SMSC75XX=m > Actual value: > > > ---------- CONFIG_USB_NET_SMSC95XX ----------------- > Config: CONFIG_USB_NET_SMSC95XX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_SMSC95XX=m > Actual value: > > > ---------- CONFIG_USB_NET_MCS7830 ----------------- > Config: CONFIG_USB_NET_MCS7830 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_MCS7830=m > Actual value: > > > ---------- CONFIG_USB_NET_RNDIS_HOST ----------------- > Config: CONFIG_USB_NET_RNDIS_HOST > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_RNDIS_HOST=m > Actual value: > > > ---------- CONFIG_USB_NET_CDC_SUBSET_ENABLE ----------------- > Config: CONFIG_USB_NET_CDC_SUBSET_ENABLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_CDC_SUBSET_ENABLE=m > Actual value: > > > ---------- CONFIG_USB_NET_CDC_SUBSET ----------------- > Config: CONFIG_USB_NET_CDC_SUBSET_ENABLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_CDC_SUBSET_ENABLE=m > Actual value: > > Config: CONFIG_USB_NET_CDC_SUBSET > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_NET_CDC_SUBSET=m > Actual value: > > > ---------- CONFIG_USB_ALI_M5632 ----------------- > Config: CONFIG_USB_ALI_M5632 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_ALI_M5632=y > Actual value: > > > ---------- CONFIG_USB_AN2720 ----------------- > Config: CONFIG_USB_AN2720 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_AN2720=y > Actual value: > > > ---------- CONFIG_USB_BELKIN ----------------- > Config: CONFIG_USB_BELKIN > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_BELKIN=y > Actual value: > > > ---------- CONFIG_USB_ARMLINUX ----------------- > Config: CONFIG_USB_ARMLINUX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_ARMLINUX=y > Actual value: > > > ---------- CONFIG_USB_KC2190 ----------------- > Config: CONFIG_USB_KC2190 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Requested value: CONFIG_USB_KC2190=y > Actual value: > > > ---------- CONFIG_E100 ----------------- > Config: CONFIG_E100 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e100.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > Requested value: CONFIG_E100=y > Actual value: > > Config: CONFIG_E1000E > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > Requested value: CONFIG_E1000E=y > Actual value: > > Config: CONFIG_E1000 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > Requested value: CONFIG_E1000=y > Actual value: > > > ---------- CONFIG_E1000E ----------------- > Config: CONFIG_E1000E > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > Requested value: CONFIG_E1000E=y > Actual value: > > > ---------- CONFIG_E1000 ----------------- > Config: CONFIG_E1000E > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > Requested value: CONFIG_E1000E=y > Actual value: > > Config: CONFIG_E1000 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > Requested value: CONFIG_E1000=y > Actual value: > > > ---------- CONFIG_IGB ----------------- > Config: CONFIG_IGB > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg > Requested value: CONFIG_IGB=y > Actual value: > > Config: CONFIG_IGBVF > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg > Requested value: CONFIG_IGBVF=m > Actual value: > > > ---------- CONFIG_IGBVF ----------------- > Config: CONFIG_IGBVF > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg > Requested value: CONFIG_IGBVF=m > Actual value: > > > ---------- CONFIG_IRQ_REMAP ----------------- > Config: CONFIG_IRQ_REMAP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg > Requested value: CONFIG_IRQ_REMAP=y > Actual value: > > > ---------- CONFIG_X86_X2APIC ----------------- > Config: CONFIG_X86_X2APIC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg > Requested value: CONFIG_X86_X2APIC=y > Actual value: > > > ---------- CONFIG_ISDN ----------------- > Config: CONFIG_ISDN > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_ISDN=y > Actual value: > > Config: CONFIG_ISDN_CAPI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_ISDN_CAPI=m > Actual value: > > > ---------- CONFIG_ISDN_CAPI ----------------- > Config: CONFIG_ISDN_CAPI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_ISDN_CAPI=m > Actual value: > > > ---------- CONFIG_BT_6LOWPAN ----------------- > Config: CONFIG_BT_6LOWPAN > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_6LOWPAN=m > Actual value: > > > ---------- CONFIG_BT_RFCOMM ----------------- > Config: CONFIG_BT_RFCOMM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_RFCOMM=m > Actual value: > > Config: CONFIG_BT_RFCOMM_TTY > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_RFCOMM_TTY=y > Actual value: > > > ---------- CONFIG_BT_RFCOMM_TTY ----------------- > Config: CONFIG_BT_RFCOMM_TTY > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_RFCOMM_TTY=y > Actual value: > > > ---------- CONFIG_BT_BNEP ----------------- > Config: CONFIG_BT_BNEP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_BNEP=m > Actual value: > > Config: CONFIG_BT_BNEP_MC_FILTER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_BNEP_MC_FILTER=y > Actual value: > > Config: CONFIG_BT_BNEP_PROTO_FILTER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_BNEP_PROTO_FILTER=y > Actual value: > > > ---------- CONFIG_BT_BNEP_MC_FILTER ----------------- > Config: CONFIG_BT_BNEP_MC_FILTER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_BNEP_MC_FILTER=y > Actual value: > > > ---------- CONFIG_BT_BNEP_PROTO_FILTER ----------------- > Config: CONFIG_BT_BNEP_PROTO_FILTER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_BNEP_PROTO_FILTER=y > Actual value: > > > ---------- CONFIG_BT_CMTP ----------------- > Config: CONFIG_BT_CMTP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_CMTP=m > Actual value: > > > ---------- CONFIG_BT_HIDP ----------------- > Config: CONFIG_BT_HIDP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_HIDP=m > Actual value: > > > ---------- CONFIG_BT_LE ----------------- > Config: CONFIG_BT_LE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_LE=y > Actual value: > > > ---------- CONFIG_BT_BREDR ----------------- > Config: CONFIG_BT_BREDR > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Requested value: CONFIG_BT_BREDR=y > Actual value: > > > ---------- CONFIG_6LOWPAN ----------------- > Config: CONFIG_6LOWPAN > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/6lowpan/6lowpan.cfg > Requested value: CONFIG_6LOWPAN=m > Actual value: > > > ---------- CONFIG_SERIAL_8250 ----------------- > Config: CONFIG_SERIAL_8250_PNP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_SERIAL_8250_PNP=y > Actual value: > > -- > Config: CONFIG_SERIAL_8250 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250=y > Actual value: # CONFIG_SERIAL_8250 is not set > > Config: CONFIG_SERIAL_8250_CONSOLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250_CONSOLE=y > Actual value: > > Config: CONFIG_SERIAL_8250_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250_PCI=y > Actual value: > > Config: CONFIG_SERIAL_8250_NR_UARTS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250_NR_UARTS=4 > Actual value: > > Config: CONFIG_SERIAL_8250_RUNTIME_UARTS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250_RUNTIME_UARTS=4 > Actual value: > > > ---------- CONFIG_SERIAL_8250_CONSOLE ----------------- > Config: CONFIG_SERIAL_8250_CONSOLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250_CONSOLE=y > Actual value: > > > ---------- CONFIG_SERIAL_8250_PCI ----------------- > Config: CONFIG_SERIAL_8250_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250_PCI=y > Actual value: > > > ---------- CONFIG_SERIAL_8250_NR_UARTS ----------------- > Config: CONFIG_SERIAL_8250_NR_UARTS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250_NR_UARTS=4 > Actual value: > > > ---------- CONFIG_SERIAL_8250_RUNTIME_UARTS ----------------- > Config: CONFIG_SERIAL_8250_RUNTIME_UARTS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_8250_RUNTIME_UARTS=4 > Actual value: > > > ---------- CONFIG_SERIAL_CORE ----------------- > Config: CONFIG_SERIAL_CORE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_CORE=y > Actual value: > > Config: CONFIG_SERIAL_CORE_CONSOLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_CORE_CONSOLE=y > Actual value: > > > ---------- CONFIG_SERIAL_CORE_CONSOLE ----------------- > Config: CONFIG_SERIAL_CORE_CONSOLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Requested value: CONFIG_SERIAL_CORE_CONSOLE=y > Actual value: > > > ---------- CONFIG_AGP ----------------- > Config: CONFIG_AGP > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Requested value: CONFIG_AGP=y > Actual value: > > Config: CONFIG_AGP_INTEL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Requested value: CONFIG_AGP_INTEL=y > Actual value: > > > ---------- CONFIG_AGP_INTEL ----------------- > Config: CONFIG_AGP_INTEL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Requested value: CONFIG_AGP_INTEL=y > Actual value: > > > ---------- CONFIG_DRM_I915 ----------------- > Config: CONFIG_DRM_I915 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Requested value: CONFIG_DRM_I915=m > Actual value: > > Config: CONFIG_DRM_I915_ALPHA_SUPPORT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y > Actual value: > > > ---------- CONFIG_DRM_I915_ALPHA_SUPPORT ----------------- > Config: CONFIG_DRM_I915_ALPHA_SUPPORT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y > Actual value: > > > ---------- CONFIG_BLK_DEV_SD ----------------- > Config: CONFIG_BLK_DEV_SD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/disk.cfg > Requested value: CONFIG_BLK_DEV_SD=y > Actual value: > > > ---------- CONFIG_USB_VIDEO_CLASS ----------------- > Config: CONFIG_USB_VIDEO_CLASS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_VIDEO_CLASS=m > Actual value: > > Config: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y > Actual value: > > > ---------- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV ----------------- > Config: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y > Actual value: > > > ---------- CONFIG_USB_GSPCA ----------------- > Config: CONFIG_USB_GSPCA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA=m > Actual value: > > -- > Config: CONFIG_USB_GSPCA_BENQ > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_BENQ=m > Actual value: > > Config: CONFIG_USB_GSPCA_CONEX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_CONEX=m > Actual value: > > Config: CONFIG_USB_GSPCA_CPIA1 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_CPIA1=m > Actual value: > > Config: CONFIG_USB_GSPCA_ETOMS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_ETOMS=m > Actual value: > > Config: CONFIG_USB_GSPCA_FINEPIX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_FINEPIX=m > Actual value: > > Config: CONFIG_USB_GSPCA_JEILINJ > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_JEILINJ=m > Actual value: > > Config: CONFIG_USB_GSPCA_JL2005BCD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_JL2005BCD=m > Actual value: > > Config: CONFIG_USB_GSPCA_KINECT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_KINECT=m > Actual value: > > Config: CONFIG_USB_GSPCA_KONICA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_KONICA=m > Actual value: > > Config: CONFIG_USB_GSPCA_MARS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_MARS=m > Actual value: > > Config: CONFIG_USB_GSPCA_MR97310A > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_MR97310A=m > Actual value: > > Config: CONFIG_USB_GSPCA_NW80X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_NW80X=m > Actual value: > > Config: CONFIG_USB_GSPCA_OV519 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_OV519=m > Actual value: > > Config: CONFIG_USB_GSPCA_OV534 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_OV534=m > Actual value: > > Config: CONFIG_USB_GSPCA_OV534_9 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_OV534_9=m > Actual value: > > Config: CONFIG_USB_GSPCA_PAC207 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_PAC207=m > Actual value: > > Config: CONFIG_USB_GSPCA_PAC7302 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_PAC7302=m > Actual value: > > Config: CONFIG_USB_GSPCA_PAC7311 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_PAC7311=m > Actual value: > > Config: CONFIG_USB_GSPCA_SE401 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SE401=m > Actual value: > > Config: CONFIG_USB_GSPCA_SN9C2028 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SN9C2028=m > Actual value: > > Config: CONFIG_USB_GSPCA_SN9C20X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SN9C20X=m > Actual value: > > Config: CONFIG_USB_GSPCA_SONIXB > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SONIXB=m > Actual value: > > Config: CONFIG_USB_GSPCA_SONIXJ > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SONIXJ=m > Actual value: > > Config: CONFIG_USB_GSPCA_SPCA500 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA500=m > Actual value: > > Config: CONFIG_USB_GSPCA_SPCA501 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA501=m > Actual value: > > Config: CONFIG_USB_GSPCA_SPCA505 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA505=m > Actual value: > > Config: CONFIG_USB_GSPCA_SPCA506 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA506=m > Actual value: > > Config: CONFIG_USB_GSPCA_SPCA508 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA508=m > Actual value: > > Config: CONFIG_USB_GSPCA_SPCA561 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA561=m > Actual value: > > Config: CONFIG_USB_GSPCA_SPCA1528 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA1528=m > Actual value: > > Config: CONFIG_USB_GSPCA_SQ905 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SQ905=m > Actual value: > > Config: CONFIG_USB_GSPCA_SQ905C > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SQ905C=m > Actual value: > > Config: CONFIG_USB_GSPCA_SQ930X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SQ930X=m > Actual value: > > Config: CONFIG_USB_GSPCA_STK014 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_STK014=m > Actual value: > > Config: CONFIG_USB_GSPCA_STV0680 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_STV0680=m > Actual value: > > Config: CONFIG_USB_GSPCA_SUNPLUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SUNPLUS=m > Actual value: > > Config: CONFIG_USB_GSPCA_T613 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_T613=m > Actual value: > > Config: CONFIG_USB_GSPCA_TOPRO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_TOPRO=m > Actual value: > > Config: CONFIG_USB_GSPCA_TV8532 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_TV8532=m > Actual value: > > Config: CONFIG_USB_GSPCA_VC032X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_VC032X=m > Actual value: > > Config: CONFIG_USB_GSPCA_VICAM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_VICAM=m > Actual value: > > Config: CONFIG_USB_GSPCA_XIRLINK_CIT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_XIRLINK_CIT=m > Actual value: > > Config: CONFIG_USB_GSPCA_ZC3XX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_ZC3XX=m > Actual value: > > > ---------- CONFIG_USB_M5602 ----------------- > Config: CONFIG_USB_M5602 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_M5602=m > Actual value: > > > ---------- CONFIG_USB_STV06XX ----------------- > Config: CONFIG_USB_STV06XX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_STV06XX=m > Actual value: > > > ---------- CONFIG_USB_GL860 ----------------- > Config: CONFIG_USB_GL860 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GL860=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_BENQ ----------------- > Config: CONFIG_USB_GSPCA_BENQ > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_BENQ=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_CONEX ----------------- > Config: CONFIG_USB_GSPCA_CONEX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_CONEX=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_CPIA1 ----------------- > Config: CONFIG_USB_GSPCA_CPIA1 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_CPIA1=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_ETOMS ----------------- > Config: CONFIG_USB_GSPCA_ETOMS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_ETOMS=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_FINEPIX ----------------- > Config: CONFIG_USB_GSPCA_FINEPIX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_FINEPIX=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_JEILINJ ----------------- > Config: CONFIG_USB_GSPCA_JEILINJ > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_JEILINJ=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_JL2005BCD ----------------- > Config: CONFIG_USB_GSPCA_JL2005BCD > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_JL2005BCD=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_KINECT ----------------- > Config: CONFIG_USB_GSPCA_KINECT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_KINECT=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_KONICA ----------------- > Config: CONFIG_USB_GSPCA_KONICA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_KONICA=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_MARS ----------------- > Config: CONFIG_USB_GSPCA_MARS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_MARS=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_MR97310A ----------------- > Config: CONFIG_USB_GSPCA_MR97310A > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_MR97310A=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_NW80X ----------------- > Config: CONFIG_USB_GSPCA_NW80X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_NW80X=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_OV519 ----------------- > Config: CONFIG_USB_GSPCA_OV519 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_OV519=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_OV534 ----------------- > Config: CONFIG_USB_GSPCA_OV534 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_OV534=m > Actual value: > > Config: CONFIG_USB_GSPCA_OV534_9 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_OV534_9=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_OV534_9 ----------------- > Config: CONFIG_USB_GSPCA_OV534_9 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_OV534_9=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_PAC207 ----------------- > Config: CONFIG_USB_GSPCA_PAC207 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_PAC207=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_PAC7302 ----------------- > Config: CONFIG_USB_GSPCA_PAC7302 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_PAC7302=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_PAC7311 ----------------- > Config: CONFIG_USB_GSPCA_PAC7311 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_PAC7311=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SE401 ----------------- > Config: CONFIG_USB_GSPCA_SE401 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SE401=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SN9C2028 ----------------- > Config: CONFIG_USB_GSPCA_SN9C2028 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SN9C2028=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SN9C20X ----------------- > Config: CONFIG_USB_GSPCA_SN9C20X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SN9C20X=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SONIXB ----------------- > Config: CONFIG_USB_GSPCA_SONIXB > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SONIXB=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SONIXJ ----------------- > Config: CONFIG_USB_GSPCA_SONIXJ > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SONIXJ=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SPCA500 ----------------- > Config: CONFIG_USB_GSPCA_SPCA500 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA500=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SPCA501 ----------------- > Config: CONFIG_USB_GSPCA_SPCA501 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA501=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SPCA505 ----------------- > Config: CONFIG_USB_GSPCA_SPCA505 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA505=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SPCA506 ----------------- > Config: CONFIG_USB_GSPCA_SPCA506 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA506=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SPCA508 ----------------- > Config: CONFIG_USB_GSPCA_SPCA508 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA508=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SPCA561 ----------------- > Config: CONFIG_USB_GSPCA_SPCA561 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA561=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SPCA1528 ----------------- > Config: CONFIG_USB_GSPCA_SPCA1528 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SPCA1528=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SQ905 ----------------- > Config: CONFIG_USB_GSPCA_SQ905 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SQ905=m > Actual value: > > Config: CONFIG_USB_GSPCA_SQ905C > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SQ905C=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SQ905C ----------------- > Config: CONFIG_USB_GSPCA_SQ905C > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SQ905C=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SQ930X ----------------- > Config: CONFIG_USB_GSPCA_SQ930X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SQ930X=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_STK014 ----------------- > Config: CONFIG_USB_GSPCA_STK014 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_STK014=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_STV0680 ----------------- > Config: CONFIG_USB_GSPCA_STV0680 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_STV0680=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_SUNPLUS ----------------- > Config: CONFIG_USB_GSPCA_SUNPLUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_SUNPLUS=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_T613 ----------------- > Config: CONFIG_USB_GSPCA_T613 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_T613=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_TOPRO ----------------- > Config: CONFIG_USB_GSPCA_TOPRO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_TOPRO=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_TV8532 ----------------- > Config: CONFIG_USB_GSPCA_TV8532 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_TV8532=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_VC032X ----------------- > Config: CONFIG_USB_GSPCA_VC032X > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_VC032X=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_VICAM ----------------- > Config: CONFIG_USB_GSPCA_VICAM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_VICAM=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_XIRLINK_CIT ----------------- > Config: CONFIG_USB_GSPCA_XIRLINK_CIT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_XIRLINK_CIT=m > Actual value: > > > ---------- CONFIG_USB_GSPCA_ZC3XX ----------------- > Config: CONFIG_USB_GSPCA_ZC3XX > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_GSPCA_ZC3XX=m > Actual value: > > > ---------- CONFIG_USB_PWC ----------------- > Config: CONFIG_USB_PWC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_PWC=m > Actual value: > > Config: CONFIG_USB_PWC_INPUT_EVDEV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_PWC_INPUT_EVDEV=y > Actual value: > > > ---------- CONFIG_USB_PWC_INPUT_EVDEV ----------------- > Config: CONFIG_USB_PWC_INPUT_EVDEV > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_PWC_INPUT_EVDEV=y > Actual value: > > > ---------- CONFIG_VIDEO_CPIA2 ----------------- > Config: CONFIG_VIDEO_CPIA2 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_VIDEO_CPIA2=m > Actual value: > > > ---------- CONFIG_USB_STKWEBCAM ----------------- > Config: CONFIG_USB_STKWEBCAM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_STKWEBCAM=m > Actual value: > > > ---------- CONFIG_USB_S2255 ----------------- > Config: CONFIG_USB_S2255 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Requested value: CONFIG_USB_S2255=m > Actual value: > > > ---------- CONFIG_SND_PCI ----------------- > Config: CONFIG_SND_PCI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_PCI=y > Actual value: > > > ---------- CONFIG_SND_HDA_INTEL ----------------- > Config: CONFIG_SND_HDA_INTEL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_INTEL=m > Actual value: > > > ---------- CONFIG_SND_HDA_GENERIC ----------------- > Config: CONFIG_SND_HDA_GENERIC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_GENERIC=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_HDMI ----------------- > Config: CONFIG_SND_HDA_CODEC_HDMI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_HDMI=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_ANALOG ----------------- > Config: CONFIG_SND_HDA_CODEC_ANALOG > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_ANALOG=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_REALTEK ----------------- > Config: CONFIG_SND_HDA_CODEC_REALTEK > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_REALTEK=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_SIGMATEL ----------------- > Config: CONFIG_SND_HDA_CODEC_SIGMATEL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_SIGMATEL=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_CIRRUS ----------------- > Config: CONFIG_SND_HDA_CODEC_CIRRUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_CIRRUS=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_CONEXANT ----------------- > Config: CONFIG_SND_HDA_CODEC_CONEXANT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_CONEXANT=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_CA0110 ----------------- > Config: CONFIG_SND_HDA_CODEC_CA0110 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_CA0110=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_CA0132 ----------------- > Config: CONFIG_SND_HDA_CODEC_CA0132 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_CA0132=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_CMEDIA ----------------- > Config: CONFIG_SND_HDA_CODEC_CMEDIA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_CMEDIA=m > Actual value: > > > ---------- CONFIG_SND_HDA_CODEC_SI3054 ----------------- > Config: CONFIG_SND_HDA_CODEC_SI3054 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Requested value: CONFIG_SND_HDA_CODEC_SI3054=m > Actual value: > > > ---------- CONFIG_DMA_SHARED_BUFFER ----------------- > Config: CONFIG_DMA_SHARED_BUFFER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DMA_SHARED_BUFFER=y > Actual value: > > > ---------- CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS ----------------- > Config: CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y > Actual value: > > > ---------- CONFIG_MOUSE_PS2_SMBUS ----------------- > Config: CONFIG_MOUSE_PS2_SMBUS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_MOUSE_PS2_SMBUS=y > Actual value: > > > ---------- CONFIG_VT_HW_CONSOLE_BINDING ----------------- > Config: CONFIG_VT_HW_CONSOLE_BINDING > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_VT_HW_CONSOLE_BINDING=y > Actual value: # CONFIG_VT_HW_CONSOLE_BINDING is not set > > > ---------- CONFIG_I2C ----------------- > Config: CONFIG_I2C_I801 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Requested value: CONFIG_I2C_I801=y > Actual value: > > -- > Config: CONFIG_I2C > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C=y > Actual value: # CONFIG_I2C is not set > > Config: CONFIG_I2C_BOARDINFO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C_BOARDINFO=y > Actual value: > > Config: CONFIG_I2C_COMPAT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C_COMPAT=y > Actual value: > > Config: CONFIG_I2C_HELPER_AUTO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C_HELPER_AUTO=y > Actual value: > > Config: CONFIG_I2C_ALGOBIT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C_ALGOBIT=y > Actual value: > > > ---------- CONFIG_I2C_BOARDINFO ----------------- > Config: CONFIG_I2C_BOARDINFO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C_BOARDINFO=y > Actual value: > > > ---------- CONFIG_I2C_COMPAT ----------------- > Config: CONFIG_I2C_COMPAT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C_COMPAT=y > Actual value: > > > ---------- CONFIG_I2C_HELPER_AUTO ----------------- > Config: CONFIG_I2C_HELPER_AUTO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C_HELPER_AUTO=y > Actual value: > > > ---------- CONFIG_I2C_ALGOBIT ----------------- > Config: CONFIG_I2C_ALGOBIT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_I2C_ALGOBIT=y > Actual value: > > > ---------- CONFIG_DRM ----------------- > Config: CONFIG_DRM_CIRRUS_QEMU > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > Requested value: CONFIG_DRM_CIRRUS_QEMU=m > Actual value: > > -- > Config: CONFIG_DRM_I915 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Requested value: CONFIG_DRM_I915=m > Actual value: > > Config: CONFIG_DRM_I915_ALPHA_SUPPORT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y > Actual value: > > -- > Config: CONFIG_DRM_VIRTIO_GPU > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg > Requested value: CONFIG_DRM_VIRTIO_GPU=y > Actual value: > > -- > Config: CONFIG_DRM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM=y > Actual value: # CONFIG_DRM is not set > > Config: CONFIG_DRM_KMS_HELPER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_KMS_HELPER=y > Actual value: > > Config: CONFIG_DRM_KMS_FB_HELPER > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_KMS_FB_HELPER=y > Actual value: > > Config: CONFIG_DRM_FBDEV_EMULATION > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_FBDEV_EMULATION=y > Actual value: > > Config: CONFIG_DRM_FBDEV_OVERALLOC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_FBDEV_OVERALLOC=100 > Actual value: > > Config: CONFIG_DRM_TTM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_TTM=y > Actual value: > > Config: CONFIG_DRM_BOCHS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_BOCHS=y > Actual value: > > Config: CONFIG_DRM_PANEL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_PANEL=y > Actual value: > > Config: CONFIG_DRM_BRIDGE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_BRIDGE=y > Actual value: > > Config: CONFIG_DRM_PANEL_BRIDGE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_PANEL_BRIDGE=y > Actual value: > > Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y > Actual value: > > > ---------- CONFIG_DRM_FBDEV_EMULATION ----------------- > Config: CONFIG_DRM_FBDEV_EMULATION > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_FBDEV_EMULATION=y > Actual value: > > > ---------- CONFIG_DRM_FBDEV_OVERALLOC ----------------- > Config: CONFIG_DRM_FBDEV_OVERALLOC > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_FBDEV_OVERALLOC=100 > Actual value: > > > ---------- CONFIG_DRM_TTM ----------------- > Config: CONFIG_DRM_TTM > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_TTM=y > Actual value: > > > ---------- CONFIG_DRM_BOCHS ----------------- > Config: CONFIG_DRM_BOCHS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_BOCHS=y > Actual value: > > > ---------- CONFIG_DRM_PANEL ----------------- > Config: CONFIG_DRM_PANEL > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_PANEL=y > Actual value: > > -- > Config: CONFIG_DRM_PANEL_BRIDGE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_PANEL_BRIDGE=y > Actual value: > > Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y > Actual value: > > > ---------- CONFIG_DRM_BRIDGE ----------------- > Config: CONFIG_DRM_BRIDGE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_BRIDGE=y > Actual value: > > > ---------- CONFIG_DRM_PANEL_BRIDGE ----------------- > Config: CONFIG_DRM_PANEL_BRIDGE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_PANEL_BRIDGE=y > Actual value: > > > ---------- CONFIG_DRM_PANEL_ORIENTATION_QUIRKS ----------------- > Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y > Actual value: > > > ---------- CONFIG_FB_CMDLINE ----------------- > Config: CONFIG_FB_CMDLINE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_CMDLINE=y > Actual value: > > > ---------- CONFIG_FB_NOTIFY ----------------- > Config: CONFIG_FB_NOTIFY > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_NOTIFY=y > Actual value: > > > ---------- CONFIG_FB ----------------- > Config: CONFIG_FB_MODE_HELPERS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > Requested value: CONFIG_FB_MODE_HELPERS=y > Actual value: > > -- > Config: CONFIG_FB_UVESA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > Requested value: CONFIG_FB_UVESA=m > Actual value: > > -- > Config: CONFIG_FB_EFI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > Requested value: CONFIG_FB_EFI=y > Actual value: > > -- > Config: CONFIG_FB_CMDLINE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_CMDLINE=y > Actual value: > > Config: CONFIG_FB_NOTIFY > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_NOTIFY=y > Actual value: > > Config: CONFIG_FB > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB=y > Actual value: # CONFIG_FB is not set > > Config: CONFIG_FB_CFB_FILLRECT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_CFB_FILLRECT=y > Actual value: > > Config: CONFIG_FB_CFB_COPYAREA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_CFB_COPYAREA=y > Actual value: > > Config: CONFIG_FB_CFB_IMAGEBLIT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_CFB_IMAGEBLIT=y > Actual value: > > Config: CONFIG_FB_SYS_FILLRECT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SYS_FILLRECT=y > Actual value: > > Config: CONFIG_FB_SYS_COPYAREA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SYS_COPYAREA=y > Actual value: > > Config: CONFIG_FB_SYS_IMAGEBLIT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SYS_IMAGEBLIT=y > Actual value: > > Config: CONFIG_FB_SYS_FOPS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SYS_FOPS=y > Actual value: > > Config: CONFIG_FB_DEFERRED_IO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_DEFERRED_IO=y > Actual value: > > Config: CONFIG_FB_SIMPLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SIMPLE=y > Actual value: > > > ---------- CONFIG_FB_CFB_FILLRECT ----------------- > Config: CONFIG_FB_CFB_FILLRECT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_CFB_FILLRECT=y > Actual value: > > > ---------- CONFIG_FB_CFB_COPYAREA ----------------- > Config: CONFIG_FB_CFB_COPYAREA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_CFB_COPYAREA=y > Actual value: > > > ---------- CONFIG_FB_CFB_IMAGEBLIT ----------------- > Config: CONFIG_FB_CFB_IMAGEBLIT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_CFB_IMAGEBLIT=y > Actual value: > > > ---------- CONFIG_FB_SYS_FILLRECT ----------------- > Config: CONFIG_FB_SYS_FILLRECT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SYS_FILLRECT=y > Actual value: > > > ---------- CONFIG_FB_SYS_COPYAREA ----------------- > Config: CONFIG_FB_SYS_COPYAREA > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SYS_COPYAREA=y > Actual value: > > > ---------- CONFIG_FB_SYS_IMAGEBLIT ----------------- > Config: CONFIG_FB_SYS_IMAGEBLIT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SYS_IMAGEBLIT=y > Actual value: > > > ---------- CONFIG_FB_SYS_FOPS ----------------- > Config: CONFIG_FB_SYS_FOPS > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SYS_FOPS=y > Actual value: > > > ---------- CONFIG_FB_DEFERRED_IO ----------------- > Config: CONFIG_FB_DEFERRED_IO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_DEFERRED_IO=y > Actual value: > > > ---------- CONFIG_FB_SIMPLE ----------------- > Config: CONFIG_FB_SIMPLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FB_SIMPLE=y > Actual value: > > > ---------- CONFIG_HDMI ----------------- > Config: CONFIG_HDMI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_HDMI=y > Actual value: > > > ---------- CONFIG_FRAMEBUFFER_CONSOLE ----------------- > Config: CONFIG_FRAMEBUFFER_CONSOLE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FRAMEBUFFER_CONSOLE=y > Actual value: > > Config: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y > Actual value: > > > ---------- CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY ----------------- > Config: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y > Actual value: > > > ---------- CONFIG_SYNC_FILE ----------------- > Config: CONFIG_SYNC_FILE > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_SYNC_FILE=y > Actual value: # CONFIG_SYNC_FILE is not set > > > ---------- CONFIG_FONT_SUPPORT ----------------- > Config: CONFIG_FONT_SUPPORT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FONT_SUPPORT=y > Actual value: > > > ---------- CONFIG_FONT_8x8 ----------------- > Config: CONFIG_FONT_8x8 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FONT_8x8=y > Actual value: > > > ---------- CONFIG_FONT_8x16 ----------------- > Config: CONFIG_FONT_8x16 > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Requested value: CONFIG_FONT_8x16=y > Actual value: > > > ---------- CONFIG_HYPERVISOR_GUEST ----------------- > Config: CONFIG_HYPERVISOR_GUEST > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/hv-guest.cfg > Requested value: CONFIG_HYPERVISOR_GUEST=y > Actual value: # CONFIG_HYPERVISOR_GUEST is not set > > > ---------- CONFIG_KVM_GUEST ----------------- > Config: CONFIG_KVM_GUEST > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > Requested value: CONFIG_KVM_GUEST=y > Actual value: > > > ---------- CONFIG_PARAVIRT ----------------- > Config: CONFIG_PARAVIRT > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > Requested value: CONFIG_PARAVIRT=y > Actual value: > > Config: CONFIG_PARAVIRT_CLOCK > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > Requested value: CONFIG_PARAVIRT_CLOCK=y > Actual value: > > > ---------- CONFIG_PARAVIRT_CLOCK ----------------- > Config: CONFIG_PARAVIRT_CLOCK > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > Requested value: CONFIG_PARAVIRT_CLOCK=y > Actual value: > > > ---------- CONFIG_SCSI ----------------- > Config: CONFIG_SCSI_VIRTIO > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg > Requested value: CONFIG_SCSI_VIRTIO=y > Actual value: > > -- > Config: CONFIG_SCSI > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg > Requested value: CONFIG_SCSI=y > Actual value: # CONFIG_SCSI is not set > > Config: CONFIG_SCSI_DEBUG > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg > Requested value: CONFIG_SCSI_DEBUG=m > Actual value: > > > ---------- CONFIG_SCSI_DEBUG ----------------- > Config: CONFIG_SCSI_DEBUG > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg > Requested value: CONFIG_SCSI_DEBUG=m > Actual value: > > > > DEBUG: Python function do_kernel_configcheck finished > > > > Bruce > > > > >> > > >> > > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > >> GEN Makefile > > >> HOSTCC scripts/basic/fixdep > > >> HOSTCC scripts/kconfig/conf.o > > >> HOSTCC scripts/kconfig/confdata.o > > >> HOSTCC scripts/kconfig/expr.o > > >> HOSTCC scripts/kconfig/lexer.lex.o > > >> HOSTCC scripts/kconfig/parser.tab.o > > >> HOSTCC scripts/kconfig/preprocess.o > > >> HOSTCC scripts/kconfig/symbol.o > > >> HOSTLD scripts/kconfig/conf > > >> scripts/kconfig/conf --olddefconfig Kconfig > > >> scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > > >> make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 > > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 > > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > >> make: *** [Makefile:179: sub-make] Error 2 > > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > >> NOTE: make HOSTCC=gcc -isystem/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,--enable-new-dtags -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/OE/build/oe-core/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 HOSTCPP=gcc -E -C /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source O=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build CC=x86_64-oe-linux-gcc -fuse-ld=bfd -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source=/usr/src/kernel oldnoconfig > > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > >> GEN Makefile > > >> make[2]: *** No rule to make target 'oldnoconfig'. Stop. > > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 > > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > >> make: *** [Makefile:179: sub-make] Error 2 > > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > >> ERROR: oe_runmake failed > > >> WARNING: exit code 1 from a shell command. > > >> ERROR: Execution of '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/run.do_configure.4075' failed with exit code 1: > > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > >> GEN Makefile > > >> HOSTCC scripts/basic/fixdep > > >> HOSTCC scripts/kconfig/conf.o > > >> HOSTCC scripts/kconfig/confdata.o > > >> HOSTCC scripts/kconfig/expr.o > > >> HOSTCC scripts/kconfig/lexer.lex.o > > >> HOSTCC scripts/kconfig/parser.tab.o > > >> HOSTCC scripts/kconfig/preprocess.o > > >> HOSTCC scripts/kconfig/symbol.o > > >> HOSTLD scripts/kconfig/conf > > >> scripts/kconfig/conf --olddefconfig Kconfig > > >> scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > > >> make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 > > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 > > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > >> make: *** [Makefile:179: sub-make] Error 2 > > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > >> GEN Makefile > > >> make[2]: *** No rule to make target 'oldnoconfig'. Stop. > > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 > > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > >> make: *** [Makefile:179: sub-make] Error 2 > > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > >> WARNING: exit code 1 from a shell command. > > >> > > >> On Fri, Jan 31, 2020 at 10:37 AM Khem Raj wrote: > > >>> > > >>> kernel-seltest fails now to build > > >>> > > >>> https://errors.yoctoproject.org/Errors/Details/308578/ > > >>> > > >>> On Tue, Jan 28, 2020 at 2:14 PM wrote: > > >>> > > > >>> > From: Bruce Ashfield > > >>> > > > >>> > This creates recipes for the v5.4/* branches of the linux-yocto > > >>> > reference kernel. > > >>> > > > >>> > preempt-rt, yaffs2, aufs5 and reference board specific patches are > > >>> > part of these branches. All major architectures: x86,x86-64,ARM, > > >>> > ARM64,ppc,mips and mips64 have been feature tested against this > > >>> > reference. > > >>> > > > >>> > 5.4 is a LTS release, and as such will receive -stable updates > > >>> > for the duration of upstream korg support. > > >>> > > > >>> > Signed-off-by: Bruce Ashfield > > >>> > --- > > >>> > .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ > > >>> > .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ > > >>> > meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ > > >>> > 3 files changed, 130 insertions(+) > > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >>> > > > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >>> > new file mode 100644 > > >>> > index 0000000000..52f0e3b833 > > >>> > --- /dev/null > > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > >>> > @@ -0,0 +1,44 @@ > > >>> > +KBRANCH ?= "v5.4/standard/preempt-rt/base" > > >>> > + > > >>> > +require recipes-kernel/linux/linux-yocto.inc > > >>> > + > > >>> > +# Skip processing of this recipe if it is not explicitly specified as the > > >>> > +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying > > >>> > +# to build multiple virtual/kernel providers, e.g. as dependency of > > >>> > +# core-image-rt-sdk, core-image-rt. > > >>> > +python () { > > >>> > + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": > > >>> > + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > > >>> > +} > > >>> > + > > >>> > +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" > > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > >>> > + > > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > > >>> > + > > >>> > +LINUX_VERSION ?= "5.4.15" > > >>> > + > > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > >>> > + > > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > >>> > +DEPENDS += "openssl-native util-linux-native" > > >>> > + > > >>> > +PV = "5.4.15" > > >>> > + > > >>> > +KMETA = "kernel-meta" > > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > > >>> > + > > >>> > +LINUX_KERNEL_TYPE = "preempt-rt" > > >>> > + > > >>> > +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" > > >>> > + > > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > >>> > + > > >>> > +# Functionality flags > > >>> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" > > >>> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > > >>> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" > > >>> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > > >>> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > > >>> > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >>> > new file mode 100644 > > >>> > index 0000000000..a028b37548 > > >>> > --- /dev/null > > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > >>> > @@ -0,0 +1,32 @@ > > >>> > +KBRANCH ?= "v5.4/standard/tiny/base" > > >>> > +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" > > >>> > + > > >>> > +LINUX_KERNEL_TYPE = "tiny" > > >>> > +KCONFIG_MODE = "--allnoconfig" > > >>> > + > > >>> > +require recipes-kernel/linux/linux-yocto.inc > > >>> > + > > >>> > +LINUX_VERSION ?= "5.4.15" > > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > >>> > + > > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > >>> > +DEPENDS += "openssl-native util-linux-native" > > >>> > + > > >>> > +KMETA = "kernel-meta" > > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > > >>> > + > > >>> > +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" > > >>> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > >>> > + > > >>> > +PV = "5.4.15" > > >>> > + > > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > > >>> > + > > >>> > +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" > > >>> > + > > >>> > +# Functionality flags > > >>> > +KERNEL_FEATURES = "" > > >>> > + > > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >>> > new file mode 100644 > > >>> > index 0000000000..9fbc47d79e > > >>> > --- /dev/null > > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > >>> > @@ -0,0 +1,54 @@ > > >>> > +KBRANCH ?= "v5.4/standard/base" > > >>> > + > > >>> > +require recipes-kernel/linux/linux-yocto.inc > > >>> > + > > >>> > +# board specific branches > > >>> > +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" > > >>> > +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" > > >>> > +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" > > >>> > +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" > > >>> > +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" > > >>> > +KBRANCH_qemux86 ?= "v5.4/standard/base" > > >>> > +KBRANCH_qemux86-64 ?= "v5.4/standard/base" > > >>> > +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" > > >>> > + > > >>> > +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" > > >>> > +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >>> > +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" > > >>> > +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >>> > +SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >>> > +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >>> > +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >>> > +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" > > >>> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > >>> > + > > >>> > +# remap qemuarm to qemuarma15 for the 5.4 kernel > > >>> > +# KMACHINE_qemuarm ?= "qemuarma15" > > >>> > + > > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ > > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > > >>> > + > > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > >>> > +LINUX_VERSION ?= "5.4.15" > > >>> > + > > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > >>> > +DEPENDS += "openssl-native util-linux-native" > > >>> > + > > >>> > +PV = "5.4.15" > > >>> > + > > >>> > +KMETA = "kernel-meta" > > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > > >>> > + > > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > >>> > + > > >>> > +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" > > >>> > + > > >>> > +# Functionality flags > > >>> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" > > >>> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > > >>> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" > > >>> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > > >>> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > > >>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" > > >>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > > >>> > -- > > >>> > 2.19.1 > > >>> > > > >>> > -- > > >>> > _______________________________________________ > > >>> > Openembedded-core mailing list > > >>> > Openembedded-core at lists.openembedded.org > > >>> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > >>> -- > > >>> _______________________________________________ > > >>> Openembedded-core mailing list > > >>> Openembedded-core at lists.openembedded.org > > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > > > -- > > - Thou shalt not follow the NULL pointer, for chaos and madness await > > thee at its end > > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From patchwork at patchwork.openembedded.org Mon Feb 3 18:02:31 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 03 Feb 2020 18:02:31 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_=3A_kernel?= =?utf-8?q?-yocto=3A_v5=2E4_LTS_kernel_=28rev2=29?= In-Reply-To: References: Message-ID: <20200203180231.2274.86022@do> == Series Details == Series: : kernel-yocto: v5.4 LTS kernel (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22338/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at a18d8beb0d) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From martin.jansa at gmail.com Mon Feb 3 18:11:50 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Mon, 3 Feb 2020 19:11:50 +0100 Subject: [OE-core] [PATCHv2] kernel.bbclass: set LD in KERNEL_CONFIG_COMMAND to fix 5.4+ builds when gold is enabled Message-ID: <20200203181150.29162-1-Martin.Jansa@gmail.com> * with 5.4 kernel the do_configure fails when gold is enabled (with ld-is-gold in DISTRO_FEATURES) * bfd is already being set in KERNEL_LD: kernel-arch.bbclass:KERNEL_LD = "${CCACHE}${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}" but KERNEL_LD is currently respected only by do_compile and do_compile_kernel modules and new kernel which contains a check for gold in Kbuild: https://lore.kernel.org/lkml/alpine.DEB.2.21.1907161434260.1767 at nanos.tec.linutronix.de/ more details: https://lore.kernel.org/r/CAMe9rOqMqkQ0LNpm25yE_Yt0FKp05WmHOrwc0aRDb53miFKM+w at mail.gmail.com will fail during the configuration even when gold wouldn't be used to build it in the end, add LD setting to KERNEL_CONFIG_COMMAND to prevent premature error when configuring scripts/kconfig/conf --olddefconfig Kconfig scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 Signed-off-by: Martin Jansa --- v2 just without --in-reply-to to original thread "kernel-yocto: v5.4 LTS kernel (rev2)", because patchtest tries to apply it with linux-yocto changes from that thread and reports failure that it cannot be applied in master meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 750988f4e5..15219c596f 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -508,7 +508,7 @@ sysroot_stage_all () { : } -KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" oldnoconfig" +KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} CC="${KERNEL_CC}" LD="${KERNEL_LD}" O=${B} olddefconfig || oe_runmake -C ${S} O=${B} CC="${KERNEL_CC}" LD="${KERNEL_LD}" oldnoconfig" python check_oldest_kernel() { oldest_kernel = d.getVar('OLDEST_KERNEL') -- 2.20.1 From mark.hatle at kernel.crashing.org Mon Feb 3 18:36:04 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Mon, 3 Feb 2020 12:36:04 -0600 Subject: [OE-core] [PATCH v2 1/2] microblaze tune: Enable 64-bit In-Reply-To: References: <20200131233305.118454-1-mark.hatle@kernel.crashing.org> Message-ID: <5e6edcb4-8eca-7bb8-5fc4-5c0504d4f130@kernel.crashing.org> On 1/31/20 10:50 PM, Nathan Rossi wrote: > On Sat, 1 Feb 2020 at 09:33, Mark Hatle wrote: >> >> From: Mark Hatle >> >> 64-bit is not yet available in Linux, but some non-Linux uses exist. >> >> Signed-off-by: Mark Hatle >> Signed-off-by: Mark Hatle >> --- >> meta/conf/machine/include/microblaze/arch-microblaze.inc | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc >> index 265898b6b6..fb777d929c 100644 >> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc >> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc >> @@ -4,6 +4,9 @@ >> TUNEVALID[microblaze] = "MicroBlaze" >> MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" >> >> +TUNEVALID[64-bit] = "64-bit MicroBlaze" >> +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" > > This should probably TUNECONFLICTS with all unsupported versions. I have no information on what versions are unsupported with 64-bit. If I receive that information, I will add it as conflicts. --Mark > Regards, > Nathan > > >> + >> # Endian >> TUNEVALID[bigendian] = "Use Microblaze Big Endian" >> TUNECONFLICTS[bigendian] += "v10.0" >> @@ -26,6 +29,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" >> +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" >> >> # Disable reorder for v8.30 if pattern-compare is not enabled >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ >> @@ -48,6 +52,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc >> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess >> TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" >> >> +# Add 64-bit to the PKGARCH if enabled. >> +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" >> + >> # Package Architecture formatting >> -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" >> +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" >> >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From mark.hatle at kernel.crashing.org Mon Feb 3 18:53:25 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Mon, 3 Feb 2020 12:53:25 -0600 Subject: [OE-core] [PATCH 2/2] microblaze tune: cleanup += In-Reply-To: <0a69a969-c20e-5273-0faa-a1f6dc5d29d7@gmail.com> References: <20200131232331.117030-1-mark.hatle@kernel.crashing.org> <20200131232331.117030-2-mark.hatle@kernel.crashing.org> <0a69a969-c20e-5273-0faa-a1f6dc5d29d7@gmail.com> Message-ID: <81b97b92-099f-a3c6-6820-d78aa29d529c@kernel.crashing.org> Yes, I didn't realize it was in Zeus. The same patches should apply to Zeus directly.. (All of the recent Microblaze Tune set...) If you want to limit it to just this one, I can certainly rebase it for you. --Mark On 1/31/20 6:47 PM, akuster808 wrote: > > > On 1/31/20 3:23 PM, Mark Hatle wrote: >> From: Mark Hatle >> >> Various += were used, refactor these to be either = or .= depending on >> usuage. >> >> CONFLICTS should be '=', as no leading space is required and they are not >> amending any other conflict settings. >> >> The TUNE_CCARGS should be .= so that if the feature does not define a CCARG >> blank spaces are not added to the CFLAGS. This is consistent to how the arm >> tuning is implemented. > Does some form of this need to be in Zeus? > > - armin >> Signed-off-by: Mark Hatle >> Signed-off-by: Mark Hatle >> --- >> .../include/microblaze/arch-microblaze.inc | 22 +++++++++---------- >> .../microblaze/feature-microblaze-math.inc | 12 +++++----- >> .../feature-microblaze-versions.inc | 2 +- >> 3 files changed, 18 insertions(+), 18 deletions(-) >> >> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc >> index 55ce158f12..19cc2b59b9 100644 >> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc >> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc >> @@ -9,34 +9,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze >> >> # Endian >> TUNEVALID[bigendian] = "Use Microblaze Big Endian" >> -TUNECONFLICTS[bigendian] += "v10.0" >> +TUNECONFLICTS[bigendian] = "v10.0" >> >> MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" >> >> -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" >> >> # General features >> TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" >> TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" >> TUNEVALID[reorder] = "Enable Reorder Instructions" >> -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" >> +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" >> >> # Core configuration tune optimizations >> TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" >> -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" >> +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" >> >> # Feature compiler args >> -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" >> -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" >> -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" >> -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "microblaze64", "-m64", "", d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" >> >> # Disable reorder for v8.30 if pattern-compare is not enabled >> -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ >> +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ >> bb.utils.contains("TUNE_FEATURES", "v8.30", \ >> bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ >> - "-mxl-reorder", "-mno-xl-reorder", d), \ >> - "-mxl-reorder", d), "-mno-xl-reorder", d)}" >> + " -mxl-reorder", " -mno-xl-reorder", d), \ >> + " -mxl-reorder", d), " -mno-xl-reorder", d)}" >> >> # Feature package architecture formatting >> MBPKGARCH_TUNE = "" >> diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc >> index a31516659c..cba0ae67e3 100644 >> --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc >> +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc >> @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" >> TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" >> >> # Compiler args >> -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" >> -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" >> >> -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" >> >> -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" >> -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" >> -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" >> +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" >> >> # Set target fpu (bitbake known target) to soft or hard (basic or extended) >> TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" >> diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc >> index 003fde3e07..6638accc98 100644 >> --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc >> +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc >> @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 >> TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" >> >> # Version flags >> -TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" >> +TUNE_CCARGS .= "${@' -mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" >> MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" >> From rasmus.villemoes at prevas.dk Mon Feb 3 18:55:18 2020 From: rasmus.villemoes at prevas.dk (Rasmus Villemoes) Date: Mon, 3 Feb 2020 18:55:18 +0000 Subject: [OE-core] [PATCH v2] glibc: don't ignore global LDFLAGS settings In-Reply-To: References: <20200120072801.16603-1-rasmus.villemoes@prevas.dk> <20200120092258.32254-1-rasmus.villemoes@prevas.dk> Message-ID: ping On 20/01/2020 16.42, Khem Raj wrote: > this patch is ok but I have reservations since += now means global > ldflags will be applied > so it would need some testing to ensure it works well. > > On Mon, Jan 20, 2020 at 1:23 AM Rasmus Villemoes > wrote: >> >> Two things: The -Wl,-rpath-link comment is stale (due to per-recipe >> staging), so we no longer need to set our own LDFLAGS to avoid >> -Wl,-rpath-link being in there. Second, overriding LDFLAGS should be >> done at the recipe level so "bitbake -e" can show what is going on. >> Otherwise debugging why one's global LDFLAGS tweaks are being ignored >> is needlessly painful. >> >> So pull out the LDFLAGS setting from do_compile, and change it to an >> append instead of assignment. >> >> For the benefit of future git blame: the -fuse-ld=bfd setting was >> added by ac64c3b96b (glibc: always use bfd linker). >> >> Signed-off-by: Rasmus Villemoes >> --- >> v2: Rebase to real upstream master. Note to self: "git pull" before rebasing to master. >> >> meta/recipes-core/glibc/glibc_2.31.bb | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/meta/recipes-core/glibc/glibc_2.31.bb b/meta/recipes-core/glibc/glibc_2.31.bb >> index b8c570db52..cfba4de49b 100644 >> --- a/meta/recipes-core/glibc/glibc_2.31.bb >> +++ b/meta/recipes-core/glibc/glibc_2.31.bb >> @@ -93,9 +93,8 @@ do_configure () { >> CPPFLAGS="" oe_runconf >> } >> >> +LDFLAGS += "-fuse-ld=bfd" >> do_compile () { >> - # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging >> - LDFLAGS="-fuse-ld=bfd" >> base_do_compile >> echo "Adjust ldd script" >> if [ -n "${RTLDLIST}" ] >> -- >> 2.23.0 >> -- Rasmus Villemoes Software Developer Prevas A/S Hedeager 3 DK-8200 Aarhus N +45 51210274 rasmus.villemoes at prevas.dk www.prevas.dk From mark.hatle at kernel.crashing.org Mon Feb 3 18:55:25 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Mon, 3 Feb 2020 12:55:25 -0600 Subject: [OE-core] [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune In-Reply-To: References: <20200131220751.106516-1-mark.hatle@kernel.crashing.org> Message-ID: <8a54da63-ab5a-8222-f401-aaea7debcfc5@kernel.crashing.org> On 1/31/20 10:49 PM, Nathan Rossi wrote: > On Sat, 1 Feb 2020 at 08:13, Mark Hatle wrote: >> >> From: Mark Hatle >> >> TUNE_ARCH - microblazeeb is not a valid architecture, microblaze is big >> endian, microblazeel is the little endian version. >> >> Version arguments: >> If a version feature is not defined, then we don't want to set either >> TUNE_CCARGS or MBPKGARCH_VERSION. >> >> Signed-off-by: Mark Hatle >> Signed-off-by: Mark Hatle >> --- >> meta/conf/machine/include/microblaze/arch-microblaze.inc | 2 +- >> .../include/microblaze/feature-microblaze-versions.inc | 4 ++-- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc >> index eab7171cb2..265898b6b6 100644 >> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc >> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc >> @@ -46,7 +46,7 @@ require conf/machine/include/microblaze/feature-microblaze-versions.inc >> require conf/machine/include/microblaze/feature-microblaze-math.inc >> >> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess > > Worth updating the comment at the same time. > >> -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" >> +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" > > This change will break some things in oe-core (and probably > meta-xilinx too). They should be updated at the same time. Do you have an example of what? Cause without this, all autoconf invocation of big endian failed for me due to invalid architecture. > Might also be worth removing the microblazeeb references in siteinfo, > and elf.py. Since they were added to support this. I looked at these and left them "just in case", as they didn't seem to conflict with anything that I saw. --Mark > Regards, > Nathan > >> >> # Package Architecture formatting >> TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" >> diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc >> index 3221e2aab7..003fde3e07 100644 >> --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc >> +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc >> @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 >> TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" >> >> # Version flags >> -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}" >> -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}" >> +TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" >> +MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" >> >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From mark.hatle at kernel.crashing.org Mon Feb 3 19:29:02 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Mon, 3 Feb 2020 13:29:02 -0600 Subject: [OE-core] [PATCH v2 2/2] microblaze tune: cleanup += In-Reply-To: <20200131233305.118454-2-mark.hatle@kernel.crashing.org> References: <20200131233305.118454-1-mark.hatle@kernel.crashing.org> <20200131233305.118454-2-mark.hatle@kernel.crashing.org> Message-ID: I just found a problem with this one in further testing. So please don't merge. There will be a v3. --Mark On 1/31/20 5:33 PM, Mark Hatle wrote: > From: Mark Hatle > > Various += were used, refactor these to be either = or .= depending on > usuage. > > CONFLICTS should be '=', as no leading space is required and they are not > amending any other conflict settings. > > The TUNE_CCARGS should be .= so that if the feature does not define a CCARG > blank spaces are not added to the CFLAGS. This is consistent to how the arm > tuning is implemented. > > Signed-off-by: Mark Hatle > Signed-off-by: Mark Hatle > --- > .../include/microblaze/arch-microblaze.inc | 22 +++++++++---------- > .../microblaze/feature-microblaze-math.inc | 12 +++++----- > .../feature-microblaze-versions.inc | 2 +- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index fb777d929c..19cc2b59b9 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -9,34 +9,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze > > # Endian > TUNEVALID[bigendian] = "Use Microblaze Big Endian" > -TUNECONFLICTS[bigendian] += "v10.0" > +TUNECONFLICTS[bigendian] = "v10.0" > > MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" > > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" > > # General features > TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" > TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" > TUNEVALID[reorder] = "Enable Reorder Instructions" > -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" > +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" > > # Core configuration tune optimizations > TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" > -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > > # Feature compiler args > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" > > # Disable reorder for v8.30 if pattern-compare is not enabled > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > bb.utils.contains("TUNE_FEATURES", "v8.30", \ > bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ > - "-mxl-reorder", "-mno-xl-reorder", d), \ > - "-mxl-reorder", d), "-mno-xl-reorder", d)}" > + " -mxl-reorder", " -mno-xl-reorder", d), \ > + " -mxl-reorder", d), " -mno-xl-reorder", d)}" > > # Feature package architecture formatting > MBPKGARCH_TUNE = "" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > index a31516659c..cba0ae67e3 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" > TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" > > # Compiler args > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" > > # Set target fpu (bitbake known target) to soft or hard (basic or extended) > TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > index 003fde3e07..6638accc98 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 > TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" > > # Version flags > -TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > +TUNE_CCARGS .= "${@' -mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > > From alex.kiernan at gmail.com Mon Feb 3 19:55:08 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Mon, 3 Feb 2020 19:55:08 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: References: <20200127231306.46105-1-alex.kiernan@gmail.com> Message-ID: Hi Richard On Mon, Feb 3, 2020 at 2:13 PM Alex Kiernan wrote: > > On Mon, Feb 3, 2020 at 10:26 AM Richard Purdie > wrote: > > > > On Mon, 2020-01-27 at 23:13 +0000, Alex Kiernan wrote: > > > Update to latest on the 243 stable branch. This includes (amongst other > > > fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. > > > > > > systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. > > > > > > Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > > > > > > Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, > > > fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). > > > > > > Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, > > > fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). > > > > Unfortunately something in this causes: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545 > > > > That's disappointing... > I'm failing to reproduce this - am I right in thinking the error I should be looking for is this one: [ 3.997360] ide-cd: hdc: tray open [ 3.999321] print_req_error: I/O error, dev hdc, sector 8388592 flags 80700 or some variation on it? I've got testimage running across a number of the images I think are the ones that are being run and I can't get any of them to fail. I did notice that a couple of the failures were on CentOS, I'm running on an Ubuntu box - I'm assuming that shouldn't make any difference? -- Alex Kiernan From alex.kiernan at gmail.com Mon Feb 3 20:26:37 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Mon, 3 Feb 2020 20:26:37 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: References: <20200127231306.46105-1-alex.kiernan@gmail.com> Message-ID: On Mon, Feb 3, 2020 at 7:55 PM Alex Kiernan wrote: > > Hi Richard > > On Mon, Feb 3, 2020 at 2:13 PM Alex Kiernan wrote: > > > > On Mon, Feb 3, 2020 at 10:26 AM Richard Purdie > > wrote: > > > > > > On Mon, 2020-01-27 at 23:13 +0000, Alex Kiernan wrote: > > > > Update to latest on the 243 stable branch. This includes (amongst other > > > > fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. > > > > > > > > systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. > > > > > > > > Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > > > > > > > > Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, > > > > fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). > > > > > > > > Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, > > > > fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). > > > > > > Unfortunately something in this causes: > > > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412 > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413 > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545 > > > > > > > That's disappointing... > > > > I'm failing to reproduce this - am I right in thinking the error I > should be looking for is this one: > > [ 3.997360] ide-cd: hdc: tray open > [ 3.999321] print_req_error: I/O error, dev hdc, sector 8388592 flags 80700 > > or some variation on it? > > I've got testimage running across a number of the images I think are > the ones that are being run and I can't get any of them to fail. > Scratch that... it looks like one of the local changes is necessary to cause this - I'd foolishly reused an external source tree rather than just letting devtool deal with it. -- Alex Kiernan From raj.khem at gmail.com Mon Feb 3 20:50:49 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 3 Feb 2020 12:50:49 -0800 Subject: [OE-core] [PATCH] python3-six: Move src_uri checks to recipe main Message-ID: <20200203205049.1324254-1-raj.khem@gmail.com> .inc is used by other versions of recipe as well, therefore putting checksums in .inc will break them unless the version is same as in oe-core Signed-off-by: Khem Raj --- meta/recipes-devtools/python/python-six.inc | 3 --- meta/recipes-devtools/python/python3-six_1.14.0.bb | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python-six.inc b/meta/recipes-devtools/python/python-six.inc index bbbddbec50..05b32810bd 100644 --- a/meta/recipes-devtools/python/python-six.inc +++ b/meta/recipes-devtools/python/python-six.inc @@ -4,9 +4,6 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d" -SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" -SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" - inherit pypi RDEPENDS_${PN} = "${PYTHON_PN}-io" diff --git a/meta/recipes-devtools/python/python3-six_1.14.0.bb b/meta/recipes-devtools/python/python3-six_1.14.0.bb index 99e6629b2f..151c366caa 100644 --- a/meta/recipes-devtools/python/python3-six_1.14.0.bb +++ b/meta/recipes-devtools/python/python3-six_1.14.0.bb @@ -1,3 +1,5 @@ inherit setuptools3 require python-six.inc +SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" +SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" -- 2.25.0 From alex.kanavin at gmail.com Mon Feb 3 20:51:09 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 3 Feb 2020 21:51:09 +0100 Subject: [OE-core] [OE-Core][PATCH] systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: References: <20200127231306.46105-1-alex.kiernan@gmail.com> Message-ID: Since move to 243 latest needs further work, how about moving straight to 244? Alex > On 3 Feb 2020, at 21.26, Alex Kiernan wrote: > >> On Mon, Feb 3, 2020 at 7:55 PM Alex Kiernan wrote: >> >> Hi Richard >> >>> On Mon, Feb 3, 2020 at 2:13 PM Alex Kiernan wrote: >>> >>> On Mon, Feb 3, 2020 at 10:26 AM Richard Purdie >>> wrote: >>>> >>>>> On Mon, 2020-01-27 at 23:13 +0000, Alex Kiernan wrote: >>>>> Update to latest on the 243 stable branch. This includes (amongst other >>>>> fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. >>>>> >>>>> systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. >>>>> >>>>> Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch >>>>> >>>>> Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, >>>>> fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). >>>>> >>>>> Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, >>>>> fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). >>>> >>>> Unfortunately something in this causes: >>>> >>>> https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412 >>>> https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413 >>>> https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545 >>>> >>> >>> That's disappointing... >>> >> >> I'm failing to reproduce this - am I right in thinking the error I >> should be looking for is this one: >> >> [ 3.997360] ide-cd: hdc: tray open >> [ 3.999321] print_req_error: I/O error, dev hdc, sector 8388592 flags 80700 >> >> or some variation on it? >> >> I've got testimage running across a number of the images I think are >> the ones that are being run and I can't get any of them to fail. >> > > Scratch that... it looks like one of the local changes is necessary to > cause this - I'd foolishly reused an external source tree rather than > just letting devtool deal with it. > > -- > Alex Kiernan > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kiernan at gmail.com Mon Feb 3 21:15:14 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Mon, 3 Feb 2020 21:15:14 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: Upgrade 243.2 -> 243.4-latest In-Reply-To: References: <20200127231306.46105-1-alex.kiernan@gmail.com> Message-ID: On Mon, Feb 3, 2020 at 8:51 PM Alexander Kanavin wrote: > > Since move to 243 latest needs further work, how about moving straight to 244? > > Alex > Having realised it was local to OE-Core, it was easy to find the problem. The upstream change that I guessed at before is what's caused the behaviour change: commit 53d8feeb2334c396dcfa7106c78ce1791fb5d0c4 Author: Michal Suchanek Date: Mon Nov 4 21:23:15 2019 +0100 libblkid: open device in nonblock mode. When autoclose is set (kernel default but many distributions reverse the setting) opening a CD-rom device causes the tray to close. The function of blkid is to report the current state of the device and not to change it. Hence it should use O_NONBLOCK when opening the device to avoid closing a CD-rom tray. blkid is used liberally in scripts so it can potentially interfere with the user operating the CD-rom hardware. Which causes a blizzard of "ide-cd: hdc: tray open" when you have our local changes: commit 90dcf2574daca8e7bf35074c46a2729a82acfe8b (HEAD -> devtool, tag: devtool-patched, devtool-no-overrides) Author: Chen Qi Date: Thu Feb 21 16:38:38 2019 +0800 rules: watch metadata changes in ide devices Formatting IDE storage does not trigger "change" uevents. As a result clients using udev API don't get any updates afterwards and get outdated information about the device. ... root at qemux86-64:~# mkfs.ext4 -F /dev/hda1 Creating filesystem with 262144 4k blocks and 65536 inodes Filesystem UUID: 98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 root at qemux86-64:~# ls /dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 ls: cannot access '/dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2': No such file or directory ... Include hd* in a match for watch option assignment. Upstream-Status: Denied qemu by default emulates IDE and the linux-yocto kernel(s) use CONFIG_IDE instead of the more modern libsata, so disks appear as /dev/hd*. A similar patch rejected by upstream because CONFIG_IDE is deprecated. Signed-off-by: Hongxu Jia [rebased for systemd 241] Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray %% original patch: 0005-rules-watch-metadata-changes-in-ide-devices.patch commit 2c49075af99308c25fbfd17ce4f28243cba3e4ec Author: Chen Qi Date: Thu Feb 21 16:28:21 2019 +0800 rules: whitelist hd* devices qemu by default emulates IDE and the linux-yocto kernel(s) use CONFIG_IDE instead of the more modern libsata, so disks appear as /dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated. Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] Signed-off-by: Patrick Ohly Signed-off-by: Khem Raj [rebased for systemd 241] Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray %% original patch: 0004-rules-whitelist-hd-devices.patch Short of dropping the the local changes, which (from reading the commit messages) seem to be mostly there to fix up issues with qemu, I'm not sure what else to do. I can't see upstream wanting to change the commit they merged as they already rejected these ones. Reading backwards we seem to have been carrying these two local changes since: commit 5702a19f1c91f9d091a15ad30e73f946c5f9fd31 Author: Patrick Ohly Date: Mon Sep 21 16:30:10 2015 +0200 systemd: apply persistent storage udev rules also for /dev/hd* This fixes booting with initramfs and root=UUID on machines with IDE disks, like "runqemu hdddirect", and kernels which still use the deprecated CONFIG_IDE. v2: Rebased against current master-next. (From OE-Core rev: 3d27dfb7e78b8e17b76fcc1d8f8e2b29ca26b0df) > > On 3 Feb 2020, at 21.26, Alex Kiernan wrote: > > > >> On Mon, Feb 3, 2020 at 7:55 PM Alex Kiernan wrote: > >> > >> Hi Richard > >> > >>> On Mon, Feb 3, 2020 at 2:13 PM Alex Kiernan wrote: > >>> > >>> On Mon, Feb 3, 2020 at 10:26 AM Richard Purdie > >>> wrote: > >>>> > >>>>> On Mon, 2020-01-27 at 23:13 +0000, Alex Kiernan wrote: > >>>>> Update to latest on the 243 stable branch. This includes (amongst other > >>>>> fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. > >>>>> > >>>>> systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. > >>>>> > >>>>> Rebase 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch > >>>>> > >>>>> Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, > >>>>> fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). > >>>>> > >>>>> Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, > >>>>> fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). > >>>> > >>>> Unfortunately something in this causes: > >>>> > >>>> https://autobuilder.yoctoproject.org/typhoon/#/builders/109/builds/412 > >>>> https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/413 > >>>> https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/1545 > >>>> > >>> > >>> That's disappointing... > >>> > >> > >> I'm failing to reproduce this - am I right in thinking the error I > >> should be looking for is this one: > >> > >> [ 3.997360] ide-cd: hdc: tray open > >> [ 3.999321] print_req_error: I/O error, dev hdc, sector 8388592 flags 80700 > >> > >> or some variation on it? > >> > >> I've got testimage running across a number of the images I think are > >> the ones that are being run and I can't get any of them to fail. > >> > > > > Scratch that... it looks like one of the local changes is necessary to > > cause this - I'd foolishly reused an external source tree rather than > > just letting devtool deal with it. > > > > -- > > Alex Kiernan > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Alex Kiernan From bruce.ashfield at gmail.com Mon Feb 3 21:26:41 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Mon, 3 Feb 2020 16:26:41 -0500 Subject: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe Message-ID: <20200203212641.57611-1-bruce.ashfield@gmail.com> From: Bruce Ashfield Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield --- I didn't realized the v5.4 series had gone in, or I would have send this sooner. This should resolve the errors that are thrown when symbol_why is run to detect missing symbol dependencies. Bruce meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6fb8a..57ec1abc6d 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 From bruce.ashfield at gmail.com Mon Feb 3 21:33:31 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Mon, 3 Feb 2020 16:33:31 -0500 Subject: [OE-core] [PATCH 1/3] linux-yocto: introduce 5.4 recipes In-Reply-To: References: <20200203173753.dcrz2qokzecl4bsx@jama> Message-ID: On Mon, Feb 3, 2020 at 12:51 PM Bruce Ashfield wrote: > > On Mon, Feb 3, 2020 at 12:37 PM Martin Jansa wrote: > > > > On Mon, Feb 03, 2020 at 12:11:31PM -0500, Bruce Ashfield wrote: > > > On Mon, Feb 3, 2020 at 11:45 AM Khem Raj wrote: > > > > > > > > > > > > > > > > On Mon, Feb 3, 2020 at 8:42 AM Martin Jansa wrote: > > > >> > > > >> It fails to build with gold enabled (ld-is-gold in DISTRO_FEATURES) > > > >> > > > >> First olddefconfig fails with "gold linker 'x86_64-oe-linux-ld' not supported" and then it fails with a bit misleading error about oldnoconfig (which is called only when oddefconfig fails) and then the whole log repeats itself again, whole log.do_configure.4075 follows: > > > > > > > > > > > > Since it?s a kernel piece I think asking for gold might be out of scope perhaps > > > > > > > > > > Yah, there's not much we can do to fix that, but I suppose it could be > > > detected in the bbclass and a better error thrown ? > > > > > > > I have staged a fix in master next which helps a bit with eg mips I had to disable bpf > > > > > > Is that the one with the missing header for on-target module build ? > > > If so, i have a similar patch here. > > > > Do you have a fix for do_kernel_configcheck as well somewhere? > > > > I'm seeing a lot of warnings in default linux-yocto build for > > qemux86-64 and the log.do_kernel_configcheck starts with long list of > > missing python since python was removed from HOSTTOOLS. > > > > I do yes. > > But it is only local, since I'm @ FOSDEM and have terrible access, and > have been spending my extra time bisecting the remaining boot / > runtime issues with 5.4 > > I'll try and get some of the independent fixes out tonight before I > travel tomorrow. I didn't realize that my other series had merged, or I would have had my commits cleaned up and ready to go sooner. Sorry about that. I just sent the fixup for basic python3 functioning .. I have a couple more correctness patches, but I don't have time to clean them up tonight. But with what I sent, it should at least call python3 and won't immediately thrown an error. Cheers, Bruce > > Bruce > > > > > DEBUG: Executing python function do_kernel_configcheck > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > /usr/bin/env: 'python': No such file or directory > > [mismatch (291)]: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/cfg/mismatch.txt > > There were hardware options requested that do not > > have a corresponding value present in the final ".config" file. > > This probably means you aren't getting the config you wanted. > > > > WARNING: [kernel config]: specified values did not make it into the kernel's final configuration: > > > > ---------- CONFIG_MCORE2 ----------------- > > Config: CONFIG_MCORE2 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg > > Requested value: CONFIG_MCORE2=y > > Actual value: # CONFIG_MCORE2 is not set > > > > > > ---------- CONFIG_ATA ----------------- > > Config: CONFIG_ATA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA=y > > Actual value: # CONFIG_ATA is not set > > > > Config: CONFIG_ATA_ACPI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA_ACPI=y > > Actual value: > > > > Config: CONFIG_ATA_SFF > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA_SFF=y > > Actual value: > > > > Config: CONFIG_ATA_BMDMA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA_BMDMA=y > > Actual value: > > > > Config: CONFIG_ATA_PIIX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA_PIIX=m > > Actual value: > > > > > > ---------- CONFIG_ATA_ACPI ----------------- > > Config: CONFIG_ATA_ACPI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA_ACPI=y > > Actual value: > > > > > > ---------- CONFIG_ATA_SFF ----------------- > > Config: CONFIG_ATA_SFF > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA_SFF=y > > Actual value: > > > > > > ---------- CONFIG_ATA_BMDMA ----------------- > > Config: CONFIG_ATA_BMDMA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA_BMDMA=y > > Actual value: > > > > > > ---------- CONFIG_ATA_PIIX ----------------- > > Config: CONFIG_ATA_PIIX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_ATA_PIIX=m > > Actual value: > > > > > > ---------- CONFIG_PATA_SCH ----------------- > > Config: CONFIG_PATA_SCH > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_PATA_SCH=y > > Actual value: > > > > > > ---------- CONFIG_INPUT_MOUSEDEV ----------------- > > Config: CONFIG_INPUT_MOUSEDEV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_INPUT_MOUSEDEV=y > > Actual value: # CONFIG_INPUT_MOUSEDEV is not set > > > > > > ---------- CONFIG_INPUT_EVDEV ----------------- > > Config: CONFIG_INPUT_EVDEV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/input/input.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_INPUT_EVDEV=y > > Actual value: # CONFIG_INPUT_EVDEV is not set > > > > > > ---------- CONFIG_INPUT_TABLET ----------------- > > Config: CONFIG_INPUT_TABLET > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_INPUT_TABLET=y > > Actual value: # CONFIG_INPUT_TABLET is not set > > > > > > ---------- CONFIG_HID_WACOM ----------------- > > Config: CONFIG_HID_WACOM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_HID_WACOM=y > > Actual value: > > > > > > ---------- CONFIG_RTC_CLASS ----------------- > > Config: CONFIG_RTC_CLASS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_RTC_CLASS=y > > Actual value: # CONFIG_RTC_CLASS is not set > > > > > > ---------- CONFIG_RTC_DRV_CMOS ----------------- > > Config: CONFIG_RTC_DRV_CMOS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_RTC_DRV_CMOS=y > > Actual value: > > > > > > ---------- CONFIG_SERIAL_8250_PNP ----------------- > > Config: CONFIG_SERIAL_8250_PNP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_SERIAL_8250_PNP=y > > Actual value: > > > > > > ---------- CONFIG_PARPORT ----------------- > > Config: CONFIG_PARPORT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_PARPORT=m > > Actual value: # CONFIG_PARPORT is not set > > > > Config: CONFIG_PARPORT_PC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_PARPORT_PC=m > > Actual value: > > > > > > ---------- CONFIG_PARPORT_PC ----------------- > > Config: CONFIG_PARPORT_PC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_PARPORT_PC=m > > Actual value: > > > > > > ---------- CONFIG_PRINTER ----------------- > > Config: CONFIG_PRINTER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_PRINTER=m > > Actual value: > > > > > > ---------- CONFIG_USB_HID ----------------- > > Config: CONFIG_USB_HID > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_HID=y > > Actual value: > > > > Config: CONFIG_USB_HIDDEV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_HIDDEV=y > > Actual value: > > > > > > ---------- CONFIG_USB_HIDDEV ----------------- > > Config: CONFIG_USB_HIDDEV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_HIDDEV=y > > Actual value: > > > > > > ---------- CONFIG_USB_SERIAL ----------------- > > Config: CONFIG_USB_SERIAL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL=y > > Actual value: > > > > Config: CONFIG_USB_SERIAL_CONSOLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL_CONSOLE=y > > Actual value: > > > > -- > > Config: CONFIG_USB_SERIAL_GENERIC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL_GENERIC=y > > Actual value: > > > > Config: CONFIG_USB_SERIAL_FTDI_SIO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL_FTDI_SIO=y > > Actual value: > > > > Config: CONFIG_USB_SERIAL_PL2303 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL_PL2303=y > > Actual value: > > > > > > ---------- CONFIG_USB_SERIAL_CONSOLE ----------------- > > Config: CONFIG_USB_SERIAL_CONSOLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL_CONSOLE=y > > Actual value: > > > > > > ---------- CONFIG_USB_EZUSB_FX2 ----------------- > > Config: CONFIG_USB_EZUSB_FX2 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_EZUSB_FX2=y > > Actual value: > > > > > > ---------- CONFIG_USB_SERIAL_GENERIC ----------------- > > Config: CONFIG_USB_SERIAL_GENERIC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL_GENERIC=y > > Actual value: > > > > > > ---------- CONFIG_USB_SERIAL_FTDI_SIO ----------------- > > Config: CONFIG_USB_SERIAL_FTDI_SIO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL_FTDI_SIO=y > > Actual value: > > > > > > ---------- CONFIG_USB_SERIAL_PL2303 ----------------- > > Config: CONFIG_USB_SERIAL_PL2303 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_USB_SERIAL_PL2303=y > > Actual value: > > > > > > ---------- CONFIG_I2C_I801 ----------------- > > Config: CONFIG_I2C_I801 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_I2C_I801=y > > Actual value: > > > > > > ---------- CONFIG_IDE ----------------- > > Config: CONFIG_IDE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_IDE=y > > Actual value: # CONFIG_IDE is not set > > > > Config: CONFIG_IDE_GD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_IDE_GD=y > > Actual value: > > > > Config: CONFIG_IDE_GD_ATA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_IDE_GD_ATA=y > > Actual value: > > > > > > ---------- CONFIG_IDE_GD ----------------- > > Config: CONFIG_IDE_GD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_IDE_GD=y > > Actual value: > > > > Config: CONFIG_IDE_GD_ATA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_IDE_GD_ATA=y > > Actual value: > > > > > > ---------- CONFIG_IDE_GD_ATA ----------------- > > Config: CONFIG_IDE_GD_ATA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_IDE_GD_ATA=y > > Actual value: > > > > > > ---------- CONFIG_BLK_DEV_PIIX ----------------- > > Config: CONFIG_BLK_DEV_PIIX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_BLK_DEV_PIIX=y > > Actual value: > > > > > > ---------- CONFIG_SATA_AHCI ----------------- > > Config: CONFIG_SATA_AHCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_SATA_AHCI=y > > Actual value: > > > > > > ---------- CONFIG_BLK_DEV_FD ----------------- > > Config: CONFIG_BLK_DEV_FD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_BLK_DEV_FD=m > > Actual value: # CONFIG_BLK_DEV_FD is not set > > > > > > ---------- CONFIG_EEPROM_AT24 ----------------- > > Config: CONFIG_EEPROM_AT24 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_EEPROM_AT24=m > > Actual value: > > > > > > ---------- CONFIG_NVME_CORE ----------------- > > Config: CONFIG_NVME_CORE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_NVME_CORE=y > > Actual value: > > > > > > ---------- CONFIG_BLK_DEV_NVME ----------------- > > Config: CONFIG_BLK_DEV_NVME > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_BLK_DEV_NVME=y > > Actual value: > > > > > > ---------- CONFIG_NET_CORE ----------------- > > Config: CONFIG_NET_CORE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_CORE=y > > Actual value: > > > > > > ---------- CONFIG_ETHERNET ----------------- > > Config: CONFIG_ETHERNET > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_ETHERNET=y > > Actual value: > > > > > > ---------- CONFIG_NET_VENDOR_3COM ----------------- > > Config: CONFIG_NET_VENDOR_3COM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_VENDOR_3COM=y > > Actual value: > > > > > > ---------- CONFIG_TYPHOON ----------------- > > Config: CONFIG_TYPHOON > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_TYPHOON=m > > Actual value: > > > > > > ---------- CONFIG_NET_VENDOR_BROADCOM ----------------- > > Config: CONFIG_NET_VENDOR_BROADCOM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_VENDOR_BROADCOM=y > > Actual value: > > > > > > ---------- CONFIG_TIGON3 ----------------- > > Config: CONFIG_TIGON3 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_TIGON3=m > > Actual value: > > > > > > ---------- CONFIG_BNX2X ----------------- > > Config: CONFIG_BNX2X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_BNX2X=m > > Actual value: > > > > Config: CONFIG_BNX2X_SRIOV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_BNX2X_SRIOV=y > > Actual value: > > > > > > ---------- CONFIG_BNX2X_SRIOV ----------------- > > Config: CONFIG_BNX2X_SRIOV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_BNX2X_SRIOV=y > > Actual value: > > > > > > ---------- CONFIG_BNXT ----------------- > > Config: CONFIG_BNXT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_BNXT=m > > Actual value: > > > > Config: CONFIG_BNXT_SRIOV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_BNXT_SRIOV=y > > Actual value: > > > > > > ---------- CONFIG_BNXT_SRIOV ----------------- > > Config: CONFIG_BNXT_SRIOV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_BNXT_SRIOV=y > > Actual value: > > > > > > ---------- CONFIG_NET_VENDOR_ATHEROS ----------------- > > Config: CONFIG_NET_VENDOR_ATHEROS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_VENDOR_ATHEROS=y > > Actual value: > > > > > > ---------- CONFIG_ATL1 ----------------- > > Config: CONFIG_ATL1 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_ATL1=m > > Actual value: > > > > Config: CONFIG_ATL1C > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_ATL1C=m > > Actual value: > > > > Config: CONFIG_ATL1E > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_ATL1E=m > > Actual value: > > > > > > ---------- CONFIG_ATL1C ----------------- > > Config: CONFIG_ATL1C > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_ATL1C=m > > Actual value: > > > > > > ---------- CONFIG_ATL1E ----------------- > > Config: CONFIG_ATL1E > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_ATL1E=m > > Actual value: > > > > > > ---------- CONFIG_ATL2 ----------------- > > Config: CONFIG_ATL2 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_ATL2=m > > Actual value: > > > > > > ---------- CONFIG_ALX ----------------- > > Config: CONFIG_ALX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_ALX=m > > Actual value: > > > > > > ---------- CONFIG_NET_VENDOR_INTEL ----------------- > > Config: CONFIG_NET_VENDOR_INTEL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_VENDOR_INTEL=y > > Actual value: > > > > > > ---------- CONFIG_NET_VENDOR_AMD ----------------- > > Config: CONFIG_NET_VENDOR_AMD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_VENDOR_AMD=y > > Actual value: > > > > > > ---------- CONFIG_PCNET32 ----------------- > > Config: CONFIG_PCNET32 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_PCNET32=m > > Actual value: > > > > > > ---------- CONFIG_NET_VENDOR_REALTEK ----------------- > > Config: CONFIG_NET_VENDOR_REALTEK > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_VENDOR_REALTEK=y > > Actual value: > > > > > > ---------- CONFIG_8139CP ----------------- > > Config: CONFIG_8139CP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_8139CP=m > > Actual value: > > > > > > ---------- CONFIG_8139TOO ----------------- > > Config: CONFIG_8139TOO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_8139TOO=m > > Actual value: > > > > > > ---------- CONFIG_R8169 ----------------- > > Config: CONFIG_R8169 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_R8169=m > > Actual value: > > > > > > ---------- CONFIG_NET_VENDOR_DLINK ----------------- > > Config: CONFIG_NET_VENDOR_DLINK > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_VENDOR_DLINK=y > > Actual value: > > > > > > ---------- CONFIG_DL2K ----------------- > > Config: CONFIG_DL2K > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_DL2K=m > > Actual value: > > > > > > ---------- CONFIG_NET_VENDOR_MARVELL ----------------- > > Config: CONFIG_NET_VENDOR_MARVELL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_NET_VENDOR_MARVELL=y > > Actual value: > > > > > > ---------- CONFIG_SKGE ----------------- > > Config: CONFIG_SKGE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_SKGE=m > > Actual value: > > > > > > ---------- CONFIG_SKY2 ----------------- > > Config: CONFIG_SKY2 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_SKY2=m > > Actual value: > > > > > > ---------- CONFIG_JME ----------------- > > Config: CONFIG_JME > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > > Requested value: CONFIG_JME=m > > Actual value: > > > > > > ---------- CONFIG_FB_MODE_HELPERS ----------------- > > Config: CONFIG_FB_MODE_HELPERS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > > Requested value: CONFIG_FB_MODE_HELPERS=y > > Actual value: > > > > > > ---------- CONFIG_CONNECTOR ----------------- > > Config: CONFIG_CONNECTOR > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > > Requested value: CONFIG_CONNECTOR=y > > Actual value: > > > > > > ---------- CONFIG_FB_UVESA ----------------- > > Config: CONFIG_FB_UVESA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > > Requested value: CONFIG_FB_UVESA=m > > Actual value: > > > > > > ---------- CONFIG_DRM_CIRRUS_QEMU ----------------- > > Config: CONFIG_DRM_CIRRUS_QEMU > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > > Requested value: CONFIG_DRM_CIRRUS_QEMU=m > > Actual value: > > > > > > ---------- CONFIG_WIRELESS ----------------- > > Config: CONFIG_WIRELESS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_WIRELESS=y > > Actual value: > > > > > > ---------- CONFIG_WLAN ----------------- > > Config: CONFIG_WLAN > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_WLAN=y > > Actual value: > > > > -- > > Config: CONFIG_WLAN_VENDOR_ATH > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_WLAN_VENDOR_ATH=y > > Actual value: > > > > > > ---------- CONFIG_MAC80211 ----------------- > > Config: CONFIG_MAC80211 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_MAC80211=m > > Actual value: > > > > > > ---------- CONFIG_CFG80211 ----------------- > > Config: CONFIG_CFG80211 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_CFG80211=m > > Actual value: > > > > -- > > Config: CONFIG_CFG80211_WEXT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_CFG80211_WEXT=y > > Actual value: > > > > > > ---------- CONFIG_ATH_COMMON ----------------- > > Config: CONFIG_ATH_COMMON > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_ATH_COMMON=m > > Actual value: > > > > > > ---------- CONFIG_WLAN_VENDOR_ATH ----------------- > > Config: CONFIG_WLAN_VENDOR_ATH > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_WLAN_VENDOR_ATH=y > > Actual value: > > > > > > ---------- CONFIG_ATH5K ----------------- > > Config: CONFIG_ATH5K > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_ATH5K=m > > Actual value: > > > > > > ---------- CONFIG_ATH9K ----------------- > > Config: CONFIG_ATH9K > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_ATH9K=m > > Actual value: > > > > > > ---------- CONFIG_WEXT_CORE ----------------- > > Config: CONFIG_WEXT_CORE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_WEXT_CORE=y > > Actual value: > > > > > > ---------- CONFIG_WEXT_PROC ----------------- > > Config: CONFIG_WEXT_PROC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_WEXT_PROC=y > > Actual value: > > > > > > ---------- CONFIG_CFG80211_WEXT ----------------- > > Config: CONFIG_CFG80211_WEXT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_CFG80211_WEXT=y > > Actual value: > > > > > > ---------- CONFIG_BCMA ----------------- > > Config: CONFIG_BCMA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_BCMA=m > > Actual value: # CONFIG_BCMA is not set > > > > Config: CONFIG_BCMA_HOST_PCI_POSSIBLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y > > Actual value: > > > > Config: CONFIG_BCMA_HOST_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_BCMA_HOST_PCI=y > > Actual value: > > > > Config: CONFIG_BCMA_DRIVER_GMAC_CMN > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_BCMA_DRIVER_GMAC_CMN=y > > Actual value: > > > > > > ---------- CONFIG_BCMA_HOST_PCI_POSSIBLE ----------------- > > Config: CONFIG_BCMA_HOST_PCI_POSSIBLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y > > Actual value: > > > > > > ---------- CONFIG_BCMA_HOST_PCI ----------------- > > Config: CONFIG_BCMA_HOST_PCI_POSSIBLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y > > Actual value: > > > > Config: CONFIG_BCMA_HOST_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_BCMA_HOST_PCI=y > > Actual value: > > > > > > ---------- CONFIG_BCMA_DRIVER_GMAC_CMN ----------------- > > Config: CONFIG_BCMA_DRIVER_GMAC_CMN > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_BCMA_DRIVER_GMAC_CMN=y > > Actual value: > > > > > > ---------- CONFIG_CRC8 ----------------- > > Config: CONFIG_CRC8 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_CRC8=m > > Actual value: # CONFIG_CRC8 is not set > > > > > > ---------- CONFIG_CORDIC ----------------- > > Config: CONFIG_CORDIC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > > Requested value: CONFIG_CORDIC=m > > Actual value: # CONFIG_CORDIC is not set > > > > > > ---------- CONFIG_PARTITION_ADVANCED ----------------- > > Config: CONFIG_PARTITION_ADVANCED > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > > Requested value: CONFIG_PARTITION_ADVANCED=y > > Actual value: # CONFIG_PARTITION_ADVANCED is not set > > > > > > ---------- CONFIG_FB_EFI ----------------- > > Config: CONFIG_FB_EFI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > > Requested value: CONFIG_FB_EFI=y > > Actual value: > > > > > > ---------- CONFIG_EFI_VARS ----------------- > > Config: CONFIG_EFI_VARS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > > Requested value: CONFIG_EFI_VARS=m > > Actual value: > > > > > > ---------- CONFIG_EFI ----------------- > > Config: CONFIG_EFI_VARS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > > Requested value: CONFIG_EFI_VARS=m > > Actual value: > > > > Config: CONFIG_EFI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > > Requested value: CONFIG_EFI=y > > Actual value: # CONFIG_EFI is not set > > > > Config: CONFIG_EFI_STUB > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > > Requested value: CONFIG_EFI_STUB=y > > Actual value: > > > > Config: CONFIG_EFIVAR_FS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > > Requested value: CONFIG_EFIVAR_FS=y > > Actual value: > > > > -- > > Config: CONFIG_EFI_EARLYCON > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/debug/printk.cfg > > Requested value: CONFIG_EFI_EARLYCON=y > > Actual value: > > > > > > ---------- CONFIG_EFI_STUB ----------------- > > Config: CONFIG_EFI_STUB > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > > Requested value: CONFIG_EFI_STUB=y > > Actual value: > > > > > > ---------- CONFIG_EFIVAR_FS ----------------- > > Config: CONFIG_EFIVAR_FS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg > > Requested value: CONFIG_EFIVAR_FS=y > > Actual value: > > > > > > ---------- CONFIG_HPET_EMULATE_RTC ----------------- > > Config: CONFIG_HPET_EMULATE_RTC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > > Requested value: CONFIG_HPET_EMULATE_RTC=y > > Actual value: > > > > > > ---------- CONFIG_HPET ----------------- > > Config: CONFIG_HPET_EMULATE_RTC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > > Requested value: CONFIG_HPET_EMULATE_RTC=y > > Actual value: > > > > Config: CONFIG_HPET > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > > Requested value: CONFIG_HPET=y > > Actual value: # CONFIG_HPET is not set > > > > Config: CONFIG_HPET_MMAP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > > Requested value: CONFIG_HPET_MMAP=y > > Actual value: > > > > > > ---------- CONFIG_HPET_MMAP ----------------- > > Config: CONFIG_HPET_MMAP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > > Requested value: CONFIG_HPET_MMAP=y > > Actual value: > > > > > > ---------- CONFIG_X86_MSR ----------------- > > Config: CONFIG_X86_MSR > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > > Requested value: CONFIG_X86_MSR=y > > Actual value: # CONFIG_X86_MSR is not set > > > > > > ---------- CONFIG_X86_CPUID ----------------- > > Config: CONFIG_X86_CPUID > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > > Requested value: CONFIG_X86_CPUID=y > > Actual value: # CONFIG_X86_CPUID is not set > > > > > > ---------- CONFIG_X86_CHECK_BIOS_CORRUPTION ----------------- > > Config: CONFIG_X86_CHECK_BIOS_CORRUPTION > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > > Requested value: CONFIG_X86_CHECK_BIOS_CORRUPTION=y > > Actual value: # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set > > > > > > ---------- CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK ----------------- > > Config: CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > > Requested value: CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y > > Actual value: > > > > > > ---------- CONFIG_SMP ----------------- > > Config: CONFIG_SMP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg > > Requested value: CONFIG_SMP=y > > Actual value: # CONFIG_SMP is not set > > > > > > ---------- CONFIG_SCHED_SMT ----------------- > > Config: CONFIG_SCHED_SMT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg > > Requested value: CONFIG_SCHED_SMT=y > > Actual value: > > > > > > ---------- CONFIG_NR_CPUS ----------------- > > Config: CONFIG_NR_CPUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg > > Requested value: CONFIG_NR_CPUS=64 > > Actual value: CONFIG_NR_CPUS=1 > > > > > > ---------- CONFIG_IA32_EMULATION ----------------- > > Config: CONFIG_IA32_EMULATION > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > > Requested value: CONFIG_IA32_EMULATION=y > > Actual value: # CONFIG_IA32_EMULATION is not set > > > > > > ---------- CONFIG_COMPAT ----------------- > > Config: CONFIG_COMPAT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > > Requested value: CONFIG_COMPAT=y > > Actual value: > > > > > > ---------- CONFIG_UNWINDER_ORC ----------------- > > Config: CONFIG_UNWINDER_ORC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > > Requested value: # CONFIG_UNWINDER_ORC is not set > > Actual value: CONFIG_UNWINDER_ORC=y > > > > > > ---------- CONFIG_UNWINDER_FRAME_POINTER ----------------- > > Config: CONFIG_UNWINDER_FRAME_POINTER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > > Requested value: CONFIG_UNWINDER_FRAME_POINTER=y > > Actual value: # CONFIG_UNWINDER_FRAME_POINTER is not set > > > > > > ---------- CONFIG_X86_AMD_PLATFORM_DEVICE ----------------- > > Config: CONFIG_X86_AMD_PLATFORM_DEVICE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg > > Requested value: CONFIG_X86_AMD_PLATFORM_DEVICE=y > > Actual value: # CONFIG_X86_AMD_PLATFORM_DEVICE is not set > > > > > > ---------- CONFIG_MICROCODE_AMD ----------------- > > Config: CONFIG_MICROCODE_AMD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg > > Requested value: CONFIG_MICROCODE_AMD=y > > Actual value: # CONFIG_MICROCODE_AMD is not set > > > > > > ---------- CONFIG_X86_MCE_AMD ----------------- > > Config: CONFIG_X86_MCE_AMD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg > > Requested value: CONFIG_X86_MCE_AMD=y > > Actual value: > > > > > > ---------- CONFIG_PCI ----------------- > > Config: CONFIG_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > > Requested value: CONFIG_PCI=y > > Actual value: # CONFIG_PCI is not set > > > > Config: CONFIG_PCI_MMCONFIG > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > > Requested value: CONFIG_PCI_MMCONFIG=y > > Actual value: > > > > Config: CONFIG_PCI_MSI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > > Requested value: CONFIG_PCI_MSI=y > > Actual value: > > > > Config: CONFIG_PCIEPORTBUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > > Requested value: CONFIG_PCIEPORTBUS=y > > Actual value: > > > > -- > > Config: CONFIG_PCI_IOV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg > > Requested value: CONFIG_PCI_IOV=y > > Actual value: > > > > > > ---------- CONFIG_PCI_MMCONFIG ----------------- > > Config: CONFIG_PCI_MMCONFIG > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > > Requested value: CONFIG_PCI_MMCONFIG=y > > Actual value: > > > > > > ---------- CONFIG_PCI_MSI ----------------- > > Config: CONFIG_PCI_MSI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > > Requested value: CONFIG_PCI_MSI=y > > Actual value: > > > > > > ---------- CONFIG_PCIEPORTBUS ----------------- > > Config: CONFIG_PCIEPORTBUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > > Requested value: CONFIG_PCIEPORTBUS=y > > Actual value: > > > > > > ---------- CONFIG_HOTPLUG_PCI ----------------- > > Config: CONFIG_HOTPLUG_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > > Requested value: CONFIG_HOTPLUG_PCI=y > > Actual value: > > > > > > ---------- CONFIG_PCI_IOV ----------------- > > Config: CONFIG_PCI_IOV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg > > Requested value: CONFIG_PCI_IOV=y > > Actual value: > > > > > > ---------- CONFIG_MMC ----------------- > > Config: CONFIG_MMC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-base.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC=y > > Actual value: # CONFIG_MMC is not set > > > > Config: CONFIG_MMC_SDHCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI=y > > Actual value: > > > > Config: CONFIG_MMC_SDHCI_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_PCI=y > > Actual value: > > > > Config: CONFIG_MMC_SDHCI_ACPI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_ACPI=y > > Actual value: > > > > Config: CONFIG_MMC_SDHCI_PLTFM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_PLTFM=y > > Actual value: > > > > Config: CONFIG_MMC_RICOH_MMC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_RICOH_MMC=y > > Actual value: > > > > > > ---------- CONFIG_MMC_SDHCI ----------------- > > Config: CONFIG_MMC_SDHCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI=y > > Actual value: > > > > Config: CONFIG_MMC_SDHCI_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_PCI=y > > Actual value: > > > > Config: CONFIG_MMC_SDHCI_ACPI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_ACPI=y > > Actual value: > > > > Config: CONFIG_MMC_SDHCI_PLTFM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_PLTFM=y > > Actual value: > > > > > > ---------- CONFIG_MMC_SDHCI_PCI ----------------- > > Config: CONFIG_MMC_SDHCI_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_PCI=y > > Actual value: > > > > > > ---------- CONFIG_MMC_SDHCI_ACPI ----------------- > > Config: CONFIG_MMC_SDHCI_ACPI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_ACPI=y > > Actual value: > > > > > > ---------- CONFIG_MMC_SDHCI_PLTFM ----------------- > > Config: CONFIG_MMC_SDHCI_PLTFM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_SDHCI_PLTFM=y > > Actual value: > > > > > > ---------- CONFIG_MMC_RICOH_MMC ----------------- > > Config: CONFIG_MMC_RICOH_MMC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > > Requested value: CONFIG_MMC_RICOH_MMC=y > > Actual value: > > > > > > ---------- CONFIG_USB_EHCI_HCD ----------------- > > Config: CONFIG_USB_EHCI_HCD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg > > Requested value: CONFIG_USB_EHCI_HCD=y > > Actual value: > > > > > > ---------- CONFIG_USB_EHCI_ROOT_HUB_TT ----------------- > > Config: CONFIG_USB_EHCI_ROOT_HUB_TT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg > > Requested value: CONFIG_USB_EHCI_ROOT_HUB_TT=y > > Actual value: > > > > > > ---------- CONFIG_USB_OHCI_HCD ----------------- > > Config: CONFIG_USB_OHCI_HCD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ohci-hcd.cfg > > Requested value: CONFIG_USB_OHCI_HCD=y > > Actual value: > > > > > > ---------- CONFIG_USB_XHCI_HCD ----------------- > > Config: CONFIG_USB_XHCI_HCD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/xhci-hcd.cfg > > Requested value: CONFIG_USB_XHCI_HCD=y > > Actual value: > > > > > > ---------- CONFIG_INPUT_TOUCHSCREEN ----------------- > > Config: CONFIG_INPUT_TOUCHSCREEN > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/input/touchscreen.cfg > > Requested value: CONFIG_INPUT_TOUCHSCREEN=y > > Actual value: # CONFIG_INPUT_TOUCHSCREEN is not set > > > > > > ---------- CONFIG_TOUCHSCREEN_USB_COMPOSITE ----------------- > > Config: CONFIG_TOUCHSCREEN_USB_COMPOSITE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/touchscreen-composite.cfg > > Requested value: CONFIG_TOUCHSCREEN_USB_COMPOSITE=m > > Actual value: > > > > > > ---------- CONFIG_USB_USBNET ----------------- > > Config: CONFIG_USB_USBNET > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_USBNET=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_DRIVERS ----------------- > > Config: CONFIG_USB_NET_DRIVERS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_DRIVERS=m > > Actual value: > > > > > > ---------- CONFIG_USB_KAWETH ----------------- > > Config: CONFIG_USB_KAWETH > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_KAWETH=m > > Actual value: > > > > > > ---------- CONFIG_USB_PEGASUS ----------------- > > Config: CONFIG_USB_PEGASUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_PEGASUS=m > > Actual value: > > > > > > ---------- CONFIG_USB_RTL8150 ----------------- > > Config: CONFIG_USB_RTL8150 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_RTL8150=m > > Actual value: > > > > > > ---------- CONFIG_USB_RTL8152 ----------------- > > Config: CONFIG_USB_RTL8152 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_RTL8152=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_AX8817X ----------------- > > Config: CONFIG_USB_NET_AX8817X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_AX8817X=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_AX88179_178A ----------------- > > Config: CONFIG_USB_NET_AX88179_178A > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_AX88179_178A=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_CDCETHER ----------------- > > Config: CONFIG_USB_NET_CDCETHER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_CDCETHER=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_CDC_EEM ----------------- > > Config: CONFIG_USB_NET_CDC_EEM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_CDC_EEM=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_CDC_NCM ----------------- > > Config: CONFIG_USB_NET_CDC_NCM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_CDC_NCM=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_DM9601 ----------------- > > Config: CONFIG_USB_NET_DM9601 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_DM9601=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_SMSC75XX ----------------- > > Config: CONFIG_USB_NET_SMSC75XX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_SMSC75XX=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_SMSC95XX ----------------- > > Config: CONFIG_USB_NET_SMSC95XX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_SMSC95XX=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_MCS7830 ----------------- > > Config: CONFIG_USB_NET_MCS7830 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_MCS7830=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_RNDIS_HOST ----------------- > > Config: CONFIG_USB_NET_RNDIS_HOST > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_RNDIS_HOST=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_CDC_SUBSET_ENABLE ----------------- > > Config: CONFIG_USB_NET_CDC_SUBSET_ENABLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_CDC_SUBSET_ENABLE=m > > Actual value: > > > > > > ---------- CONFIG_USB_NET_CDC_SUBSET ----------------- > > Config: CONFIG_USB_NET_CDC_SUBSET_ENABLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_CDC_SUBSET_ENABLE=m > > Actual value: > > > > Config: CONFIG_USB_NET_CDC_SUBSET > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_NET_CDC_SUBSET=m > > Actual value: > > > > > > ---------- CONFIG_USB_ALI_M5632 ----------------- > > Config: CONFIG_USB_ALI_M5632 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_ALI_M5632=y > > Actual value: > > > > > > ---------- CONFIG_USB_AN2720 ----------------- > > Config: CONFIG_USB_AN2720 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_AN2720=y > > Actual value: > > > > > > ---------- CONFIG_USB_BELKIN ----------------- > > Config: CONFIG_USB_BELKIN > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_BELKIN=y > > Actual value: > > > > > > ---------- CONFIG_USB_ARMLINUX ----------------- > > Config: CONFIG_USB_ARMLINUX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_ARMLINUX=y > > Actual value: > > > > > > ---------- CONFIG_USB_KC2190 ----------------- > > Config: CONFIG_USB_KC2190 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > > Requested value: CONFIG_USB_KC2190=y > > Actual value: > > > > > > ---------- CONFIG_E100 ----------------- > > Config: CONFIG_E100 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e100.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > > Requested value: CONFIG_E100=y > > Actual value: > > > > Config: CONFIG_E1000E > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > > Requested value: CONFIG_E1000E=y > > Actual value: > > > > Config: CONFIG_E1000 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > > Requested value: CONFIG_E1000=y > > Actual value: > > > > > > ---------- CONFIG_E1000E ----------------- > > Config: CONFIG_E1000E > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > > Requested value: CONFIG_E1000E=y > > Actual value: > > > > > > ---------- CONFIG_E1000 ----------------- > > Config: CONFIG_E1000E > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > > Requested value: CONFIG_E1000E=y > > Actual value: > > > > Config: CONFIG_E1000 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > > Requested value: CONFIG_E1000=y > > Actual value: > > > > > > ---------- CONFIG_IGB ----------------- > > Config: CONFIG_IGB > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg > > Requested value: CONFIG_IGB=y > > Actual value: > > > > Config: CONFIG_IGBVF > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg > > Requested value: CONFIG_IGBVF=m > > Actual value: > > > > > > ---------- CONFIG_IGBVF ----------------- > > Config: CONFIG_IGBVF > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg > > Requested value: CONFIG_IGBVF=m > > Actual value: > > > > > > ---------- CONFIG_IRQ_REMAP ----------------- > > Config: CONFIG_IRQ_REMAP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg > > Requested value: CONFIG_IRQ_REMAP=y > > Actual value: > > > > > > ---------- CONFIG_X86_X2APIC ----------------- > > Config: CONFIG_X86_X2APIC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg > > Requested value: CONFIG_X86_X2APIC=y > > Actual value: > > > > > > ---------- CONFIG_ISDN ----------------- > > Config: CONFIG_ISDN > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_ISDN=y > > Actual value: > > > > Config: CONFIG_ISDN_CAPI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_ISDN_CAPI=m > > Actual value: > > > > > > ---------- CONFIG_ISDN_CAPI ----------------- > > Config: CONFIG_ISDN_CAPI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_ISDN_CAPI=m > > Actual value: > > > > > > ---------- CONFIG_BT_6LOWPAN ----------------- > > Config: CONFIG_BT_6LOWPAN > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_6LOWPAN=m > > Actual value: > > > > > > ---------- CONFIG_BT_RFCOMM ----------------- > > Config: CONFIG_BT_RFCOMM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_RFCOMM=m > > Actual value: > > > > Config: CONFIG_BT_RFCOMM_TTY > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_RFCOMM_TTY=y > > Actual value: > > > > > > ---------- CONFIG_BT_RFCOMM_TTY ----------------- > > Config: CONFIG_BT_RFCOMM_TTY > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_RFCOMM_TTY=y > > Actual value: > > > > > > ---------- CONFIG_BT_BNEP ----------------- > > Config: CONFIG_BT_BNEP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_BNEP=m > > Actual value: > > > > Config: CONFIG_BT_BNEP_MC_FILTER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_BNEP_MC_FILTER=y > > Actual value: > > > > Config: CONFIG_BT_BNEP_PROTO_FILTER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_BNEP_PROTO_FILTER=y > > Actual value: > > > > > > ---------- CONFIG_BT_BNEP_MC_FILTER ----------------- > > Config: CONFIG_BT_BNEP_MC_FILTER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_BNEP_MC_FILTER=y > > Actual value: > > > > > > ---------- CONFIG_BT_BNEP_PROTO_FILTER ----------------- > > Config: CONFIG_BT_BNEP_PROTO_FILTER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_BNEP_PROTO_FILTER=y > > Actual value: > > > > > > ---------- CONFIG_BT_CMTP ----------------- > > Config: CONFIG_BT_CMTP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_CMTP=m > > Actual value: > > > > > > ---------- CONFIG_BT_HIDP ----------------- > > Config: CONFIG_BT_HIDP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_HIDP=m > > Actual value: > > > > > > ---------- CONFIG_BT_LE ----------------- > > Config: CONFIG_BT_LE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_LE=y > > Actual value: > > > > > > ---------- CONFIG_BT_BREDR ----------------- > > Config: CONFIG_BT_BREDR > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > > Requested value: CONFIG_BT_BREDR=y > > Actual value: > > > > > > ---------- CONFIG_6LOWPAN ----------------- > > Config: CONFIG_6LOWPAN > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/6lowpan/6lowpan.cfg > > Requested value: CONFIG_6LOWPAN=m > > Actual value: > > > > > > ---------- CONFIG_SERIAL_8250 ----------------- > > Config: CONFIG_SERIAL_8250_PNP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_SERIAL_8250_PNP=y > > Actual value: > > > > -- > > Config: CONFIG_SERIAL_8250 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250=y > > Actual value: # CONFIG_SERIAL_8250 is not set > > > > Config: CONFIG_SERIAL_8250_CONSOLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250_CONSOLE=y > > Actual value: > > > > Config: CONFIG_SERIAL_8250_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250_PCI=y > > Actual value: > > > > Config: CONFIG_SERIAL_8250_NR_UARTS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250_NR_UARTS=4 > > Actual value: > > > > Config: CONFIG_SERIAL_8250_RUNTIME_UARTS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250_RUNTIME_UARTS=4 > > Actual value: > > > > > > ---------- CONFIG_SERIAL_8250_CONSOLE ----------------- > > Config: CONFIG_SERIAL_8250_CONSOLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250_CONSOLE=y > > Actual value: > > > > > > ---------- CONFIG_SERIAL_8250_PCI ----------------- > > Config: CONFIG_SERIAL_8250_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250_PCI=y > > Actual value: > > > > > > ---------- CONFIG_SERIAL_8250_NR_UARTS ----------------- > > Config: CONFIG_SERIAL_8250_NR_UARTS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250_NR_UARTS=4 > > Actual value: > > > > > > ---------- CONFIG_SERIAL_8250_RUNTIME_UARTS ----------------- > > Config: CONFIG_SERIAL_8250_RUNTIME_UARTS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_8250_RUNTIME_UARTS=4 > > Actual value: > > > > > > ---------- CONFIG_SERIAL_CORE ----------------- > > Config: CONFIG_SERIAL_CORE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_CORE=y > > Actual value: > > > > Config: CONFIG_SERIAL_CORE_CONSOLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_CORE_CONSOLE=y > > Actual value: > > > > > > ---------- CONFIG_SERIAL_CORE_CONSOLE ----------------- > > Config: CONFIG_SERIAL_CORE_CONSOLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg > > Requested value: CONFIG_SERIAL_CORE_CONSOLE=y > > Actual value: > > > > > > ---------- CONFIG_AGP ----------------- > > Config: CONFIG_AGP > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > > Requested value: CONFIG_AGP=y > > Actual value: > > > > Config: CONFIG_AGP_INTEL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > > Requested value: CONFIG_AGP_INTEL=y > > Actual value: > > > > > > ---------- CONFIG_AGP_INTEL ----------------- > > Config: CONFIG_AGP_INTEL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > > Requested value: CONFIG_AGP_INTEL=y > > Actual value: > > > > > > ---------- CONFIG_DRM_I915 ----------------- > > Config: CONFIG_DRM_I915 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > > Requested value: CONFIG_DRM_I915=m > > Actual value: > > > > Config: CONFIG_DRM_I915_ALPHA_SUPPORT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > > Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y > > Actual value: > > > > > > ---------- CONFIG_DRM_I915_ALPHA_SUPPORT ----------------- > > Config: CONFIG_DRM_I915_ALPHA_SUPPORT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > > Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y > > Actual value: > > > > > > ---------- CONFIG_BLK_DEV_SD ----------------- > > Config: CONFIG_BLK_DEV_SD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/disk.cfg > > Requested value: CONFIG_BLK_DEV_SD=y > > Actual value: > > > > > > ---------- CONFIG_USB_VIDEO_CLASS ----------------- > > Config: CONFIG_USB_VIDEO_CLASS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_VIDEO_CLASS=m > > Actual value: > > > > Config: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y > > Actual value: > > > > > > ---------- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV ----------------- > > Config: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA ----------------- > > Config: CONFIG_USB_GSPCA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA=m > > Actual value: > > > > -- > > Config: CONFIG_USB_GSPCA_BENQ > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_BENQ=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_CONEX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_CONEX=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_CPIA1 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_CPIA1=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_ETOMS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_ETOMS=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_FINEPIX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_FINEPIX=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_JEILINJ > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_JEILINJ=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_JL2005BCD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_JL2005BCD=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_KINECT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_KINECT=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_KONICA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_KONICA=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_MARS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_MARS=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_MR97310A > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_MR97310A=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_NW80X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_NW80X=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_OV519 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_OV519=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_OV534 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_OV534=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_OV534_9 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_OV534_9=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_PAC207 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_PAC207=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_PAC7302 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_PAC7302=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_PAC7311 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_PAC7311=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SE401 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SE401=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SN9C2028 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SN9C2028=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SN9C20X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SN9C20X=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SONIXB > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SONIXB=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SONIXJ > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SONIXJ=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SPCA500 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA500=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SPCA501 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA501=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SPCA505 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA505=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SPCA506 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA506=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SPCA508 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA508=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SPCA561 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA561=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SPCA1528 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA1528=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SQ905 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SQ905=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SQ905C > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SQ905C=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SQ930X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SQ930X=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_STK014 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_STK014=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_STV0680 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_STV0680=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SUNPLUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SUNPLUS=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_T613 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_T613=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_TOPRO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_TOPRO=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_TV8532 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_TV8532=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_VC032X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_VC032X=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_VICAM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_VICAM=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_XIRLINK_CIT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_XIRLINK_CIT=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_ZC3XX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_ZC3XX=m > > Actual value: > > > > > > ---------- CONFIG_USB_M5602 ----------------- > > Config: CONFIG_USB_M5602 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_M5602=m > > Actual value: > > > > > > ---------- CONFIG_USB_STV06XX ----------------- > > Config: CONFIG_USB_STV06XX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_STV06XX=m > > Actual value: > > > > > > ---------- CONFIG_USB_GL860 ----------------- > > Config: CONFIG_USB_GL860 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GL860=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_BENQ ----------------- > > Config: CONFIG_USB_GSPCA_BENQ > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_BENQ=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_CONEX ----------------- > > Config: CONFIG_USB_GSPCA_CONEX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_CONEX=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_CPIA1 ----------------- > > Config: CONFIG_USB_GSPCA_CPIA1 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_CPIA1=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_ETOMS ----------------- > > Config: CONFIG_USB_GSPCA_ETOMS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_ETOMS=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_FINEPIX ----------------- > > Config: CONFIG_USB_GSPCA_FINEPIX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_FINEPIX=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_JEILINJ ----------------- > > Config: CONFIG_USB_GSPCA_JEILINJ > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_JEILINJ=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_JL2005BCD ----------------- > > Config: CONFIG_USB_GSPCA_JL2005BCD > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_JL2005BCD=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_KINECT ----------------- > > Config: CONFIG_USB_GSPCA_KINECT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_KINECT=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_KONICA ----------------- > > Config: CONFIG_USB_GSPCA_KONICA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_KONICA=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_MARS ----------------- > > Config: CONFIG_USB_GSPCA_MARS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_MARS=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_MR97310A ----------------- > > Config: CONFIG_USB_GSPCA_MR97310A > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_MR97310A=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_NW80X ----------------- > > Config: CONFIG_USB_GSPCA_NW80X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_NW80X=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_OV519 ----------------- > > Config: CONFIG_USB_GSPCA_OV519 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_OV519=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_OV534 ----------------- > > Config: CONFIG_USB_GSPCA_OV534 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_OV534=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_OV534_9 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_OV534_9=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_OV534_9 ----------------- > > Config: CONFIG_USB_GSPCA_OV534_9 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_OV534_9=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_PAC207 ----------------- > > Config: CONFIG_USB_GSPCA_PAC207 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_PAC207=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_PAC7302 ----------------- > > Config: CONFIG_USB_GSPCA_PAC7302 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_PAC7302=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_PAC7311 ----------------- > > Config: CONFIG_USB_GSPCA_PAC7311 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_PAC7311=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SE401 ----------------- > > Config: CONFIG_USB_GSPCA_SE401 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SE401=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SN9C2028 ----------------- > > Config: CONFIG_USB_GSPCA_SN9C2028 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SN9C2028=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SN9C20X ----------------- > > Config: CONFIG_USB_GSPCA_SN9C20X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SN9C20X=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SONIXB ----------------- > > Config: CONFIG_USB_GSPCA_SONIXB > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SONIXB=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SONIXJ ----------------- > > Config: CONFIG_USB_GSPCA_SONIXJ > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SONIXJ=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SPCA500 ----------------- > > Config: CONFIG_USB_GSPCA_SPCA500 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA500=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SPCA501 ----------------- > > Config: CONFIG_USB_GSPCA_SPCA501 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA501=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SPCA505 ----------------- > > Config: CONFIG_USB_GSPCA_SPCA505 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA505=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SPCA506 ----------------- > > Config: CONFIG_USB_GSPCA_SPCA506 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA506=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SPCA508 ----------------- > > Config: CONFIG_USB_GSPCA_SPCA508 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA508=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SPCA561 ----------------- > > Config: CONFIG_USB_GSPCA_SPCA561 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA561=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SPCA1528 ----------------- > > Config: CONFIG_USB_GSPCA_SPCA1528 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SPCA1528=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SQ905 ----------------- > > Config: CONFIG_USB_GSPCA_SQ905 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SQ905=m > > Actual value: > > > > Config: CONFIG_USB_GSPCA_SQ905C > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SQ905C=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SQ905C ----------------- > > Config: CONFIG_USB_GSPCA_SQ905C > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SQ905C=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SQ930X ----------------- > > Config: CONFIG_USB_GSPCA_SQ930X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SQ930X=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_STK014 ----------------- > > Config: CONFIG_USB_GSPCA_STK014 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_STK014=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_STV0680 ----------------- > > Config: CONFIG_USB_GSPCA_STV0680 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_STV0680=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_SUNPLUS ----------------- > > Config: CONFIG_USB_GSPCA_SUNPLUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_SUNPLUS=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_T613 ----------------- > > Config: CONFIG_USB_GSPCA_T613 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_T613=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_TOPRO ----------------- > > Config: CONFIG_USB_GSPCA_TOPRO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_TOPRO=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_TV8532 ----------------- > > Config: CONFIG_USB_GSPCA_TV8532 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_TV8532=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_VC032X ----------------- > > Config: CONFIG_USB_GSPCA_VC032X > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_VC032X=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_VICAM ----------------- > > Config: CONFIG_USB_GSPCA_VICAM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_VICAM=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_XIRLINK_CIT ----------------- > > Config: CONFIG_USB_GSPCA_XIRLINK_CIT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_XIRLINK_CIT=m > > Actual value: > > > > > > ---------- CONFIG_USB_GSPCA_ZC3XX ----------------- > > Config: CONFIG_USB_GSPCA_ZC3XX > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_GSPCA_ZC3XX=m > > Actual value: > > > > > > ---------- CONFIG_USB_PWC ----------------- > > Config: CONFIG_USB_PWC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_PWC=m > > Actual value: > > > > Config: CONFIG_USB_PWC_INPUT_EVDEV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_PWC_INPUT_EVDEV=y > > Actual value: > > > > > > ---------- CONFIG_USB_PWC_INPUT_EVDEV ----------------- > > Config: CONFIG_USB_PWC_INPUT_EVDEV > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_PWC_INPUT_EVDEV=y > > Actual value: > > > > > > ---------- CONFIG_VIDEO_CPIA2 ----------------- > > Config: CONFIG_VIDEO_CPIA2 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_VIDEO_CPIA2=m > > Actual value: > > > > > > ---------- CONFIG_USB_STKWEBCAM ----------------- > > Config: CONFIG_USB_STKWEBCAM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_STKWEBCAM=m > > Actual value: > > > > > > ---------- CONFIG_USB_S2255 ----------------- > > Config: CONFIG_USB_S2255 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > > Requested value: CONFIG_USB_S2255=m > > Actual value: > > > > > > ---------- CONFIG_SND_PCI ----------------- > > Config: CONFIG_SND_PCI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_PCI=y > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_INTEL ----------------- > > Config: CONFIG_SND_HDA_INTEL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_INTEL=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_GENERIC ----------------- > > Config: CONFIG_SND_HDA_GENERIC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_GENERIC=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_HDMI ----------------- > > Config: CONFIG_SND_HDA_CODEC_HDMI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_HDMI=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_ANALOG ----------------- > > Config: CONFIG_SND_HDA_CODEC_ANALOG > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_ANALOG=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_REALTEK ----------------- > > Config: CONFIG_SND_HDA_CODEC_REALTEK > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_REALTEK=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_SIGMATEL ----------------- > > Config: CONFIG_SND_HDA_CODEC_SIGMATEL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_SIGMATEL=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_CIRRUS ----------------- > > Config: CONFIG_SND_HDA_CODEC_CIRRUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_CIRRUS=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_CONEXANT ----------------- > > Config: CONFIG_SND_HDA_CODEC_CONEXANT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_CONEXANT=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_CA0110 ----------------- > > Config: CONFIG_SND_HDA_CODEC_CA0110 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_CA0110=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_CA0132 ----------------- > > Config: CONFIG_SND_HDA_CODEC_CA0132 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_CA0132=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_CMEDIA ----------------- > > Config: CONFIG_SND_HDA_CODEC_CMEDIA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_CMEDIA=m > > Actual value: > > > > > > ---------- CONFIG_SND_HDA_CODEC_SI3054 ----------------- > > Config: CONFIG_SND_HDA_CODEC_SI3054 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > > Requested value: CONFIG_SND_HDA_CODEC_SI3054=m > > Actual value: > > > > > > ---------- CONFIG_DMA_SHARED_BUFFER ----------------- > > Config: CONFIG_DMA_SHARED_BUFFER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DMA_SHARED_BUFFER=y > > Actual value: > > > > > > ---------- CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS ----------------- > > Config: CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y > > Actual value: > > > > > > ---------- CONFIG_MOUSE_PS2_SMBUS ----------------- > > Config: CONFIG_MOUSE_PS2_SMBUS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_MOUSE_PS2_SMBUS=y > > Actual value: > > > > > > ---------- CONFIG_VT_HW_CONSOLE_BINDING ----------------- > > Config: CONFIG_VT_HW_CONSOLE_BINDING > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_VT_HW_CONSOLE_BINDING=y > > Actual value: # CONFIG_VT_HW_CONSOLE_BINDING is not set > > > > > > ---------- CONFIG_I2C ----------------- > > Config: CONFIG_I2C_I801 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > > Requested value: CONFIG_I2C_I801=y > > Actual value: > > > > -- > > Config: CONFIG_I2C > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C=y > > Actual value: # CONFIG_I2C is not set > > > > Config: CONFIG_I2C_BOARDINFO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C_BOARDINFO=y > > Actual value: > > > > Config: CONFIG_I2C_COMPAT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C_COMPAT=y > > Actual value: > > > > Config: CONFIG_I2C_HELPER_AUTO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C_HELPER_AUTO=y > > Actual value: > > > > Config: CONFIG_I2C_ALGOBIT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C_ALGOBIT=y > > Actual value: > > > > > > ---------- CONFIG_I2C_BOARDINFO ----------------- > > Config: CONFIG_I2C_BOARDINFO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C_BOARDINFO=y > > Actual value: > > > > > > ---------- CONFIG_I2C_COMPAT ----------------- > > Config: CONFIG_I2C_COMPAT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C_COMPAT=y > > Actual value: > > > > > > ---------- CONFIG_I2C_HELPER_AUTO ----------------- > > Config: CONFIG_I2C_HELPER_AUTO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C_HELPER_AUTO=y > > Actual value: > > > > > > ---------- CONFIG_I2C_ALGOBIT ----------------- > > Config: CONFIG_I2C_ALGOBIT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_I2C_ALGOBIT=y > > Actual value: > > > > > > ---------- CONFIG_DRM ----------------- > > Config: CONFIG_DRM_CIRRUS_QEMU > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > > Requested value: CONFIG_DRM_CIRRUS_QEMU=m > > Actual value: > > > > -- > > Config: CONFIG_DRM_I915 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > > Requested value: CONFIG_DRM_I915=m > > Actual value: > > > > Config: CONFIG_DRM_I915_ALPHA_SUPPORT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > > Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y > > Actual value: > > > > -- > > Config: CONFIG_DRM_VIRTIO_GPU > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg > > Requested value: CONFIG_DRM_VIRTIO_GPU=y > > Actual value: > > > > -- > > Config: CONFIG_DRM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM=y > > Actual value: # CONFIG_DRM is not set > > > > Config: CONFIG_DRM_KMS_HELPER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_KMS_HELPER=y > > Actual value: > > > > Config: CONFIG_DRM_KMS_FB_HELPER > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_KMS_FB_HELPER=y > > Actual value: > > > > Config: CONFIG_DRM_FBDEV_EMULATION > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_FBDEV_EMULATION=y > > Actual value: > > > > Config: CONFIG_DRM_FBDEV_OVERALLOC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_FBDEV_OVERALLOC=100 > > Actual value: > > > > Config: CONFIG_DRM_TTM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_TTM=y > > Actual value: > > > > Config: CONFIG_DRM_BOCHS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_BOCHS=y > > Actual value: > > > > Config: CONFIG_DRM_PANEL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_PANEL=y > > Actual value: > > > > Config: CONFIG_DRM_BRIDGE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_BRIDGE=y > > Actual value: > > > > Config: CONFIG_DRM_PANEL_BRIDGE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_PANEL_BRIDGE=y > > Actual value: > > > > Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y > > Actual value: > > > > > > ---------- CONFIG_DRM_FBDEV_EMULATION ----------------- > > Config: CONFIG_DRM_FBDEV_EMULATION > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_FBDEV_EMULATION=y > > Actual value: > > > > > > ---------- CONFIG_DRM_FBDEV_OVERALLOC ----------------- > > Config: CONFIG_DRM_FBDEV_OVERALLOC > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_FBDEV_OVERALLOC=100 > > Actual value: > > > > > > ---------- CONFIG_DRM_TTM ----------------- > > Config: CONFIG_DRM_TTM > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_TTM=y > > Actual value: > > > > > > ---------- CONFIG_DRM_BOCHS ----------------- > > Config: CONFIG_DRM_BOCHS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_BOCHS=y > > Actual value: > > > > > > ---------- CONFIG_DRM_PANEL ----------------- > > Config: CONFIG_DRM_PANEL > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_PANEL=y > > Actual value: > > > > -- > > Config: CONFIG_DRM_PANEL_BRIDGE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_PANEL_BRIDGE=y > > Actual value: > > > > Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y > > Actual value: > > > > > > ---------- CONFIG_DRM_BRIDGE ----------------- > > Config: CONFIG_DRM_BRIDGE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_BRIDGE=y > > Actual value: > > > > > > ---------- CONFIG_DRM_PANEL_BRIDGE ----------------- > > Config: CONFIG_DRM_PANEL_BRIDGE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_PANEL_BRIDGE=y > > Actual value: > > > > > > ---------- CONFIG_DRM_PANEL_ORIENTATION_QUIRKS ----------------- > > Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y > > Actual value: > > > > > > ---------- CONFIG_FB_CMDLINE ----------------- > > Config: CONFIG_FB_CMDLINE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_CMDLINE=y > > Actual value: > > > > > > ---------- CONFIG_FB_NOTIFY ----------------- > > Config: CONFIG_FB_NOTIFY > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_NOTIFY=y > > Actual value: > > > > > > ---------- CONFIG_FB ----------------- > > Config: CONFIG_FB_MODE_HELPERS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > > Requested value: CONFIG_FB_MODE_HELPERS=y > > Actual value: > > > > -- > > Config: CONFIG_FB_UVESA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > > Requested value: CONFIG_FB_UVESA=m > > Actual value: > > > > -- > > Config: CONFIG_FB_EFI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > > Requested value: CONFIG_FB_EFI=y > > Actual value: > > > > -- > > Config: CONFIG_FB_CMDLINE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_CMDLINE=y > > Actual value: > > > > Config: CONFIG_FB_NOTIFY > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_NOTIFY=y > > Actual value: > > > > Config: CONFIG_FB > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB=y > > Actual value: # CONFIG_FB is not set > > > > Config: CONFIG_FB_CFB_FILLRECT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_CFB_FILLRECT=y > > Actual value: > > > > Config: CONFIG_FB_CFB_COPYAREA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_CFB_COPYAREA=y > > Actual value: > > > > Config: CONFIG_FB_CFB_IMAGEBLIT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_CFB_IMAGEBLIT=y > > Actual value: > > > > Config: CONFIG_FB_SYS_FILLRECT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SYS_FILLRECT=y > > Actual value: > > > > Config: CONFIG_FB_SYS_COPYAREA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SYS_COPYAREA=y > > Actual value: > > > > Config: CONFIG_FB_SYS_IMAGEBLIT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SYS_IMAGEBLIT=y > > Actual value: > > > > Config: CONFIG_FB_SYS_FOPS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SYS_FOPS=y > > Actual value: > > > > Config: CONFIG_FB_DEFERRED_IO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_DEFERRED_IO=y > > Actual value: > > > > Config: CONFIG_FB_SIMPLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SIMPLE=y > > Actual value: > > > > > > ---------- CONFIG_FB_CFB_FILLRECT ----------------- > > Config: CONFIG_FB_CFB_FILLRECT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_CFB_FILLRECT=y > > Actual value: > > > > > > ---------- CONFIG_FB_CFB_COPYAREA ----------------- > > Config: CONFIG_FB_CFB_COPYAREA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_CFB_COPYAREA=y > > Actual value: > > > > > > ---------- CONFIG_FB_CFB_IMAGEBLIT ----------------- > > Config: CONFIG_FB_CFB_IMAGEBLIT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_CFB_IMAGEBLIT=y > > Actual value: > > > > > > ---------- CONFIG_FB_SYS_FILLRECT ----------------- > > Config: CONFIG_FB_SYS_FILLRECT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SYS_FILLRECT=y > > Actual value: > > > > > > ---------- CONFIG_FB_SYS_COPYAREA ----------------- > > Config: CONFIG_FB_SYS_COPYAREA > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SYS_COPYAREA=y > > Actual value: > > > > > > ---------- CONFIG_FB_SYS_IMAGEBLIT ----------------- > > Config: CONFIG_FB_SYS_IMAGEBLIT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SYS_IMAGEBLIT=y > > Actual value: > > > > > > ---------- CONFIG_FB_SYS_FOPS ----------------- > > Config: CONFIG_FB_SYS_FOPS > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SYS_FOPS=y > > Actual value: > > > > > > ---------- CONFIG_FB_DEFERRED_IO ----------------- > > Config: CONFIG_FB_DEFERRED_IO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_DEFERRED_IO=y > > Actual value: > > > > > > ---------- CONFIG_FB_SIMPLE ----------------- > > Config: CONFIG_FB_SIMPLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FB_SIMPLE=y > > Actual value: > > > > > > ---------- CONFIG_HDMI ----------------- > > Config: CONFIG_HDMI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_HDMI=y > > Actual value: > > > > > > ---------- CONFIG_FRAMEBUFFER_CONSOLE ----------------- > > Config: CONFIG_FRAMEBUFFER_CONSOLE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FRAMEBUFFER_CONSOLE=y > > Actual value: > > > > Config: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y > > Actual value: > > > > > > ---------- CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY ----------------- > > Config: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y > > Actual value: > > > > > > ---------- CONFIG_SYNC_FILE ----------------- > > Config: CONFIG_SYNC_FILE > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_SYNC_FILE=y > > Actual value: # CONFIG_SYNC_FILE is not set > > > > > > ---------- CONFIG_FONT_SUPPORT ----------------- > > Config: CONFIG_FONT_SUPPORT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FONT_SUPPORT=y > > Actual value: > > > > > > ---------- CONFIG_FONT_8x8 ----------------- > > Config: CONFIG_FONT_8x8 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FONT_8x8=y > > Actual value: > > > > > > ---------- CONFIG_FONT_8x16 ----------------- > > Config: CONFIG_FONT_8x16 > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > > Requested value: CONFIG_FONT_8x16=y > > Actual value: > > > > > > ---------- CONFIG_HYPERVISOR_GUEST ----------------- > > Config: CONFIG_HYPERVISOR_GUEST > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/hv-guest.cfg > > Requested value: CONFIG_HYPERVISOR_GUEST=y > > Actual value: # CONFIG_HYPERVISOR_GUEST is not set > > > > > > ---------- CONFIG_KVM_GUEST ----------------- > > Config: CONFIG_KVM_GUEST > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > > Requested value: CONFIG_KVM_GUEST=y > > Actual value: > > > > > > ---------- CONFIG_PARAVIRT ----------------- > > Config: CONFIG_PARAVIRT > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > > Requested value: CONFIG_PARAVIRT=y > > Actual value: > > > > Config: CONFIG_PARAVIRT_CLOCK > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > > Requested value: CONFIG_PARAVIRT_CLOCK=y > > Actual value: > > > > > > ---------- CONFIG_PARAVIRT_CLOCK ----------------- > > Config: CONFIG_PARAVIRT_CLOCK > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > > Requested value: CONFIG_PARAVIRT_CLOCK=y > > Actual value: > > > > > > ---------- CONFIG_SCSI ----------------- > > Config: CONFIG_SCSI_VIRTIO > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg > > Requested value: CONFIG_SCSI_VIRTIO=y > > Actual value: > > > > -- > > Config: CONFIG_SCSI > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg > > Requested value: CONFIG_SCSI=y > > Actual value: # CONFIG_SCSI is not set > > > > Config: CONFIG_SCSI_DEBUG > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg > > Requested value: CONFIG_SCSI_DEBUG=m > > Actual value: > > > > > > ---------- CONFIG_SCSI_DEBUG ----------------- > > Config: CONFIG_SCSI_DEBUG > > From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg > > Requested value: CONFIG_SCSI_DEBUG=m > > Actual value: > > > > > > > > DEBUG: Python function do_kernel_configcheck finished > > > > > > Bruce > > > > > > >> > > > >> > > > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > >> GEN Makefile > > > >> HOSTCC scripts/basic/fixdep > > > >> HOSTCC scripts/kconfig/conf.o > > > >> HOSTCC scripts/kconfig/confdata.o > > > >> HOSTCC scripts/kconfig/expr.o > > > >> HOSTCC scripts/kconfig/lexer.lex.o > > > >> HOSTCC scripts/kconfig/parser.tab.o > > > >> HOSTCC scripts/kconfig/preprocess.o > > > >> HOSTCC scripts/kconfig/symbol.o > > > >> HOSTLD scripts/kconfig/conf > > > >> scripts/kconfig/conf --olddefconfig Kconfig > > > >> scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > > > >> make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 > > > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 > > > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > >> make: *** [Makefile:179: sub-make] Error 2 > > > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > >> NOTE: make HOSTCC=gcc -isystem/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -L/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,--enable-new-dtags -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/OE/build/oe-core/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 HOSTCPP=gcc -E -C /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source O=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build CC=x86_64-oe-linux-gcc -fuse-ld=bfd -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0=/usr/src/debug/linux-yocto/5.4.15-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source=/usr/src/kernel oldnoconfig > > > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > >> GEN Makefile > > > >> make[2]: *** No rule to make target 'oldnoconfig'. Stop. > > > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 > > > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > >> make: *** [Makefile:179: sub-make] Error 2 > > > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > >> ERROR: oe_runmake failed > > > >> WARNING: exit code 1 from a shell command. > > > >> ERROR: Execution of '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/run.do_configure.4075' failed with exit code 1: > > > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > >> GEN Makefile > > > >> HOSTCC scripts/basic/fixdep > > > >> HOSTCC scripts/kconfig/conf.o > > > >> HOSTCC scripts/kconfig/confdata.o > > > >> HOSTCC scripts/kconfig/expr.o > > > >> HOSTCC scripts/kconfig/lexer.lex.o > > > >> HOSTCC scripts/kconfig/parser.tab.o > > > >> HOSTCC scripts/kconfig/preprocess.o > > > >> HOSTCC scripts/kconfig/symbol.o > > > >> HOSTLD scripts/kconfig/conf > > > >> scripts/kconfig/conf --olddefconfig Kconfig > > > >> scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld' not supported > > > >> make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/scripts/kconfig/Makefile:73: olddefconfig] Error 1 > > > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: olddefconfig] Error 2 > > > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > >> make: *** [Makefile:179: sub-make] Error 2 > > > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > >> make: Entering directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > >> make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > >> GEN Makefile > > > >> make[2]: *** No rule to make target 'oldnoconfig'. Stop. > > > >> make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/Makefile:567: oldnoconfig] Error 2 > > > >> make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > > > >> make: *** [Makefile:179: sub-make] Error 2 > > > >> make: Leaving directory '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source' > > > >> WARNING: exit code 1 from a shell command. > > > >> > > > >> On Fri, Jan 31, 2020 at 10:37 AM Khem Raj wrote: > > > >>> > > > >>> kernel-seltest fails now to build > > > >>> > > > >>> https://errors.yoctoproject.org/Errors/Details/308578/ > > > >>> > > > >>> On Tue, Jan 28, 2020 at 2:14 PM wrote: > > > >>> > > > > >>> > From: Bruce Ashfield > > > >>> > > > > >>> > This creates recipes for the v5.4/* branches of the linux-yocto > > > >>> > reference kernel. > > > >>> > > > > >>> > preempt-rt, yaffs2, aufs5 and reference board specific patches are > > > >>> > part of these branches. All major architectures: x86,x86-64,ARM, > > > >>> > ARM64,ppc,mips and mips64 have been feature tested against this > > > >>> > reference. > > > >>> > > > > >>> > 5.4 is a LTS release, and as such will receive -stable updates > > > >>> > for the duration of upstream korg support. > > > >>> > > > > >>> > Signed-off-by: Bruce Ashfield > > > >>> > --- > > > >>> > .../linux/linux-yocto-rt_5.4.bb | 44 +++++++++++++++ > > > >>> > .../linux/linux-yocto-tiny_5.4.bb | 32 +++++++++++ > > > >>> > meta/recipes-kernel/linux/linux-yocto_5.4.bb | 54 +++++++++++++++++++ > > > >>> > 3 files changed, 130 insertions(+) > > > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > > >>> > create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.4.bb > > > >>> > > > > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > > >>> > new file mode 100644 > > > >>> > index 0000000000..52f0e3b833 > > > >>> > --- /dev/null > > > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb > > > >>> > @@ -0,0 +1,44 @@ > > > >>> > +KBRANCH ?= "v5.4/standard/preempt-rt/base" > > > >>> > + > > > >>> > +require recipes-kernel/linux/linux-yocto.inc > > > >>> > + > > > >>> > +# Skip processing of this recipe if it is not explicitly specified as the > > > >>> > +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying > > > >>> > +# to build multiple virtual/kernel providers, e.g. as dependency of > > > >>> > +# core-image-rt-sdk, core-image-rt. > > > >>> > +python () { > > > >>> > + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": > > > >>> > + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > > > >>> > +} > > > >>> > + > > > >>> > +SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" > > > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > > >>> > + > > > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > > > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > > > >>> > + > > > >>> > +LINUX_VERSION ?= "5.4.15" > > > >>> > + > > > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > >>> > + > > > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > >>> > +DEPENDS += "openssl-native util-linux-native" > > > >>> > + > > > >>> > +PV = "5.4.15" > > > >>> > + > > > >>> > +KMETA = "kernel-meta" > > > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > > > >>> > + > > > >>> > +LINUX_KERNEL_TYPE = "preempt-rt" > > > >>> > + > > > >>> > +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" > > > >>> > + > > > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > > >>> > + > > > >>> > +# Functionality flags > > > >>> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" > > > >>> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > > > >>> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" > > > >>> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > > > >>> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > > > >>> > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > > > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > > >>> > new file mode 100644 > > > >>> > index 0000000000..a028b37548 > > > >>> > --- /dev/null > > > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb > > > >>> > @@ -0,0 +1,32 @@ > > > >>> > +KBRANCH ?= "v5.4/standard/tiny/base" > > > >>> > +KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" > > > >>> > + > > > >>> > +LINUX_KERNEL_TYPE = "tiny" > > > >>> > +KCONFIG_MODE = "--allnoconfig" > > > >>> > + > > > >>> > +require recipes-kernel/linux/linux-yocto.inc > > > >>> > + > > > >>> > +LINUX_VERSION ?= "5.4.15" > > > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > >>> > + > > > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > >>> > +DEPENDS += "openssl-native util-linux-native" > > > >>> > + > > > >>> > +KMETA = "kernel-meta" > > > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > > > >>> > + > > > >>> > +SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" > > > >>> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > > >>> > + > > > >>> > +PV = "5.4.15" > > > >>> > + > > > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > > > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > > > >>> > + > > > >>> > +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" > > > >>> > + > > > >>> > +# Functionality flags > > > >>> > +KERNEL_FEATURES = "" > > > >>> > + > > > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > > >>> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > > >>> > new file mode 100644 > > > >>> > index 0000000000..9fbc47d79e > > > >>> > --- /dev/null > > > >>> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb > > > >>> > @@ -0,0 +1,54 @@ > > > >>> > +KBRANCH ?= "v5.4/standard/base" > > > >>> > + > > > >>> > +require recipes-kernel/linux/linux-yocto.inc > > > >>> > + > > > >>> > +# board specific branches > > > >>> > +KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" > > > >>> > +KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" > > > >>> > +KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" > > > >>> > +KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" > > > >>> > +KBRANCH_qemuriscv64 ?= "v5.4/standard/base" > > > >>> > +KBRANCH_qemux86 ?= "v5.4/standard/base" > > > >>> > +KBRANCH_qemux86-64 ?= "v5.4/standard/base" > > > >>> > +KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" > > > >>> > + > > > >>> > +SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" > > > >>> > +SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > > >>> > +SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" > > > >>> > +SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > > >>> > +SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > > >>> > +SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > > >>> > +SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > > >>> > +SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" > > > >>> > +SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" > > > >>> > +SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" > > > >>> > + > > > >>> > +# remap qemuarm to qemuarma15 for the 5.4 kernel > > > >>> > +# KMACHINE_qemuarm ?= "qemuarma15" > > > >>> > + > > > >>> > +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ > > > >>> > + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" > > > >>> > + > > > >>> > +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > >>> > +LINUX_VERSION ?= "5.4.15" > > > >>> > + > > > >>> > +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > >>> > +DEPENDS += "openssl-native util-linux-native" > > > >>> > + > > > >>> > +PV = "5.4.15" > > > >>> > + > > > >>> > +KMETA = "kernel-meta" > > > >>> > +KCONF_BSP_AUDIT_LEVEL = "2" > > > >>> > + > > > >>> > +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" > > > >>> > + > > > >>> > +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" > > > >>> > + > > > >>> > +# Functionality flags > > > >>> > +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" > > > >>> > +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" > > > >>> > +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" > > > >>> > +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" > > > >>> > +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" > > > >>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" > > > >>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" > > > >>> > -- > > > >>> > 2.19.1 > > > >>> > > > > >>> > -- > > > >>> > _______________________________________________ > > > >>> > Openembedded-core mailing list > > > >>> > Openembedded-core at lists.openembedded.org > > > >>> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > >>> -- > > > >>> _______________________________________________ > > > >>> Openembedded-core mailing list > > > >>> Openembedded-core at lists.openembedded.org > > > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > > > > > > > -- > > > - Thou shalt not follow the NULL pointer, for chaos and madness await > > > thee at its end > > > - "Use the force Harry" - Gandalf, Star Trek II > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From martin.jansa at gmail.com Mon Feb 3 22:11:42 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Mon, 3 Feb 2020 23:11:42 +0100 Subject: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe In-Reply-To: <20200203212641.57611-1-bruce.ashfield@gmail.com> References: <20200203212641.57611-1-bruce.ashfield@gmail.com> Message-ID: <20200203221142.7jljrrrjxic3qtau@jama> On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfield at gmail.com wrote: > From: Bruce Ashfield > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > python3 safe: > > - we explicitly call /usr/bin/env python3 > - we full specifiy our symbols > - do not assume that 'None' can be converted to a string > > Signed-off-by: Bruce Ashfield > --- > > I didn't realized the v5.4 series had gone in, or I would have > send this sooner. This should resolve the errors that are thrown > when symbol_why is run to detect missing symbol dependencies. > > Bruce > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > index a4c0b6fb8a..57ec1abc6d 100644 > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > DEPENDS = "git-native" > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > PR = "r12" > PV = "0.2+git${SRCPV}" This needs a bit more cleanup for python3. DEBUG: Executing python function do_kernel_configcheck Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro res += args[int(new_args[0])] ValueError: invalid literal for int() with base 10: 'error-if' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ self._init(filename, warn, warn_to_stderr, encoding) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init self._parse_block(None, self.top_node, self.top_node).next = None File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block prev = self._parse_block(None, parent, prev) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block while self._next_line(): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line self._tokens = self._tokenize(line) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize self._parse_assignment(s) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment s, i = self._expand_macro(s, i, ()) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro res += self._fn_val(new_args) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val return py_fn(self, *args) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn kconf.filename, kconf.linenr, msg)) kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro res += args[int(new_args[0])] ValueError: invalid literal for int() with base 10: 'error-if' During handling of the above exception, another exception occurred: and the log is full of this (the warnings at the end look the same as before) # wc -l /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 11804 /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 Maybe kernel_configcheck now needs KERNEL_LD exported as well? See: https://patchwork.openembedded.org/patch/169702/ which fixed do_configure with 5.4. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From bruce.ashfield at gmail.com Mon Feb 3 22:22:26 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Mon, 3 Feb 2020 17:22:26 -0500 Subject: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe In-Reply-To: <20200203221142.7jljrrrjxic3qtau@jama> References: <20200203212641.57611-1-bruce.ashfield@gmail.com> <20200203221142.7jljrrrjxic3qtau@jama> Message-ID: On Mon, Feb 3, 2020 at 5:11 PM Martin Jansa wrote: > > On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfield at gmail.com wrote: > > From: Bruce Ashfield > > > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > > python3 safe: > > > > - we explicitly call /usr/bin/env python3 > > - we full specifiy our symbols > > - do not assume that 'None' can be converted to a string > > > > Signed-off-by: Bruce Ashfield > > --- > > > > I didn't realized the v5.4 series had gone in, or I would have > > send this sooner. This should resolve the errors that are thrown > > when symbol_why is run to detect missing symbol dependencies. > > > > Bruce > > > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > index a4c0b6fb8a..57ec1abc6d 100644 > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > > > DEPENDS = "git-native" > > > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > > PR = "r12" > > PV = "0.2+git${SRCPV}" > > This needs a bit more cleanup for python3. > That's strange, it works fine under python3 here. I have a few more scattered changes that i can't detangle right now. > DEBUG: Executing python function do_kernel_configcheck > Traceback (most recent call last): > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > res += args[int(new_args[0])] > ValueError: invalid literal for int() with base 10: 'error-if' > > During handling of the above exception, another exception occurred: > > Traceback (most recent call last): > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in > conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ > self._init(filename, warn, warn_to_stderr, encoding) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init > self._parse_block(None, self.top_node, self.top_node).next = None > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block > prev = self._parse_block(None, parent, prev) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block > while self._next_line(): > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line > self._tokens = self._tokenize(line) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize > self._parse_assignment(s) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment > s, i = self._expand_macro(s, i, ()) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro > res += self._fn_val(new_args) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val > return py_fn(self, *args) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn > kconf.filename, kconf.linenr, msg)) > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported > Traceback (most recent call last): > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > res += args[int(new_args[0])] > ValueError: invalid literal for int() with base 10: 'error-if' > > During handling of the above exception, another exception occurred: > > and the log is full of this (the warnings at the end look the same as before) > > # wc -l /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > 11804 /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > > Maybe kernel_configcheck now needs KERNEL_LD exported as well? See: > https://patchwork.openembedded.org/patch/169702/ > which fixed do_configure with 5.4. I'm running it fully against v5.4 here, and it is working fine. But I have enough debug through things, that I can't get them cleaned up now, since I have to be up for a flight in a few hours. What board are you building ? Because none of the warnings you are seeing should be coming out, since I've cleaned all of those options .. so there's some other mismatch going on. Cheers, Bruce -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From alex.kiernan at gmail.com Mon Feb 3 22:35:26 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Mon, 3 Feb 2020 22:35:26 +0000 Subject: [OE-core] [OE-Core][PATCH v2] systemd: Upgrade 243.2 -> 243.4-latest Message-ID: <20200203223526.49375-1-alex.kiernan@gmail.com> Update to latest on the 243 stable branch. This includes (amongst other fixes) seccomp filter changes which fix failures with glibc 2.31, e.g. systemd-journald[543]: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at src/basic/time-util.c:55, function now(). Aborting. Refresh: 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0001-do-not-disable-buffer-in-writing-files.patch Drop 0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch, fixed in 5c0224c7bf3c ("Handle d_type == DT_UNKNOWN correctly"). Drop 0001-seccomp-more-comprehensive-protection-against-libsec.patch, fixed in 70e8c1978a9a ("seccomp: real syscall numbers are >= 0"). Drop 0004-rules-whitelist-hd-devices.patch and 0005-rules-watch-metadata-changes-in-ide-devices.patch which cause ide-cd to flap with tray open messages (and don't appear to be required any more) Commits from v243-stable: 70e8c1978a9a seccomp: real syscall numbers are >= 0 a0a1977d9a5d seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion 7f936c60d597 network: set ipv6 mtu after link-up or device mtu change b59d88cc62a4 man: fix typo in net-naming-scheme man page c5e5ac095821 man: fix typos (#14304) 9a2f26564d5a ipv4ll: do not reset conflict counter on restart bc9e1ebfdd3b Fix typo (duplicate "or") c6cb71b7e741 network: if /sys is rw, then udev should be around 67dcdfd95629 nspawn: do not fail if udev is not running a7938a1bc6d3 Create parent directories when creating systemd-private subdirs 53aa44f8738a network: do not return error but return UINT64_MAX if speed meter is disabled 65abf126744f core: swap priority can be negative b1cf452ff5f6 systemctl: enhance message about kexec missing kernel 07a0e5b42523 man: use mkswap@ instead of makeswap@ 57dc017c6bac journald: don't ask for the machine ID if we don't need it ac392a57c08c journalctl: pager_close() calls fflush(stdout) anyway as first thing ee7dfadc8237 journald: remove unused field 471073f1b52b journalctl: return EOPNOTSUPP if pcre is not enabled 002ededb61a0 man: drop reference to machined, add one for journald instead fd3bd4be3bff pid1: make TimeoutAbortSec settable for transient units eb2ef4d6643e pid1: fix setting of DefaultTimeoutAbortSec 1d75e29b2378 shared/ask-password-api: modify keyctl break value a16b1ee7e565 cryptsetup: reduce the chance that we will be OOM killed 4836fb010ae8 core: write out correct field name when creating transient service units 3e2c547f6d3c udevd: don't use monitor after manager_exit() d42f7d45a8e2 Revert "udevd: fix crash when workers time out after exit is signal caught" c9a287eee8fd man/systemd.link: Add missing verb *be* a67a3ae04b89 man: document all pager variables for systemctl and systemd 3a8fce3f38b6 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange= fdffd284b682 core/service: downgrade "scheduling restart" message to debug 733e7f19d3cf travis: add missing closing quote sign 0d7b7817fc34 systemd-tmpfiles: don't install timer when service isn't installed either 0e7f83cd2b31 pam_systemd: prolong method call timeout when allocating session e51d9bf9e5ac man: add entry about SpeedMeter= aa1fc791c7a1 udev: silence warning about PROGRAM+= or IMPORT+= rules b9a619bb6738 udevadm: ignore EROFS and return earlier 1ec5b9f80cb5 basic: add vmware hypervisor detection from device-tree 7fa7080248aa umount: be happy if /proc/swaps doesn't exist 71ccd774bb33 shutdown: make logging more useful if NULL swap/mount table files are specified 38453c6d42e4 man: share description of $SYSTEMD_COLORS in other tools b50ca0152681 core: do not propagate polkit error to caller 99b72a66ca55 ask-password: don't hit assert() when we query pw which the user C-d and caching is enabled 288edd686911 man: mention $RUNTIME_DIRECTORY & friends in environment list 37aeadd433d3 cryptsetup-generator: guess whether the keyfile argument is two items or one a87e8fdc72d7 verify: fix segmentation fault 3aea728cd2d2 timedated: it might be that tzinfo files are just not installed cc103c72abc1 timedated: handle UTC specially, when generating /etc/localtime f5a4caa5418b time-util: treat /etc/localtime missing as UTC 2139d58652bb bpf: fix off-by-one in class whitelisting cb7693595db9 bpf: fix device type filter 56e1ba304b00 core: constify bpf program arrays b06b7ace92c1 run: propagate return code/status from the child 5db454b8031c udevd: fix crash when workers time out after exit is signal caught b774282a855e udev: ignore error caused by device disconnection 8d88a2ecd7ce udev: fix error code in the log message c41484a2f3d7 udev: ignore ENOENT when chmod_and_chown() device node f218b65b3246 udev: do not append newline when write attributes ce4d17ddbc16 time-util: uniquify timezone list, in case UTC is listed in timezone1970.tab, too 28f0b34c57bc time-util: always accept UTC as valid timezone 8b888d236007 seccomp: add all *time64 syscalls 53d8feeb2334 libblkid: open device in nonblock mode. b9478046b03d man: describe ordering in case of Conflicts= fa3e5bd2bbb4 man: put description of Wants= above Requires= bdebd2c325fc meson: remove strange dep that causes meson to enter infinite loop 26bc77d8e5af man: fix option typo in pam_systemd man page 9c12127e3d2e man: save pull-raw example file without underscores 4c106cbcf1af man: small grammatical/word choice fixes to crypttab man page 03cc374fca74 shared/format-table: disable ellipsization when piped 0a5497d3fa4b sd-device-enumerator: do not return error when a device is removed 7b0d0331d051 bootctl: create leading dirs when "bootctl random-seed" is called if needed 5aab35aac9db core, job: fix breakage of ordering dependencies by systemctl reload command cd86ae937305 journalctl: allow running vacuum on remote journals, too fc0451bc0a3f allow an empty DefaultInstance= in configuration files 587266c24aae man/systemd.net-naming-scheme: fix typo e0e63f0f9bb9 nspawn: respect quiet on capabilities warning 37e50c05b564 nspawn: mangle slice name 4fefc493541e mkosi: Find hostname command on Arch Linux c430e8affba4 Fix mkosi on Arch Linux 1765b8d803dd Update to Fedora31 0b9a2a9a9868 sd-boot: Silence compiler warning when building with -O2 24e02f8d49b6 sd-boot: Don't loudly complain if RNG protocol isn't available 14e377ef3519 sd-boot: Only disable optimization on debug builds a39008ddecb9 meson: correct man page deps 4c1dcc06fa30 sd-event: don't invalidate source type on disconnect fb89ee34cedc analyze: fix minor memleak a449299bc087 analyze: sort list of unknown syscalls kernel implements 51ea58a04b18 seccomp: add new Linux 5.3 syscalls to syscall filter lists 819695c8b027 resolved: check for IP in certificate when using DoT with GnuTLS 37f817e21097 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS 32056809baa2 coverity: replace python with jq d2b4d7ee17de network-generator: Add missing help for --root f1b18c206208 modules-load: do not fail service if modules are not present 606de6626714 pid1: order .automount units after local-fs-pre.target 1366b81f2bc5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() 84d5cd699e25 shared/install: fix error codes returned by install_context_apply() 417779c58a86 man: alias names can't be used with enable command 00af6c447f25 resolved: set stream type during DnsStream creation 66dd9d7d25fd sd-device: allow sd_device_get_devtype to be called with NULL arg and do not assert 048f9da1a4b3 Remove unused plymouth_running() function 34fa67bbe732 machine-id-setup: avoid unexpected aborting 24c99fa2ef3d test-socket-util: avoid writing past the defined buffer ce82233f99b3 test: drop duplicated 's' 75a0e7209114 nspawn: fix handling of --console=help f41a282875fc Revert "sysusers: properly mark generated accounts as locked" fc2dceac6172 Remove unprintable non-ASCII char from special glyph ASCII fallback table dedf5b511e6f logind: fix emission of PropertiesChanged for users 6e3cfe2e58f5 logind: fix emission of PropertiesChanged on seats a9152084d7e9 resolved: fix connection failures with TLS 1.3 and GnuTLS 961879ed9ddb udev: tag any display devices as master-of-seat when nomodeset is used 8aa7bafa1295 systemd-fsck: fix systemd-fsck/fsck pipe bad closure 19590e289ace ceph is a network filesystem 339606ad9e99 portabled: allow to detach an image with a unit in linked-runtime state bd9692734ac5 network: ndisc: do not drop all prefixes when a prefix matches a blacklist 5e6d4f8b79e0 systemctl: fix memleak caused by wrong cleanup func 47d0e23d26af udev: fix memleak caused by wrong cleanup function a6fb0542c5ef parse_hwdb: fix compatibility with pyparsing 2.4.* cb1d892f1780 parse_hwdb: process files in order ef677436aa20 test: Pass personality test even when i686 userland runs on x86_64 kernel 3f6398c450b8 docs: fix inadvertent change in uid range 25bb377a73e7 cgroup: fix typo in BPF firewall support warning message 6d97aca0d503 fix build with compilers with default stack-protector enabled fbad077cec34 nspawn: surrender controlling terminal to PID2 when using the PID1 stub 0553c3c66889 pid1: fix DefaultTasksMax initialization f406a691a722 src/core/automount: use DirectoryMode when calling mkdir -p 20438f96c326 udevadm trigger: do not propagate EACCES and ENODEV 6480630bc397 hwdb: Correct WWWW Pattern In Documentation Comment 9d8e889810b5 nspawn: consistenly fail if parsing the environment fails 40e169b30423 nspawn: default to unified hierarchy if --as-pid2 is used b5df1037a0c0 cgroup: Mark memory protections as explicitly set in transient units f14e3e02cca7 cgroup: Respect DefaultMemoryMin when setting memory.min ea248e53bf76 cgroup: Check ancestor memory min for unified memory config de1d25a506db cgroup: docs: memory.high doc fixups 2ab45f38d8c4 cgroup: docs: Mention unbounded protection for memory.{low,min} 19a43dc38a13 Consider smb3 as remote filesystem 5c0224c7bf3c Handle d_type == DT_UNKNOWN correctly 8282bc61df10 util-lib: Don't propagate EACCES from find_binary PATH lookup to caller 9d0ae987a634 network: drop noisy log message f67f0e4ec45a Updated log message when the timesync happens for the first time (#13624) e151bf467494 units: make systemd-binfmt.service easier to work with no autofs 2b8e574d8242 Corect man page reference in systemd-nologin.conf comments a0577353f191 man: Add a missing space in machinectl(1) 693e98398869 log: Add missing "%" in "%m" log format strings ea7151b8c435 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist b90549290e33 man: fix typo Signed-off-by: Alex Kiernan --- Changes in v2: - drop 0004-rules-whitelist-hd-devices.patch and 0005-rules-watch-metadata-changes-in-ide-devices.patch which cause ide-cd to flap with tray open messages (and don't appear to be required any more) - refresh 0001-do-not-disable-buffer-in-writing-files.patch (Khem Raj ) ...md-boot_243.2.bb => systemd-boot_243.4.bb} | 0 meta/recipes-core/systemd/systemd.inc | 4 +- ...tall-dependency-links-at-install-tim.patch | 30 ++-- ...-not-disable-buffer-in-writing-files.patch | 88 ++++------ ...prehensive-protection-against-libsec.patch | 152 ------------------ ...ider-symlink-on-filesystems-like-NFS.patch | 42 ----- .../0004-rules-whitelist-hd-devices.patch | 34 ---- ...atch-metadata-changes-in-ide-devices.patch | 45 ------ .../{systemd_243.2.bb => systemd_243.4.bb} | 4 - 9 files changed, 45 insertions(+), 354 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_243.2.bb => systemd-boot_243.4.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch delete mode 100644 meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch delete mode 100644 meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch rename meta/recipes-core/systemd/{systemd_243.2.bb => systemd_243.4.bb} (99%) diff --git a/meta/recipes-core/systemd/systemd-boot_243.2.bb b/meta/recipes-core/systemd/systemd-boot_243.4.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.2.bb rename to meta/recipes-core/systemd/systemd-boot_243.4.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 18f17d28ac53..2fca6dca64b7 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9" +SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +PV = "243.4+git${SRCPV}" + S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 73e65ff79859..ea37680221f2 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -diff --git a/units/meson.build b/units/meson.build -index e1ee9f86c3..6bb7771b36 100644 ---- a/units/meson.build -+++ b/units/meson.build +Index: systemd-stable/units/meson.build +=================================================================== +--- systemd-stable.orig/units/meson.build ++++ systemd-stable/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +48,10 @@ index e1ee9f86c3..6bb7771b36 100644 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 30a6bc9918..4231f3b70f 100644 ---- a/units/proc-sys-fs-binfmt_misc.automount -+++ b/units/proc-sys-fs-binfmt_misc.automount +Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount +=================================================================== +--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount ++++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,19 +59,19 @@ index 30a6bc9918..4231f3b70f 100644 + +[Install] +WantedBy=sysinit.target -diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index e940c7c9ad..6be7f5cc9b 100644 ---- a/units/systemd-binfmt.service.in -+++ b/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm +Index: systemd-stable/units/systemd-binfmt.service.in +=================================================================== +--- systemd-stable.orig/units/systemd-binfmt.service.in ++++ systemd-stable/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount After=proc-sys-fs-binfmt_misc.automount + After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target - ConditionPathIsReadWrite=/proc/sys/ -@@ -28,3 +29,6 @@ Type=oneshot +@@ -29,3 +30,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt TimeoutSec=90s diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index 2f4daf866588..d6d68a09ac9b 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -38,11 +38,9 @@ Signed-off-by: Scott Murray src/vconsole/vconsole-setup.c | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 7b5839ccd6..18f6e8ffc8 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { +@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co xsprintf(c, PID_FMT "\n", pid); @@ -51,7 +49,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (isempty(sc)) { @@ -60,7 +58,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (streq(sc, "0")) { @@ -69,7 +67,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -78,7 +76,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -87,7 +85,7 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control if (r < 0) return r; @@ -105,11 +103,9 @@ index 7b5839ccd6..18f6e8ffc8 100644 if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 42ce53d5aa..57512532a6 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -125,11 +121,9 @@ index 42ce53d5aa..57512532a6 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c -index 123d00e13e..e7ea78f349 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { +@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -138,8 +132,6 @@ index 123d00e13e..e7ea78f349 100644 if (r < 0) return r; -diff --git a/src/basic/util.c b/src/basic/util.c -index 93d610bc98..97dca64f73 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -294,7 +294,7 @@ void disable_coredumps(void) { @@ -151,11 +143,9 @@ index 93d610bc98..97dca64f73 100644 if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index aa9d811f2e..8c7f2dae7a 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { +@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) if (!fn) return log_oom(); @@ -164,7 +154,7 @@ index aa9d811f2e..8c7f2dae7a 100644 } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { +@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) (void) delete_rule(rule); @@ -182,11 +172,9 @@ index aa9d811f2e..8c7f2dae7a 100644 STRV_FOREACH(f, files) { k = apply_file(*f, true); -diff --git a/src/core/main.c b/src/core/main.c -index bcce7178a8..4199cedab9 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1285,7 +1285,7 @@ static int bump_unix_max_dgram_qlen(void) { +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -195,7 +183,7 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1509,7 +1509,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool if (getpid_cached() != 1) return; @@ -204,11 +192,9 @@ index bcce7178a8..4199cedab9 100644 if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } -diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index b95e6239d4..fdbdaaaccb 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) } #ifdef SMACK_RUN_LABEL @@ -230,8 +216,6 @@ index b95e6239d4..fdbdaaaccb 100644 if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c -index 17e7cd1a00..87a7667716 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -243,11 +227,9 @@ index 17e7cd1a00..87a7667716 100644 if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; -diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index c4a7f2f3d3..bcac758284 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value if (!value) return -ENOMEM; @@ -256,11 +238,9 @@ index c4a7f2f3d3..bcac758284 100644 if (r < 0) { if (r == -ELOOP) return -EINVAL; -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 30b9a66334..cc1d577933 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1325,7 +1325,7 @@ static int trigger_device(Manager *m, sd_device *d) { +@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd if (!t) return -ENOMEM; @@ -269,11 +249,9 @@ index 30b9a66334..cc1d577933 100644 } return 0; -diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index 0462b46413..7c53d41483 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -282,11 +260,9 @@ index 0462b46413..7c53d41483 100644 if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 2aec8041f0..841542f2f3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2357,7 +2357,7 @@ static int reset_audit_loginuid(void) { +@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -295,7 +271,7 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3566,13 +3566,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -311,11 +287,9 @@ index 2aec8041f0..841542f2f3 100644 if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c -index 93bdcf11bf..68cddb7a9f 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c +@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con log_debug("Setting '%s' to '%s'", p, value); @@ -324,11 +298,9 @@ index 93bdcf11bf..68cddb7a9f 100644 } int sysctl_read(const char *property, char **content) { -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f168d7f890 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info(void) { +@@ -54,7 +54,7 @@ static int write_hibernate_location_info /* if it's a swap partition, we just write the disk to /sys/power/resume */ if (streq(type, "partition")) { @@ -337,7 +309,7 @@ index b9fe96635d..f168d7f890 100644 if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); -@@ -98,14 +98,14 @@ static int write_hibernate_location_info(void) { +@@ -98,14 +98,14 @@ static int write_hibernate_location_info offset = fiemap->fm_extents[0].fe_physical / page_size(); xsprintf(offset_str, "%" PRIu64, offset); @@ -363,7 +335,7 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char **states) { +@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** STRV_FOREACH(state, states) { int k; @@ -372,24 +344,20 @@ index b9fe96635d..f168d7f890 100644 if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); -diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c -index 77d95e513f..25ce4abfb1 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato if (!filename) return log_oom(); - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(filename, action, 0); if (r < 0) { - log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, - "Failed to write '%s' to '%s': %m", action, filename); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index cb5123042a..ea309a9e7f 100644 + bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); + --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { +@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -398,11 +366,9 @@ index cb5123042a..ea309a9e7f 100644 if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 75d052ae70..5a15c939d8 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na static int toggle_utf8_sysfs(bool utf8) { int r; diff --git a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch b/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch deleted file mode 100644 index f359d2879b8a..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-seccomp-more-comprehensive-protection-against-libsec.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 4df8fe8415eaf4abd5b93c3447452547c6ea9e5f Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 14 Nov 2019 17:51:30 +0100 -Subject: [PATCH] seccomp: more comprehensive protection against libseccomp's - __NR_xyz namespace invasion - -A follow-up for 59b657296a2fe104f112b91bbf9301724067cc81, adding the -same conditioning for all cases of our __NR_xyz use. - -Fixes: #14031 - -Reference: -https://github.com/systemd/systemd/pull/14032/commits/62f66fdbcc33580467c01b1f149474b6c973df5a - -Upstream-Status: Backport - -Signed-off-by: Ming Liu ---- - src/basic/missing_syscall.h | 10 +++++----- - src/test/test-seccomp.c | 19 ++++++++++--------- - 2 files changed, 15 insertions(+), 14 deletions(-) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 6d9b125..1255d8b 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -274,7 +274,7 @@ static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, c - - #if !HAVE_KCMP - static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { --# ifdef __NR_kcmp -+# if defined __NR_kcmp && __NR_kcmp > 0 - return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); - # else - errno = ENOSYS; -@@ -289,7 +289,7 @@ static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long i - - #if !HAVE_KEYCTL - static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { --# ifdef __NR_keyctl -+# if defined __NR_keyctl && __NR_keyctl > 0 - return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); - # else - errno = ENOSYS; -@@ -300,7 +300,7 @@ static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg - } - - static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { --# ifdef __NR_add_key -+# if defined __NR_add_key && __NR_add_key > 0 - return syscall(__NR_add_key, type, description, payload, plen, ringid); - # else - errno = ENOSYS; -@@ -311,7 +311,7 @@ static inline key_serial_t missing_add_key(const char *type, const char *descrip - } - - static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { --# ifdef __NR_request_key -+# if defined __NR_request_key && __NR_request_key > 0 - return syscall(__NR_request_key, type, description, callout_info, destringid); - # else - errno = ENOSYS; -@@ -496,7 +496,7 @@ enum { - static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask, - unsigned long maxnode) { - long i; --# ifdef __NR_set_mempolicy -+# if defined __NR_set_mempolicy && __NR_set_mempolicy > 0 - i = syscall(__NR_set_mempolicy, mode, nodemask, maxnode); - # else - errno = ENOSYS; -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index 018c20f..c669204 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -28,7 +28,8 @@ - #include "tmpfile-util.h" - #include "virt.h" - --#if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) -+/* __NR_socket may be invalid due to libseccomp */ -+#if !defined(__NR_socket) || __NR_socket <= 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__) - /* On these archs, socket() is implemented via the socketcall() syscall multiplexer, - * and we can't restrict it hence via seccomp. */ - # define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 1 -@@ -304,14 +305,14 @@ static void test_protect_sysctl(void) { - assert_se(pid >= 0); - - if (pid == 0) { --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, NULL) < 0); - assert_se(errno == EFAULT); - #endif - - assert_se(seccomp_protect_sysctl() >= 0); - --#if __NR__sysctl > 0 -+#if defined __NR__sysctl && __NR__sysctl > 0 - assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0); - assert_se(errno == EPERM); - #endif -@@ -640,7 +641,7 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(poll(NULL, 0, 0) == 0); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(-1)) >= 0); -@@ -656,7 +657,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(access) >= 0 -+#if defined __NR_access && __NR_access > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_access + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_faccessat + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -672,7 +673,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); -@@ -689,7 +690,7 @@ static void test_load_syscall_filter_set_raw(void) { - s = hashmap_free(s); - - assert_se(s = hashmap_new(NULL)); --#if SCMP_SYS(poll) >= 0 -+#if defined __NR_poll && __NR_poll > 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); - #else - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); -@@ -767,8 +768,8 @@ static int real_open(const char *path, int flags, mode_t mode) { - * testing purposes that calls the real syscall, on architectures where SYS_open is defined. On - * other architectures, let's just fall back to the glibc call. */ - --#ifdef SYS_open -- return (int) syscall(SYS_open, path, flags, mode); -+#if defined __NR_open && __NR_open > 0 -+ return (int) syscall(__NR_open, path, flags, mode); - #else - return open(path, flags, mode); - #endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch b/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch deleted file mode 100644 index ba20a0bb46ce..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d0122c077d2d8fd0fd29b463c501e7ddf9177ff3 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 24 Sep 2019 17:04:50 +0800 -Subject: [PATCH] unit-file.c: consider symlink on filesystems like NFS - -Some filesystems do not fully support readdir, according to the manual, -so we should also consider DT_UNKNOWN to correctly handle symlinks. - -Signed-off-by: Chen Qi - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/13637] ---- - src/shared/unit-file.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c -index 4a5f23e6c1..8373103000 100644 ---- a/src/shared/unit-file.c -+++ b/src/shared/unit-file.c -@@ -247,6 +247,7 @@ int unit_file_build_name_map( - _cleanup_free_ char *_filename_free = NULL, *simplified = NULL; - const char *suffix, *dst = NULL; - bool valid_unit_name; -+ struct stat sb; - - valid_unit_name = unit_name_is_valid(de->d_name, UNIT_NAME_ANY); - -@@ -279,7 +280,10 @@ int unit_file_build_name_map( - if (hashmap_contains(ids, de->d_name)) - continue; - -- if (de->d_type == DT_LNK) { -+ if (de->d_type == DT_LNK || -+ (de->d_type == DT_UNKNOWN && -+ lstat(filename, &sb) == 0 && -+ (sb.st_mode & S_IFMT) == S_IFLNK)) { - /* We don't explicitly check for alias loops here. unit_ids_map_get() which - * limits the number of hops should be used to access the map. */ - --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch deleted file mode 100644 index f9c5996ffb22..000000000000 --- a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dc0a6a9fe4da9738efaba942233ad39da625a918 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 21 Feb 2019 16:28:21 +0800 -Subject: [PATCH 4/5] rules: whitelist hd* devices - -qemu by default emulates IDE and the linux-yocto kernel(s) use -CONFIG_IDE instead of the more modern libsata, so disks appear as -/dev/hd*. Patch rejected upstream because CONFIG_IDE is deprecated. - -Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276] - -Signed-off-by: Patrick Ohly -Signed-off-by: Khem Raj -[rebased for systemd 241] -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - rules/60-persistent-storage.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules -index 7802b1c94f..c0534ae26a 100644 ---- a/rules/60-persistent-storage.rules -+++ b/rules/60-persistent-storage.rules -@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" - ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" - - SUBSYSTEM!="block", GOTO="persistent_storage_end" --KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end" -+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", GOTO="persistent_storage_end" - - # ignore partitions that span the entire disk - TEST=="whole_disk", GOTO="persistent_storage_end" diff --git a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch b/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch deleted file mode 100644 index 96175b5b5ebc..000000000000 --- a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d1bccc721dd8f43fee29c5df0e9b78345e69f4b6 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 21 Feb 2019 16:38:38 +0800 -Subject: [PATCH 5/5] rules: watch metadata changes in ide devices - -Formatting IDE storage does not trigger "change" uevents. As a result -clients using udev API don't get any updates afterwards and get outdated -information about the device. -... -root at qemux86-64:~# mkfs.ext4 -F /dev/hda1 -Creating filesystem with 262144 4k blocks and 65536 inodes -Filesystem UUID: 98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 - -root at qemux86-64:~# ls /dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2 -ls: cannot access '/dev/disk/by-uuid/98791eb2-2bf3-47ad-b4d8-4cf7e914eee2': No such file or directory -... -Include hd* in a match for watch option assignment. - -Upstream-Status: Denied - -qemu by default emulates IDE and the linux-yocto kernel(s) use -CONFIG_IDE instead of the more modern libsata, so disks appear as -/dev/hd*. A similar patch rejected by upstream because CONFIG_IDE -is deprecated. - -Signed-off-by: Hongxu Jia -[rebased for systemd 241] -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - rules/60-block.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/60-block.rules b/rules/60-block.rules -index 3134ab995e..cd72a494a1 100644 ---- a/rules/60-block.rules -+++ b/rules/60-block.rules -@@ -9,5 +9,5 @@ ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", - - # watch metadata changes, caused by tools closing the device node which was opened for writing - ACTION!="remove", SUBSYSTEM=="block", \ -- KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", \ -+ KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", \ - OPTIONS+="watch" diff --git a/meta/recipes-core/systemd/systemd_243.2.bb b/meta/recipes-core/systemd/systemd_243.4.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.2.bb rename to meta/recipes-core/systemd/systemd_243.4.bb index e31fac8c5617..a0d10e03beb4 100644 --- a/meta/recipes-core/systemd/systemd_243.2.bb +++ b/meta/recipes-core/systemd/systemd_243.4.bb @@ -20,10 +20,6 @@ SRC_URI += "file://touchscreen.rules \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://0004-rules-whitelist-hd-devices.patch \ - file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ - file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \ - file://0001-seccomp-more-comprehensive-protection-against-libsec.patch \ file://99-default.preset \ " -- 2.17.1 From martin.jansa at gmail.com Mon Feb 3 22:44:20 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Mon, 3 Feb 2020 23:44:20 +0100 Subject: [OE-core] [PATCH] kernel-yocto.bbclass: export LD in the environment used by kconf_check Message-ID: <20200203224420.4801-1-Martin.Jansa@gmail.com> * resolves following exceptions in log.do_kernel_configcheck: DEBUG: Executing python function do_kernel_configcheck Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro res += args[int(new_args[0])] ValueError: invalid literal for int() with base 10: 'error-if' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ self._init(filename, warn, warn_to_stderr, encoding) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init self._parse_block(None, self.top_node, self.top_node).next = None File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block prev = self._parse_block(None, parent, prev) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block while self._next_line(): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line self._tokens = self._tokenize(line) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize self._parse_assignment(s) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment s, i = self._expand_macro(s, i, ()) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro res += self._fn_val(new_args) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val return py_fn(self, *args) File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn kconf.filename, kconf.linenr, msg)) kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported Traceback (most recent call last): File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro res += args[int(new_args[0])] ValueError: invalid literal for int() with base 10: 'error-if' * there is still 291 mismatched options in default 5.4.15 builds, but at least the 11804 lines long log doesn't start with 9022 lines of above exceptions DEBUG: Executing python function do_kernel_configcheck [mismatch (291)]: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/cfg/mismatch.txt There were hardware options requested that do not have a corresponding value present in the final ".config" file. This probably means you aren't getting the config you wanted. WARNING: [kernel config]: specified values did not make it into the kernel's final configuration: ... Signed-off-by: Martin Jansa --- meta/classes/kernel-yocto.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 87c681f1c3..141eeafeb9 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -370,6 +370,7 @@ python do_kernel_configcheck() { env = os.environ.copy() env['PATH'] = "%s:%s%s" % (d.getVar('PATH'), s, "/scripts/util/") + env['LD'] = "${KERNEL_LD}" try: configs = subprocess.check_output(['scc', '--configs', '-o', s + '/.kernel-meta'], env=env).decode('utf-8') -- 2.20.1 From martin.jansa at gmail.com Mon Feb 3 22:55:15 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Mon, 3 Feb 2020 23:55:15 +0100 Subject: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe In-Reply-To: References: <20200203212641.57611-1-bruce.ashfield@gmail.com> <20200203221142.7jljrrrjxic3qtau@jama> Message-ID: <20200203225515.ltbstk7emywvexon@jama> On Mon, Feb 03, 2020 at 05:22:26PM -0500, Bruce Ashfield wrote: > On Mon, Feb 3, 2020 at 5:11 PM Martin Jansa wrote: > > > > On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfield at gmail.com wrote: > > > From: Bruce Ashfield > > > > > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > > > python3 safe: > > > > > > - we explicitly call /usr/bin/env python3 > > > - we full specifiy our symbols > > > - do not assume that 'None' can be converted to a string > > > > > > Signed-off-by: Bruce Ashfield > > > --- > > > > > > I didn't realized the v5.4 series had gone in, or I would have > > > send this sooner. This should resolve the errors that are thrown > > > when symbol_why is run to detect missing symbol dependencies. > > > > > > Bruce > > > > > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > index a4c0b6fb8a..57ec1abc6d 100644 > > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > > > > > DEPENDS = "git-native" > > > > > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > > > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > > > PR = "r12" > > > PV = "0.2+git${SRCPV}" > > > > This needs a bit more cleanup for python3. > > > > That's strange, it works fine under python3 here. I have a few more > scattered changes that i can't detangle right now. > > > DEBUG: Executing python function do_kernel_configcheck > > Traceback (most recent call last): > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > > res += args[int(new_args[0])] > > ValueError: invalid literal for int() with base 10: 'error-if' > > > > During handling of the above exception, another exception occurred: > > > > Traceback (most recent call last): > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in > > conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ > > self._init(filename, warn, warn_to_stderr, encoding) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init > > self._parse_block(None, self.top_node, self.top_node).next = None > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block > > prev = self._parse_block(None, parent, prev) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block > > while self._next_line(): > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line > > self._tokens = self._tokenize(line) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize > > self._parse_assignment(s) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment > > s, i = self._expand_macro(s, i, ()) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro > > res += self._fn_val(new_args) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val > > return py_fn(self, *args) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn > > kconf.filename, kconf.linenr, msg)) > > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported > > Traceback (most recent call last): > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > > res += args[int(new_args[0])] > > ValueError: invalid literal for int() with base 10: 'error-if' > > > > During handling of the above exception, another exception occurred: > > > > and the log is full of this (the warnings at the end look the same as before) > > > > # wc -l /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > > 11804 /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > > > > Maybe kernel_configcheck now needs KERNEL_LD exported as well? See: > > https://patchwork.openembedded.org/patch/169702/ > > which fixed do_configure with 5.4. > > I'm running it fully against v5.4 here, and it is working fine. But I > have enough debug through things, that I can't get them cleaned up > now, since I have to be up for a flight in a few hours. > > What board are you building ? Because none of the warnings you are > seeing should be coming out, since I've cleaned all of those options > .. so there's some other mismatch going on. qemux86-64 as shown in the log With only oe-core layer included and the only relevant option from local.conf is: DISTRO_FEATURES_append = " ld-is-go Even after fixing the python3 exceptions with: https://patchwork.openembedded.org/patch/169709/ I see following mismatch options: DEBUG: Executing python function do_kernel_configcheck [mismatch (291)]: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/cfg/mismatch.txt There were hardware options requested that do not have a corresponding value present in the final ".config" file. This probably means you aren't getting the config you wanted. WARNING: [kernel config]: specified values did not make it into the kernel's final configuration: ---------- CONFIG_MCORE2 ----------------- Config: CONFIG_MCORE2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg Requested value: CONFIG_MCORE2=y Actual value: # CONFIG_MCORE2 is not set Config 'MCORE2' has the following Direct dependencies (=y): ---------- CONFIG_ATA ----------------- Config: CONFIG_ATA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA=y Actual value: # CONFIG_ATA is not set Config: CONFIG_ATA_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_ACPI=y Actual value: Config: CONFIG_ATA_SFF From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_SFF=y Actual value: Config: CONFIG_ATA_BMDMA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_BMDMA=y Actual value: Config: CONFIG_ATA_PIIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_PIIX=m Actual value: Config 'ATA' has the following Direct dependencies (=y): HAS_IOMEM(=y) && BLOCK(=y) ---------- CONFIG_ATA_ACPI ----------------- Config: CONFIG_ATA_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_ACPI=y Actual value: Config 'ATA_ACPI' has the following Direct dependencies (=n): ACPI(=y) && ATA(=n) ---------- CONFIG_ATA_SFF ----------------- Config: CONFIG_ATA_SFF From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_SFF=y Actual value: Config 'ATA_SFF' has the following Direct dependencies (=n): ATA(=n) ---------- CONFIG_ATA_BMDMA ----------------- Config: CONFIG_ATA_BMDMA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_BMDMA=y Actual value: Config 'ATA_BMDMA' has the following Direct dependencies (=n): HAS_DMA(=y) && ATA_SFF(=n) && ATA(=n) ---------- CONFIG_ATA_PIIX ----------------- Config: CONFIG_ATA_PIIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_ATA_PIIX=m Actual value: No reference to ATA_PIIX found ---------- CONFIG_PATA_SCH ----------------- Config: CONFIG_PATA_SCH From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PATA_SCH=y Actual value: No reference to PATA_SCH found ---------- CONFIG_INPUT_MOUSEDEV ----------------- Config: CONFIG_INPUT_MOUSEDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_INPUT_MOUSEDEV=y Actual value: # CONFIG_INPUT_MOUSEDEV is not set Config 'INPUT_MOUSEDEV' has the following Direct dependencies (=y): INPUT(=y) && !UML(undefined/n) (=y) ---------- CONFIG_INPUT_EVDEV ----------------- Config: CONFIG_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/input/input.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_INPUT_EVDEV=y Actual value: # CONFIG_INPUT_EVDEV is not set No reference to INPUT_EVDEV found ---------- CONFIG_INPUT_TABLET ----------------- Config: CONFIG_INPUT_TABLET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_INPUT_TABLET=y Actual value: # CONFIG_INPUT_TABLET is not set Config 'INPUT_TABLET' has the following Direct dependencies (=y): INPUT(=y) && !UML(undefined/n) (=y) ---------- CONFIG_HID_WACOM ----------------- Config: CONFIG_HID_WACOM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_HID_WACOM=y Actual value: No reference to HID_WACOM found ---------- CONFIG_RTC_CLASS ----------------- Config: CONFIG_RTC_CLASS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_RTC_CLASS=y Actual value: # CONFIG_RTC_CLASS is not set Config 'RTC_CLASS' has the following Direct dependencies (=y): !S390(undefined/n) (=y) && !UML(undefined/n) (=y) ---------- CONFIG_RTC_DRV_CMOS ----------------- Config: CONFIG_RTC_DRV_CMOS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_RTC_DRV_CMOS=y Actual value: Config 'RTC_DRV_CMOS' has the following Direct dependencies (=n): X86(=y) || ARM(undefined/n) || PPC(undefined/n) || MIPS(undefined/n) || SPARC64(undefined/n) (=y) && RTC_CLASS(=n) ---------- CONFIG_SERIAL_8250_PNP ----------------- Config: CONFIG_SERIAL_8250_PNP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_SERIAL_8250_PNP=y Actual value: No reference to SERIAL_8250_PNP found ---------- CONFIG_PARPORT ----------------- Config: CONFIG_PARPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PARPORT=m Actual value: # CONFIG_PARPORT is not set Config: CONFIG_PARPORT_PC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PARPORT_PC=m Actual value: Config 'PARPORT' has the following Direct dependencies (=y): HAS_IOMEM(=y) ---------- CONFIG_PARPORT_PC ----------------- Config: CONFIG_PARPORT_PC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PARPORT_PC=m Actual value: Config 'PARPORT_PC' has the following Direct dependencies (=n): ARCH_MIGHT_HAVE_PC_PARPORT(=y) && PARPORT(=n) ---------- CONFIG_PRINTER ----------------- Config: CONFIG_PRINTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_PRINTER=m Actual value: Config 'PRINTER' has the following Direct dependencies (=n): PARPORT(=n) ---------- CONFIG_USB_HID ----------------- Config: CONFIG_USB_HID From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_HID=y Actual value: Config: CONFIG_USB_HIDDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_HIDDEV=y Actual value: Config 'USB_HID' has the following Direct dependencies (=n): USB(=n) && INPUT(=y) && USB(=n) && INPUT(=y) ---------- CONFIG_USB_HIDDEV ----------------- Config: CONFIG_USB_HIDDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_HIDDEV=y Actual value: No reference to USB_HIDDEV found ---------- CONFIG_USB_SERIAL ----------------- Config: CONFIG_USB_SERIAL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL=y Actual value: Config: CONFIG_USB_SERIAL_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_CONSOLE=y Actual value: -- Config: CONFIG_USB_SERIAL_GENERIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_GENERIC=y Actual value: Config: CONFIG_USB_SERIAL_FTDI_SIO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_FTDI_SIO=y Actual value: Config: CONFIG_USB_SERIAL_PL2303 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_PL2303=y Actual value: Config 'USB_SERIAL' has the following Direct dependencies (=n): TTY(=y) && USB(=n) && USB_SUPPORT(=y) ---------- CONFIG_USB_SERIAL_CONSOLE ----------------- Config: CONFIG_USB_SERIAL_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_CONSOLE=y Actual value: No reference to USB_SERIAL_CONSOLE found ---------- CONFIG_USB_EZUSB_FX2 ----------------- Config: CONFIG_USB_EZUSB_FX2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_EZUSB_FX2=y Actual value: Config 'USB_EZUSB_FX2' has the following Direct dependencies (=n): USB(=n) && USB_SUPPORT(=y) ---------- CONFIG_USB_SERIAL_GENERIC ----------------- Config: CONFIG_USB_SERIAL_GENERIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_GENERIC=y Actual value: No reference to USB_SERIAL_GENERIC found ---------- CONFIG_USB_SERIAL_FTDI_SIO ----------------- Config: CONFIG_USB_SERIAL_FTDI_SIO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_FTDI_SIO=y Actual value: No reference to USB_SERIAL_FTDI_SIO found ---------- CONFIG_USB_SERIAL_PL2303 ----------------- Config: CONFIG_USB_SERIAL_PL2303 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_USB_SERIAL_PL2303=y Actual value: No reference to USB_SERIAL_PL2303 found ---------- CONFIG_I2C_I801 ----------------- Config: CONFIG_I2C_I801 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_I2C_I801=y Actual value: Config 'I2C_I801' has the following Direct dependencies (=n): PCI(=n) && HAS_IOMEM(=y) && I2C(=n) ---------- CONFIG_IDE ----------------- Config: CONFIG_IDE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE=y Actual value: # CONFIG_IDE is not set Config: CONFIG_IDE_GD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD=y Actual value: Config: CONFIG_IDE_GD_ATA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD_ATA=y Actual value: Config 'IDE' has the following Direct dependencies (=y): HAVE_IDE(=y) && BLOCK(=y) ---------- CONFIG_IDE_GD ----------------- Config: CONFIG_IDE_GD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD=y Actual value: Config: CONFIG_IDE_GD_ATA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD_ATA=y Actual value: Config 'IDE_GD' has the following Direct dependencies (=n): IDE(=n) ---------- CONFIG_IDE_GD_ATA ----------------- Config: CONFIG_IDE_GD_ATA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_IDE_GD_ATA=y Actual value: Config 'IDE_GD_ATA' has the following Direct dependencies (=n): IDE_GD(=n) && IDE(=n) ---------- CONFIG_BLK_DEV_PIIX ----------------- Config: CONFIG_BLK_DEV_PIIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_BLK_DEV_PIIX=y Actual value: No reference to BLK_DEV_PIIX found ---------- CONFIG_SATA_AHCI ----------------- Config: CONFIG_SATA_AHCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_SATA_AHCI=y Actual value: Config 'SATA_AHCI' has the following Direct dependencies (=n): PCI(=n) && HAS_DMA(=y) && ATA(=n) ---------- CONFIG_BLK_DEV_FD ----------------- Config: CONFIG_BLK_DEV_FD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_BLK_DEV_FD=m Actual value: # CONFIG_BLK_DEV_FD is not set No reference to BLK_DEV_FD found ---------- CONFIG_EEPROM_AT24 ----------------- Config: CONFIG_EEPROM_AT24 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_EEPROM_AT24=m Actual value: No reference to EEPROM_AT24 found ---------- CONFIG_NVME_CORE ----------------- Config: CONFIG_NVME_CORE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_NVME_CORE=y Actual value: Config 'NVME_CORE' has the following Direct dependencies (=y): y ---------- CONFIG_BLK_DEV_NVME ----------------- Config: CONFIG_BLK_DEV_NVME From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_BLK_DEV_NVME=y Actual value: Config 'BLK_DEV_NVME' has the following Direct dependencies (=n): PCI(=n) && BLOCK(=y) ---------- CONFIG_NET_CORE ----------------- Config: CONFIG_NET_CORE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_CORE=y Actual value: Config 'NET_CORE' has the following Direct dependencies (=n): NETDEVICES(=n) ---------- CONFIG_ETHERNET ----------------- Config: CONFIG_ETHERNET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ETHERNET=y Actual value: Config 'ETHERNET' has the following Direct dependencies (=n): NET(=n) && NETDEVICES(=n) ---------- CONFIG_NET_VENDOR_3COM ----------------- Config: CONFIG_NET_VENDOR_3COM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_3COM=y Actual value: Config 'NET_VENDOR_3COM' has the following Direct dependencies (=n): ISA(=n) || EISA(=n) || PCI(=n) || PCMCIA(=n) (=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_TYPHOON ----------------- Config: CONFIG_TYPHOON From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_TYPHOON=m Actual value: No reference to TYPHOON found ---------- CONFIG_NET_VENDOR_BROADCOM ----------------- Config: CONFIG_NET_VENDOR_BROADCOM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_BROADCOM=y Actual value: Config 'NET_VENDOR_BROADCOM' has the following Direct dependencies (=n): (SSB_POSSIBLE(=y) && HAS_DMA(=y)) || PCI(=n) || BCM63XX(undefined/n) || SIBYTE_SB1xxx_SOC(undefined/n) (=y) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_TIGON3 ----------------- Config: CONFIG_TIGON3 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_TIGON3=m Actual value: Config 'TIGON3' has the following Direct dependencies (=n): PCI(=n) && NET_VENDOR_BROADCOM(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_BNX2X ----------------- Config: CONFIG_BNX2X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNX2X=m Actual value: Config: CONFIG_BNX2X_SRIOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNX2X_SRIOV=y Actual value: Config 'BNX2X' has the following Direct dependencies (=n): PCI(=n) && NET_VENDOR_BROADCOM(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_BNX2X_SRIOV ----------------- Config: CONFIG_BNX2X_SRIOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNX2X_SRIOV=y Actual value: No reference to BNX2X_SRIOV found ---------- CONFIG_BNXT ----------------- Config: CONFIG_BNXT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNXT=m Actual value: Config: CONFIG_BNXT_SRIOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNXT_SRIOV=y Actual value: Config 'BNXT' has the following Direct dependencies (=n): PCI(=n) && NET_VENDOR_BROADCOM(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_BNXT_SRIOV ----------------- Config: CONFIG_BNXT_SRIOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_BNXT_SRIOV=y Actual value: No reference to BNXT_SRIOV found ---------- CONFIG_NET_VENDOR_ATHEROS ----------------- Config: CONFIG_NET_VENDOR_ATHEROS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_ATHEROS=y Actual value: Config 'NET_VENDOR_ATHEROS' has the following Direct dependencies (=n): PCI(=n) || ATH79(undefined/n) (=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_ATL1 ----------------- Config: CONFIG_ATL1 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1=m Actual value: Config: CONFIG_ATL1C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1C=m Actual value: Config: CONFIG_ATL1E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1E=m Actual value: No reference to ATL1 found ---------- CONFIG_ATL1C ----------------- Config: CONFIG_ATL1C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1C=m Actual value: No reference to ATL1C found ---------- CONFIG_ATL1E ----------------- Config: CONFIG_ATL1E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL1E=m Actual value: No reference to ATL1E found ---------- CONFIG_ATL2 ----------------- Config: CONFIG_ATL2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ATL2=m Actual value: No reference to ATL2 found ---------- CONFIG_ALX ----------------- Config: CONFIG_ALX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_ALX=m Actual value: No reference to ALX found ---------- CONFIG_NET_VENDOR_INTEL ----------------- Config: CONFIG_NET_VENDOR_INTEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_INTEL=y Actual value: Config 'NET_VENDOR_INTEL' has the following Direct dependencies (=n): ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_NET_VENDOR_AMD ----------------- Config: CONFIG_NET_VENDOR_AMD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_AMD=y Actual value: Config 'NET_VENDOR_AMD' has the following Direct dependencies (=n): DIO(undefined/n) || MACH_DECSTATION(undefined/n) || MVME147(undefined/n) || ATARI(undefined/n) || SUN3(undefined/n) || SUN3X(undefined/n) || SBUS(=n) || PCI(=n) || ZORRO(undefined/n) || (ISA(=n) && ISA_DMA_API(=y)) || (ARM(undefined/n) && ARCH_EBSA110(undefined/n)) || ISA(=n) || EISA(=n) || PCMCIA(=n) || ARM64(undefined/n) (=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_PCNET32 ----------------- Config: CONFIG_PCNET32 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_PCNET32=m Actual value: No reference to PCNET32 found ---------- CONFIG_NET_VENDOR_REALTEK ----------------- Config: CONFIG_NET_VENDOR_REALTEK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_REALTEK=y Actual value: Config 'NET_VENDOR_REALTEK' has the following Direct dependencies (=n): PCI(=n) || (PARPORT(=n) && X86(=y)) (=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_8139CP ----------------- Config: CONFIG_8139CP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_8139CP=m Actual value: No reference to 8139CP found ---------- CONFIG_8139TOO ----------------- Config: CONFIG_8139TOO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_8139TOO=m Actual value: Config '8139TOO' has the following Direct dependencies (=n): PCI(=n) && NET_VENDOR_REALTEK(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_R8169 ----------------- Config: CONFIG_R8169 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_R8169=m Actual value: No reference to R8169 found ---------- CONFIG_NET_VENDOR_DLINK ----------------- Config: CONFIG_NET_VENDOR_DLINK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_DLINK=y Actual value: Config 'NET_VENDOR_DLINK' has the following Direct dependencies (=n): PCI(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_DL2K ----------------- Config: CONFIG_DL2K From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_DL2K=m Actual value: No reference to DL2K found ---------- CONFIG_NET_VENDOR_MARVELL ----------------- Config: CONFIG_NET_VENDOR_MARVELL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_NET_VENDOR_MARVELL=y Actual value: Config 'NET_VENDOR_MARVELL' has the following Direct dependencies (=n): PCI(=n) || CPU_PXA168(undefined/n) || MV64X60(undefined/n) || PPC32(undefined/n) || PLAT_ORION(undefined/n) || INET(=n) || COMPILE_TEST(=n) (=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_SKGE ----------------- Config: CONFIG_SKGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_SKGE=m Actual value: Config 'SKGE' has the following Direct dependencies (=n): PCI(=n) && NET_VENDOR_MARVELL(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_SKY2 ----------------- Config: CONFIG_SKY2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_SKY2=m Actual value: Config 'SKY2' has the following Direct dependencies (=n): PCI(=n) && NET_VENDOR_MARVELL(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_JME ----------------- Config: CONFIG_JME From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Requested value: CONFIG_JME=m Actual value: No reference to JME found ---------- CONFIG_FB_MODE_HELPERS ----------------- Config: CONFIG_FB_MODE_HELPERS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_FB_MODE_HELPERS=y Actual value: Config 'FB_MODE_HELPERS' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_CONNECTOR ----------------- Config: CONFIG_CONNECTOR From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_CONNECTOR=y Actual value: Config 'CONNECTOR' has the following Direct dependencies (=n): NET(=n) ---------- CONFIG_FB_UVESA ----------------- Config: CONFIG_FB_UVESA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_FB_UVESA=m Actual value: No reference to FB_UVESA found ---------- CONFIG_DRM_CIRRUS_QEMU ----------------- Config: CONFIG_DRM_CIRRUS_QEMU From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_DRM_CIRRUS_QEMU=m Actual value: No reference to DRM_CIRRUS_QEMU found ---------- CONFIG_WIRELESS ----------------- Config: CONFIG_WIRELESS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WIRELESS=y Actual value: Config 'WIRELESS' has the following Direct dependencies (=n): !S390(undefined/n) (=y) && NET(=n) ---------- CONFIG_WLAN ----------------- Config: CONFIG_WLAN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WLAN=y Actual value: -- Config: CONFIG_WLAN_VENDOR_ATH From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WLAN_VENDOR_ATH=y Actual value: Config 'WLAN' has the following Direct dependencies (=n): !S390(undefined/n) (=y) && NET(=n) && NETDEVICES(=n) ---------- CONFIG_MAC80211 ----------------- Config: CONFIG_MAC80211 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_MAC80211=m Actual value: Config 'MAC80211' has the following Direct dependencies (=n): CFG80211(=n) && WIRELESS(=n) && NET(=n) ---------- CONFIG_CFG80211 ----------------- Config: CONFIG_CFG80211 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CFG80211=m Actual value: -- Config: CONFIG_CFG80211_WEXT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CFG80211_WEXT=y Actual value: Config 'CFG80211' has the following Direct dependencies (=n): RFKILL(=n) || !RFKILL(=n) (=y) && WIRELESS(=n) && NET(=n) ---------- CONFIG_ATH_COMMON ----------------- Config: CONFIG_ATH_COMMON From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_ATH_COMMON=m Actual value: Config 'ATH_COMMON' has the following Direct dependencies (=n): WLAN(=n) && NETDEVICES(=n) ---------- CONFIG_WLAN_VENDOR_ATH ----------------- Config: CONFIG_WLAN_VENDOR_ATH From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WLAN_VENDOR_ATH=y Actual value: Config 'WLAN_VENDOR_ATH' has the following Direct dependencies (=n): WLAN(=n) && NETDEVICES(=n) ---------- CONFIG_ATH5K ----------------- Config: CONFIG_ATH5K From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_ATH5K=m Actual value: Config 'ATH5K' has the following Direct dependencies (=n): PCI(=n) || ATH25(undefined/n) (=n) && MAC80211(=n) && WLAN_VENDOR_ATH(=n) && WLAN(=n) && NETDEVICES(=n) ---------- CONFIG_ATH9K ----------------- Config: CONFIG_ATH9K From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_ATH9K=m Actual value: Config 'ATH9K' has the following Direct dependencies (=n): MAC80211(=n) && HAS_DMA(=y) && WLAN_VENDOR_ATH(=n) && WLAN(=n) && NETDEVICES(=n) ---------- CONFIG_WEXT_CORE ----------------- Config: CONFIG_WEXT_CORE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WEXT_CORE=y Actual value: Config 'WEXT_CORE' has the following Direct dependencies (=n): CFG80211_WEXT(=n) || WIRELESS_EXT(=n) (=n) && WIRELESS(=n) && NET(=n) ---------- CONFIG_WEXT_PROC ----------------- Config: CONFIG_WEXT_PROC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_WEXT_PROC=y Actual value: No reference to WEXT_PROC found ---------- CONFIG_CFG80211_WEXT ----------------- Config: CONFIG_CFG80211_WEXT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CFG80211_WEXT=y Actual value: Config 'CFG80211_WEXT' has the following Direct dependencies (=n): CFG80211(=n) && WIRELESS(=n) && NET(=n) ---------- CONFIG_BCMA ----------------- Config: CONFIG_BCMA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA=m Actual value: # CONFIG_BCMA is not set Config: CONFIG_BCMA_HOST_PCI_POSSIBLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y Actual value: Config: CONFIG_BCMA_HOST_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI=y Actual value: Config: CONFIG_BCMA_DRIVER_GMAC_CMN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_DRIVER_GMAC_CMN=y Actual value: Config 'BCMA' has the following Direct dependencies (=y): BCMA_POSSIBLE(=y) ---------- CONFIG_BCMA_HOST_PCI_POSSIBLE ----------------- Config: CONFIG_BCMA_HOST_PCI_POSSIBLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y Actual value: Config 'BCMA_HOST_PCI_POSSIBLE' has the following Direct dependencies (=n): PCI(=n) = y (=n) && BCMA(=n) ---------- CONFIG_BCMA_HOST_PCI ----------------- Config: CONFIG_BCMA_HOST_PCI_POSSIBLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI_POSSIBLE=y Actual value: Config: CONFIG_BCMA_HOST_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_HOST_PCI=y Actual value: No reference to BCMA_HOST_PCI found ---------- CONFIG_BCMA_DRIVER_GMAC_CMN ----------------- Config: CONFIG_BCMA_DRIVER_GMAC_CMN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_BCMA_DRIVER_GMAC_CMN=y Actual value: No reference to BCMA_DRIVER_GMAC_CMN found ---------- CONFIG_CRC8 ----------------- Config: CONFIG_CRC8 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CRC8=m Actual value: # CONFIG_CRC8 is not set Config 'CRC8' has the following Direct dependencies (=y): y ---------- CONFIG_CORDIC ----------------- Config: CONFIG_CORDIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Requested value: CONFIG_CORDIC=m Actual value: # CONFIG_CORDIC is not set Config 'CORDIC' has the following Direct dependencies (=y): y ---------- CONFIG_PARTITION_ADVANCED ----------------- Config: CONFIG_PARTITION_ADVANCED From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_PARTITION_ADVANCED=y Actual value: # CONFIG_PARTITION_ADVANCED is not set Config 'PARTITION_ADVANCED' has the following Direct dependencies (=y): BLOCK(=y) ---------- CONFIG_FB_EFI ----------------- Config: CONFIG_FB_EFI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_FB_EFI=y Actual value: No reference to FB_EFI found ---------- CONFIG_EFI_VARS ----------------- Config: CONFIG_EFI_VARS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_EFI_VARS=m Actual value: Config 'EFI_VARS' has the following Direct dependencies (=n): EFI(=n) && EFI(=n) ---------- CONFIG_EFI ----------------- Config: CONFIG_EFI_VARS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_EFI_VARS=m Actual value: Config: CONFIG_EFI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFI=y Actual value: # CONFIG_EFI is not set Config: CONFIG_EFI_STUB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFI_STUB=y Actual value: Config: CONFIG_EFIVAR_FS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFIVAR_FS=y Actual value: -- Config: CONFIG_EFI_EARLYCON From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/debug/printk.cfg Requested value: CONFIG_EFI_EARLYCON=y Actual value: Config 'EFI' has the following Direct dependencies (=y): ACPI(=y) ---------- CONFIG_EFI_STUB ----------------- Config: CONFIG_EFI_STUB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFI_STUB=y Actual value: Config 'EFI_STUB' has the following Direct dependencies (=n): EFI(=n) && !X86_USE_3DNOW(=n) (=y) ---------- CONFIG_EFIVAR_FS ----------------- Config: CONFIG_EFIVAR_FS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg Requested value: CONFIG_EFIVAR_FS=y Actual value: No reference to EFIVAR_FS found ---------- CONFIG_HPET_EMULATE_RTC ----------------- Config: CONFIG_HPET_EMULATE_RTC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET_EMULATE_RTC=y Actual value: No reference to HPET_EMULATE_RTC found ---------- CONFIG_HPET ----------------- Config: CONFIG_HPET_EMULATE_RTC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET_EMULATE_RTC=y Actual value: Config: CONFIG_HPET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET=y Actual value: # CONFIG_HPET is not set Config: CONFIG_HPET_MMAP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET_MMAP=y Actual value: Config 'HPET' has the following Direct dependencies (=y): ACPI(=y) ---------- CONFIG_HPET_MMAP ----------------- Config: CONFIG_HPET_MMAP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Requested value: CONFIG_HPET_MMAP=y Actual value: Config 'HPET_MMAP' has the following Direct dependencies (=n): HPET(=n) ---------- CONFIG_X86_MSR ----------------- Config: CONFIG_X86_MSR From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Requested value: CONFIG_X86_MSR=y Actual value: # CONFIG_X86_MSR is not set Config 'X86_MSR' has the following Direct dependencies (=y): y ---------- CONFIG_X86_CPUID ----------------- Config: CONFIG_X86_CPUID From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Requested value: CONFIG_X86_CPUID=y Actual value: # CONFIG_X86_CPUID is not set No reference to X86_CPUID found ---------- CONFIG_X86_CHECK_BIOS_CORRUPTION ----------------- Config: CONFIG_X86_CHECK_BIOS_CORRUPTION From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Requested value: CONFIG_X86_CHECK_BIOS_CORRUPTION=y Actual value: # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set Config 'X86_CHECK_BIOS_CORRUPTION' has the following Direct dependencies (=y): y ---------- CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK ----------------- Config: CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Requested value: CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y Actual value: No reference to X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK found ---------- CONFIG_SMP ----------------- Config: CONFIG_SMP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg Requested value: CONFIG_SMP=y Actual value: # CONFIG_SMP is not set Config 'SMP' has the following Direct dependencies (=y): y ---------- CONFIG_SCHED_SMT ----------------- Config: CONFIG_SCHED_SMT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg Requested value: CONFIG_SCHED_SMT=y Actual value: No reference to SCHED_SMT found ---------- CONFIG_NR_CPUS ----------------- Config: CONFIG_NR_CPUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg Requested value: CONFIG_NR_CPUS=64 Actual value: CONFIG_NR_CPUS=1 No reference to NR_CPUS found ---------- CONFIG_IA32_EMULATION ----------------- Config: CONFIG_IA32_EMULATION From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Requested value: CONFIG_IA32_EMULATION=y Actual value: # CONFIG_IA32_EMULATION is not set Config 'IA32_EMULATION' has the following Direct dependencies (=y): X86_64(=y) ---------- CONFIG_COMPAT ----------------- Config: CONFIG_COMPAT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Requested value: CONFIG_COMPAT=y Actual value: Config 'COMPAT' has the following Direct dependencies (=n): IA32_EMULATION(=n) || X86_X32(=n) ---------- CONFIG_UNWINDER_ORC ----------------- Config: CONFIG_UNWINDER_ORC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Requested value: # CONFIG_UNWINDER_ORC is not set Actual value: CONFIG_UNWINDER_ORC=y Config 'UNWINDER_ORC' has the following Direct dependencies (=y): X86_64(=y) && ---------- CONFIG_UNWINDER_FRAME_POINTER ----------------- Config: CONFIG_UNWINDER_FRAME_POINTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Requested value: CONFIG_UNWINDER_FRAME_POINTER=y Actual value: # CONFIG_UNWINDER_FRAME_POINTER is not set Config 'UNWINDER_FRAME_POINTER' has the following Direct dependencies (=y): ---------- CONFIG_X86_AMD_PLATFORM_DEVICE ----------------- Config: CONFIG_X86_AMD_PLATFORM_DEVICE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg Requested value: CONFIG_X86_AMD_PLATFORM_DEVICE=y Actual value: # CONFIG_X86_AMD_PLATFORM_DEVICE is not set No reference to X86_AMD_PLATFORM_DEVICE found ---------- CONFIG_MICROCODE_AMD ----------------- Config: CONFIG_MICROCODE_AMD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg Requested value: CONFIG_MICROCODE_AMD=y Actual value: # CONFIG_MICROCODE_AMD is not set No reference to MICROCODE_AMD found ---------- CONFIG_X86_MCE_AMD ----------------- Config: CONFIG_X86_MCE_AMD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/amd.cfg Requested value: CONFIG_X86_MCE_AMD=y Actual value: Config 'X86_MCE_AMD' has the following Direct dependencies (=n): X86_MCE(=y) && X86_LOCAL_APIC(=y) && AMD_NB(=n) ---------- CONFIG_PCI ----------------- Config: CONFIG_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI=y Actual value: # CONFIG_PCI is not set Config: CONFIG_PCI_MMCONFIG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI_MMCONFIG=y Actual value: Config: CONFIG_PCI_MSI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI_MSI=y Actual value: Config: CONFIG_PCIEPORTBUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCIEPORTBUS=y Actual value: -- Config: CONFIG_PCI_IOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg Requested value: CONFIG_PCI_IOV=y Actual value: Config 'PCI' has the following Direct dependencies (=y): HAVE_PCI(=y) ---------- CONFIG_PCI_MMCONFIG ----------------- Config: CONFIG_PCI_MMCONFIG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI_MMCONFIG=y Actual value: Config 'PCI_MMCONFIG' has the following Direct dependencies (=n): PCI(=n) && ACPI(=y) || SFI(=n) || JAILHOUSE_GUEST(=n) (=y) && X86_64(=y) || PCI_GOANY(=n) || PCI_GOMMCONFIG(=n) (=y) ---------- CONFIG_PCI_MSI ----------------- Config: CONFIG_PCI_MSI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCI_MSI=y Actual value: Config 'PCI_MSI' has the following Direct dependencies (=n): PCI(=n) ---------- CONFIG_PCIEPORTBUS ----------------- Config: CONFIG_PCIEPORTBUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_PCIEPORTBUS=y Actual value: Config 'PCIEPORTBUS' has the following Direct dependencies (=n): PCI(=n) && PCI(=n) ---------- CONFIG_HOTPLUG_PCI ----------------- Config: CONFIG_HOTPLUG_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Requested value: CONFIG_HOTPLUG_PCI=y Actual value: Config 'HOTPLUG_PCI' has the following Direct dependencies (=n): PCI(=n) && SYSFS(=y) && PCI(=n) ---------- CONFIG_PCI_IOV ----------------- Config: CONFIG_PCI_IOV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg Requested value: CONFIG_PCI_IOV=y Actual value: Config 'PCI_IOV' has the following Direct dependencies (=n): PCI(=n) ---------- CONFIG_MMC ----------------- Config: CONFIG_MMC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-base.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC=y Actual value: # CONFIG_MMC is not set Config: CONFIG_MMC_SDHCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI=y Actual value: Config: CONFIG_MMC_SDHCI_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PCI=y Actual value: Config: CONFIG_MMC_SDHCI_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_ACPI=y Actual value: Config: CONFIG_MMC_SDHCI_PLTFM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PLTFM=y Actual value: Config: CONFIG_MMC_RICOH_MMC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_RICOH_MMC=y Actual value: Config 'MMC' has the following Direct dependencies (=y): HAS_IOMEM(=y) ---------- CONFIG_MMC_SDHCI ----------------- Config: CONFIG_MMC_SDHCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI=y Actual value: Config: CONFIG_MMC_SDHCI_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PCI=y Actual value: Config: CONFIG_MMC_SDHCI_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_ACPI=y Actual value: Config: CONFIG_MMC_SDHCI_PLTFM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PLTFM=y Actual value: Config 'MMC_SDHCI' has the following Direct dependencies (=n): HAS_DMA(=y) && MMC(=n) ---------- CONFIG_MMC_SDHCI_PCI ----------------- Config: CONFIG_MMC_SDHCI_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PCI=y Actual value: Config 'MMC_SDHCI_PCI' has the following Direct dependencies (=n): MMC_SDHCI(=n) && PCI(=n) && MMC(=n) ---------- CONFIG_MMC_SDHCI_ACPI ----------------- Config: CONFIG_MMC_SDHCI_ACPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_ACPI=y Actual value: No reference to MMC_SDHCI_ACPI found ---------- CONFIG_MMC_SDHCI_PLTFM ----------------- Config: CONFIG_MMC_SDHCI_PLTFM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_SDHCI_PLTFM=y Actual value: Config 'MMC_SDHCI_PLTFM' has the following Direct dependencies (=n): MMC_SDHCI(=n) && MMC(=n) ---------- CONFIG_MMC_RICOH_MMC ----------------- Config: CONFIG_MMC_RICOH_MMC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Requested value: CONFIG_MMC_RICOH_MMC=y Actual value: No reference to MMC_RICOH_MMC found ---------- CONFIG_USB_EHCI_HCD ----------------- Config: CONFIG_USB_EHCI_HCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg Requested value: CONFIG_USB_EHCI_HCD=y Actual value: Config 'USB_EHCI_HCD' has the following Direct dependencies (=n): HAS_DMA(=y) && HAS_IOMEM(=y) && USB(=n) && USB_SUPPORT(=y) ---------- CONFIG_USB_EHCI_ROOT_HUB_TT ----------------- Config: CONFIG_USB_EHCI_ROOT_HUB_TT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg Requested value: CONFIG_USB_EHCI_ROOT_HUB_TT=y Actual value: Config 'USB_EHCI_ROOT_HUB_TT' has the following Direct dependencies (=n): USB_EHCI_HCD(=n) && USB(=n) && USB_SUPPORT(=y) ---------- CONFIG_USB_OHCI_HCD ----------------- Config: CONFIG_USB_OHCI_HCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/ohci-hcd.cfg Requested value: CONFIG_USB_OHCI_HCD=y Actual value: Config 'USB_OHCI_HCD' has the following Direct dependencies (=n): HAS_DMA(=y) && HAS_IOMEM(=y) && USB(=n) && USB_SUPPORT(=y) ---------- CONFIG_USB_XHCI_HCD ----------------- Config: CONFIG_USB_XHCI_HCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/xhci-hcd.cfg Requested value: CONFIG_USB_XHCI_HCD=y Actual value: Config 'USB_XHCI_HCD' has the following Direct dependencies (=n): HAS_DMA(=y) && HAS_IOMEM(=y) && USB(=n) && USB_SUPPORT(=y) ---------- CONFIG_INPUT_TOUCHSCREEN ----------------- Config: CONFIG_INPUT_TOUCHSCREEN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/input/touchscreen.cfg Requested value: CONFIG_INPUT_TOUCHSCREEN=y Actual value: # CONFIG_INPUT_TOUCHSCREEN is not set Config 'INPUT_TOUCHSCREEN' has the following Direct dependencies (=y): INPUT(=y) && !UML(undefined/n) (=y) ---------- CONFIG_TOUCHSCREEN_USB_COMPOSITE ----------------- Config: CONFIG_TOUCHSCREEN_USB_COMPOSITE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb/touchscreen-composite.cfg Requested value: CONFIG_TOUCHSCREEN_USB_COMPOSITE=m Actual value: Config 'TOUCHSCREEN_USB_COMPOSITE' has the following Direct dependencies (=n): USB_ARCH_HAS_HCD(=y) && INPUT_TOUCHSCREEN(=n) && INPUT(=y) && !UML(undefined/n) (=y) ---------- CONFIG_USB_USBNET ----------------- Config: CONFIG_USB_USBNET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_USBNET=m Actual value: Config 'USB_USBNET' has the following Direct dependencies (=n): USB_NET_DRIVERS(=n) && NETDEVICES(=n) ---------- CONFIG_USB_NET_DRIVERS ----------------- Config: CONFIG_USB_NET_DRIVERS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_DRIVERS=m Actual value: Config 'USB_NET_DRIVERS' has the following Direct dependencies (=n): USB(=n) && NET(=n) && NETDEVICES(=n) ---------- CONFIG_USB_KAWETH ----------------- Config: CONFIG_USB_KAWETH From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_KAWETH=m Actual value: No reference to USB_KAWETH found ---------- CONFIG_USB_PEGASUS ----------------- Config: CONFIG_USB_PEGASUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_PEGASUS=m Actual value: No reference to USB_PEGASUS found ---------- CONFIG_USB_RTL8150 ----------------- Config: CONFIG_USB_RTL8150 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_RTL8150=m Actual value: No reference to USB_RTL8150 found ---------- CONFIG_USB_RTL8152 ----------------- Config: CONFIG_USB_RTL8152 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_RTL8152=m Actual value: No reference to USB_RTL8152 found ---------- CONFIG_USB_NET_AX8817X ----------------- Config: CONFIG_USB_NET_AX8817X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_AX8817X=m Actual value: No reference to USB_NET_AX8817X found ---------- CONFIG_USB_NET_AX88179_178A ----------------- Config: CONFIG_USB_NET_AX88179_178A From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_AX88179_178A=m Actual value: No reference to USB_NET_AX88179_178A found ---------- CONFIG_USB_NET_CDCETHER ----------------- Config: CONFIG_USB_NET_CDCETHER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDCETHER=m Actual value: Config 'USB_NET_CDCETHER' has the following Direct dependencies (=n): USB_USBNET(=n) && USB_NET_DRIVERS(=n) && NETDEVICES(=n) ---------- CONFIG_USB_NET_CDC_EEM ----------------- Config: CONFIG_USB_NET_CDC_EEM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_EEM=m Actual value: No reference to USB_NET_CDC_EEM found ---------- CONFIG_USB_NET_CDC_NCM ----------------- Config: CONFIG_USB_NET_CDC_NCM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_NCM=m Actual value: Config 'USB_NET_CDC_NCM' has the following Direct dependencies (=n): USB_USBNET(=n) && USB_NET_DRIVERS(=n) && NETDEVICES(=n) ---------- CONFIG_USB_NET_DM9601 ----------------- Config: CONFIG_USB_NET_DM9601 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_DM9601=m Actual value: No reference to USB_NET_DM9601 found ---------- CONFIG_USB_NET_SMSC75XX ----------------- Config: CONFIG_USB_NET_SMSC75XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_SMSC75XX=m Actual value: No reference to USB_NET_SMSC75XX found ---------- CONFIG_USB_NET_SMSC95XX ----------------- Config: CONFIG_USB_NET_SMSC95XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_SMSC95XX=m Actual value: No reference to USB_NET_SMSC95XX found ---------- CONFIG_USB_NET_MCS7830 ----------------- Config: CONFIG_USB_NET_MCS7830 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_MCS7830=m Actual value: No reference to USB_NET_MCS7830 found ---------- CONFIG_USB_NET_RNDIS_HOST ----------------- Config: CONFIG_USB_NET_RNDIS_HOST From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_RNDIS_HOST=m Actual value: Config 'USB_NET_RNDIS_HOST' has the following Direct dependencies (=n): USB_USBNET(=n) && USB_NET_DRIVERS(=n) && NETDEVICES(=n) ---------- CONFIG_USB_NET_CDC_SUBSET_ENABLE ----------------- Config: CONFIG_USB_NET_CDC_SUBSET_ENABLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_SUBSET_ENABLE=m Actual value: Config 'USB_NET_CDC_SUBSET_ENABLE' has the following Direct dependencies (=n): USB_NET_CDC_SUBSET(=n) && USB_NET_DRIVERS(=n) && NETDEVICES(=n) ---------- CONFIG_USB_NET_CDC_SUBSET ----------------- Config: CONFIG_USB_NET_CDC_SUBSET_ENABLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_SUBSET_ENABLE=m Actual value: Config: CONFIG_USB_NET_CDC_SUBSET From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_NET_CDC_SUBSET=m Actual value: Config 'USB_NET_CDC_SUBSET' has the following Direct dependencies (=n): USB_USBNET(=n) && USB_NET_DRIVERS(=n) && NETDEVICES(=n) ---------- CONFIG_USB_ALI_M5632 ----------------- Config: CONFIG_USB_ALI_M5632 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_ALI_M5632=y Actual value: No reference to USB_ALI_M5632 found ---------- CONFIG_USB_AN2720 ----------------- Config: CONFIG_USB_AN2720 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_AN2720=y Actual value: No reference to USB_AN2720 found ---------- CONFIG_USB_BELKIN ----------------- Config: CONFIG_USB_BELKIN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_BELKIN=y Actual value: No reference to USB_BELKIN found ---------- CONFIG_USB_ARMLINUX ----------------- Config: CONFIG_USB_ARMLINUX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_ARMLINUX=y Actual value: No reference to USB_ARMLINUX found ---------- CONFIG_USB_KC2190 ----------------- Config: CONFIG_USB_KC2190 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Requested value: CONFIG_USB_KC2190=y Actual value: No reference to USB_KC2190 found ---------- CONFIG_E100 ----------------- Config: CONFIG_E100 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e100.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E100=y Actual value: Config: CONFIG_E1000E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000E=y Actual value: Config: CONFIG_E1000 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000=y Actual value: No reference to E100 found ---------- CONFIG_E1000E ----------------- Config: CONFIG_E1000E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000E=y Actual value: Config 'E1000E' has the following Direct dependencies (=n): PCI(=n) && !SPARC32(undefined/n) || BROKEN(=n) (=y) && NET_VENDOR_INTEL(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_E1000 ----------------- Config: CONFIG_E1000E From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000E=y Actual value: Config: CONFIG_E1000 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Requested value: CONFIG_E1000=y Actual value: No reference to E1000 found ---------- CONFIG_IGB ----------------- Config: CONFIG_IGB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg Requested value: CONFIG_IGB=y Actual value: Config: CONFIG_IGBVF From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg Requested value: CONFIG_IGBVF=m Actual value: Config 'IGB' has the following Direct dependencies (=n): PCI(=n) && NET_VENDOR_INTEL(=n) && ETHERNET(=n) && NETDEVICES(=n) ---------- CONFIG_IGBVF ----------------- Config: CONFIG_IGBVF From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/igb/igb.cfg Requested value: CONFIG_IGBVF=m Actual value: No reference to IGBVF found ---------- CONFIG_IRQ_REMAP ----------------- Config: CONFIG_IRQ_REMAP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg Requested value: CONFIG_IRQ_REMAP=y Actual value: Config 'IRQ_REMAP' has the following Direct dependencies (=n): X86_64(=y) && X86_IO_APIC(=y) && PCI_MSI(=n) && ACPI(=y) && IOMMU_SUPPORT(=y) ---------- CONFIG_X86_X2APIC ----------------- Config: CONFIG_X86_X2APIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg Requested value: CONFIG_X86_X2APIC=y Actual value: Config 'X86_X2APIC' has the following Direct dependencies (=n): X86_LOCAL_APIC(=y) && X86_64(=y) && IRQ_REMAP(=n) || HYPERVISOR_GUEST(=n) (=n) ---------- CONFIG_ISDN ----------------- Config: CONFIG_ISDN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_ISDN=y Actual value: Config: CONFIG_ISDN_CAPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_ISDN_CAPI=m Actual value: Config 'ISDN' has the following Direct dependencies (=n): NET(=n) && NETDEVICES(=n) && !S390(undefined/n) (=y) && !UML(undefined/n) (=y) ---------- CONFIG_ISDN_CAPI ----------------- Config: CONFIG_ISDN_CAPI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_ISDN_CAPI=m Actual value: Config 'ISDN_CAPI' has the following Direct dependencies (=n): ISDN(=n) ---------- CONFIG_BT_6LOWPAN ----------------- Config: CONFIG_BT_6LOWPAN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_6LOWPAN=m Actual value: No reference to BT_6LOWPAN found ---------- CONFIG_BT_RFCOMM ----------------- Config: CONFIG_BT_RFCOMM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_RFCOMM=m Actual value: Config: CONFIG_BT_RFCOMM_TTY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_RFCOMM_TTY=y Actual value: Config 'BT_RFCOMM' has the following Direct dependencies (=n): BT_BREDR(=n) && NET(=n) ---------- CONFIG_BT_RFCOMM_TTY ----------------- Config: CONFIG_BT_RFCOMM_TTY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_RFCOMM_TTY=y Actual value: No reference to BT_RFCOMM_TTY found ---------- CONFIG_BT_BNEP ----------------- Config: CONFIG_BT_BNEP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP=m Actual value: Config: CONFIG_BT_BNEP_MC_FILTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP_MC_FILTER=y Actual value: Config: CONFIG_BT_BNEP_PROTO_FILTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP_PROTO_FILTER=y Actual value: Config 'BT_BNEP' has the following Direct dependencies (=n): BT_BREDR(=n) && NET(=n) ---------- CONFIG_BT_BNEP_MC_FILTER ----------------- Config: CONFIG_BT_BNEP_MC_FILTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP_MC_FILTER=y Actual value: No reference to BT_BNEP_MC_FILTER found ---------- CONFIG_BT_BNEP_PROTO_FILTER ----------------- Config: CONFIG_BT_BNEP_PROTO_FILTER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BNEP_PROTO_FILTER=y Actual value: No reference to BT_BNEP_PROTO_FILTER found ---------- CONFIG_BT_CMTP ----------------- Config: CONFIG_BT_CMTP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_CMTP=m Actual value: No reference to BT_CMTP found ---------- CONFIG_BT_HIDP ----------------- Config: CONFIG_BT_HIDP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_HIDP=m Actual value: No reference to BT_HIDP found ---------- CONFIG_BT_LE ----------------- Config: CONFIG_BT_LE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_LE=y Actual value: Config 'BT_LE' has the following Direct dependencies (=n): BT(=n) && NET(=n) ---------- CONFIG_BT_BREDR ----------------- Config: CONFIG_BT_BREDR From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Requested value: CONFIG_BT_BREDR=y Actual value: Config 'BT_BREDR' has the following Direct dependencies (=n): BT(=n) && NET(=n) ---------- CONFIG_6LOWPAN ----------------- Config: CONFIG_6LOWPAN From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/6lowpan/6lowpan.cfg Requested value: CONFIG_6LOWPAN=m Actual value: Config '6LOWPAN' has the following Direct dependencies (=n): IPV6(=n) && NET(=n) ---------- CONFIG_SERIAL_8250 ----------------- Config: CONFIG_SERIAL_8250_PNP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_SERIAL_8250_PNP=y Actual value: -- Config: CONFIG_SERIAL_8250 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250=y Actual value: # CONFIG_SERIAL_8250 is not set Config: CONFIG_SERIAL_8250_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_CONSOLE=y Actual value: Config: CONFIG_SERIAL_8250_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_PCI=y Actual value: Config: CONFIG_SERIAL_8250_NR_UARTS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_NR_UARTS=4 Actual value: Config: CONFIG_SERIAL_8250_RUNTIME_UARTS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_RUNTIME_UARTS=4 Actual value: Config 'SERIAL_8250' has the following Direct dependencies (=y): !S390(undefined/n) (=y) && HAS_IOMEM(=y) && TTY(=y) ---------- CONFIG_SERIAL_8250_CONSOLE ----------------- Config: CONFIG_SERIAL_8250_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_CONSOLE=y Actual value: Config 'SERIAL_8250_CONSOLE' has the following Direct dependencies (=n): SERIAL_8250(=n) = y (=n) && HAS_IOMEM(=y) && TTY(=y) ---------- CONFIG_SERIAL_8250_PCI ----------------- Config: CONFIG_SERIAL_8250_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_PCI=y Actual value: Config 'SERIAL_8250_PCI' has the following Direct dependencies (=n): SERIAL_8250(=n) && PCI(=n) && HAS_IOMEM(=y) && TTY(=y) ---------- CONFIG_SERIAL_8250_NR_UARTS ----------------- Config: CONFIG_SERIAL_8250_NR_UARTS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_NR_UARTS=4 Actual value: Config 'SERIAL_8250_NR_UARTS' has the following Direct dependencies (=n): SERIAL_8250(=n) && HAS_IOMEM(=y) && TTY(=y) ---------- CONFIG_SERIAL_8250_RUNTIME_UARTS ----------------- Config: CONFIG_SERIAL_8250_RUNTIME_UARTS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_8250_RUNTIME_UARTS=4 Actual value: No reference to SERIAL_8250_RUNTIME_UARTS found ---------- CONFIG_SERIAL_CORE ----------------- Config: CONFIG_SERIAL_CORE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_CORE=y Actual value: Config: CONFIG_SERIAL_CORE_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_CORE_CONSOLE=y Actual value: Config 'SERIAL_CORE' has the following Direct dependencies (=y): HAS_IOMEM(=y) && TTY(=y) ---------- CONFIG_SERIAL_CORE_CONSOLE ----------------- Config: CONFIG_SERIAL_CORE_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/8250.cfg Requested value: CONFIG_SERIAL_CORE_CONSOLE=y Actual value: Config 'SERIAL_CORE_CONSOLE' has the following Direct dependencies (=y): HAS_IOMEM(=y) && TTY(=y) ---------- CONFIG_AGP ----------------- Config: CONFIG_AGP From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_AGP=y Actual value: Config: CONFIG_AGP_INTEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_AGP_INTEL=y Actual value: Config 'AGP' has the following Direct dependencies (=n): ALPHA(undefined/n) || IA64(undefined/n) || PARISC(undefined/n) || PPC(undefined/n) || X86(=y) (=y) && PCI(=n) && HAS_IOMEM(=y) ---------- CONFIG_AGP_INTEL ----------------- Config: CONFIG_AGP_INTEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_AGP_INTEL=y Actual value: Config 'AGP_INTEL' has the following Direct dependencies (=n): AGP(=n) && X86(=y) && HAS_IOMEM(=y) ---------- CONFIG_DRM_I915 ----------------- Config: CONFIG_DRM_I915 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915=m Actual value: Config: CONFIG_DRM_I915_ALPHA_SUPPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y Actual value: Config 'DRM_I915' has the following Direct dependencies (=n): DRM(=n) && X86(=y) && PCI(=n) && HAS_IOMEM(=y) ---------- CONFIG_DRM_I915_ALPHA_SUPPORT ----------------- Config: CONFIG_DRM_I915_ALPHA_SUPPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y Actual value: Config 'DRM_I915_ALPHA_SUPPORT' has the following Direct dependencies (=n): DRM_I915(=n) && HAS_IOMEM(=y) ---------- CONFIG_BLK_DEV_SD ----------------- Config: CONFIG_BLK_DEV_SD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/disk.cfg Requested value: CONFIG_BLK_DEV_SD=y Actual value: No reference to BLK_DEV_SD found ---------- CONFIG_USB_VIDEO_CLASS ----------------- Config: CONFIG_USB_VIDEO_CLASS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_VIDEO_CLASS=m Actual value: Config: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y Actual value: Config 'USB_VIDEO_CLASS' has the following Direct dependencies (=n): VIDEO_V4L2(=n) && MEDIA_CAMERA_SUPPORT(=n) && MEDIA_USB_SUPPORT(=n) && USB(=n) && MEDIA_SUPPORT(=n) && MEDIA_SUPPORT(=n) ---------- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV ----------------- Config: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y Actual value: No reference to USB_VIDEO_CLASS_INPUT_EVDEV found ---------- CONFIG_USB_GSPCA ----------------- Config: CONFIG_USB_GSPCA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA=m Actual value: -- Config: CONFIG_USB_GSPCA_BENQ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_BENQ=m Actual value: Config: CONFIG_USB_GSPCA_CONEX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_CONEX=m Actual value: Config: CONFIG_USB_GSPCA_CPIA1 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_CPIA1=m Actual value: Config: CONFIG_USB_GSPCA_ETOMS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_ETOMS=m Actual value: Config: CONFIG_USB_GSPCA_FINEPIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_FINEPIX=m Actual value: Config: CONFIG_USB_GSPCA_JEILINJ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_JEILINJ=m Actual value: Config: CONFIG_USB_GSPCA_JL2005BCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_JL2005BCD=m Actual value: Config: CONFIG_USB_GSPCA_KINECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_KINECT=m Actual value: Config: CONFIG_USB_GSPCA_KONICA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_KONICA=m Actual value: Config: CONFIG_USB_GSPCA_MARS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_MARS=m Actual value: Config: CONFIG_USB_GSPCA_MR97310A From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_MR97310A=m Actual value: Config: CONFIG_USB_GSPCA_NW80X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_NW80X=m Actual value: Config: CONFIG_USB_GSPCA_OV519 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV519=m Actual value: Config: CONFIG_USB_GSPCA_OV534 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534=m Actual value: Config: CONFIG_USB_GSPCA_OV534_9 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534_9=m Actual value: Config: CONFIG_USB_GSPCA_PAC207 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC207=m Actual value: Config: CONFIG_USB_GSPCA_PAC7302 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC7302=m Actual value: Config: CONFIG_USB_GSPCA_PAC7311 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC7311=m Actual value: Config: CONFIG_USB_GSPCA_SE401 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SE401=m Actual value: Config: CONFIG_USB_GSPCA_SN9C2028 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SN9C2028=m Actual value: Config: CONFIG_USB_GSPCA_SN9C20X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SN9C20X=m Actual value: Config: CONFIG_USB_GSPCA_SONIXB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SONIXB=m Actual value: Config: CONFIG_USB_GSPCA_SONIXJ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SONIXJ=m Actual value: Config: CONFIG_USB_GSPCA_SPCA500 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA500=m Actual value: Config: CONFIG_USB_GSPCA_SPCA501 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA501=m Actual value: Config: CONFIG_USB_GSPCA_SPCA505 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA505=m Actual value: Config: CONFIG_USB_GSPCA_SPCA506 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA506=m Actual value: Config: CONFIG_USB_GSPCA_SPCA508 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA508=m Actual value: Config: CONFIG_USB_GSPCA_SPCA561 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA561=m Actual value: Config: CONFIG_USB_GSPCA_SPCA1528 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA1528=m Actual value: Config: CONFIG_USB_GSPCA_SQ905 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905=m Actual value: Config: CONFIG_USB_GSPCA_SQ905C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905C=m Actual value: Config: CONFIG_USB_GSPCA_SQ930X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ930X=m Actual value: Config: CONFIG_USB_GSPCA_STK014 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_STK014=m Actual value: Config: CONFIG_USB_GSPCA_STV0680 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_STV0680=m Actual value: Config: CONFIG_USB_GSPCA_SUNPLUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SUNPLUS=m Actual value: Config: CONFIG_USB_GSPCA_T613 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_T613=m Actual value: Config: CONFIG_USB_GSPCA_TOPRO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_TOPRO=m Actual value: Config: CONFIG_USB_GSPCA_TV8532 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_TV8532=m Actual value: Config: CONFIG_USB_GSPCA_VC032X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_VC032X=m Actual value: Config: CONFIG_USB_GSPCA_VICAM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_VICAM=m Actual value: Config: CONFIG_USB_GSPCA_XIRLINK_CIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_XIRLINK_CIT=m Actual value: Config: CONFIG_USB_GSPCA_ZC3XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_ZC3XX=m Actual value: Config 'USB_GSPCA' has the following Direct dependencies (=n): VIDEO_V4L2(=n) && INPUT(=y) || INPUT(=y) = n (=y) && MEDIA_CAMERA_SUPPORT(=n) && MEDIA_USB_SUPPORT(=n) && USB(=n) && MEDIA_SUPPORT(=n) && MEDIA_SUPPORT(=n) ---------- CONFIG_USB_M5602 ----------------- Config: CONFIG_USB_M5602 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_M5602=m Actual value: No reference to USB_M5602 found ---------- CONFIG_USB_STV06XX ----------------- Config: CONFIG_USB_STV06XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_STV06XX=m Actual value: No reference to USB_STV06XX found ---------- CONFIG_USB_GL860 ----------------- Config: CONFIG_USB_GL860 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GL860=m Actual value: No reference to USB_GL860 found ---------- CONFIG_USB_GSPCA_BENQ ----------------- Config: CONFIG_USB_GSPCA_BENQ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_BENQ=m Actual value: No reference to USB_GSPCA_BENQ found ---------- CONFIG_USB_GSPCA_CONEX ----------------- Config: CONFIG_USB_GSPCA_CONEX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_CONEX=m Actual value: No reference to USB_GSPCA_CONEX found ---------- CONFIG_USB_GSPCA_CPIA1 ----------------- Config: CONFIG_USB_GSPCA_CPIA1 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_CPIA1=m Actual value: No reference to USB_GSPCA_CPIA1 found ---------- CONFIG_USB_GSPCA_ETOMS ----------------- Config: CONFIG_USB_GSPCA_ETOMS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_ETOMS=m Actual value: No reference to USB_GSPCA_ETOMS found ---------- CONFIG_USB_GSPCA_FINEPIX ----------------- Config: CONFIG_USB_GSPCA_FINEPIX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_FINEPIX=m Actual value: No reference to USB_GSPCA_FINEPIX found ---------- CONFIG_USB_GSPCA_JEILINJ ----------------- Config: CONFIG_USB_GSPCA_JEILINJ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_JEILINJ=m Actual value: No reference to USB_GSPCA_JEILINJ found ---------- CONFIG_USB_GSPCA_JL2005BCD ----------------- Config: CONFIG_USB_GSPCA_JL2005BCD From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_JL2005BCD=m Actual value: No reference to USB_GSPCA_JL2005BCD found ---------- CONFIG_USB_GSPCA_KINECT ----------------- Config: CONFIG_USB_GSPCA_KINECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_KINECT=m Actual value: No reference to USB_GSPCA_KINECT found ---------- CONFIG_USB_GSPCA_KONICA ----------------- Config: CONFIG_USB_GSPCA_KONICA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_KONICA=m Actual value: No reference to USB_GSPCA_KONICA found ---------- CONFIG_USB_GSPCA_MARS ----------------- Config: CONFIG_USB_GSPCA_MARS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_MARS=m Actual value: No reference to USB_GSPCA_MARS found ---------- CONFIG_USB_GSPCA_MR97310A ----------------- Config: CONFIG_USB_GSPCA_MR97310A From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_MR97310A=m Actual value: No reference to USB_GSPCA_MR97310A found ---------- CONFIG_USB_GSPCA_NW80X ----------------- Config: CONFIG_USB_GSPCA_NW80X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_NW80X=m Actual value: No reference to USB_GSPCA_NW80X found ---------- CONFIG_USB_GSPCA_OV519 ----------------- Config: CONFIG_USB_GSPCA_OV519 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV519=m Actual value: No reference to USB_GSPCA_OV519 found ---------- CONFIG_USB_GSPCA_OV534 ----------------- Config: CONFIG_USB_GSPCA_OV534 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534=m Actual value: Config: CONFIG_USB_GSPCA_OV534_9 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534_9=m Actual value: No reference to USB_GSPCA_OV534 found ---------- CONFIG_USB_GSPCA_OV534_9 ----------------- Config: CONFIG_USB_GSPCA_OV534_9 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_OV534_9=m Actual value: No reference to USB_GSPCA_OV534_9 found ---------- CONFIG_USB_GSPCA_PAC207 ----------------- Config: CONFIG_USB_GSPCA_PAC207 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC207=m Actual value: No reference to USB_GSPCA_PAC207 found ---------- CONFIG_USB_GSPCA_PAC7302 ----------------- Config: CONFIG_USB_GSPCA_PAC7302 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC7302=m Actual value: No reference to USB_GSPCA_PAC7302 found ---------- CONFIG_USB_GSPCA_PAC7311 ----------------- Config: CONFIG_USB_GSPCA_PAC7311 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_PAC7311=m Actual value: No reference to USB_GSPCA_PAC7311 found ---------- CONFIG_USB_GSPCA_SE401 ----------------- Config: CONFIG_USB_GSPCA_SE401 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SE401=m Actual value: No reference to USB_GSPCA_SE401 found ---------- CONFIG_USB_GSPCA_SN9C2028 ----------------- Config: CONFIG_USB_GSPCA_SN9C2028 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SN9C2028=m Actual value: No reference to USB_GSPCA_SN9C2028 found ---------- CONFIG_USB_GSPCA_SN9C20X ----------------- Config: CONFIG_USB_GSPCA_SN9C20X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SN9C20X=m Actual value: No reference to USB_GSPCA_SN9C20X found ---------- CONFIG_USB_GSPCA_SONIXB ----------------- Config: CONFIG_USB_GSPCA_SONIXB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SONIXB=m Actual value: No reference to USB_GSPCA_SONIXB found ---------- CONFIG_USB_GSPCA_SONIXJ ----------------- Config: CONFIG_USB_GSPCA_SONIXJ From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SONIXJ=m Actual value: No reference to USB_GSPCA_SONIXJ found ---------- CONFIG_USB_GSPCA_SPCA500 ----------------- Config: CONFIG_USB_GSPCA_SPCA500 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA500=m Actual value: No reference to USB_GSPCA_SPCA500 found ---------- CONFIG_USB_GSPCA_SPCA501 ----------------- Config: CONFIG_USB_GSPCA_SPCA501 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA501=m Actual value: No reference to USB_GSPCA_SPCA501 found ---------- CONFIG_USB_GSPCA_SPCA505 ----------------- Config: CONFIG_USB_GSPCA_SPCA505 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA505=m Actual value: No reference to USB_GSPCA_SPCA505 found ---------- CONFIG_USB_GSPCA_SPCA506 ----------------- Config: CONFIG_USB_GSPCA_SPCA506 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA506=m Actual value: No reference to USB_GSPCA_SPCA506 found ---------- CONFIG_USB_GSPCA_SPCA508 ----------------- Config: CONFIG_USB_GSPCA_SPCA508 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA508=m Actual value: No reference to USB_GSPCA_SPCA508 found ---------- CONFIG_USB_GSPCA_SPCA561 ----------------- Config: CONFIG_USB_GSPCA_SPCA561 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA561=m Actual value: No reference to USB_GSPCA_SPCA561 found ---------- CONFIG_USB_GSPCA_SPCA1528 ----------------- Config: CONFIG_USB_GSPCA_SPCA1528 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SPCA1528=m Actual value: No reference to USB_GSPCA_SPCA1528 found ---------- CONFIG_USB_GSPCA_SQ905 ----------------- Config: CONFIG_USB_GSPCA_SQ905 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905=m Actual value: Config: CONFIG_USB_GSPCA_SQ905C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905C=m Actual value: No reference to USB_GSPCA_SQ905 found ---------- CONFIG_USB_GSPCA_SQ905C ----------------- Config: CONFIG_USB_GSPCA_SQ905C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ905C=m Actual value: No reference to USB_GSPCA_SQ905C found ---------- CONFIG_USB_GSPCA_SQ930X ----------------- Config: CONFIG_USB_GSPCA_SQ930X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SQ930X=m Actual value: No reference to USB_GSPCA_SQ930X found ---------- CONFIG_USB_GSPCA_STK014 ----------------- Config: CONFIG_USB_GSPCA_STK014 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_STK014=m Actual value: No reference to USB_GSPCA_STK014 found ---------- CONFIG_USB_GSPCA_STV0680 ----------------- Config: CONFIG_USB_GSPCA_STV0680 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_STV0680=m Actual value: No reference to USB_GSPCA_STV0680 found ---------- CONFIG_USB_GSPCA_SUNPLUS ----------------- Config: CONFIG_USB_GSPCA_SUNPLUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_SUNPLUS=m Actual value: No reference to USB_GSPCA_SUNPLUS found ---------- CONFIG_USB_GSPCA_T613 ----------------- Config: CONFIG_USB_GSPCA_T613 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_T613=m Actual value: No reference to USB_GSPCA_T613 found ---------- CONFIG_USB_GSPCA_TOPRO ----------------- Config: CONFIG_USB_GSPCA_TOPRO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_TOPRO=m Actual value: No reference to USB_GSPCA_TOPRO found ---------- CONFIG_USB_GSPCA_TV8532 ----------------- Config: CONFIG_USB_GSPCA_TV8532 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_TV8532=m Actual value: No reference to USB_GSPCA_TV8532 found ---------- CONFIG_USB_GSPCA_VC032X ----------------- Config: CONFIG_USB_GSPCA_VC032X From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_VC032X=m Actual value: No reference to USB_GSPCA_VC032X found ---------- CONFIG_USB_GSPCA_VICAM ----------------- Config: CONFIG_USB_GSPCA_VICAM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_VICAM=m Actual value: No reference to USB_GSPCA_VICAM found ---------- CONFIG_USB_GSPCA_XIRLINK_CIT ----------------- Config: CONFIG_USB_GSPCA_XIRLINK_CIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_XIRLINK_CIT=m Actual value: No reference to USB_GSPCA_XIRLINK_CIT found ---------- CONFIG_USB_GSPCA_ZC3XX ----------------- Config: CONFIG_USB_GSPCA_ZC3XX From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_GSPCA_ZC3XX=m Actual value: No reference to USB_GSPCA_ZC3XX found ---------- CONFIG_USB_PWC ----------------- Config: CONFIG_USB_PWC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_PWC=m Actual value: Config: CONFIG_USB_PWC_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_PWC_INPUT_EVDEV=y Actual value: Config 'USB_PWC' has the following Direct dependencies (=n): VIDEO_V4L2(=n) && MEDIA_CAMERA_SUPPORT(=n) && MEDIA_USB_SUPPORT(=n) && USB(=n) && MEDIA_SUPPORT(=n) && MEDIA_SUPPORT(=n) ---------- CONFIG_USB_PWC_INPUT_EVDEV ----------------- Config: CONFIG_USB_PWC_INPUT_EVDEV From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_PWC_INPUT_EVDEV=y Actual value: No reference to USB_PWC_INPUT_EVDEV found ---------- CONFIG_VIDEO_CPIA2 ----------------- Config: CONFIG_VIDEO_CPIA2 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_VIDEO_CPIA2=m Actual value: No reference to VIDEO_CPIA2 found ---------- CONFIG_USB_STKWEBCAM ----------------- Config: CONFIG_USB_STKWEBCAM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_STKWEBCAM=m Actual value: No reference to USB_STKWEBCAM found ---------- CONFIG_USB_S2255 ----------------- Config: CONFIG_USB_S2255 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Requested value: CONFIG_USB_S2255=m Actual value: No reference to USB_S2255 found ---------- CONFIG_SND_PCI ----------------- Config: CONFIG_SND_PCI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_PCI=y Actual value: Config 'SND_PCI' has the following Direct dependencies (=n): PCI(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_INTEL ----------------- Config: CONFIG_SND_HDA_INTEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_INTEL=m Actual value: Config 'SND_HDA_INTEL' has the following Direct dependencies (=n): SND_PCI(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_GENERIC ----------------- Config: CONFIG_SND_HDA_GENERIC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_GENERIC=m Actual value: Config 'SND_HDA_GENERIC' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_HDMI ----------------- Config: CONFIG_SND_HDA_CODEC_HDMI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_HDMI=m Actual value: Config 'SND_HDA_CODEC_HDMI' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_ANALOG ----------------- Config: CONFIG_SND_HDA_CODEC_ANALOG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_ANALOG=m Actual value: Config 'SND_HDA_CODEC_ANALOG' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_REALTEK ----------------- Config: CONFIG_SND_HDA_CODEC_REALTEK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_REALTEK=m Actual value: Config 'SND_HDA_CODEC_REALTEK' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_SIGMATEL ----------------- Config: CONFIG_SND_HDA_CODEC_SIGMATEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_SIGMATEL=m Actual value: Config 'SND_HDA_CODEC_SIGMATEL' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_CIRRUS ----------------- Config: CONFIG_SND_HDA_CODEC_CIRRUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CIRRUS=m Actual value: Config 'SND_HDA_CODEC_CIRRUS' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_CONEXANT ----------------- Config: CONFIG_SND_HDA_CODEC_CONEXANT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CONEXANT=m Actual value: Config 'SND_HDA_CODEC_CONEXANT' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_CA0110 ----------------- Config: CONFIG_SND_HDA_CODEC_CA0110 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CA0110=m Actual value: Config 'SND_HDA_CODEC_CA0110' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_CA0132 ----------------- Config: CONFIG_SND_HDA_CODEC_CA0132 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CA0132=m Actual value: Config 'SND_HDA_CODEC_CA0132' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_CMEDIA ----------------- Config: CONFIG_SND_HDA_CODEC_CMEDIA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_CMEDIA=m Actual value: Config 'SND_HDA_CODEC_CMEDIA' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_SND_HDA_CODEC_SI3054 ----------------- Config: CONFIG_SND_HDA_CODEC_SI3054 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Requested value: CONFIG_SND_HDA_CODEC_SI3054=m Actual value: Config 'SND_HDA_CODEC_SI3054' has the following Direct dependencies (=n): SND_HDA(=n) && SND(=n) && !UML(undefined/n) (=y) && SOUND(=n) ---------- CONFIG_DMA_SHARED_BUFFER ----------------- Config: CONFIG_DMA_SHARED_BUFFER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DMA_SHARED_BUFFER=y Actual value: Config 'DMA_SHARED_BUFFER' has the following Direct dependencies (=y): y ---------- CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS ----------------- Config: CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y Actual value: No reference to MOUSE_PS2_SYNAPTICS_SMBUS found ---------- CONFIG_MOUSE_PS2_SMBUS ----------------- Config: CONFIG_MOUSE_PS2_SMBUS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_MOUSE_PS2_SMBUS=y Actual value: Config 'MOUSE_PS2_SMBUS' has the following Direct dependencies (=y): MOUSE_PS2(=y) && INPUT_MOUSE(=y) && INPUT(=y) && !UML(undefined/n) (=y) ---------- CONFIG_VT_HW_CONSOLE_BINDING ----------------- Config: CONFIG_VT_HW_CONSOLE_BINDING From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_VT_HW_CONSOLE_BINDING=y Actual value: # CONFIG_VT_HW_CONSOLE_BINDING is not set Config 'VT_HW_CONSOLE_BINDING' has the following Direct dependencies (=y): HW_CONSOLE(=y) && TTY(=y) ---------- CONFIG_I2C ----------------- Config: CONFIG_I2C_I801 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Requested value: CONFIG_I2C_I801=y Actual value: -- Config: CONFIG_I2C From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C=y Actual value: # CONFIG_I2C is not set Config: CONFIG_I2C_BOARDINFO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_BOARDINFO=y Actual value: Config: CONFIG_I2C_COMPAT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_COMPAT=y Actual value: Config: CONFIG_I2C_HELPER_AUTO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_HELPER_AUTO=y Actual value: Config: CONFIG_I2C_ALGOBIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_ALGOBIT=y Actual value: Config 'I2C' has the following Direct dependencies (=y): y ---------- CONFIG_I2C_BOARDINFO ----------------- Config: CONFIG_I2C_BOARDINFO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_BOARDINFO=y Actual value: No reference to I2C_BOARDINFO found ---------- CONFIG_I2C_COMPAT ----------------- Config: CONFIG_I2C_COMPAT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_COMPAT=y Actual value: No reference to I2C_COMPAT found ---------- CONFIG_I2C_HELPER_AUTO ----------------- Config: CONFIG_I2C_HELPER_AUTO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_HELPER_AUTO=y Actual value: Config 'I2C_HELPER_AUTO' has the following Direct dependencies (=n): I2C(=n) ---------- CONFIG_I2C_ALGOBIT ----------------- Config: CONFIG_I2C_ALGOBIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_I2C_ALGOBIT=y Actual value: Config 'I2C_ALGOBIT' has the following Direct dependencies (=n): I2C(=n) ---------- CONFIG_DRM ----------------- Config: CONFIG_DRM_CIRRUS_QEMU From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_DRM_CIRRUS_QEMU=m Actual value: -- Config: CONFIG_DRM_I915 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915=m Actual value: Config: CONFIG_DRM_I915_ALPHA_SUPPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Requested value: CONFIG_DRM_I915_ALPHA_SUPPORT=y Actual value: -- Config: CONFIG_DRM_VIRTIO_GPU From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg Requested value: CONFIG_DRM_VIRTIO_GPU=y Actual value: -- Config: CONFIG_DRM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM=y Actual value: # CONFIG_DRM is not set Config: CONFIG_DRM_KMS_HELPER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_KMS_HELPER=y Actual value: Config: CONFIG_DRM_KMS_FB_HELPER From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/i915/i915.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_KMS_FB_HELPER=y Actual value: Config: CONFIG_DRM_FBDEV_EMULATION From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_FBDEV_EMULATION=y Actual value: Config: CONFIG_DRM_FBDEV_OVERALLOC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_FBDEV_OVERALLOC=100 Actual value: Config: CONFIG_DRM_TTM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_TTM=y Actual value: Config: CONFIG_DRM_BOCHS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_BOCHS=y Actual value: Config: CONFIG_DRM_PANEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL=y Actual value: Config: CONFIG_DRM_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_BRIDGE=y Actual value: Config: CONFIG_DRM_PANEL_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_BRIDGE=y Actual value: Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y Actual value: Config 'DRM' has the following Direct dependencies (=y): AGP(=n) || AGP(=n) = n (=y) && !EMULATED_CMPXCHG(undefined/n) (=y) && HAS_DMA(=y) && HAS_IOMEM(=y) ---------- CONFIG_DRM_FBDEV_EMULATION ----------------- Config: CONFIG_DRM_FBDEV_EMULATION From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_FBDEV_EMULATION=y Actual value: Config 'DRM_FBDEV_EMULATION' has the following Direct dependencies (=n): DRM(=n) && HAS_IOMEM(=y) ---------- CONFIG_DRM_FBDEV_OVERALLOC ----------------- Config: CONFIG_DRM_FBDEV_OVERALLOC From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_FBDEV_OVERALLOC=100 Actual value: No reference to DRM_FBDEV_OVERALLOC found ---------- CONFIG_DRM_TTM ----------------- Config: CONFIG_DRM_TTM From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_TTM=y Actual value: Config 'DRM_TTM' has the following Direct dependencies (=n): DRM(=n) && MMU(=y) && HAS_IOMEM(=y) ---------- CONFIG_DRM_BOCHS ----------------- Config: CONFIG_DRM_BOCHS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_BOCHS=y Actual value: No reference to DRM_BOCHS found ---------- CONFIG_DRM_PANEL ----------------- Config: CONFIG_DRM_PANEL From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL=y Actual value: -- Config: CONFIG_DRM_PANEL_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_BRIDGE=y Actual value: Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y Actual value: Config 'DRM_PANEL' has the following Direct dependencies (=n): DRM(=n) && HAS_IOMEM(=y) ---------- CONFIG_DRM_BRIDGE ----------------- Config: CONFIG_DRM_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_BRIDGE=y Actual value: Config 'DRM_BRIDGE' has the following Direct dependencies (=n): DRM(=n) && HAS_IOMEM(=y) ---------- CONFIG_DRM_PANEL_BRIDGE ----------------- Config: CONFIG_DRM_PANEL_BRIDGE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_BRIDGE=y Actual value: Config 'DRM_PANEL_BRIDGE' has the following Direct dependencies (=n): DRM_BRIDGE(=n) && DRM_KMS_HELPER(=n) && HAS_IOMEM(=y) ---------- CONFIG_DRM_PANEL_ORIENTATION_QUIRKS ----------------- Config: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y Actual value: Config 'DRM_PANEL_ORIENTATION_QUIRKS' has the following Direct dependencies (=y): HAS_IOMEM(=y) ---------- CONFIG_FB_CMDLINE ----------------- Config: CONFIG_FB_CMDLINE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CMDLINE=y Actual value: Config 'FB_CMDLINE' has the following Direct dependencies (=y): HAS_IOMEM(=y) ---------- CONFIG_FB_NOTIFY ----------------- Config: CONFIG_FB_NOTIFY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_NOTIFY=y Actual value: Config 'FB_NOTIFY' has the following Direct dependencies (=y): HAS_IOMEM(=y) ---------- CONFIG_FB ----------------- Config: CONFIG_FB_MODE_HELPERS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_FB_MODE_HELPERS=y Actual value: -- Config: CONFIG_FB_UVESA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Requested value: CONFIG_FB_UVESA=m Actual value: -- Config: CONFIG_FB_EFI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Requested value: CONFIG_FB_EFI=y Actual value: -- Config: CONFIG_FB_CMDLINE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CMDLINE=y Actual value: Config: CONFIG_FB_NOTIFY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_NOTIFY=y Actual value: Config: CONFIG_FB From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB=y Actual value: # CONFIG_FB is not set Config: CONFIG_FB_CFB_FILLRECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_FILLRECT=y Actual value: Config: CONFIG_FB_CFB_COPYAREA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_COPYAREA=y Actual value: Config: CONFIG_FB_CFB_IMAGEBLIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_IMAGEBLIT=y Actual value: Config: CONFIG_FB_SYS_FILLRECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_FILLRECT=y Actual value: Config: CONFIG_FB_SYS_COPYAREA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_COPYAREA=y Actual value: Config: CONFIG_FB_SYS_IMAGEBLIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_IMAGEBLIT=y Actual value: Config: CONFIG_FB_SYS_FOPS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_FOPS=y Actual value: Config: CONFIG_FB_DEFERRED_IO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_DEFERRED_IO=y Actual value: Config: CONFIG_FB_SIMPLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SIMPLE=y Actual value: Config 'FB' has the following Direct dependencies (=y): HAS_IOMEM(=y) ---------- CONFIG_FB_CFB_FILLRECT ----------------- Config: CONFIG_FB_CFB_FILLRECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_FILLRECT=y Actual value: Config 'FB_CFB_FILLRECT' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_FB_CFB_COPYAREA ----------------- Config: CONFIG_FB_CFB_COPYAREA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_COPYAREA=y Actual value: Config 'FB_CFB_COPYAREA' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_FB_CFB_IMAGEBLIT ----------------- Config: CONFIG_FB_CFB_IMAGEBLIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_CFB_IMAGEBLIT=y Actual value: Config 'FB_CFB_IMAGEBLIT' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_FB_SYS_FILLRECT ----------------- Config: CONFIG_FB_SYS_FILLRECT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_FILLRECT=y Actual value: Config 'FB_SYS_FILLRECT' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_FB_SYS_COPYAREA ----------------- Config: CONFIG_FB_SYS_COPYAREA From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_COPYAREA=y Actual value: Config 'FB_SYS_COPYAREA' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_FB_SYS_IMAGEBLIT ----------------- Config: CONFIG_FB_SYS_IMAGEBLIT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_IMAGEBLIT=y Actual value: Config 'FB_SYS_IMAGEBLIT' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_FB_SYS_FOPS ----------------- Config: CONFIG_FB_SYS_FOPS From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SYS_FOPS=y Actual value: Config 'FB_SYS_FOPS' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_FB_DEFERRED_IO ----------------- Config: CONFIG_FB_DEFERRED_IO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_DEFERRED_IO=y Actual value: Config 'FB_DEFERRED_IO' has the following Direct dependencies (=n): FB(=n) && HAS_IOMEM(=y) ---------- CONFIG_FB_SIMPLE ----------------- Config: CONFIG_FB_SIMPLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FB_SIMPLE=y Actual value: Config 'FB_SIMPLE' has the following Direct dependencies (=n): FB(=n) = y (=n) && HAS_IOMEM(=y) ---------- CONFIG_HDMI ----------------- Config: CONFIG_HDMI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_HDMI=y Actual value: Config 'HDMI' has the following Direct dependencies (=y): HAS_IOMEM(=y) ---------- CONFIG_FRAMEBUFFER_CONSOLE ----------------- Config: CONFIG_FRAMEBUFFER_CONSOLE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FRAMEBUFFER_CONSOLE=y Actual value: Config: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y Actual value: Config 'FRAMEBUFFER_CONSOLE' has the following Direct dependencies (=n): FB(=n) && !UML(undefined/n) (=y) && VT(=y) ---------- CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY ----------------- Config: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y Actual value: Config 'FRAMEBUFFER_CONSOLE_DETECT_PRIMARY' has the following Direct dependencies (=n): FRAMEBUFFER_CONSOLE(=n) && VT(=y) ---------- CONFIG_SYNC_FILE ----------------- Config: CONFIG_SYNC_FILE From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_SYNC_FILE=y Actual value: # CONFIG_SYNC_FILE is not set Config 'SYNC_FILE' has the following Direct dependencies (=y): y ---------- CONFIG_FONT_SUPPORT ----------------- Config: CONFIG_FONT_SUPPORT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FONT_SUPPORT=y Actual value: Config 'FONT_SUPPORT' has the following Direct dependencies (=y): y ---------- CONFIG_FONT_8x8 ----------------- Config: CONFIG_FONT_8x8 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FONT_8x8=y Actual value: Config 'FONT_8x8' has the following Direct dependencies (=n): FRAMEBUFFER_CONSOLE(=n) || STI_CONSOLE(=n) (=n) && FONT_SUPPORT(=n) ---------- CONFIG_FONT_8x16 ----------------- Config: CONFIG_FONT_8x16 From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Requested value: CONFIG_FONT_8x16=y Actual value: Config 'FONT_8x16' has the following Direct dependencies (=n): FONT_SUPPORT(=n) ---------- CONFIG_HYPERVISOR_GUEST ----------------- Config: CONFIG_HYPERVISOR_GUEST From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/hv-guest.cfg Requested value: CONFIG_HYPERVISOR_GUEST=y Actual value: # CONFIG_HYPERVISOR_GUEST is not set Config 'HYPERVISOR_GUEST' has the following Direct dependencies (=y): y ---------- CONFIG_KVM_GUEST ----------------- Config: CONFIG_KVM_GUEST From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Requested value: CONFIG_KVM_GUEST=y Actual value: Config 'KVM_GUEST' has the following Direct dependencies (=n): PARAVIRT(=n) && HYPERVISOR_GUEST(=n) ---------- CONFIG_PARAVIRT ----------------- Config: CONFIG_PARAVIRT From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Requested value: CONFIG_PARAVIRT=y Actual value: Config: CONFIG_PARAVIRT_CLOCK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Requested value: CONFIG_PARAVIRT_CLOCK=y Actual value: Config 'PARAVIRT' has the following Direct dependencies (=n): HYPERVISOR_GUEST(=n) ---------- CONFIG_PARAVIRT_CLOCK ----------------- Config: CONFIG_PARAVIRT_CLOCK From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Requested value: CONFIG_PARAVIRT_CLOCK=y Actual value: Config 'PARAVIRT_CLOCK' has the following Direct dependencies (=n): HYPERVISOR_GUEST(=n) ---------- CONFIG_SCSI ----------------- Config: CONFIG_SCSI_VIRTIO From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/cfg/virtio.cfg Requested value: CONFIG_SCSI_VIRTIO=y Actual value: -- Config: CONFIG_SCSI From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg Requested value: CONFIG_SCSI=y Actual value: # CONFIG_SCSI is not set Config: CONFIG_SCSI_DEBUG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg Requested value: CONFIG_SCSI_DEBUG=m Actual value: Config 'SCSI' has the following Direct dependencies (=y): BLOCK(=y) ---------- CONFIG_SCSI_DEBUG ----------------- Config: CONFIG_SCSI_DEBUG From: /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/.kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg Requested value: CONFIG_SCSI_DEBUG=m Actual value: No reference to SCSI_DEBUG found DEBUG: Python function do_kernel_configcheck finished > > Cheers, > > Bruce > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From jupiter.hce at gmail.com Mon Feb 3 23:00:27 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 4 Feb 2020 10:00:27 +1100 Subject: [OE-core] Failed to add u-boot ubifs (not working) In-Reply-To: <20200203110820.kokz6qu4l74nyhlk@qschulz> References: <20200203110820.kokz6qu4l74nyhlk@qschulz> Message-ID: Hi Quentin, Thanks for your response. On 2/3/20, Quentin Schulz wrote: > Hi JH, > > On Mon, Feb 03, 2020 at 09:56:49PM +1100, JH wrote: >> Hi, >> >> I added my local machine to ubifs, is it correct? >> >> UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_nand_config,ubifs" >> > > Also, you need to select UBOOT_CONFIG somewhere, with the above line, > you just say "if nand is selected as an UBOOT_CONFIG, do xyz". You still > need to select it (with I assume, UBOOT_CONFIG += "nand" in a bbappend > somewhere). Sorry for not being it clear, I indeed defined UBOOT_CONFIG = "nand" in the local.conf. Should I define it as UBOOT_CONFIG += "nand" or should I move it to a u-boot bbappend? > What's in your mx6ull_14x14_evk_nand_config? The mx6ull_14x14_evk_nand_config,ubifs was from a tip found and copied from Internet, but the original definition is from included meta-freescale/conf/machine/imx6ullevk.conf: UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard" UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config" I tried to use UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_config,ubifs", no avail. > I haven't used that option before but what's ,ubifs supposed to do? Are > you sure this nand option for UBOOT_CONFIG would actually create a .imx > and not a .ubifs for example or something along those lines. > > TL;DR: Make sure UBOOT_CONFIG has nand in it, check that .imx is built > with your defconfig and check that you're actually enabling the UBI > command in your defconfig. Yes, all enabled in my kernel 4.19.75: CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_MTD_UBI_FASTMAP=y # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI_BLOCK=y CONFIG_DTC=y CONFIG_OF=y > Also, it would be helpful if you could give links to the recipes you're > using. I seem to recall in some other mail it was > http://git.yoctoproject.org/cgit/cgit.cgi/meta-freescale/tree/recipes-bsp/u-boot/u-boot-imx_2017.03.bb?h=sumo > but it could be thud version as well. Yes, I am using the thud, the u-boot-imx_2017.03.bb is the same, here is the link: http://git.yoctoproject.org/cgit/cgit.cgi/meta-freescale/tree/recipes-bsp/u-boot/u-boot-imx_2017.03.bb?h=thud Thank you very much. Kind regards, - jh On 2/3/20, JH wrote: > Hi, > > I added my local machine to ubifs, is it correct? > > UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_nand_config,ubifs" > > I built the u-boot.imx, but the ubi was still missing in u-boot. What > I could be missing? > > => run nand-boot; > Unknown command 'ubi' - try 'help' > Unknown command 'ubi' - try 'help' > > Thank you. > > Kind regards, > > - jh > From raj.khem at gmail.com Tue Feb 4 01:45:36 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 3 Feb 2020 17:45:36 -0800 Subject: [OE-core] [PATCH] webkitgtk: Prefer -pthread over -lpthread Message-ID: <20200204014536.2524501-1-raj.khem@gmail.com> -pthread is compiler driver option which links in needed dependencies for pthreads along with -lpthread, this aids in fixing build failures on rv64 Signed-off-by: Khem Raj --- ...1-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 45 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.2.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch new file mode 100644 index 0000000000..268118b5ca --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch @@ -0,0 +1,45 @@ +From 8ee7806ad2d5606967f7a1529a113fb9d1a386de Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 3 Feb 2020 17:06:27 -0800 +Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG + +Fixes build failures on risv64 + +Taken from https://trac.webkit.org/changeset/231843/webkit + + Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of +-lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to +missing atomic primitives. + +Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] +Signed-off-by: Khem Raj +--- + Source/cmake/OptionsGTK.cmake | 2 ++ + Source/cmake/OptionsJSCOnly.cmake | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake +index d3beef19..6a92856f 100644 +--- a/Source/cmake/OptionsGTK.cmake ++++ b/Source/cmake/OptionsGTK.cmake +@@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT + set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") + set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") + ++set(THREADS_PREFER_PTHREAD_FLAG ON) ++ + find_package(Cairo 1.14.0 REQUIRED) + find_package(Fontconfig 2.8.0 REQUIRED) + find_package(Freetype 2.4.2 REQUIRED) +diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake +index b2e87418..326ade23 100644 +--- a/Source/cmake/OptionsJSCOnly.cmake ++++ b/Source/cmake/OptionsJSCOnly.cmake +@@ -1,3 +1,4 @@ ++set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + + if (MSVC) +-- +2.25.0 + diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb index a223cfd451..a184d833c4 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb @@ -15,6 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ + file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ file://x32_support.patch \ file://cross-compile.patch \ file://0001-Fix-build-with-musl.patch \ -- 2.25.0 From takondra at cisco.com Tue Feb 4 02:20:06 2020 From: takondra at cisco.com (Taras Kondratiuk) Date: Tue, 4 Feb 2020 02:20:06 +0000 Subject: [OE-core] [PATCH] gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' Message-ID: <20200204022006.714-1-takondra@cisco.com> Linux kernel compilation for aarch64 triggers ICE if CONFIG_CC_OPTIMIZE_FOR_SIZE=y. The rootcause is GCC bug #91102 'aarch64 ICE on Linux kernel with -Os'. Apply the fix to 9.2. Signed-off-by: Taras Kondratiuk --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...02-aarch64-ICE-on-Linux-kernel-with-.patch | 95 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index 926df11c2782..2bae85afe3a3 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -69,6 +69,7 @@ SRC_URI = "\ file://CVE-2019-15847_1.patch \ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ + file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch new file mode 100644 index 000000000000..c37e0bb9dd9b --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch @@ -0,0 +1,95 @@ +From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 +From: Vladimir Makarov +Date: Wed, 10 Jul 2019 16:07:10 +0000 +Subject: [PATCH] re PR target/91102 (aarch64 ICE on Linux kernel with -Os + starting with r270266) + +2019-07-10 Vladimir Makarov + + PR target/91102 + * lra-constraints.c (process_alt_operands): Don't match user + defined regs only if they are early clobbers. + +2019-07-10 Vladimir Makarov + + PR target/91102 + * gcc.target/aarch64/pr91102.c: New test. + +From-SVN: r273357 +Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/613caed2feb9cfc8158308670b59df3d031ec629] +[takondra: dropped conflicting ChangeLog changes] +Signed-off-by: Taras Kondratiuk +--- + gcc/lra-constraints.c | 17 ++++++++++---- + gcc/testsuite/gcc.target/aarch64/pr91102.c | 26 ++++++++++++++++++++++ + 2 files changed, 39 insertions(+), 4 deletions(-) + create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c + +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c +index cf33da8013e4..6382dbf852b6 100644 +--- a/gcc/lra-constraints.c ++++ b/gcc/lra-constraints.c +@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) + else + { + /* Operands don't match. If the operands are +- different user defined explicit hard registers, +- then we cannot make them match. */ ++ different user defined explicit hard ++ registers, then we cannot make them match ++ when one is early clobber operand. */ + if ((REG_P (*curr_id->operand_loc[nop]) + || SUBREG_P (*curr_id->operand_loc[nop])) + && (REG_P (*curr_id->operand_loc[m]) +@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative) + && REG_P (m_reg) + && HARD_REGISTER_P (m_reg) + && REG_USERVAR_P (m_reg)) +- break; ++ { ++ int i; ++ ++ for (i = 0; i < early_clobbered_regs_num; i++) ++ if (m == early_clobbered_nops[i]) ++ break; ++ if (i < early_clobbered_regs_num ++ || early_clobber_p) ++ break; ++ } + } +- + /* Both operands must allow a reload register, + otherwise we cannot make them match. */ + if (curr_alt[m] == NO_REGS) +diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c +new file mode 100644 +index 000000000000..70b99045a48e +--- /dev/null ++++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c +@@ -0,0 +1,26 @@ ++/* PR target/91102 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++ ++int ++foo (long d, long l) ++{ ++ register long e asm ("x1") = d; ++ register long f asm("x2") = l; ++ asm ("" : : "r" (e), "r" (f)); ++ return 3; ++} ++ ++struct T { int i; int j; }; ++union S { long h; struct T t; }; ++ ++void ++bar (union S b) ++{ ++ while (1) ++ { ++ union S c = b; ++ c.t.j++; ++ b.h = foo (b.h, c.h); ++ } ++} -- 2.18.1 From raj.khem at gmail.com Tue Feb 4 03:57:20 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 3 Feb 2020 19:57:20 -0800 Subject: [OE-core] [PATCH] gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' In-Reply-To: <20200204022006.714-1-takondra@cisco.com> References: <20200204022006.714-1-takondra@cisco.com> Message-ID: this is ok. Also please ask it to be backported to 9.3 on gcc bugzilla On Mon, Feb 3, 2020 at 6:20 PM Taras Kondratiuk wrote: > > Linux kernel compilation for aarch64 triggers ICE if > CONFIG_CC_OPTIMIZE_FOR_SIZE=y. > > The rootcause is GCC bug #91102 'aarch64 ICE on Linux kernel with -Os'. > Apply the fix to 9.2. > > Signed-off-by: Taras Kondratiuk > --- > meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + > ...02-aarch64-ICE-on-Linux-kernel-with-.patch | 95 +++++++++++++++++++ > 2 files changed, 96 insertions(+) > create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch > > diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc > index 926df11c2782..2bae85afe3a3 100644 > --- a/meta/recipes-devtools/gcc/gcc-9.2.inc > +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc > @@ -69,6 +69,7 @@ SRC_URI = "\ > file://CVE-2019-15847_1.patch \ > file://CVE-2019-15847_2.patch \ > file://CVE-2019-15847_3.patch \ > + file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ > " > S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" > SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" > diff --git a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch > new file mode 100644 > index 000000000000..c37e0bb9dd9b > --- /dev/null > +++ b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch > @@ -0,0 +1,95 @@ > +From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 > +From: Vladimir Makarov > +Date: Wed, 10 Jul 2019 16:07:10 +0000 > +Subject: [PATCH] re PR target/91102 (aarch64 ICE on Linux kernel with -Os > + starting with r270266) > + > +2019-07-10 Vladimir Makarov > + > + PR target/91102 > + * lra-constraints.c (process_alt_operands): Don't match user > + defined regs only if they are early clobbers. > + > +2019-07-10 Vladimir Makarov > + > + PR target/91102 > + * gcc.target/aarch64/pr91102.c: New test. > + > +From-SVN: r273357 > +Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/613caed2feb9cfc8158308670b59df3d031ec629] > +[takondra: dropped conflicting ChangeLog changes] > +Signed-off-by: Taras Kondratiuk > +--- > + gcc/lra-constraints.c | 17 ++++++++++---- > + gcc/testsuite/gcc.target/aarch64/pr91102.c | 26 ++++++++++++++++++++++ > + 2 files changed, 39 insertions(+), 4 deletions(-) > + create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c > + > +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c > +index cf33da8013e4..6382dbf852b6 100644 > +--- a/gcc/lra-constraints.c > ++++ b/gcc/lra-constraints.c > +@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) > + else > + { > + /* Operands don't match. If the operands are > +- different user defined explicit hard registers, > +- then we cannot make them match. */ > ++ different user defined explicit hard > ++ registers, then we cannot make them match > ++ when one is early clobber operand. */ > + if ((REG_P (*curr_id->operand_loc[nop]) > + || SUBREG_P (*curr_id->operand_loc[nop])) > + && (REG_P (*curr_id->operand_loc[m]) > +@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative) > + && REG_P (m_reg) > + && HARD_REGISTER_P (m_reg) > + && REG_USERVAR_P (m_reg)) > +- break; > ++ { > ++ int i; > ++ > ++ for (i = 0; i < early_clobbered_regs_num; i++) > ++ if (m == early_clobbered_nops[i]) > ++ break; > ++ if (i < early_clobbered_regs_num > ++ || early_clobber_p) > ++ break; > ++ } > + } > +- > + /* Both operands must allow a reload register, > + otherwise we cannot make them match. */ > + if (curr_alt[m] == NO_REGS) > +diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c > +new file mode 100644 > +index 000000000000..70b99045a48e > +--- /dev/null > ++++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c > +@@ -0,0 +1,26 @@ > ++/* PR target/91102 */ > ++/* { dg-do compile } */ > ++/* { dg-options "-O2" } */ > ++ > ++int > ++foo (long d, long l) > ++{ > ++ register long e asm ("x1") = d; > ++ register long f asm("x2") = l; > ++ asm ("" : : "r" (e), "r" (f)); > ++ return 3; > ++} > ++ > ++struct T { int i; int j; }; > ++union S { long h; struct T t; }; > ++ > ++void > ++bar (union S b) > ++{ > ++ while (1) > ++ { > ++ union S c = b; > ++ c.t.j++; > ++ b.h = foo (b.h, c.h); > ++ } > ++} > -- > 2.18.1 > From akuster808 at gmail.com Tue Feb 4 04:17:42 2020 From: akuster808 at gmail.com (akuster808) Date: Mon, 3 Feb 2020 20:17:42 -0800 Subject: [OE-core] [PATCH] gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' In-Reply-To: References: <20200204022006.714-1-takondra@cisco.com> Message-ID: On 2/3/20 7:57 PM, Khem Raj wrote: > this is ok. Also please ask it to be backported to 9.3 on gcc bugzilla And zeus : ) - armin > > On Mon, Feb 3, 2020 at 6:20 PM Taras Kondratiuk wrote: >> Linux kernel compilation for aarch64 triggers ICE if >> CONFIG_CC_OPTIMIZE_FOR_SIZE=y. >> >> The rootcause is GCC bug #91102 'aarch64 ICE on Linux kernel with -Os'. >> Apply the fix to 9.2. >> >> Signed-off-by: Taras Kondratiuk >> --- >> meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + >> ...02-aarch64-ICE-on-Linux-kernel-with-.patch | 95 +++++++++++++++++++ >> 2 files changed, 96 insertions(+) >> create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch >> >> diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc >> index 926df11c2782..2bae85afe3a3 100644 >> --- a/meta/recipes-devtools/gcc/gcc-9.2.inc >> +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc >> @@ -69,6 +69,7 @@ SRC_URI = "\ >> file://CVE-2019-15847_1.patch \ >> file://CVE-2019-15847_2.patch \ >> file://CVE-2019-15847_3.patch \ >> + file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ >> " >> S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" >> SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" >> diff --git a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch >> new file mode 100644 >> index 000000000000..c37e0bb9dd9b >> --- /dev/null >> +++ b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch >> @@ -0,0 +1,95 @@ >> +From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 >> +From: Vladimir Makarov >> +Date: Wed, 10 Jul 2019 16:07:10 +0000 >> +Subject: [PATCH] re PR target/91102 (aarch64 ICE on Linux kernel with -Os >> + starting with r270266) >> + >> +2019-07-10 Vladimir Makarov >> + >> + PR target/91102 >> + * lra-constraints.c (process_alt_operands): Don't match user >> + defined regs only if they are early clobbers. >> + >> +2019-07-10 Vladimir Makarov >> + >> + PR target/91102 >> + * gcc.target/aarch64/pr91102.c: New test. >> + >> +From-SVN: r273357 >> +Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/613caed2feb9cfc8158308670b59df3d031ec629] >> +[takondra: dropped conflicting ChangeLog changes] >> +Signed-off-by: Taras Kondratiuk >> +--- >> + gcc/lra-constraints.c | 17 ++++++++++---- >> + gcc/testsuite/gcc.target/aarch64/pr91102.c | 26 ++++++++++++++++++++++ >> + 2 files changed, 39 insertions(+), 4 deletions(-) >> + create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c >> + >> +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c >> +index cf33da8013e4..6382dbf852b6 100644 >> +--- a/gcc/lra-constraints.c >> ++++ b/gcc/lra-constraints.c >> +@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) >> + else >> + { >> + /* Operands don't match. If the operands are >> +- different user defined explicit hard registers, >> +- then we cannot make them match. */ >> ++ different user defined explicit hard >> ++ registers, then we cannot make them match >> ++ when one is early clobber operand. */ >> + if ((REG_P (*curr_id->operand_loc[nop]) >> + || SUBREG_P (*curr_id->operand_loc[nop])) >> + && (REG_P (*curr_id->operand_loc[m]) >> +@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative) >> + && REG_P (m_reg) >> + && HARD_REGISTER_P (m_reg) >> + && REG_USERVAR_P (m_reg)) >> +- break; >> ++ { >> ++ int i; >> ++ >> ++ for (i = 0; i < early_clobbered_regs_num; i++) >> ++ if (m == early_clobbered_nops[i]) >> ++ break; >> ++ if (i < early_clobbered_regs_num >> ++ || early_clobber_p) >> ++ break; >> ++ } >> + } >> +- >> + /* Both operands must allow a reload register, >> + otherwise we cannot make them match. */ >> + if (curr_alt[m] == NO_REGS) >> +diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c >> +new file mode 100644 >> +index 000000000000..70b99045a48e >> +--- /dev/null >> ++++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c >> +@@ -0,0 +1,26 @@ >> ++/* PR target/91102 */ >> ++/* { dg-do compile } */ >> ++/* { dg-options "-O2" } */ >> ++ >> ++int >> ++foo (long d, long l) >> ++{ >> ++ register long e asm ("x1") = d; >> ++ register long f asm("x2") = l; >> ++ asm ("" : : "r" (e), "r" (f)); >> ++ return 3; >> ++} >> ++ >> ++struct T { int i; int j; }; >> ++union S { long h; struct T t; }; >> ++ >> ++void >> ++bar (union S b) >> ++{ >> ++ while (1) >> ++ { >> ++ union S c = b; >> ++ c.t.j++; >> ++ b.h = foo (b.h, c.h); >> ++ } >> ++} >> -- >> 2.18.1 >> From anuj.mittal at intel.com Tue Feb 4 05:51:45 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Tue, 4 Feb 2020 13:51:45 +0800 Subject: [OE-core] [PATCH v2] sqlite3: upgrade 3.30.1 -> 3.31.1 In-Reply-To: <20200204054432.822155-4-anuj.mittal@intel.com> References: <20200204054432.822155-4-anuj.mittal@intel.com> Message-ID: <20200204055145.998317-1-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../sqlite/sqlite3/CVE-2019-19244.patch | 33 ---------- .../sqlite/sqlite3/CVE-2019-19880.patch | 33 ---------- .../sqlite/sqlite3/CVE-2019-19923.patch | 50 -------------- .../sqlite/sqlite3/CVE-2019-19924.patch | 65 ------------------- .../sqlite/sqlite3/CVE-2019-19925.patch | 33 ---------- .../sqlite/sqlite3/CVE-2019-19926.patch | 31 --------- .../sqlite/sqlite3/CVE-2019-19959.patch | 46 ------------- .../sqlite/sqlite3/CVE-2019-20218.patch | 31 --------- meta/recipes-support/sqlite/sqlite3_3.30.1.bb | 20 ------ meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 12 ++++ 10 files changed, 12 insertions(+), 342 deletions(-) delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.30.1.bb create mode 100644 meta/recipes-support/sqlite/sqlite3_3.31.1.bb diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch deleted file mode 100644 index 3f70979acc..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19244 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 0f690d4ae5ffe656762fdbb7f36cc4c2dcbb2d9d Mon Sep 17 00:00:00 2001 -From: dan -Date: Fri, 22 Nov 2019 10:14:01 +0000 -Subject: [PATCH] Fix a crash that could occur if a sub-select that uses both - DISTINCT and window functions also used an ORDER BY that is the same as its - select list. - -Amalgamation version of the patch: -FossilOrigin-Name: bcdd66c1691955c697f3d756c2b035acfe98f6aad72e90b0021bab6e9023b3ba ---- - sqlite3.c | 5 +++-- - sqlite3.h | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 8fd740b..db1c649 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( - */ - if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct - && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 -+ && p->pWin==0 - ){ - p->selFlags &= ~SF_Distinct; - pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch deleted file mode 100644 index ca5c31c57b..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19880 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 3622d20ad10dfac9586d4423547ed960cbc66fcf Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Wed, 18 Dec 2019 00:05:50 +0000 -Subject: [PATCH] When processing constant integer values in ORDER BY clauses - of window definitions (see check-in [7e4 --- - ---- - sqlite3.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sqlite3.c b/sqlite3.c -index db1c649..a83b3d2 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -147584,9 +147584,11 @@ static ExprList *exprListAppendList( - int nInit = pList ? pList->nExpr : 0; - for(i=0; inExpr; i++){ - Expr *pDup = sqlite3ExprDup(pParse->db, pAppend->a[i].pExpr, 0); -+ assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) ); - if( bIntToNull && pDup && pDup->op==TK_INTEGER ){ - pDup->op = TK_NULL; - pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse); -+ pDup->u.zToken = 0; - } - pList = sqlite3ExprListAppend(pParse, pList, pDup); - if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags; --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch deleted file mode 100644 index b1b866b250..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch +++ /dev/null @@ -1,50 +0,0 @@ -CVE: CVE-2019-19923 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From b64463719dc53bde98b0ce3930b10a32560c3a02 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Wed, 18 Dec 2019 20:51:58 +0000 -Subject: [PATCH] Continue to back away from the LEFT JOIN optimization of - check-in [41c27bc0ff1d3135] by disallowing query flattening if the outer - query is DISTINCT. Without this fix, if an index scan is run on the table - within the view on the right-hand side of the LEFT JOIN, stale result - registers might be accessed yielding incorrect results, and/or an - OP_IfNullRow opcode might be invoked on the un-opened table, resulting in a - NULL-pointer dereference. This problem was found by the Yongheng and Rui - fuzzer. - -FossilOrigin-Name: 862974312edf00e9d1068115d1a39b7235b7db68b6d86b81d38a12f025a4748e ---- - sqlite3.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index d29da07..5bc06c8 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -129216,6 +129216,7 @@ static void substSelect( - ** (3b) the FROM clause of the subquery may not contain a virtual - ** table and - ** (3c) the outer query may not be an aggregate. -+** (3d) the outer query may not be DISTINCT. - ** - ** (4) The subquery can not be DISTINCT. - ** -@@ -129412,8 +129413,11 @@ static int flattenSubquery( - */ - if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){ - isLeftJoin = 1; -- if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){ -- /* (3a) (3c) (3b) */ -+ if( pSubSrc->nSrc>1 /* (3a) */ -+ || isAgg /* (3b) */ -+ || IsVirtual(pSubSrc->a[0].pTab) /* (3c) */ -+ || (p->selFlags & SF_Distinct)!=0 /* (3d) */ -+ ){ - return 0; - } - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch deleted file mode 100644 index 80d5edbb0c..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch +++ /dev/null @@ -1,65 +0,0 @@ -CVE: CVE-2019-19924 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 854fe21e8a987f84da81f6bb9e90abc5355c6621 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 20:37:32 +0000 -Subject: [PATCH] When an error occurs while rewriting the parser tree for - window functions in the sqlite3WindowRewrite() routine, make sure that - pParse->nErr is set, and make sure that this shuts down any subsequent code - generation that might depend on the transformations that were implemented. - This fixes a problem discovered by the Yongheng and Rui fuzzer. - -Amalgamation format of backported patch -FossilOrigin-Name: e2bddcd4c55ba3cbe0130332679ff4b048630d0ced9a8899982edb5a3569ba7f ---- - sqlite3.c | 16 +++++++++++----- - sqlite3.h | 2 +- - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 408ec4c..857c28e 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -77798,7 +77798,8 @@ SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse *pParse, Index *pIdx){ - */ - static void vdbeVComment(Vdbe *p, const char *zFormat, va_list ap){ - assert( p->nOp>0 || p->aOp==0 ); -- assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed ); -+ assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed -+ || p->pParse->nErr>0 ); - if( p->nOp ){ - assert( p->aOp ); - sqlite3DbFree(p->db, p->aOp[p->nOp-1].zComment); -@@ -97872,6 +97873,7 @@ static int codeCompare( - int addr; - CollSeq *p4; - -+ if( pParse->nErr ) return 0; - p4 = sqlite3BinaryCompareCollSeq(pParse, pLeft, pRight); - p5 = binaryCompareP5(pLeft, pRight, jumpIfNull); - addr = sqlite3VdbeAddOp4(pParse->pVdbe, opcode, in2, dest, in1, -@@ -147627,7 +147629,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ - - pTab = sqlite3DbMallocZero(db, sizeof(Table)); - if( pTab==0 ){ -- return SQLITE_NOMEM; -+ return sqlite3ErrorToParser(db, SQLITE_NOMEM); - } - - p->pSrc = 0; -@@ -147731,6 +147733,10 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ - sqlite3DbFree(db, pTab); - } - -+ if( rc && pParse->nErr==0 ){ -+ assert( pParse->db->mallocFailed ); -+ return sqlite3ErrorToParser(pParse->db, SQLITE_NOMEM); -+ } - return rc; - } - --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch deleted file mode 100644 index ffc2c6afff..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2019-19925 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From e92580434d2cdca228649d32f76167492de4f512 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 15:15:40 +0000 -Subject: [PATCH] Fix the zipfile extension so that INSERT works even if the - pathname of the file being inserted is a NULL. Bug discovered by the - Yongheng and Rui fuzzer. - -FossilOrigin-Name: a80f84b511231204658304226de3e075a55afc2e3f39ac063716f7a57f585c06 ---- - shell.c | 1 + - sqlite3.c | 4 ++-- - sqlite3.h | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/shell.c b/shell.c -index 053180c..404a8d4 100644 ---- a/shell.c -+++ b/shell.c -@@ -5827,6 +5827,7 @@ static int zipfileUpdate( - - if( rc==SQLITE_OK ){ - zPath = (const char*)sqlite3_value_text(apVal[2]); -+ if( zPath==0 ) zPath = ""; - nPath = (int)strlen(zPath); - mTime = zipfileGetTime(apVal[4]); - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch deleted file mode 100644 index 92bc7908bc..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch +++ /dev/null @@ -1,31 +0,0 @@ -CVE: CVE-2019-19926 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 4165b1e1e0001165ace9051a70f938099505eadc Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Thu, 19 Dec 2019 22:08:19 +0000 -Subject: [PATCH] Continuation of [e2bddcd4c55ba3cb]: Add another spot where it - is necessary to abort early due to prior errors in sqlite3WindowRewrite(). - -FossilOrigin-Name: cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2 ---- - sqlite3.c | 7 ++++--- - sqlite3.h | 2 +- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 857c28e..19a474d 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -128427,6 +128427,7 @@ static int multiSelect( - } - #endif - } -+ if( pParse->nErr ) goto multi_select_end; - - /* Compute collating sequences used by - ** temporary tables needed to implement the compound select. --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch deleted file mode 100644 index cba8ec9d30..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch +++ /dev/null @@ -1,46 +0,0 @@ -CVE: CVE-2019-19959 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From f83f7e8141ee7cbbf7f2dc8985279a7372b259b6 Mon Sep 17 00:00:00 2001 -From: "D. Richard Hipp" -Date: Mon, 23 Dec 2019 21:04:33 +0000 -Subject: [PATCH] Fix the zipfile() function in the zipfile extension so that - it is able to deal with goofy filenames that contain embedded zeros. - -FossilOrigin-Name: cc0fb00a128fd0773db5ff7891f7aa577a3671d570166d2cbb30df922344adcf ---- - shell.c | 4 ++-- - sqlite3.c | 4 ++-- - sqlite3.h | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/shell.c b/shell.c -index 404a8d4..48065e9 100644 ---- a/shell.c -+++ b/shell.c -@@ -5841,7 +5841,7 @@ static int zipfileUpdate( - zFree = sqlite3_mprintf("%s/", zPath); - if( zFree==0 ){ rc = SQLITE_NOMEM; } - zPath = (const char*)zFree; -- nPath++; -+ nPath = (int)strlen(zPath); - } - } - -@@ -6242,11 +6242,11 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){ - }else{ - if( zName[nName-1]!='/' ){ - zName = zFree = sqlite3_mprintf("%s/", zName); -- nName++; - if( zName==0 ){ - rc = SQLITE_NOMEM; - goto zipfile_step_out; - } -+ nName = (int)strlen(zName); - }else{ - while( nName>1 && zName[nName-2]=='/' ) nName--; - } --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch deleted file mode 100644 index fb6cd6df2d..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch +++ /dev/null @@ -1,31 +0,0 @@ -CVE: CVE-2019-20218 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 6bbd76d34f29f61483791231f2ce579dcadab8a5 Mon Sep 17 00:00:00 2001 -From: Dan Kennedy -Date: Fri, 27 Dec 2019 20:54:42 +0000 -Subject: [PATCH] Do not attempt to unwind the WITH stack in the Parse object - following an error. This fixes a separate case to [de6e6d68]. - -FossilOrigin-Name: d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92 ---- - sqlite3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 5bc06c8..408ec4c 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -130570,7 +130570,7 @@ static int selectExpander(Walker *pWalker, Select *p){ - - /* Process NATURAL keywords, and ON and USING clauses of joins. - */ -- if( db->mallocFailed || sqliteProcessJoin(pParse, p) ){ -+ if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){ - return WRC_Abort; - } - --- -2.24.1 - diff --git a/meta/recipes-support/sqlite/sqlite3_3.30.1.bb b/meta/recipes-support/sqlite/sqlite3_3.30.1.bb deleted file mode 100644 index e055aca205..0000000000 --- a/meta/recipes-support/sqlite/sqlite3_3.30.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" - -SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://CVE-2019-19244.patch \ - file://CVE-2019-19880.patch \ - file://CVE-2019-19923.patch \ - file://CVE-2019-19924.patch \ - file://CVE-2019-19925.patch \ - file://CVE-2019-19926.patch \ - file://CVE-2019-19959.patch \ - file://CVE-2019-20218.patch \ - " -SRC_URI[md5sum] = "51252dc6bc9094ba11ab151ba650ff3c" -SRC_URI[sha256sum] = "8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60" - -# -19242 is only an issue in specific development branch commits -CVE_CHECK_WHITELIST += "CVE-2019-19242" diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb new file mode 100644 index 0000000000..903d66ab29 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb @@ -0,0 +1,12 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" + +SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + " +SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" +SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" + +# -19242 is only an issue in specific development branch commits +CVE_CHECK_WHITELIST += "CVE-2019-19242" -- 2.24.1 From anuj.mittal at intel.com Tue Feb 4 05:47:04 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Tue, 4 Feb 2020 13:47:04 +0800 Subject: [OE-core] [PATCH 1/4] x264: upgrade to latest revision Message-ID: <20200204054707.913173-1-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../x264/x264/Fix-X32-build-by-disabling-asm.patch | 14 ++++++-------- meta/recipes-multimedia/x264/x264_git.bb | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch index 087a448eec..cb771fb0bf 100644 --- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch +++ b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch @@ -1,4 +1,4 @@ -From 66b120079fb21ed38cab0900c63360b0a7853eaa Mon Sep 17 00:00:00 2001 +From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 13 Dec 2016 14:22:32 -0700 Subject: [PATCH] Fix X32 build by disabling asm @@ -12,15 +12,16 @@ doesn't successfully build at this time, and my assembly is very rusty. Upstream-Status: Pending Signed-off-by: Christopher Larson + --- configure | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 3109ec4..844aeae 100755 +index 51b128d..6ea9469 100755 --- a/configure +++ b/configure -@@ -703,7 +703,13 @@ case $host_cpu in +@@ -754,7 +754,13 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" stack_alignment=16 @@ -33,9 +34,9 @@ index 3109ec4..844aeae 100755 + fi + fi if [ "$SYS" = MACOSX ]; then - ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX" + ASFLAGS="$ASFLAGS -f macho64 -DPREFIX" if cc_check '' "-arch x86_64"; then -@@ -722,7 +728,11 @@ case $host_cpu in +@@ -773,7 +779,11 @@ case $host_cpu in RCFLAGS="--target=pe-x86-64 $RCFLAGS" fi else @@ -48,6 +49,3 @@ index 3109ec4..844aeae 100755 fi ;; powerpc*) --- -2.8.0 - diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index f22930a0ee..39429a8809 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -14,9 +14,9 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "72db437770fd1ce3961f624dd57a8e75ff65ae0b" +SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c" -PV = "r2917+git${SRCPV}" +PV = "r2991+git${SRCPV}" S = "${WORKDIR}/git" -- 2.24.1 From anuj.mittal at intel.com Tue Feb 4 05:47:05 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Tue, 4 Feb 2020 13:47:05 +0800 Subject: [OE-core] [PATCH 2/4] ncurses: add CVE_VERSION In-Reply-To: <20200204054707.913173-1-anuj.mittal@intel.com> References: <20200204054707.913173-1-anuj.mittal@intel.com> Message-ID: <20200204054707.913173-2-anuj.mittal@intel.com> Include the version number in a format that is comparable to what we get from NVD. Signed-off-by: Anuj Mittal --- meta/recipes-core/ncurses/ncurses_6.1+20191019.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb index ee7d4bed28..187777f6ef 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb @@ -9,3 +9,5 @@ SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" + +CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" -- 2.24.1 From anuj.mittal at intel.com Tue Feb 4 05:47:06 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Tue, 4 Feb 2020 13:47:06 +0800 Subject: [OE-core] [PATCH 3/4] libxml2: fix CVE-2020-7595 In-Reply-To: <20200204054707.913173-1-anuj.mittal@intel.com> References: <20200204054707.913173-1-anuj.mittal@intel.com> Message-ID: <20200204054707.913173-3-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../libxml/libxml2/CVE-2020-7595.patch | 36 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch new file mode 100644 index 0000000000..facfefd362 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch @@ -0,0 +1,36 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Thu, 12 Dec 2019 17:30:55 +0800 +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities + +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef +return NULL which cause a infinite loop in xmlStringLenDecodeEntities + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076] +CVE: CVE-2020-7595 +Signed-off-by: Anuj Mittal +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index d1c31963..a34bb6cd 100644 +--- a/parser.c ++++ b/parser.c +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + else + c = 0; + while ((c != 0) && (c != end) && /* non input consuming loop */ +- (c != end2) && (c != end3)) { ++ (c != end2) && (c != end3) && ++ (ctxt->instate != XML_PARSER_EOF)) { + + if (c == 0) break; + if ((c == '&') && (str[1] == '#')) { +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 2c833fa7a2..6a4097c2c6 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://libxml-m4-use-pkgconfig.patch \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ + file://CVE-2020-7595.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- 2.24.1 From anuj.mittal at intel.com Tue Feb 4 05:47:07 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Tue, 4 Feb 2020 13:47:07 +0800 Subject: [OE-core] [PATCH 4/4] sqlite3: upgrade 3.30.1 -> 3.31.1 In-Reply-To: <20200204054707.913173-1-anuj.mittal@intel.com> References: <20200204054707.913173-1-anuj.mittal@intel.com> Message-ID: <20200204054707.913173-4-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- meta/recipes-support/sqlite/sqlite3_3.30.1.bb | 20 ------------------- meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 12 +++++++++++ 2 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.30.1.bb create mode 100644 meta/recipes-support/sqlite/sqlite3_3.31.1.bb diff --git a/meta/recipes-support/sqlite/sqlite3_3.30.1.bb b/meta/recipes-support/sqlite/sqlite3_3.30.1.bb deleted file mode 100644 index e055aca205..0000000000 --- a/meta/recipes-support/sqlite/sqlite3_3.30.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" - -SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://CVE-2019-19244.patch \ - file://CVE-2019-19880.patch \ - file://CVE-2019-19923.patch \ - file://CVE-2019-19924.patch \ - file://CVE-2019-19925.patch \ - file://CVE-2019-19926.patch \ - file://CVE-2019-19959.patch \ - file://CVE-2019-20218.patch \ - " -SRC_URI[md5sum] = "51252dc6bc9094ba11ab151ba650ff3c" -SRC_URI[sha256sum] = "8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60" - -# -19242 is only an issue in specific development branch commits -CVE_CHECK_WHITELIST += "CVE-2019-19242" diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb new file mode 100644 index 0000000000..903d66ab29 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb @@ -0,0 +1,12 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" + +SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + " +SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" +SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" + +# -19242 is only an issue in specific development branch commits +CVE_CHECK_WHITELIST += "CVE-2019-19242" -- 2.24.1 From nathan at nathanrossi.com Tue Feb 4 06:52:17 2020 From: nathan at nathanrossi.com (Nathan Rossi) Date: Tue, 4 Feb 2020 16:52:17 +1000 Subject: [OE-core] [PATCH v2 1/2] microblaze tune: Enable 64-bit In-Reply-To: <5e6edcb4-8eca-7bb8-5fc4-5c0504d4f130@kernel.crashing.org> References: <20200131233305.118454-1-mark.hatle@kernel.crashing.org> <5e6edcb4-8eca-7bb8-5fc4-5c0504d4f130@kernel.crashing.org> Message-ID: On Tue, 4 Feb 2020 at 04:36, Mark Hatle wrote: > > > > On 1/31/20 10:50 PM, Nathan Rossi wrote: > > On Sat, 1 Feb 2020 at 09:33, Mark Hatle wrote: > >> > >> From: Mark Hatle > >> > >> 64-bit is not yet available in Linux, but some non-Linux uses exist. > >> > >> Signed-off-by: Mark Hatle > >> Signed-off-by: Mark Hatle > >> --- > >> meta/conf/machine/include/microblaze/arch-microblaze.inc | 9 ++++++++- > >> 1 file changed, 8 insertions(+), 1 deletion(-) > >> > >> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> index 265898b6b6..fb777d929c 100644 > >> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> @@ -4,6 +4,9 @@ > >> TUNEVALID[microblaze] = "MicroBlaze" > >> MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" > >> > >> +TUNEVALID[64-bit] = "64-bit MicroBlaze" > >> +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" > > > > This should probably TUNECONFLICTS with all unsupported versions. > > I have no information on what versions are unsupported with 64-bit. If I > receive that information, I will add it as conflicts. It looks like it was added in v11.0 (and unsupported in all prior versions), according to the microblaze reference manual (https://www.xilinx.com/support/documentation/sw_manuals/xilinx2019_2/ug984-vivado-microblaze-ref.pdf). Regards, Nathan > > --Mark > > > Regards, > > Nathan > > > > > >> + > >> # Endian > >> TUNEVALID[bigendian] = "Use Microblaze Big Endian" > >> TUNECONFLICTS[bigendian] += "v10.0" > >> @@ -26,6 +29,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 > >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > >> +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > >> > >> # Disable reorder for v8.30 if pattern-compare is not enabled > >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > >> @@ -48,6 +52,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc > >> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess > >> TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" > >> > >> +# Add 64-bit to the PKGARCH if enabled. > >> +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" > >> + > >> # Package Architecture formatting > >> -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > >> +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > >> > >> -- > >> 2.17.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From jupiter.hce at gmail.com Tue Feb 4 07:26:38 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 4 Feb 2020 18:26:38 +1100 Subject: [OE-core] How to patch a local file in a simple elegant way? Message-ID: Hello, Is anyway to patch a local file without committing to the git source? I did not realize a local patch is that hard or if it is impossible. In my OE build, I want to make a patch file for mx6ullevk.h in meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb, to customize mtdparts and bootargs as I could not find a simple way to do it using bbapaend, I did not and I don't want to submit the patch to the git source. So I got a bunch of errors: ERROR: u-boot-imx-2017.03-r0 do_fetch: Fetcher failure: Unable to find revision 8be98e9322040c655b9e5c9fb2c494e002e3fad9 in branch imx_v2017.03_4.9.123_imx8mm_gafile://mx6ullevk.patch even from upstream ERROR: u-boot-imx-2017.03-r0 do_fetch: Fetcher failure for URL: 'git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=imx_v2017.03_4.9.123_imx8mm_gafile://mx6ullevk.patch'. Unable to fetch URL from any source. ERROR: u-boot-imx-2017.03-r0 do_fetch: Function failed: base_do_fetch ERROR: Logfile of failure stored in: /build/Installation/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/temp/log.do_fetch.25780 ERROR: Task (/build/Installation/sa_platform_build/Source/Yocto/oe-core/../meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb:do_fetch) failed with exit code '1' Googling Internet, there are many suggestions to workarounds, git to local repository, git to your own repository, or even copy all git source to build u-boot offline. None of is elegant, I am sure there are some nice way to do it. Could you please advise if there is a simple elegant way to do it? Thank you. Kind regards, - jh From nathan at nathanrossi.com Tue Feb 4 08:16:32 2020 From: nathan at nathanrossi.com (Nathan Rossi) Date: Tue, 4 Feb 2020 18:16:32 +1000 Subject: [OE-core] [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune In-Reply-To: <8a54da63-ab5a-8222-f401-aaea7debcfc5@kernel.crashing.org> References: <20200131220751.106516-1-mark.hatle@kernel.crashing.org> <8a54da63-ab5a-8222-f401-aaea7debcfc5@kernel.crashing.org> Message-ID: On Tue, 4 Feb 2020 at 04:55, Mark Hatle wrote: > > > > On 1/31/20 10:49 PM, Nathan Rossi wrote: > > On Sat, 1 Feb 2020 at 08:13, Mark Hatle wrote: > >> > >> From: Mark Hatle > >> > >> TUNE_ARCH - microblazeeb is not a valid architecture, microblaze is big > >> endian, microblazeel is the little endian version. > >> > >> Version arguments: > >> If a version feature is not defined, then we don't want to set either > >> TUNE_CCARGS or MBPKGARCH_VERSION. > >> > >> Signed-off-by: Mark Hatle > >> Signed-off-by: Mark Hatle > >> --- > >> meta/conf/machine/include/microblaze/arch-microblaze.inc | 2 +- > >> .../include/microblaze/feature-microblaze-versions.inc | 4 ++-- > >> 2 files changed, 3 insertions(+), 3 deletions(-) > >> > >> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> index eab7171cb2..265898b6b6 100644 > >> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> @@ -46,7 +46,7 @@ require conf/machine/include/microblaze/feature-microblaze-versions.inc > >> require conf/machine/include/microblaze/feature-microblaze-math.inc > >> > >> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess > > > > Worth updating the comment at the same time. > > > >> -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" > >> +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" > > > > This change will break some things in oe-core (and probably > > meta-xilinx too). They should be updated at the same time. > > Do you have an example of what? Cause without this, all autoconf invocation of > big endian failed for me due to invalid architecture. So core-image-minimal builds were working when I had been testing, but that was a number of releases ago now. There are only a few instances in oe-core that check for "microblazeeb". classes/meson.bbclass:60: elif arch == "microblazeel" or arch == "microblazeeb": Probably just arch.startswith("microblaze") here classes/kernel-arch.bbclass:37: elif re.match('microblazee[bl]', a): return 'microblaze' This one won't break, since "microblaze" is already a valid kernel arch. But for clean up just needs to be microblazeel. recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h > > > Might also be worth removing the microblazeeb references in siteinfo, > > and elf.py. Since they were added to support this. > > I looked at these and left them "just in case", as they didn't seem to conflict > with anything that I saw. Leaving them is fine, though removal to avoid confusion and for clean up in general is probably a good idea. Thanks, Nathan > > --Mark > > > Regards, > > Nathan > > > >> > >> # Package Architecture formatting > >> TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > >> diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > >> index 3221e2aab7..003fde3e07 100644 > >> --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > >> +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > >> @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 > >> TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" > >> > >> # Version flags > >> -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}" > >> -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}" > >> +TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > >> +MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > >> > >> -- > >> 2.17.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Tue Feb 4 08:28:17 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 04 Feb 2020 08:28:17 +0000 Subject: [OE-core] How to patch a local file in a simple elegant way? In-Reply-To: References: Message-ID: <587d3ca449eb20660d1effbbd07e1f671511485f.camel@linuxfoundation.org> On Tue, 2020-02-04 at 18:26 +1100, JH wrote: > Hello, > > Is anyway to patch a local file without committing to the git source? > I did not realize a local patch is that hard or if it is impossible. > > In my OE build, I want to make a patch file for mx6ullevk.h in > meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb, to customize > mtdparts and bootargs as I could not find a simple way to do it using > bbapaend, I did not and I don't want to submit the patch to the git > source. So I got a bunch of errors: > > ERROR: u-boot-imx-2017.03-r0 do_fetch: Fetcher failure: Unable to > find > revision 8be98e9322040c655b9e5c9fb2c494e002e3fad9 in branch > imx_v2017.03_4.9.123_imx8mm_gafile://mx6ullevk.patch even from > upstream > ERROR: u-boot-imx-2017.03-r0 do_fetch: Fetcher failure for URL: > 'git://source.codeaurora.org/external/imx/uboot- > imx.git;protocol=https;branch=imx_v2017.03_4.9.123_imx8mm_ga > file://mx6ullevk.patch'. > Unable to fetch URL from any source. > ERROR: u-boot-imx-2017.03-r0 do_fetch: Function failed: base_do_fetch > ERROR: Logfile of failure stored in: > /build/Installation/sa_platform_build/Source/Yocto/build/tmp- > glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03- > r0/temp/log.do_fetch.25780 > ERROR: Task (/build/Installation/sa_platform_build/Source/Yocto/oe- > core/../meta-freescale/recipes-bsp/u-boot/u-boot- > imx_2017.03.bb:do_fetch) > failed with exit code '1' I think your approach was right, you just need to fix the whitespace issue. Note how the above error says: 123_imx8mm_gafile://mx6u You need a space before the "file://" so probably _append = " file://xxx" instead of what I'd guess you had: _append = "file://xxx" Cheers, Richard From git at andred.net Tue Feb 4 08:43:19 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Tue, 04 Feb 2020 08:43:19 +0000 Subject: [OE-core] nondeterministic -c testimage (python3 from hosttools vs recipe-sysroot-native) Message-ID: Hi, I have some OEQA image tests where external python3 scripts are invoked by the OEQA test case. Those external scripts use #!/usr/bin/env python3 as shebang. Now it appears that if rm-work is enabled, those are run using python3 from the tmp/hosttools/python3 symlink and without rm-work, they run using python3 from the recipe-sysroot-native (which all makes sense). But the whole testing becomes a bit nondeterministic... In particular, those external python3 script import modules that are not available in the recipe-sysroot-native (but they are in the host's python3 installation). What is the correct solution here - considering that a) OEQA test cases themselves are run using hosttools' python3, and also considering b) that additional hosttools symlinks are added if testimage is enabled (via bitbake.conf) 1) Should testimage remove the recipe-sysroot-native from PATH (for the duration of the test) so that everything runs in the same environment? Or 2) should my image update TESTIMAGEDEPENDS and depend on python3-native and all the extra python3 native module recipes from OE. I'm inclined to send a patch to update PATH for the testimage run, but wanted to gauge opinions first? What is the correct approach here? Cheers, Andre' From quentin.schulz at streamunlimited.com Tue Feb 4 09:05:48 2020 From: quentin.schulz at streamunlimited.com (Quentin Schulz) Date: Tue, 4 Feb 2020 10:05:48 +0100 Subject: [OE-core] Failed to add u-boot ubifs (not working) In-Reply-To: References: <20200203110820.kokz6qu4l74nyhlk@qschulz> Message-ID: <20200204090548.jokxe7ircypcb6co@qschulz> Hi JH, On Tue, Feb 04, 2020 at 10:00:27AM +1100, JH wrote: > Hi Quentin, > > Thanks for your response. > > On 2/3/20, Quentin Schulz wrote: > > Hi JH, > > > > On Mon, Feb 03, 2020 at 09:56:49PM +1100, JH wrote: > >> Hi, > >> > >> I added my local machine to ubifs, is it correct? > >> > >> UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_nand_config,ubifs" > >> > > > > Also, you need to select UBOOT_CONFIG somewhere, with the above line, > > you just say "if nand is selected as an UBOOT_CONFIG, do xyz". You still > > need to select it (with I assume, UBOOT_CONFIG += "nand" in a bbappend > > somewhere). > > Sorry for not being it clear, I indeed defined UBOOT_CONFIG = "nand" > in the local.conf. Should I define it as UBOOT_CONFIG += "nand" or > should I move it to a u-boot bbappend? > >From what you say below, it was defined in a machine configuration file, so modify it there. It;s fine *for debugging purposes* to modify the original file but in the case of machine configuration file, once you've settled with some modifications, you need to create a new one in your own layer and add the changes there so they can be shared with people (conf/local.conf is NOT supposed to be shared). But UBOOT_CONFIG = "nand" looks decent to me (it's a machine specific variable, so rather set it in the machine configuration file). > > What's in your mx6ull_14x14_evk_nand_config? > > The mx6ull_14x14_evk_nand_config,ubifs was from a tip found and copied > from Internet, but the original definition is from included > meta-freescale/conf/machine/imx6ullevk.conf: > > UBOOT_CONFIG ??= "sd" > UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard" > UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config" > > I tried to use UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_config,ubifs", no avail. > I'd first have a look what this ",sdcard" thing is doing (c.f. http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-bsp/u-boot/u-boot.inc?h=thud). > > I haven't used that option before but what's ,ubifs supposed to do? Are > > you sure this nand option for UBOOT_CONFIG would actually create a .imx > > and not a .ubifs for example or something along those lines. > > > > TL;DR: Make sure UBOOT_CONFIG has nand in it, check that .imx is built > > with your defconfig and check that you're actually enabling the UBI > > command in your defconfig. > > Yes, all enabled in my kernel 4.19.75: > You're mixing things up. If you want the ubi command to be present in U-Boot, you need to put it in the U-Boot defconfig. Kernel defconfig has nothing to do with it. Though, you might want ubi support in the kernel but that's unrelated to your current issue. > CONFIG_MTD_UBI=y > CONFIG_MTD_UBI_WL_THRESHOLD=4096 > CONFIG_MTD_UBI_BEB_LIMIT=20 > CONFIG_MTD_UBI_FASTMAP=y > # CONFIG_MTD_UBI_GLUEBI is not set > CONFIG_MTD_UBI_BLOCK=y > CONFIG_DTC=y > CONFIG_OF=y > > > Also, it would be helpful if you could give links to the recipes you're > > using. I seem to recall in some other mail it was > > http://git.yoctoproject.org/cgit/cgit.cgi/meta-freescale/tree/recipes-bsp/u-boot/u-boot-imx_2017.03.bb?h=sumo > > but it could be thud version as well. > I've seen a few mails from you recently on the mailing list which are more or less sequels to previous mails. FWIW, we have an IRC channel on freenode at #yocto, that might be helpful if you have quick questions (e.g. your "applying a patch" mail). I find Yocto to not be the most forgiving when copy-pasting stuff from the internet. I'd suggest to invest a little bit of time in reading the source code of what you're trying to modify (u-boot recipes, classes, etc.), you also have an extensive documentation here: https://www.yoctoproject.org/docs/2.6.4/mega-manual/mega-manual.html it is a manual containing all the other manuals you can find per topic here: https://www.yoctoproject.org/docs/ I can also suggest Live coding sessions with Jozef on the project's YT channel https://www.youtube.com/user/TheYoctoProject. (It's Twitch streams uploaded to YT so if you'd rather watch when he's streaming: https://www.twitch.tv/letoatreidesthe2nd I want to end those recommendations on a note: sending mails is perfectly fine :) Have fun with Yocto, Quentin From Mikko.Rapeli at bmw.de Tue Feb 4 09:21:26 2020 From: Mikko.Rapeli at bmw.de (Mikko.Rapeli at bmw.de) Date: Tue, 4 Feb 2020 09:21:26 +0000 Subject: [OE-core] [PATCH v2] sqlite3: upgrade 3.30.1 -> 3.31.1 In-Reply-To: <20200204055145.998317-1-anuj.mittal@intel.com> References: <20200204054432.822155-4-anuj.mittal@intel.com> <20200204055145.998317-1-anuj.mittal@intel.com> Message-ID: <20200204092125.GT104502@korppu> Hi, slightly off topic but I was checking CVEs for sqlite3 and noticed this recipe uses the merged source tree format. This makes it very hard to cherry-pick CVE and other patches from Debian, Ubuntu, OpenSUSE etc. Why use sqlite sources in "amalgamation" format? https://sqlite.org/amalgamation.html Cheers, -Mikko From git at andred.net Tue Feb 4 10:12:21 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Tue, 04 Feb 2020 10:12:21 +0000 Subject: [OE-core] nondeterministic -c testimage (python3 from hosttools vs recipe-sysroot-native) In-Reply-To: References: Message-ID: <7ac1f42722323cd35a7e0a875944350c6c65cfd9.camel@andred.net> Answering my own question here... On Tue, 2020-02-04 at 08:43 +0000, Andr? Draszik wrote: > 1) Should testimage remove the recipe-sysroot-native from PATH (for the duration of the > test) so that everything runs in the same environment? Or > 2) should my image update TESTIMAGEDEPENDS and depend on python3-native and all the extra > python3 native module recipes from OE. > > > I'm inclined to send a patch to update PATH for the testimage run, but wanted to gauge > opinions first? Option 1) probably won't work, as things like native apt/opkg/rpm etc. are being added to recipe-sysroot-native via TESTIMAGEDEPENDS, so PATH can not be changed. I'll have to use option 2). Cheers, Andre' From jupiter.hce at gmail.com Tue Feb 4 11:09:20 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 4 Feb 2020 22:09:20 +1100 Subject: [OE-core] Which package for nandbiterrs? Message-ID: Hi, I built the image in thud to include following MTD receipts: mtd-utils mtd-utils-ubifs mtd-utils-tests But the nandbiterrs is still missing, which package for nandbiterrs? Thank you. Kind regards, - jh From marek.belisko at gmail.com Tue Feb 4 11:13:05 2020 From: marek.belisko at gmail.com (Belisko Marek) Date: Tue, 4 Feb 2020 12:13:05 +0100 Subject: [OE-core] [yocto] Which package for nandbiterrs? In-Reply-To: References: Message-ID: On Tue, Feb 4, 2020 at 12:09 PM JH wrote: > > Hi, > > I built the image in thud to include following MTD receipts: > > mtd-utils > mtd-utils-ubifs > mtd-utils-tests > > But the nandbiterrs is still missing, which package for nandbiterrs? Are you referring to this one: https://elixir.bootlin.com/linux/latest/source/drivers/mtd/tests/nandbiterrs.c Then it's in kernel (not sure if tests are build though). > > Thank you. > > Kind regards, > > - jh > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > > View/Reply Online (#48265): https://lists.yoctoproject.org/g/yocto/message/48265 > Mute This Topic: https://lists.yoctoproject.org/mt/70970236/900721 > Group Owner: yocto+owner at lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [marek.belisko at gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- BR, marek From jupiter.hce at gmail.com Tue Feb 4 11:22:13 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 4 Feb 2020 22:22:13 +1100 Subject: [OE-core] [yocto] Which package for nandbiterrs? In-Reply-To: References: Message-ID: On 2/4/20, Belisko Marek wrote: > On Tue, Feb 4, 2020 at 12:09 PM JH wrote: >> >> Hi, >> >> I built the image in thud to include following MTD receipts: >> >> mtd-utils >> mtd-utils-ubifs >> mtd-utils-tests >> >> But the nandbiterrs is still missing, which package for nandbiterrs? > Are you referring to this one: > https://elixir.bootlin.com/linux/latest/source/drivers/mtd/tests/nandbiterrs.c > Then it's in kernel (not sure if tests are build though). I think so, I have enabled CONFIG_MTD_TESTS=y, it still does not have nandbiterrs. I built it with kernel 4.19.75, did you mean the that build could not include that test file? Thanks marek, - jh From marek.belisko at gmail.com Tue Feb 4 11:42:47 2020 From: marek.belisko at gmail.com (Belisko Marek) Date: Tue, 4 Feb 2020 12:42:47 +0100 Subject: [OE-core] [yocto] Which package for nandbiterrs? In-Reply-To: References: Message-ID: On Tue, Feb 4, 2020 at 12:22 PM JH wrote: > > On 2/4/20, Belisko Marek wrote: > > On Tue, Feb 4, 2020 at 12:09 PM JH wrote: > >> > >> Hi, > >> > >> I built the image in thud to include following MTD receipts: > >> > >> mtd-utils > >> mtd-utils-ubifs > >> mtd-utils-tests > >> > >> But the nandbiterrs is still missing, which package for nandbiterrs? > > Are you referring to this one: > > https://elixir.bootlin.com/linux/latest/source/drivers/mtd/tests/nandbiterrs.c > > Then it's in kernel (not sure if tests are build though). > > I think so, I have enabled CONFIG_MTD_TESTS=y, it still does not have > nandbiterrs. I built it with kernel 4.19.75, did you mean the that > build could not include that test file? Well did you check build directory if it was really build (check .config)? Or better try to build as module and install kernel-modules and then you can modprobe it. > > Thanks marek, > > - jh BR, marek From Kai.Kang at windriver.com Tue Feb 4 09:24:05 2020 From: Kai.Kang at windriver.com (Kang Kai) Date: Tue, 4 Feb 2020 17:24:05 +0800 Subject: [OE-core] [PATCH] ifupdown: add ptest In-Reply-To: References: <20200203091406.37643-1-kai.kang@windriver.com> Message-ID: <4d47a7c5-d60a-2fcc-3a4d-a716727bbcbd@windriver.com> On 2020/2/3 ??8:50, Alexander Kanavin wrote: > I think a build configuration for this also needs to be enabled and tested as explained in the email thread from the bug (in magefeatures.py from selftest I think). Otherwise this wouldn?t be built or checked anywhere. Hi Alex, In imagefeatures.py, it just run 'bitbake -g core-image-sato' and doesn't really build and test RDEPENDS packages of packagegroup-core-base-utils. So for the packages in the RDEPENDS packages of packagegroup-core-base-utils but not in any image, they all are not be tested. I didn't find a proper recipe to place these recipes. Maybe a new image recipe need to be created. Regards, Kai > > Alex > >> On 3 Feb 2020, at 10.14, wrote: >> >> From: Kai Kang >> >> Add ptest for ifupdown with its own test cases. >> >> [Yocto #13736] >> >> Signed-off-by: Kai Kang >> --- >> meta/recipes-core/ifupdown/files/run-ptest | 4 ++ >> .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ >> meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- >> 3 files changed, 62 insertions(+), 1 deletion(-) >> create mode 100644 meta/recipes-core/ifupdown/files/run-ptest >> create mode 100644 meta/recipes-core/ifupdown/files/tweak-ptest-script.patch >> >> diff --git a/meta/recipes-core/ifupdown/files/run-ptest b/meta/recipes-core/ifupdown/files/run-ptest >> new file mode 100644 >> index 0000000000..8694042392 >> --- /dev/null >> +++ b/meta/recipes-core/ifupdown/files/run-ptest >> @@ -0,0 +1,4 @@ >> +#!/bin/sh >> + >> +CURDIR=$(dirname `readlink -f $0`) >> +cd $CURDIR/tests && ./testbuild-linux >> diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch >> new file mode 100644 >> index 0000000000..d7600cf243 >> --- /dev/null >> +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch >> @@ -0,0 +1,49 @@ >> +Tweak tests of ifupdown to make it work with oe-core ptest framework. >> + >> +Upstream-Status: Inappropriate [oe-core specific] >> + >> +Signed-off-by: Kai Kang >> + >> +diff --git a/tests/testbuild-linux b/tests/testbuild-linux >> +index 1181ea0..d5c1814 100755 >> +--- a/tests/testbuild-linux >> ++++ b/tests/testbuild-linux >> +@@ -1,6 +1,7 @@ >> + #!/bin/sh -e >> + >> +-dir=tests/linux >> ++curdir=$(dirname `readlink -f $0`) >> ++dir=$curdir/linux >> + >> + result=true >> + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do >> +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do >> + echo "Testcase $test: $args" >> + >> + exitcode=0 >> +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ >> ++ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ >> + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? >> + >> + (echo "exit code: $exitcode"; >> +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do >> + echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test >> + >> + exitcode=0 >> +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ >> ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ >> + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? >> + >> + (echo "exit code: $exitcode"; >> +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do >> + echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test >> + >> + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then >> +- echo "(okay)" >> ++ echo "PASS: $test" >> + else >> +- echo "(failed)" >> ++ echo "FAIL: $test" >> + result=false >> + fi >> + echo "==========" >> diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb >> index 0de97fe372..53cb971d33 100644 >> --- a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb >> +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb >> @@ -11,13 +11,15 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ >> file://99_network \ >> file://0001-Define-FNM_EXTMATCH-for-musl.patch \ >> file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ >> + file://run-ptest \ >> + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ >> " >> SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" >> >> S = "${WORKDIR}/git" >> >> >> -inherit update-alternatives >> +inherit ptest update-alternatives >> >> do_compile () { >> chmod a+rx *.pl *.sh >> @@ -40,6 +42,12 @@ do_install () { >> cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 >> } >> >> +do_install_ptest () { >> + install -d ${D}${PTEST_PATH}/tests >> + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ >> + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ >> +} >> + >> ALTERNATIVE_PRIORITY = "100" >> ALTERNATIVE_${PN} = "ifup ifdown" >> >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Kai Kang From akuster808 at gmail.com Tue Feb 4 15:06:00 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:00 -0800 Subject: [OE-core] [zeus 0/8] Merge request Message-ID: Please concider these changes for zeus The following changes since commit 2bba0052597020ea887c84419440df11f9859283: sstatesig: Improve debug output if getpwuid() fails (2020-01-18 14:04:27 -0800) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib stable/zeus-next http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/zeus-next Armin Kuster (1): python2: add ntpath De Huo (2): bash: Fix CVE-2019-18276 kbd: configure.ac: Fix logic of vlock configure switch Hongxu Jia (1): kbd: avoid vlock conflict with busybox Joe Slater (1): webkitgtk: fix occasional link error Lee Chee Yang (1): libxml2: Fix CVE-2019-19956 Sana Kazi (1): bzip2: Fix CVE-2019-12900 Sumit Garg (1): core: recipes: fix some native tools dependencies ...-Fix-logic-of-vlock-configure-switch.patch | 31 ++ meta/recipes-core/kbd/kbd_2.0.4.bb | 4 +- .../libxml/libxml2/Fix-CVE-2019-19956.patch | 40 ++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + .../python/python/python2-manifest.json | 1 + .../bash/bash/bash-CVE-2019-18276.patch | 402 ++++++++++++++++++ meta/recipes-extended/bash/bash_5.0.bb | 1 + .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 ++ meta/recipes-extended/man-db/man-db_2.8.7.bb | 2 +- meta/recipes-extended/psmisc/psmisc.inc | 2 +- .../xorg-app/xorg-app-common.inc | 2 +- .../webkit/webkitgtk/fix-link-error.patch | 45 ++ meta/recipes-sato/webkit/webkitgtk_2.24.4.bb | 1 + 13 files changed, 564 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch create mode 100644 meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch create mode 100644 meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch create mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch create mode 100755 meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch -- 2.17.1 From akuster808 at gmail.com Tue Feb 4 15:06:01 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:01 -0800 Subject: [OE-core] [zeus 1/8] libxml2: Fix CVE-2019-19956 In-Reply-To: References: Message-ID: <3bd467abc907070b98dc470a23ac4d72866d58d9.1580828664.git.akuster808@gmail.com> From: Lee Chee Yang see: https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549 Signed-off-by: Lee Chee Yang Signed-off-by: Armin Kuster --- .../libxml/libxml2/Fix-CVE-2019-19956.patch | 40 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch diff --git a/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch new file mode 100644 index 0000000000..1c2dff9d5f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch @@ -0,0 +1,40 @@ +From 5a02583c7e683896d84878bd90641d8d9b0d0549 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Wed, 7 Aug 2019 17:39:17 +0800 +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover + +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to +NULL and free newDoc will cause a memory leak. + +Found with libFuzzer. + +Closes #82. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549] +CVE: CVE-2019-19956 + +Signed-off-by: Chee Yang Lee + +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index 1ce1ccf1..26d9f4e3 100644 +--- a/parser.c ++++ b/parser.c +@@ -13894,7 +13894,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, + xmlFreeParserCtxt(ctxt); + newDoc->intSubset = NULL; + newDoc->extSubset = NULL; +- newDoc->oldNs = NULL; ++ if(doc != NULL) ++ newDoc->oldNs = NULL; + xmlFreeDoc(newDoc); + + return(ret); +-- +2.24.1 + + diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index c38f883e44..c44a90b1c2 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://libxml-m4-use-pkgconfig.patch \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ + file://Fix-CVE-2019-19956.patch \ " SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6" -- 2.17.1 From akuster808 at gmail.com Tue Feb 4 15:06:02 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:02 -0800 Subject: [OE-core] [zeus 2/8] bash: Fix CVE-2019-18276 In-Reply-To: References: Message-ID: <14ee1e10505e52ad21aec0e3184896145d4d3efa.1580828664.git.akuster808@gmail.com> From: De Huo An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 patch 11. By default, if Bash is run with its effective UID not equal to its real UID, it will drop privileges by setting its effective UID to its real UID. However, it does so incorrectly. On Linux and other systems that support "saved UID" functionality, the saved UID is not dropped. An attacker with command execution in the shell can use "enable -f" for runtime loading of a new builtin, which can be a shared object that calls setuid() and therefore regains privileges. However, binaries running with an effective UID of 0 are unaffected. Backport the CVE patche from https://github.com/bminor/bash/commit/ 951bdaad7a18cc0dc1036bba86b18b90874d39ff to fix CVE-2019-18276 Signed-off-by: Chet Ramey Signed-off-by: De Huo Signed-off-by: Armin Kuster --- .../bash/bash/bash-CVE-2019-18276.patch | 402 ++++++++++++++++++ meta/recipes-extended/bash/bash_5.0.bb | 1 + 2 files changed, 403 insertions(+) create mode 100644 meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch diff --git a/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch b/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch new file mode 100644 index 0000000000..78dcc1b636 --- /dev/null +++ b/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch @@ -0,0 +1,402 @@ +From 951bdaad7a18cc0dc1036bba86b18b90874d39ff Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Mon, 1 Jul 2019 09:03:53 -0400 +Subject: [PATCH] commit bash-20190628 snapshot + +An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 patch 11. +By default, if Bash is run with its effective UID not equal to its real UID, +it will drop privileges by setting its effective UID to its real UID. +However, it does so incorrectly. On Linux and other systems that support "saved UID" functionality, +the saved UID is not dropped. An attacker with command execution in the shell can use "enable -f" for +runtime loading of a new builtin, which can be a shared object that calls setuid() and therefore +regains privileges. However, binaries running with an effective UID of 0 are unaffected. + +Upstream-Status: Backport [https://github.com/bminor/bash/commit/951bdaad7a18cc0dc1036bba86b18b90874d39ff] +CVE: CVE-2019-18276 +Signed-off-by: Chet Ramey +Signed-off-by: De Huo +--- + MANIFEST | 2 ++ + bashline.c | 50 +------------------------------------------------- + builtins/help.def | 2 +- + config.h.in | 10 +++++++++- + configure | 11 +++++++++++ + configure.ac | 1 + + doc/bash.1 | 3 ++- + doc/bashref.texi | 3 ++- + lib/glob/glob.c | 5 ++++- + pathexp.c | 16 ++++++++++++++-- + shell.c | 8 ++++++++ + tests/glob.tests | 2 ++ + tests/glob6.sub | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + tests/glob7.sub | 11 +++++++++++ + 14 files changed, 122 insertions(+), 56 deletions(-) + create mode 100644 tests/glob6.sub + create mode 100644 tests/glob7.sub + +diff --git a/MANIFEST b/MANIFEST +index 03de221..f9ccad7 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -1037,6 +1037,8 @@ tests/extglob3.tests f + tests/extglob3.right f + tests/extglob4.sub f + tests/extglob5.sub f ++tests/glob6.sub f ++tests/glob7.sub f + tests/func.tests f + tests/func.right f + tests/func1.sub f +diff --git a/bashline.c b/bashline.c +index 824ea9d..d86b47d 100644 +--- a/bashline.c ++++ b/bashline.c +@@ -3718,55 +3718,7 @@ static int + completion_glob_pattern (string) + char *string; + { +- register int c; +- char *send; +- int open; +- +- DECLARE_MBSTATE; +- +- open = 0; +- send = string + strlen (string); +- +- while (c = *string++) +- { +- switch (c) +- { +- case '?': +- case '*': +- return (1); +- +- case '[': +- open++; +- continue; +- +- case ']': +- if (open) +- return (1); +- continue; +- +- case '+': +- case '@': +- case '!': +- if (*string == '(') /*)*/ +- return (1); +- continue; +- +- case '\\': +- if (*string++ == 0) +- return (0); +- } +- +- /* Advance one fewer byte than an entire multibyte character to +- account for the auto-increment in the loop above. */ +-#ifdef HANDLE_MULTIBYTE +- string--; +- ADVANCE_CHAR_P (string, send - string); +- string++; +-#else +- ADVANCE_CHAR_P (string, send - string); +-#endif +- } +- return (0); ++ return (glob_pattern_p (string) == 1); + } + + static char *globtext; +diff --git a/builtins/help.def b/builtins/help.def +index 006c4b5..92f9b38 100644 +--- a/builtins/help.def ++++ b/builtins/help.def +@@ -128,7 +128,7 @@ help_builtin (list) + + /* We should consider making `help bash' do something. */ + +- if (glob_pattern_p (list->word->word)) ++ if (glob_pattern_p (list->word->word) == 1) + { + printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1))); + print_word_list (list, ", "); +diff --git a/config.h.in b/config.h.in +index 8554aec..ad4b1e8 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -1,6 +1,6 @@ + /* config.h -- Configuration file for bash. */ + +-/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc. ++/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc. + + This file is part of GNU Bash, the Bourne Again SHell. + +@@ -807,6 +807,14 @@ + #undef HAVE_SETREGID + #undef HAVE_DECL_SETREGID + ++/* Define if you have the setregid function. */ ++#undef HAVE_SETRESGID ++#undef HAVE_DECL_SETRESGID ++ ++/* Define if you have the setresuid function. */ ++#undef HAVE_SETRESUID ++#undef HAVE_DECL_SETRESUID ++ + /* Define if you have the setvbuf function. */ + #undef HAVE_SETVBUF + +diff --git a/configure b/configure +index 2f62662..b3321c9 100755 +--- a/configure ++++ b/configure +@@ -10281,6 +10281,17 @@ cat >>confdefs.h <<_ACEOF + #define HAVE_DECL_SETREGID $ac_have_decl + _ACEOF + ++ac_fn_c_check_decl "$LINENO" "" "ac_cv_have_decl_" "$ac_includes_default" ++if test "x$ac_cv_have_decl_" = xyes; then : ++ ac_have_decl=1 ++else ++ ac_have_decl=0 ++fi ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_ $ac_have_decl ++_ACEOF ++(setresuid, setresgid) + ac_fn_c_check_decl "$LINENO" "strcpy" "ac_cv_have_decl_strcpy" "$ac_includes_default" + if test "x$ac_cv_have_decl_strcpy" = xyes; then : + ac_have_decl=1 +diff --git a/configure.ac b/configure.ac +index 52b4cdb..549adef 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -810,6 +810,7 @@ AC_CHECK_DECLS([confstr]) + AC_CHECK_DECLS([printf]) + AC_CHECK_DECLS([sbrk]) + AC_CHECK_DECLS([setregid]) ++AC_CHECK_DECLS[(setresuid, setresgid]) + AC_CHECK_DECLS([strcpy]) + AC_CHECK_DECLS([strsignal]) + +diff --git a/doc/bash.1 b/doc/bash.1 +index e6cd08d..9e58a0b 100644 +--- a/doc/bash.1 ++++ b/doc/bash.1 +@@ -4681,7 +4681,8 @@ above). + .PD + .SH "SIMPLE COMMAND EXPANSION" + When a simple command is executed, the shell performs the following +-expansions, assignments, and redirections, from left to right. ++expansions, assignments, and redirections, from left to right, in ++the following order. + .IP 1. + The words that the parser has marked as variable assignments (those + preceding the command name) and redirections are saved for later +diff --git a/doc/bashref.texi b/doc/bashref.texi +index d33cd57..3065126 100644 +--- a/doc/bashref.texi ++++ b/doc/bashref.texi +@@ -2964,7 +2964,8 @@ is not specified. If the file does not exist, it is created. + @cindex command expansion + + When a simple command is executed, the shell performs the following +-expansions, assignments, and redirections, from left to right. ++expansions, assignments, and redirections, from left to right, in ++the following order. + + @enumerate + @item +diff --git a/lib/glob/glob.c b/lib/glob/glob.c +index 398253b..2eaa33e 100644 +--- a/lib/glob/glob.c ++++ b/lib/glob/glob.c +@@ -607,6 +607,7 @@ glob_vector (pat, dir, flags) + register unsigned int i; + int mflags; /* Flags passed to strmatch (). */ + int pflags; /* flags passed to sh_makepath () */ ++ int hasglob; /* return value from glob_pattern_p */ + int nalloca; + struct globval *firstmalloc, *tmplink; + char *convfn; +@@ -648,10 +649,12 @@ glob_vector (pat, dir, flags) + patlen = (pat && *pat) ? strlen (pat) : 0; + + /* If the filename pattern (PAT) does not contain any globbing characters, ++ or contains a pattern with only backslash escapes (hasglob == 2), + we can dispense with reading the directory, and just see if there is + a filename `DIR/PAT'. If there is, and we can access it, just make the + vector to return and bail immediately. */ +- if (skip == 0 && glob_pattern_p (pat) == 0) ++ hasglob = 0; ++ if (skip == 0 && (hasglob = glob_pattern_p (pat)) == 0 || hasglob == 2) + { + int dirlen; + struct stat finfo; +diff --git a/pathexp.c b/pathexp.c +index c1bf2d8..e6c5392 100644 +--- a/pathexp.c ++++ b/pathexp.c +@@ -58,7 +58,10 @@ int extended_glob = EXTGLOB_DEFAULT; + /* Control enabling special handling of `**' */ + int glob_star = 0; + +-/* Return nonzero if STRING has any unquoted special globbing chars in it. */ ++/* Return nonzero if STRING has any unquoted special globbing chars in it. ++ This is supposed to be called when pathname expansion is performed, so ++ it implements the rules in Posix 2.13.3, specifically that an unquoted ++ slash cannot appear in a bracket expression. */ + int + unquoted_glob_pattern_p (string) + register char *string; +@@ -85,10 +88,14 @@ unquoted_glob_pattern_p (string) + continue; + + case ']': +- if (open) ++ if (open) /* XXX - if --open == 0? */ + return (1); + continue; + ++ case '/': ++ if (open) ++ open = 0; ++ + case '+': + case '@': + case '!': +@@ -106,6 +113,11 @@ unquoted_glob_pattern_p (string) + string++; + continue; + } ++ else if (open && *string == '/') ++ { ++ string++; /* quoted slashes in bracket expressions are ok */ ++ continue; ++ } + else if (*string == 0) + return (0); + +diff --git a/shell.c b/shell.c +index a2b2a55..6adabc8 100644 +--- a/shell.c ++++ b/shell.c +@@ -1293,7 +1293,11 @@ disable_priv_mode () + { + int e; + ++#if HAVE_DECL_SETRESUID ++ if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0) ++#else + if (setuid (current_user.uid) < 0) ++#endif + { + e = errno; + sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid); +@@ -1302,7 +1306,11 @@ disable_priv_mode () + exit (e); + #endif + } ++#if HAVE_DECL_SETRESGID ++ if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0) ++#else + if (setgid (current_user.gid) < 0) ++#endif + sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid); + + current_user.euid = current_user.uid; +diff --git a/tests/glob.tests b/tests/glob.tests +index 01913bb..fb012f7 100644 +--- a/tests/glob.tests ++++ b/tests/glob.tests +@@ -12,6 +12,8 @@ ${THIS_SH} ./glob1.sub + ${THIS_SH} ./glob2.sub + ${THIS_SH} ./glob3.sub + ${THIS_SH} ./glob4.sub ++${THIS_SH} ./glob6.sub ++${THIS_SH} ./glob7.sub + + MYDIR=$PWD # save where we are + +diff --git a/tests/glob6.sub b/tests/glob6.sub +new file mode 100644 +index 0000000..b099811 +--- /dev/null ++++ b/tests/glob6.sub +@@ -0,0 +1,54 @@ ++# tests of the backslash-in-glob-patterns discussion on the austin-group ML ++ ++: ${TMPDIR:=/var/tmp} ++ ++ORIG=$PWD ++GLOBDIR=$TMPDIR/bash-glob-$$ ++mkdir $GLOBDIR && cd $GLOBDIR ++ ++# does the pattern matcher allow backslashes as escape characters and remove ++# them as part of matching? ++touch abcdefg ++pat='ab\cd*' ++printf '<%s>\n' $pat ++pat='\.' ++printf '<%s>\n' $pat ++rm abcdefg ++ ++# how about when escaping pattern characters? ++touch '*abc.c' ++a='\**.c' ++printf '%s\n' $a ++rm -f '*abc.c' ++ ++# how about when making the distinction between readable and searchable path ++# components? ++mkdir -m a=x searchable ++mkdir -m a=r readable ++ ++p='searchable/\.' ++printf "%s\n" $p ++ ++p='searchable/\./.' ++printf "%s\n" $p ++ ++p='readable/\.' ++printf "%s\n" $p ++ ++p='readable/\./.' ++printf "%s\n" $p ++ ++printf "%s\n" 'searchable/\.' ++printf "%s\n" 'readable/\.' ++ ++echo */. ++ ++p='*/\.' ++echo $p ++ ++echo */'.' ++ ++rmdir searchable readable ++ ++cd $ORIG ++rmdir $GLOBDIR +diff --git a/tests/glob7.sub b/tests/glob7.sub +new file mode 100644 +index 0000000..0212b8e +--- /dev/null ++++ b/tests/glob7.sub +@@ -0,0 +1,11 @@ ++# according to Posix 2.13.3, a slash in a bracket expression renders that ++# bracket expression invalid ++shopt -s nullglob ++ ++echo 1: [qwe/qwe] ++echo 2: [qwe/ ++echo 3: [qwe/] ++ ++echo 4: [qwe\/qwe] ++echo 5: [qwe\/ ++echo 6: [qwe\/] +-- +1.9.1 diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index eadc82279d..1b7058746f 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://run-ptest \ file://run-bash-ptests \ file://fix-run-builtins.patch \ + file://bash-CVE-2019-18276.patch \ " SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" -- 2.17.1 From akuster808 at gmail.com Tue Feb 4 15:06:03 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:03 -0800 Subject: [OE-core] [zeus 3/8] kbd: configure.ac: Fix logic of vlock configure switch In-Reply-To: References: Message-ID: <3a63d9e476f64b40978eea48e33603638137daca.1580828664.git.akuster808@gmail.com> From: De Huo Downstream bug report: https://bugs.gentoo.org/661650 Upstream-Status: Backport [f7f357ef079b6d185f340e716d7c72a98d82bad0] Signed-off-by: Lars Wendler Signed-off-by: De Huo Signed-off-by: Armin Kuster --- ...-Fix-logic-of-vlock-configure-switch.patch | 31 +++++++++++++++++++ meta/recipes-core/kbd/kbd_2.0.4.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch diff --git a/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch b/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch new file mode 100644 index 0000000000..c3f068f61b --- /dev/null +++ b/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch @@ -0,0 +1,31 @@ +From f7f357ef079b6d185f340e716d7c72a98d82bad0 Mon Sep 17 00:00:00 2001 +From: Garry Filakhtov +Date: Fri, 20 Jul 2018 15:58:56 +0200 +Subject: [PATCH] configure.ac: Fix logic of vlock configure switch + +Downstream bug report: https://bugs.gentoo.org/661650 + +Upstream-Status: Backport [f7f357ef079b6d185f340e716d7c72a98d82bad0] + +Signed-off-by: Lars Wendler +Signed-off-by: De Huo +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 87eb63c..07098cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,7 +119,7 @@ AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes") + + AC_ARG_ENABLE(vlock, + AS_HELP_STRING(--disable-vlock, [do not build vlock]), +- [VLOCK_PROG=no],[VLOCK_PROG=yes]) ++ [VLOCK_PROG=$enableval],[VLOCK_PROG=yes]) + AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes") + + if test "$VLOCK_PROG" = "yes"; then +-- +2.23.0 + diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb b/meta/recipes-core/kbd/kbd_2.0.4.bb index 4af3256fff..17ce6e7a9c 100644 --- a/meta/recipes-core/kbd/kbd_2.0.4.bb +++ b/meta/recipes-core/kbd/kbd_2.0.4.bb @@ -13,6 +13,7 @@ RCONFLICTS_${PN} = "console-tools" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ + file://0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch \ " SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6" -- 2.17.1 From akuster808 at gmail.com Tue Feb 4 15:06:04 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:04 -0800 Subject: [OE-core] [zeus 4/8] kbd: avoid vlock conflict with busybox In-Reply-To: References: Message-ID: From: Hongxu Jia busybox as well as vlock utility from meta-oe provides vlock utility which can conflict when with kbd if pam is a enabled distro_feature Fixes image build errors update-alternatives: Error: not linking /usr/bin/vlock to /bin/busybox.suid since /usr/bin/vlock exists and is not a link ERROR: yoe-qt5-wayland-image-1.0-r0 do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget_${PN} (). Deferring to first boot via 'exit 1' is no longer supported. Signed-off-by: Khem Raj The vlock doesn't exist if PAM isn't enabled. Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie Signed-off-by: De Huo Signed-off-by: Armin Kuster --- meta/recipes-core/kbd/kbd_2.0.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb b/meta/recipes-core/kbd/kbd_2.0.4.bb index 17ce6e7a9c..47e76da2b4 100644 --- a/meta/recipes-core/kbd/kbd_2.0.4.bb +++ b/meta/recipes-core/kbd/kbd_2.0.4.bb @@ -59,7 +59,8 @@ RDEPENDS_${PN}-ptest = "make" inherit update-alternatives -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey" +ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" -- 2.17.1 From akuster808 at gmail.com Tue Feb 4 15:06:05 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:05 -0800 Subject: [OE-core] [zeus 5/8] bzip2: Fix CVE-2019-12900 In-Reply-To: References: Message-ID: From: Sana Kazi Added patch for CVE-2019-12900 as backport from upstream. Fixes out of bound access discovered while fuzzying karchive. Tested by: Sana.Kazi at kpit.com Signed-off-by: Saloni Jain Signed-off-by: Armin Kuster --- .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch new file mode 100644 index 0000000000..9859d9d1a2 --- /dev/null +++ b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch @@ -0,0 +1,36 @@ +From 74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 28 May 2019 19:35:18 +0200 +Subject: [PATCH] Make sure nSelectors is not out of range + +nSelectors is used in a loop from 0 to nSelectors to access selectorMtf +which is +UChar selectorMtf[BZ_MAX_SELECTORS]; +so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid memory +access +Fixes out of bounds access discovered while fuzzying karchive + +Link: https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc.patch + +Upstream-Status: Backport +CVE: CVE-2019-12900.patch +Signed-off-by: Saloni Jain +--- + decompress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/decompress.c b/decompress.c +index ab6a624..f3db91d 100644 +--- a/decompress.c ++++ b/decompress.c +@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s ) + GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); + if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); + GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); +- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); ++ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); + for (i = 0; i < nSelectors; i++) { + j = 0; + while (True) { +-- +2.22.0 -- 2.17.1 From akuster808 at gmail.com Tue Feb 4 15:06:06 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:06 -0800 Subject: [OE-core] [zeus 6/8] core: recipes: fix some native tools dependencies In-Reply-To: References: Message-ID: <1e0f2151ab9c30e104bcbd30e2c1d842a1ff4150.1580828664.git.akuster808@gmail.com> From: Sumit Garg Some native tools dependency issues were seen while building with external GCC tool-set rather than source GCC tool-set. While building with source tool-set these dependencies were implicitly met which is not the case with external tool-set. So explicitly state these native tools dependencies. Signed-off-by: Sumit Garg Signed-off-by: Armin Kuster --- meta/recipes-extended/man-db/man-db_2.8.7.bb | 2 +- meta/recipes-extended/psmisc/psmisc.inc | 2 +- meta/recipes-graphics/xorg-app/xorg-app-common.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/man-db/man-db_2.8.7.bb b/meta/recipes-extended/man-db/man-db_2.8.7.bb index 083b2374aa..0d73b03482 100644 --- a/meta/recipes-extended/man-db/man-db_2.8.7.bb +++ b/meta/recipes-extended/man-db/man-db_2.8.7.bb @@ -10,7 +10,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ SRC_URI[md5sum] = "ec0b23c8314a1654c4d059b2c18ce43d" SRC_URI[sha256sum] = "b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326" -DEPENDS = "libpipeline gdbm groff-native base-passwd" +DEPENDS = "libpipeline gdbm groff-native base-passwd flex-native" RDEPENDS_${PN} += "base-passwd" # | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr' diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index 594a10cf22..6de5acb71b 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -7,7 +7,7 @@ command sends a specified signal (SIGTERM if nothing is specified) to \ processes identified by name. The fuser command identifies the PIDs \ of processes that are using specified files or filesystems." SECTION = "base" -DEPENDS = "ncurses virtual/libintl gettext-native" +DEPENDS = "ncurses virtual/libintl gettext-native xz-native" LICENSE = "GPLv2" SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc index 3529cb26ef..211e399cf0 100644 --- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc @@ -12,6 +12,6 @@ INC_PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig distro_features_check gettext FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" -- 2.17.1 From akuster808 at gmail.com Tue Feb 4 15:06:07 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:07 -0800 Subject: [OE-core] [zeus 7/8] webkitgtk: fix occasional link error In-Reply-To: References: Message-ID: <5c9a1dd59387ca9972e7036272dcd47a4a168efe.1580828664.git.akuster808@gmail.com> From: Joe Slater Partial backport from WebKit.git. See patch for details. Fixed in webkitgtk 2.26.1. Signed-off-by: Joe Slater Signed-off-by: Armin Kuster --- .../webkit/webkitgtk/fix-link-error.patch | 45 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.24.4.bb | 1 + 2 files changed, 46 insertions(+) create mode 100755 meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch b/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch new file mode 100755 index 0000000000..9696ddd691 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch @@ -0,0 +1,45 @@ +webkitgtk: fix an occasional link error + +Part of ae465a4e... Changelog is not included in the source tarball. + +Upstream-Status: backport [git://git.webkit.org/WebKit.git] + +commit ae465a4e3b1498b6c4038fc7e596e0e3662d116f +Author: Hironori.Fujii at sony.com +Date: Fri Jun 28 07:38:09 2019 +0000 + + [Win] unresolved external symbol "JSC::JSObject::didBecomePrototype(void)" referenced in function "JSC::Structure::create(...)" + https://bugs.webkit.org/show_bug.cgi?id=199312 + + Reviewed by Keith Miller. + + WinCairo port, clang-cl Release builds reported a following linkage error: + + > WebCore.lib(UnifiedSource-4babe430-10.cpp.obj) : error LNK2019: unresolved external symbol "public: void __cdecl JSC::JSObject::didBecomePrototype(void)" (?didBecomePrototype at JSObject@JSC@@QEAAXXZ) referenced in function "public: static class JSC::Structure * __cdecl JSC::Structure::create(class JSC::VM &,class JSC::JSGlobalObject *,class JSC::JSValue,class JSC::TypeInfo const &,struct JSC::ClassInfo const *,unsigned char,unsigned int)" (?create at Structure@JSC@@SAPEAV12 at AEAVVM@2 at PEAVJSGlobalObject@2 at VJSValue@2 at AEBVTypeInfo@2 at PEBUClassInfo@2 at EI@Z) + + No new tests because there is no behavior change. + + * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp: Include , + and do not include headers which is included by it. + + git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 246922 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +[ modification of Changelog deleted ] + +diff --git a/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp b/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp +index d1b047c..0899a9a 100644 +--- a/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp ++++ b/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp +@@ -49,11 +49,8 @@ + #include "SQLiteTransaction.h" + #include "ThreadSafeDataBuffer.h" + #include +-#include +-#include +-#include ++#include + #include +-#include + #include + #include + #include diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb index c090782411..1c71762945 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb @@ -23,6 +23,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://include_array.patch \ file://narrowing.patch \ file://0001-gstreamer-add-a-missing-format-string.patch \ + file://fix-link-error.patch \ " SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87" -- 2.17.1 From akuster808 at gmail.com Tue Feb 4 15:06:08 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Tue, 4 Feb 2020 07:06:08 -0800 Subject: [OE-core] [zeus 8/8] python2: add ntpath In-Reply-To: References: Message-ID: <9b1bf083129be2b849db52d4f0eda9eb6077c97e.1580828664.git.akuster808@gmail.com> python3 has this but python is missing this. [Yocto #13740] Signed-off-by: Armin Kuster --- meta/recipes-devtools/python/python/python2-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json index eb52e862ab..fd98774d00 100644 --- a/meta/recipes-devtools/python/python/python2-manifest.json +++ b/meta/recipes-devtools/python/python/python2-manifest.json @@ -267,6 +267,7 @@ "${libdir}/python2.7/lib-dynload/xreadlines.so", "${libdir}/python2.7/linecache.py", "${libdir}/python2.7/new.py", + "${libdir}/python2.7/ntpath.py", "${libdir}/python2.7/os.py", "${libdir}/python2.7/platform.py", "${libdir}/python2.7/posixpath.py", -- 2.17.1 From sjolley.yp.pm at gmail.com Tue Feb 4 15:58:15 2020 From: sjolley.yp.pm at gmail.com (sjolley.yp.pm at gmail.com) Date: Tue, 4 Feb 2020 07:58:15 -0800 Subject: [OE-core] Yocto Project Status WW05'20 Message-ID: <095001d5db73$e911af70$bb350e50$@gmail.com> Current Dev Position: YP 3.1 M3 Next Deadline: YP 3.1 M3 build date 2/24/2020 Next Team Meetings: * Bug Triage meeting Thursday Feb. 6th at 7:30am PDT ( https://zoom.us/j/454367603) * Monthly Project Meeting Tuesday Feb. 4th at 8am PDT ( https://zoom.us/j/990892712) * Weekly Engineering Sync Tuesday Feb. 11th at 8am PDT ( https://zoom.us/j/990892712) * Twitch - Next event is Tuesday Feb. 11th at 8am PDT ( https://www.twitch.tv/yocto_project) Key Status/Updates: * YP 3.1 M2 is due to be released with reservations. * There are significant concerns with M2 due to the build reproducibility failures which continue to cause major problems with master too. These will have to block the M3 build/release. * The NPM fetcher rework patches have now merged, we'd like to thank Jean-Marie Lemetayer for his patience whilst they were made into good shape with regression tests, thanks, its a good end result. * The host dependencies on makeinfo and pod2man have now been dropped to simplify build dependencies and improve reproducibility. * The mpc8315e-rdb machine/BSP has been dropped from meta-yocto-bsp. * Build reproducibility issues have been tracked down to a number of causes but many more remain, some with open bugs, some with bugs yet to be filed. Any assistance with reproducibility issues is appreciated as is the major factor blocking patch merging at present. * Reproducibility failure debugging has been improved with better integration into the autobuilder to assist with this. Saved problematic output is now saved at: https://autobuilder.yocto.io/pub/repro-fail/ * Ongoing kernel issues still prevent kernel upgrades merging at present but work on debugging the issues is moving forward (thanks Victor/Cisco in particular) * We're collecting a list of companies, products and projects which use the Yocto Project on the wiki: https://wiki.yoctoproject.org/wiki/Project_Users Please add any you know are missing (or email Richard/Stephen who can add). * We have created a "documentation" list and a "licensing" list on the yocto project mailing list infrastructure. We believe these topics would benefit from dedicated discussions, the people involved usually aren't interested in bulk email as would be found on other lists. The new lists can be found at: https://lists.yoctoproject.org/g/licensing/join and https://lists.yoctoproject.org/g/docs/join * The triage team is worried about attendance at triage meetings and the project is finding it hard to find people to help fix bugs. If anyone is willing to work on bugs, assistance would be greatly appreciated. YP 3.1 Milestone Dates: * YP 3.1 M2 should release shortly * YP 3.1 M3 build date 2/24/2020 * YP 3.1 M3 release date 3/6/2020 * YP 3.1 M4 build date 3/30/2020 * YP 3.1 M4 release date 4/24/2020 Planned upcoming dot releases: * YP 2.7.3 build date 2/10/2020 * YP 2.7.3 release date 2/21/2020 * YP 3.0.2 build date 2/3/2020 * YP 3.0.2 release date 2/14/2020 Tracking Metrics: * WDD 2767 (last week 2765) ( https://wiki.yoctoproject.org/charts/combo.html) * Poky Patch Metrics * Total patches found: 1368 (last week 1368) * Patches in the Pending State: 544 (40%) [last week 545 (39%)] The Yocto Project's technical governance is through its Technical Steering Committee, more information is available at: https://wiki.yoctoproject.org/wiki/TSC The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status [If anyone has suggestions for other information you'd like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From alistair.francis at wdc.com Tue Feb 4 18:41:13 2020 From: alistair.francis at wdc.com (Alistair Francis) Date: Tue, 4 Feb 2020 10:41:13 -0800 Subject: [OE-core] [PATCH] qemu: Upgrade to 4.2.0 Message-ID: <20200204184113.16070-1-alistair.francis@wdc.com> While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- ...u-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...e_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 6 +- ...emu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...test-which-runs-all-unit-test-cases-.patch | 6 +- ...n-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...-connect-socket-to-a-spawned-command.patch | 14 +-- .../0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++- ...dd-pkg-config-handling-for-libgcrypt.patch | 14 +-- ...-libcap-header-issue-on-some-distro.patch} | 0 ...linux-user-remove-host-stime-syscall.patch | 61 ---------- ...messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 ------------------ .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 20 files changed, 53 insertions(+), 228 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb => qemu-system-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch => 0011-fix-libcap-header-issue-on-some-distro.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch rename meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch => 0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5ae16..23f2ce97c3 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43e6b..c04297cad0 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0011-fix-libcap-header-issue-on-some-distro.patch \ + file://0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060997..deca13acae 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102ae5..66ff996508 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd53cf..7f7da51006 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68030..012d60d8f0 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab40b1..bc30397e8c 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a73681510e..ec303371b0 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a42385530f..0810ae84c0 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2545..89baad9b7f 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25bec..30bb4ddf26 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d9455f..7e273eeced 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7daa42..34df78b7fe 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0011-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0011-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be45d..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e407f..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 4 20:50:53 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 4 Feb 2020 21:50:53 +0100 Subject: [OE-core] [PATCH] ifupdown: add ptest In-Reply-To: <4d47a7c5-d60a-2fcc-3a4d-a716727bbcbd@windriver.com> References: <20200203091406.37643-1-kai.kang@windriver.com> <4d47a7c5-d60a-2fcc-3a4d-a716727bbcbd@windriver.com> Message-ID: imagefeatures.py does set: PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils" VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils" which I believe does actually replace replace busybox with that packagegroup in any image, as packagegroup-core-boot RDEPENDS on VIRTUAL-RUNTIME_base-utils. I'm not sure why imagefeatures.py only does 'bitbake("--graphviz core-image-sato")' instead of building and booting that image properly, but this is exactly the place where it should happen. Alex On Tue, 4 Feb 2020 at 10:25, Kang Kai wrote: > In imagefeatures.py, it just run 'bitbake -g core-image-sato' and > doesn't really build and test RDEPENDS packages of > packagegroup-core-base-utils. > > So for the packages in the RDEPENDS packages of > packagegroup-core-base-utils but not in any image, they all are not be > tested. > > I didn't find a proper recipe to place these recipes. Maybe a new image > recipe need to be created. > > Regards, > Kai > > > > > > > Alex > > > >> On 3 Feb 2020, at 10.14, < > kai.kang at windriver.com> wrote: > >> > >> From: Kai Kang > >> > >> Add ptest for ifupdown with its own test cases. > >> > >> [Yocto #13736] > >> > >> Signed-off-by: Kai Kang > >> --- > >> meta/recipes-core/ifupdown/files/run-ptest | 4 ++ > >> .../ifupdown/files/tweak-ptest-script.patch | 49 +++++++++++++++++++ > >> meta/recipes-core/ifupdown/ifupdown_0.8.35.bb | 10 +++- > >> 3 files changed, 62 insertions(+), 1 deletion(-) > >> create mode 100644 meta/recipes-core/ifupdown/files/run-ptest > >> create mode 100644 > meta/recipes-core/ifupdown/files/tweak-ptest-script.patch > >> > >> diff --git a/meta/recipes-core/ifupdown/files/run-ptest > b/meta/recipes-core/ifupdown/files/run-ptest > >> new file mode 100644 > >> index 0000000000..8694042392 > >> --- /dev/null > >> +++ b/meta/recipes-core/ifupdown/files/run-ptest > >> @@ -0,0 +1,4 @@ > >> +#!/bin/sh > >> + > >> +CURDIR=$(dirname `readlink -f $0`) > >> +cd $CURDIR/tests && ./testbuild-linux > >> diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch > b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch > >> new file mode 100644 > >> index 0000000000..d7600cf243 > >> --- /dev/null > >> +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch > >> @@ -0,0 +1,49 @@ > >> +Tweak tests of ifupdown to make it work with oe-core ptest framework. > >> + > >> +Upstream-Status: Inappropriate [oe-core specific] > >> + > >> +Signed-off-by: Kai Kang > >> + > >> +diff --git a/tests/testbuild-linux b/tests/testbuild-linux > >> +index 1181ea0..d5c1814 100755 > >> +--- a/tests/testbuild-linux > >> ++++ b/tests/testbuild-linux > >> +@@ -1,6 +1,7 @@ > >> + #!/bin/sh -e > >> + > >> +-dir=tests/linux > >> ++curdir=$(dirname `readlink -f $0`) > >> ++dir=$curdir/linux > >> + > >> + result=true > >> + for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do > >> +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 > 17 18; do > >> + echo "Testcase $test: $args" > >> + > >> + exitcode=0 > >> +- ./ifup -v --no-act-commands --force -i $dir/testcase.$test > --state-dir=$dir/state.$test $args \ > >> ++ ifup -v --no-act-commands --force -i $dir/testcase.$test > --state-dir=$dir/state.$test $args \ > >> + >$dir/up-res-out.$test 2>$dir/up-res-err.$test || > exitcode=$? > >> + > >> + (echo "exit code: $exitcode"; > >> +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 > 17 18; do > >> + echo "====stderr===="; cat $dir/up-res-err.$test) > > $dir/up-res.$test > >> + > >> + exitcode=0 > >> +- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test > --state-dir=$dir/state.$test $args \ > >> ++ ifdown -v --no-act-commands --force -i $dir/testcase.$test > --state-dir=$dir/state.$test $args \ > >> + >$dir/down-res-out.$test 2>$dir/down-res-err.$test || > exitcode=$? > >> + > >> + (echo "exit code: $exitcode"; > >> +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 > 17 18; do > >> + echo "====stderr===="; cat $dir/down-res-err.$test) > > $dir/down-res.$test > >> + > >> + if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub > $dir/down.$test $dir/down-res.$test; then > >> +- echo "(okay)" > >> ++ echo "PASS: $test" > >> + else > >> +- echo "(failed)" > >> ++ echo "FAIL: $test" > >> + result=false > >> + fi > >> + echo "==========" > >> diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb > b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb > >> index 0de97fe372..53cb971d33 100644 > >> --- a/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb > >> +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.35.bb > >> @@ -11,13 +11,15 @@ SRC_URI = "git:// > salsa.debian.org/debian/ifupdown.git;protocol=https \ > >> file://99_network \ > >> file://0001-Define-FNM_EXTMATCH-for-musl.patch \ > >> > file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ > >> + file://run-ptest \ > >> + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', > 'file://tweak-ptest-script.patch', '', d)} \ > >> " > >> SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" > >> > >> S = "${WORKDIR}/git" > >> > >> > >> -inherit update-alternatives > >> +inherit ptest update-alternatives > >> > >> do_compile () { > >> chmod a+rx *.pl *.sh > >> @@ -40,6 +42,12 @@ do_install () { > >> cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 > >> } > >> > >> +do_install_ptest () { > >> + install -d ${D}${PTEST_PATH}/tests > >> + cp -r ${S}/tests/testbuild-linux ${D}${PTEST_PATH}/tests/ > >> + cp -r ${S}/tests/linux ${D}${PTEST_PATH}/tests/ > >> +} > >> + > >> ALTERNATIVE_PRIORITY = "100" > >> ALTERNATIVE_${PN} = "ifup ifdown" > >> > >> -- > >> 2.17.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > -- > Kai Kang > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From mark.hatle at kernel.crashing.org Tue Feb 4 21:06:25 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 4 Feb 2020 15:06:25 -0600 Subject: [OE-core] [PATCH v4 0/5] Microblaze tune updates Message-ID: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> Version 4 of the patch set. I've collected all of the patches resently sent, and reworked them per the comments on the mailing list. The patches are directly available at: git://git.openembedded.org/openembedded-core-contrib mgh/xilinx-microblaze The work was broken up into a few more individual pieces. This will allow backports to Zeus for fixes vs new features. Mark Hatle (5): microblaze tune: change microblazeeb to microblaze microblaze tune: Allow no version to be set microblaze tune: Enable 64-bit microblaze tune: cleanup += Microblaze: Adjust Linux items from microblazeeb to microblaze meta/classes/meson.bbclass | 2 +- meta/classes/siteinfo.bbclass | 3 -- .../include/microblaze/arch-microblaze.inc | 35 ++++++++++++------- .../microblaze/feature-microblaze-math.inc | 12 +++---- .../feature-microblaze-versions.inc | 4 +-- meta/lib/oe/elf.py | 3 -- .../{microblazeeb => microblaze}/objarch.h | 0 7 files changed, 31 insertions(+), 28 deletions(-) rename meta/recipes-extended/ghostscript/ghostscript/{microblazeeb => microblaze}/objarch.h (100%) -- 2.17.1 From mark.hatle at kernel.crashing.org Tue Feb 4 21:06:26 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 4 Feb 2020 15:06:26 -0600 Subject: [OE-core] [PATCH v4 1/5] microblaze tune: change microblazeeb to microblaze In-Reply-To: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> References: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> Message-ID: <20200204210630.41960-2-mark.hatle@kernel.crashing.org> From: Mark Hatle Using microblazeeb breaks a number of autoconf recipes, including newlib components. 'microblaze' is defined as the big-endian version, while microblazeel is defined as the little-endian version. config.sub: 2018-07-03 ... | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ ... | microblaze-* | microblazeel-* \ ... microblaze*) basic_machine=microblaze-xilinx ... Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle --- meta/conf/machine/include/microblaze/arch-microblaze.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index eab7171cb2..89e9484190 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -45,8 +45,8 @@ MBPKGARCH_TUNE .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", require conf/machine/include/microblaze/feature-microblaze-versions.inc require conf/machine/include/microblaze/feature-microblaze-math.inc -# Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" +# Architecture name, either 'microblaze' or 'microblazeel' depending on endianess +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" # Package Architecture formatting TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" -- 2.17.1 From mark.hatle at kernel.crashing.org Tue Feb 4 21:06:27 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 4 Feb 2020 15:06:27 -0600 Subject: [OE-core] [PATCH v4 2/5] microblaze tune: Allow no version to be set In-Reply-To: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> References: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> Message-ID: <20200204210630.41960-3-mark.hatle@kernel.crashing.org> From: Mark Hatle We want to allow no version to be configured. This should use the GCC default which is the latest defined version, currently 11.0. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle --- .../include/microblaze/feature-microblaze-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc index 3221e2aab7..5c37f49abb 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" # Version flags -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}" -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}" +TUNE_CCARGS += "${@'-mcpu=%s' % (microblaze_current_version(d, True)) if microblaze_current_version(d, True) != '' else ''}" +MBPKGARCH_VERSION = "${@'-%s' % (microblaze_current_version(d, True)) if microblaze_current_version(d, True) != '' else ''}" -- 2.17.1 From mark.hatle at kernel.crashing.org Tue Feb 4 21:06:29 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 4 Feb 2020 15:06:29 -0600 Subject: [OE-core] [PATCH v4 4/5] microblaze tune: cleanup += In-Reply-To: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> References: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> Message-ID: <20200204210630.41960-5-mark.hatle@kernel.crashing.org> From: Mark Hatle Various += were used, refactor these to be either = or .= depending on usuage. CONFLICTS should be '=', as no leading space is required and they are not amending any other conflict settings. The TUNE_CCARGS should be .= so that if the feature does not define a CCARG blank spaces are not added to the CFLAGS. This is consistent to how the arm tuning is implemented. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle --- .../include/microblaze/arch-microblaze.inc | 22 +++++++++---------- .../microblaze/feature-microblaze-math.inc | 12 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index 0349caac0a..4f58076ac9 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -11,34 +11,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze # Endian TUNEVALID[bigendian] = "Use Microblaze Big Endian" -TUNECONFLICTS[bigendian] += "v10.0" +TUNECONFLICTS[bigendian] = "v10.0" MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" # General features TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" TUNEVALID[reorder] = "Enable Reorder Instructions" -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" # Core configuration tune optimizations TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" # Feature compiler args -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" # Disable reorder for v8.30 if pattern-compare is not enabled -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ bb.utils.contains("TUNE_FEATURES", "v8.30", \ bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ - "-mxl-reorder", "-mno-xl-reorder", d), \ - "-mxl-reorder", d), "-mno-xl-reorder", d)}" + " -mxl-reorder", " -mno-xl-reorder", d), \ + " -mxl-reorder", d), " -mno-xl-reorder", d)}" # Feature package architecture formatting MBPKGARCH_TUNE = "" diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc index a31516659c..cba0ae67e3 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" # Compiler args -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" # Set target fpu (bitbake known target) to soft or hard (basic or extended) TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" -- 2.17.1 From mark.hatle at kernel.crashing.org Tue Feb 4 21:06:30 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 4 Feb 2020 15:06:30 -0600 Subject: [OE-core] [PATCH v4 5/5] Microblaze: Adjust Linux items from microblazeeb to microblaze In-Reply-To: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> References: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> Message-ID: <20200204210630.41960-6-mark.hatle@kernel.crashing.org> Due to recent changes to the tune, in order to match config.guess, the name of the big-endian microblaze architecture was changes to 'microblaze'. Signed-off-by: Mark Hatle --- meta/classes/meson.bbclass | 2 +- meta/classes/siteinfo.bbclass | 3 --- meta/lib/oe/elf.py | 3 --- .../ghostscript/{microblazeeb => microblaze}/objarch.h | 0 4 files changed, 1 insertion(+), 7 deletions(-) rename meta/recipes-extended/ghostscript/ghostscript/{microblazeeb => microblaze}/objarch.h (100%) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 001602bd04..06034e8b47 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -57,7 +57,7 @@ def meson_cpu_family(var, d): return 'mips64' elif re.match(r"i[3-6]86", arch): return "x86" - elif arch == "microblazeel" or arch == "microblazeeb": + elif arch == "microblazeel": return "microblaze" else: return arch diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index d62aaac0f0..1a048c053f 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -35,7 +35,6 @@ def siteinfo_data_for_machine(arch, os, d): "lm32": "endian-big bit-32", "m68k": "endian-big bit-32", "microblaze": "endian-big bit-32 microblaze-common", - "microblazeeb": "endian-big bit-32 microblaze-common", "microblazeel": "endian-little bit-32 microblaze-common", "mips": "endian-big bit-32 mips-common", "mips64": "endian-big bit-64 mips-common", @@ -89,8 +88,6 @@ def siteinfo_data_for_machine(arch, os, d): "arm-linux-musleabi": "arm-linux", "armeb-linux-gnueabi": "armeb-linux", "armeb-linux-musleabi": "armeb-linux", - "microblazeeb-linux" : "microblaze-linux", - "microblazeeb-linux-musl" : "microblaze-linux", "microblazeel-linux" : "microblaze-linux", "microblazeel-linux-musl" : "microblaze-linux", "mips-linux-musl": "mips-linux", diff --git a/meta/lib/oe/elf.py b/meta/lib/oe/elf.py index 2ed614f652..df0a4593fa 100644 --- a/meta/lib/oe/elf.py +++ b/meta/lib/oe/elf.py @@ -22,7 +22,6 @@ def machine_dict(d): "mips": ( 8, 0, 0, False, 32), "mipsel": ( 8, 0, 0, True, 32), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), "powerpc": (20, 0, 0, False, 32), "riscv32": (243, 0, 0, True, 32), @@ -60,7 +59,6 @@ def machine_dict(d): "sh4": (42, 0, 0, True, 32), "sparc": ( 2, 0, 0, False, 32), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), }, "linux-musl" : { @@ -81,7 +79,6 @@ def machine_dict(d): "mips64": ( 8, 0, 0, False, 64), "mips64el": ( 8, 0, 0, True, 64), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), "riscv32": (243, 0, 0, True, 32), "riscv64": (243, 0, 0, True, 64), diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h similarity index 100% rename from meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h rename to meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h -- 2.17.1 From mark.hatle at kernel.crashing.org Tue Feb 4 21:06:28 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 4 Feb 2020 15:06:28 -0600 Subject: [OE-core] [PATCH v4 3/5] microblaze tune: Enable 64-bit In-Reply-To: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> References: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> Message-ID: <20200204210630.41960-4-mark.hatle@kernel.crashing.org> From: Mark Hatle 64-bit is not yet available in Linux, but some non-Linux uses exist. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle --- .../machine/include/microblaze/arch-microblaze.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index 89e9484190..0349caac0a 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -4,6 +4,11 @@ TUNEVALID[microblaze] = "MicroBlaze" MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" +# 64-bit +TUNEVALID[64-bit] = "64-bit MicroBlaze" +TUNECONFLICTS[64-bit] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" + # Endian TUNEVALID[bigendian] = "Use Microblaze Big Endian" TUNECONFLICTS[bigendian] += "v10.0" @@ -26,6 +31,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" # Disable reorder for v8.30 if pattern-compare is not enabled TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ @@ -48,6 +54,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc # Architecture name, either 'microblaze' or 'microblazeel' depending on endianess TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" +# Add 64-bit to the PKGARCH if enabled. +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" + # Package Architecture formatting -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" -- 2.17.1 From richard.purdie at linuxfoundation.org Tue Feb 4 21:29:22 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 04 Feb 2020 21:29:22 +0000 Subject: [OE-core] [PATCH] ifupdown: add ptest In-Reply-To: References: <20200203091406.37643-1-kai.kang@windriver.com> <4d47a7c5-d60a-2fcc-3a4d-a716727bbcbd@windriver.com> Message-ID: <1e008fb569c7f94319b00108b26133e2127fe0c7.camel@linuxfoundation.org> On Tue, 2020-02-04 at 21:50 +0100, Alexander Kanavin wrote: > imagefeatures.py does set: > > PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base- > utils" > VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils" > > which I believe does actually replace replace busybox with that > packagegroup in any image, as packagegroup-core-boot RDEPENDS on > VIRTUAL-RUNTIME_base-utils. > > I'm not sure why imagefeatures.py only does 'bitbake("--graphviz > core-image-sato")' instead of building and booting that image > properly, but this is exactly the place where it should happen. I suspect it dates from a time where booting and testing the image likely wouldn't have worked. It sounds like there would be a lot more value in that now. I merged this patch on the basis it was a good step forwards on the issue in case that wasn't clear. Cheers, Richard From anuj.mittal at intel.com Wed Feb 5 00:44:36 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Wed, 5 Feb 2020 00:44:36 +0000 Subject: [OE-core] [zeus 5/8] bzip2: Fix CVE-2019-12900 In-Reply-To: References: Message-ID: I think this should be reverted. Sorry, I had given comments at the time patch was sent but missed this in zeus review. http://lists.openembedded.org/pipermail/openembedded-core/2020-January/291826.html This CVE is not applicable to 1.0.7. This is not failing because the CVE patch file is not included in SRC_URI in recipe. Thanks, Anuj > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Armin Kuster > Sent: Tuesday, February 4, 2020 11:06 PM > To: openembedded-core at openembedded.org > Subject: [OE-core] [zeus 5/8] bzip2: Fix CVE-2019-12900 > > From: Sana Kazi > > Added patch for CVE-2019-12900 as backport from upstream. > Fixes out of bound access discovered while fuzzying karchive. > > Tested by: Sana.Kazi at kpit.com > > Signed-off-by: Saloni Jain > Signed-off-by: Armin Kuster > --- > .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019- > 12900.patch > > diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch > b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch > new file mode 100644 > index 0000000000..9859d9d1a2 > --- /dev/null > +++ b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch > @@ -0,0 +1,36 @@ > +From 74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc Mon Sep 17 00:00:00 2001 > +From: Albert Astals Cid > +Date: Tue, 28 May 2019 19:35:18 +0200 > +Subject: [PATCH] Make sure nSelectors is not out of range > + > +nSelectors is used in a loop from 0 to nSelectors to access selectorMtf > +which is > +UChar selectorMtf[BZ_MAX_SELECTORS]; > +so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid > +memory access Fixes out of bounds access discovered while fuzzying > +karchive > + > +Link: > +https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef > +9824db71a8ffee5962cdbc.patch > + > +Upstream-Status: Backport > +CVE: CVE-2019-12900.patch > +Signed-off-by: Saloni Jain > +--- > + decompress.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/decompress.c b/decompress.c index ab6a624..f3db91d 100644 > +--- a/decompress.c > ++++ b/decompress.c > +@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s ) > + GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); > + if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); > + GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); > +- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); > ++ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) > ++ RETURN(BZ_DATA_ERROR); > + for (i = 0; i < nSelectors; i++) { > + j = 0; > + while (True) { > +-- > +2.22.0 > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From anuj.mittal at intel.com Wed Feb 5 00:56:55 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Wed, 5 Feb 2020 00:56:55 +0000 Subject: [OE-core] [zeus 2/8] bash: Fix CVE-2019-18276 In-Reply-To: <14ee1e10505e52ad21aec0e3184896145d4d3efa.1580828664.git.akuster808@gmail.com> References: <14ee1e10505e52ad21aec0e3184896145d4d3efa.1580828664.git.akuster808@gmail.com> Message-ID: Was the original patch sent to the oe-core list? This CVE should be applicable to master too. Also it looks like the patch is doing other things besides fixing just the CVE. Thanks, Anuj > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Armin Kuster > Sent: Tuesday, February 4, 2020 11:06 PM > To: openembedded-core at openembedded.org > Subject: [OE-core] [zeus 2/8] bash: Fix CVE-2019-18276 > > From: De Huo > > An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 > patch 11. > By default, if Bash is run with its effective UID not equal to its real UID, it will drop > privileges by setting its effective UID to its real UID. > However, it does so incorrectly. On Linux and other systems that support "saved UID" > functionality, the saved UID is not dropped. An attacker with command execution in > the shell can use "enable -f" for runtime loading of a new builtin, which can be a > shared object that calls setuid() and therefore regains privileges. However, binaries > running with an effective UID of 0 are unaffected. > > Backport the CVE patche from https://github.com/bminor/bash/commit/ > 951bdaad7a18cc0dc1036bba86b18b90874d39ff to fix CVE-2019-18276 > > Signed-off-by: Chet Ramey > Signed-off-by: De Huo > Signed-off-by: Armin Kuster > --- > .../bash/bash/bash-CVE-2019-18276.patch | 402 ++++++++++++++++++ > meta/recipes-extended/bash/bash_5.0.bb | 1 + > 2 files changed, 403 insertions(+) > create mode 100644 meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch > > diff --git a/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch > b/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch > new file mode 100644 > index 0000000000..78dcc1b636 > --- /dev/null > +++ b/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch > @@ -0,0 +1,402 @@ > +From 951bdaad7a18cc0dc1036bba86b18b90874d39ff Mon Sep 17 00:00:00 2001 > +From: Chet Ramey > +Date: Mon, 1 Jul 2019 09:03:53 -0400 > +Subject: [PATCH] commit bash-20190628 snapshot > + > +An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 > patch 11. > +By default, if Bash is run with its effective UID not equal to its real > +UID, it will drop privileges by setting its effective UID to its real UID. > +However, it does so incorrectly. On Linux and other systems that > +support "saved UID" functionality, the saved UID is not dropped. An > +attacker with command execution in the shell can use "enable -f" for > +runtime loading of a new builtin, which can be a shared object that calls setuid() and > therefore regains privileges. However, binaries running with an effective UID of 0 are > unaffected. > + > +Upstream-Status: Backport > +[https://github.com/bminor/bash/commit/951bdaad7a18cc0dc1036bba86b18b90 > +874d39ff] > +CVE: CVE-2019-18276 > +Signed-off-by: Chet Ramey > +Signed-off-by: De Huo > +--- > + MANIFEST | 2 ++ > + bashline.c | 50 +------------------------------------------------- > + builtins/help.def | 2 +- > + config.h.in | 10 +++++++++- > + configure | 11 +++++++++++ > + configure.ac | 1 + > + doc/bash.1 | 3 ++- > + doc/bashref.texi | 3 ++- > + lib/glob/glob.c | 5 ++++- > + pathexp.c | 16 ++++++++++++++-- > + shell.c | 8 ++++++++ > + tests/glob.tests | 2 ++ > + tests/glob6.sub | 54 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > + tests/glob7.sub | 11 +++++++++++ > + 14 files changed, 122 insertions(+), 56 deletions(-) create mode > +100644 tests/glob6.sub create mode 100644 tests/glob7.sub > + > +diff --git a/MANIFEST b/MANIFEST > +index 03de221..f9ccad7 100644 > +--- a/MANIFEST > ++++ b/MANIFEST > +@@ -1037,6 +1037,8 @@ tests/extglob3.tests f > + tests/extglob3.right f > + tests/extglob4.sub f > + tests/extglob5.sub f > ++tests/glob6.sub f > ++tests/glob7.sub f > + tests/func.tests f > + tests/func.right f > + tests/func1.sub f > +diff --git a/bashline.c b/bashline.c > +index 824ea9d..d86b47d 100644 > +--- a/bashline.c > ++++ b/bashline.c > +@@ -3718,55 +3718,7 @@ static int > + completion_glob_pattern (string) > + char *string; > + { > +- register int c; > +- char *send; > +- int open; > +- > +- DECLARE_MBSTATE; > +- > +- open = 0; > +- send = string + strlen (string); > +- > +- while (c = *string++) > +- { > +- switch (c) > +- { > +- case '?': > +- case '*': > +- return (1); > +- > +- case '[': > +- open++; > +- continue; > +- > +- case ']': > +- if (open) > +- return (1); > +- continue; > +- > +- case '+': > +- case '@': > +- case '!': > +- if (*string == '(') /*)*/ > +- return (1); > +- continue; > +- > +- case '\\': > +- if (*string++ == 0) > +- return (0); > +- } > +- > +- /* Advance one fewer byte than an entire multibyte character to > +- account for the auto-increment in the loop above. */ > +-#ifdef HANDLE_MULTIBYTE > +- string--; > +- ADVANCE_CHAR_P (string, send - string); > +- string++; > +-#else > +- ADVANCE_CHAR_P (string, send - string); > +-#endif > +- } > +- return (0); > ++ return (glob_pattern_p (string) == 1); > + } > + > + static char *globtext; > +diff --git a/builtins/help.def b/builtins/help.def index > +006c4b5..92f9b38 100644 > +--- a/builtins/help.def > ++++ b/builtins/help.def > +@@ -128,7 +128,7 @@ help_builtin (list) > + > + /* We should consider making `help bash' do something. */ > + > +- if (glob_pattern_p (list->word->word)) > ++ if (glob_pattern_p (list->word->word) == 1) > + { > + printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands > matching keywords `", (list->next ? 2 : 1))); > + print_word_list (list, ", "); > +diff --git a/config.h.in b/config.h.in > +index 8554aec..ad4b1e8 100644 > +--- a/config.h.in > ++++ b/config.h.in > +@@ -1,6 +1,6 @@ > + /* config.h -- Configuration file for bash. */ > + > +-/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc. > ++/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc. > + > + This file is part of GNU Bash, the Bourne Again SHell. > + > +@@ -807,6 +807,14 @@ > + #undef HAVE_SETREGID > + #undef HAVE_DECL_SETREGID > + > ++/* Define if you have the setregid function. */ #undef HAVE_SETRESGID > ++#undef HAVE_DECL_SETRESGID > ++ > ++/* Define if you have the setresuid function. */ #undef > ++HAVE_SETRESUID #undef HAVE_DECL_SETRESUID > ++ > + /* Define if you have the setvbuf function. */ #undef HAVE_SETVBUF > + > +diff --git a/configure b/configure > +index 2f62662..b3321c9 100755 > +--- a/configure > ++++ b/configure > +@@ -10281,6 +10281,17 @@ cat >>confdefs.h <<_ACEOF #define > +HAVE_DECL_SETREGID $ac_have_decl _ACEOF > + > ++ac_fn_c_check_decl "$LINENO" "" "ac_cv_have_decl_" "$ac_includes_default" > ++if test "x$ac_cv_have_decl_" = xyes; then : > ++ ac_have_decl=1 > ++else > ++ ac_have_decl=0 > ++fi > ++ > ++cat >>confdefs.h <<_ACEOF > ++#define HAVE_DECL_ $ac_have_decl > ++_ACEOF > ++(setresuid, setresgid) > + ac_fn_c_check_decl "$LINENO" "strcpy" "ac_cv_have_decl_strcpy" > "$ac_includes_default" > + if test "x$ac_cv_have_decl_strcpy" = xyes; then : > + ac_have_decl=1 > +diff --git a/configure.ac b/configure.ac index 52b4cdb..549adef 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -810,6 +810,7 @@ AC_CHECK_DECLS([confstr]) > + AC_CHECK_DECLS([printf]) > + AC_CHECK_DECLS([sbrk]) > + AC_CHECK_DECLS([setregid]) > ++AC_CHECK_DECLS[(setresuid, setresgid]) > + AC_CHECK_DECLS([strcpy]) > + AC_CHECK_DECLS([strsignal]) > + > +diff --git a/doc/bash.1 b/doc/bash.1 > +index e6cd08d..9e58a0b 100644 > +--- a/doc/bash.1 > ++++ b/doc/bash.1 > +@@ -4681,7 +4681,8 @@ above). > + .PD > + .SH "SIMPLE COMMAND EXPANSION" > + When a simple command is executed, the shell performs the following > +-expansions, assignments, and redirections, from left to right. > ++expansions, assignments, and redirections, from left to right, in the > ++following order. > + .IP 1. > + The words that the parser has marked as variable assignments (those > +preceding the command name) and redirections are saved for later diff > +--git a/doc/bashref.texi b/doc/bashref.texi index d33cd57..3065126 > +100644 > +--- a/doc/bashref.texi > ++++ b/doc/bashref.texi > +@@ -2964,7 +2964,8 @@ is not specified. If the file does not exist, it is created. > + @cindex command expansion > + > + When a simple command is executed, the shell performs the following > +-expansions, assignments, and redirections, from left to right. > ++expansions, assignments, and redirections, from left to right, in the > ++following order. > + > + @enumerate > + @item > +diff --git a/lib/glob/glob.c b/lib/glob/glob.c index 398253b..2eaa33e > +100644 > +--- a/lib/glob/glob.c > ++++ b/lib/glob/glob.c > +@@ -607,6 +607,7 @@ glob_vector (pat, dir, flags) > + register unsigned int i; > + int mflags; /* Flags passed to strmatch (). */ > + int pflags; /* flags passed to sh_makepath () */ > ++ int hasglob; /* return value from glob_pattern_p */ > + int nalloca; > + struct globval *firstmalloc, *tmplink; > + char *convfn; > +@@ -648,10 +649,12 @@ glob_vector (pat, dir, flags) > + patlen = (pat && *pat) ? strlen (pat) : 0; > + > + /* If the filename pattern (PAT) does not contain any globbing > + characters, > ++ or contains a pattern with only backslash escapes (hasglob == 2), > + we can dispense with reading the directory, and just see if there is > + a filename `DIR/PAT'. If there is, and we can access it, just make the > + vector to return and bail immediately. */ > +- if (skip == 0 && glob_pattern_p (pat) == 0) > ++ hasglob = 0; > ++ if (skip == 0 && (hasglob = glob_pattern_p (pat)) == 0 || hasglob == > ++ 2) > + { > + int dirlen; > + struct stat finfo; > +diff --git a/pathexp.c b/pathexp.c > +index c1bf2d8..e6c5392 100644 > +--- a/pathexp.c > ++++ b/pathexp.c > +@@ -58,7 +58,10 @@ int extended_glob = EXTGLOB_DEFAULT; > + /* Control enabling special handling of `**' */ int glob_star = 0; > + > +-/* Return nonzero if STRING has any unquoted special globbing chars in > +it. */ > ++/* Return nonzero if STRING has any unquoted special globbing chars in it. > ++ This is supposed to be called when pathname expansion is performed, so > ++ it implements the rules in Posix 2.13.3, specifically that an unquoted > ++ slash cannot appear in a bracket expression. */ > + int > + unquoted_glob_pattern_p (string) > + register char *string; > +@@ -85,10 +88,14 @@ unquoted_glob_pattern_p (string) > + continue; > + > + case ']': > +- if (open) > ++ if (open) /* XXX - if --open == 0? */ > + return (1); > + continue; > + > ++ case '/': > ++ if (open) > ++ open = 0; > ++ > + case '+': > + case '@': > + case '!': > +@@ -106,6 +113,11 @@ unquoted_glob_pattern_p (string) > + string++; > + continue; > + } > ++ else if (open && *string == '/') > ++ { > ++ string++; /* quoted slashes in bracket expressions are ok */ > ++ continue; > ++ } > + else if (*string == 0) > + return (0); > + > +diff --git a/shell.c b/shell.c > +index a2b2a55..6adabc8 100644 > +--- a/shell.c > ++++ b/shell.c > +@@ -1293,7 +1293,11 @@ disable_priv_mode () { > + int e; > + > ++#if HAVE_DECL_SETRESUID > ++ if (setresuid (current_user.uid, current_user.uid, current_user.uid) > ++< 0) #else > + if (setuid (current_user.uid) < 0) > ++#endif > + { > + e = errno; > + sys_error (_("cannot set uid to %d: effective uid %d"), > +current_user.uid, current_user.euid); @@ -1302,7 +1306,11 @@ disable_priv_mode > () > + exit (e); > + #endif > + } > ++#if HAVE_DECL_SETRESGID > ++ if (setresgid (current_user.gid, current_user.gid, current_user.gid) > ++< 0) #else > + if (setgid (current_user.gid) < 0) > ++#endif > + sys_error (_("cannot set gid to %d: effective gid %d"), > + current_user.gid, current_user.egid); > + > + current_user.euid = current_user.uid; diff --git a/tests/glob.tests > +b/tests/glob.tests index 01913bb..fb012f7 100644 > +--- a/tests/glob.tests > ++++ b/tests/glob.tests > +@@ -12,6 +12,8 @@ ${THIS_SH} ./glob1.sub ${THIS_SH} ./glob2.sub > +${THIS_SH} ./glob3.sub ${THIS_SH} ./glob4.sub > ++${THIS_SH} ./glob6.sub > ++${THIS_SH} ./glob7.sub > + > + MYDIR=$PWD # save where we are > + > +diff --git a/tests/glob6.sub b/tests/glob6.sub new file mode 100644 > +index 0000000..b099811 > +--- /dev/null > ++++ b/tests/glob6.sub > +@@ -0,0 +1,54 @@ > ++# tests of the backslash-in-glob-patterns discussion on the > ++austin-group ML > ++ > ++: ${TMPDIR:=/var/tmp} > ++ > ++ORIG=$PWD > ++GLOBDIR=$TMPDIR/bash-glob-$$ > ++mkdir $GLOBDIR && cd $GLOBDIR > ++ > ++# does the pattern matcher allow backslashes as escape characters and > ++remove # them as part of matching? > ++touch abcdefg > ++pat='ab\cd*' > ++printf '<%s>\n' $pat > ++pat='\.' > ++printf '<%s>\n' $pat > ++rm abcdefg > ++ > ++# how about when escaping pattern characters? > ++touch '*abc.c' > ++a='\**.c' > ++printf '%s\n' $a > ++rm -f '*abc.c' > ++ > ++# how about when making the distinction between readable and > ++searchable path # components? > ++mkdir -m a=x searchable > ++mkdir -m a=r readable > ++ > ++p='searchable/\.' > ++printf "%s\n" $p > ++ > ++p='searchable/\./.' > ++printf "%s\n" $p > ++ > ++p='readable/\.' > ++printf "%s\n" $p > ++ > ++p='readable/\./.' > ++printf "%s\n" $p > ++ > ++printf "%s\n" 'searchable/\.' > ++printf "%s\n" 'readable/\.' > ++ > ++echo */. > ++ > ++p='*/\.' > ++echo $p > ++ > ++echo */'.' > ++ > ++rmdir searchable readable > ++ > ++cd $ORIG > ++rmdir $GLOBDIR > +diff --git a/tests/glob7.sub b/tests/glob7.sub new file mode 100644 > +index 0000000..0212b8e > +--- /dev/null > ++++ b/tests/glob7.sub > +@@ -0,0 +1,11 @@ > ++# according to Posix 2.13.3, a slash in a bracket expression renders > ++that # bracket expression invalid shopt -s nullglob > ++ > ++echo 1: [qwe/qwe] > ++echo 2: [qwe/ > ++echo 3: [qwe/] > ++ > ++echo 4: [qwe\/qwe] > ++echo 5: [qwe\/ > ++echo 6: [qwe\/] > +-- > +1.9.1 > diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes- > extended/bash/bash_5.0.bb > index eadc82279d..1b7058746f 100644 > --- a/meta/recipes-extended/bash/bash_5.0.bb > +++ b/meta/recipes-extended/bash/bash_5.0.bb > @@ -19,6 +19,7 @@ SRC_URI = > "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ > file://run-ptest \ > file://run-bash-ptests \ > file://fix-run-builtins.patch \ > + file://bash-CVE-2019-18276.patch \ > " > > SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Wed Feb 5 01:08:19 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 4 Feb 2020 17:08:19 -0800 Subject: [OE-core] [PATCH] bison: Upgrade to 3.5.1 Message-ID: <20200205010819.4172914-1-raj.khem@gmail.com> Minor upgrade on 3.5 release series Signed-off-by: Khem Raj --- meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} (90%) diff --git a/meta/recipes-devtools/bison/bison_3.5.bb b/meta/recipes-devtools/bison/bison_3.5.1.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.bb rename to meta/recipes-devtools/bison/bison_3.5.1.bb index 3d8f6579b9..e70252d974 100644 --- a/meta/recipes-devtools/bison/bison_3.5.bb +++ b/meta/recipes-devtools/bison/bison_3.5.1.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" -SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" +SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" +SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" inherit autotools gettext texinfo -- 2.25.0 From takondra at cisco.com Wed Feb 5 01:25:32 2020 From: takondra at cisco.com (Taras Kondratiuk (takondra)) Date: Wed, 5 Feb 2020 01:25:32 +0000 Subject: [OE-core] [PATCH] gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' In-Reply-To: References: <20200204022006.714-1-takondra@cisco.com> , Message-ID: On Mon 2/3/20 20:17 akuster808 wrote: > On 2/3/20 7:57 PM, Khem Raj wrote: > > this is ok. Also please ask it to be backported to 9.3 on gcc bugzilla Asked to add it to 9.3 in the bugzilla. > > And zeus : ) The patch applies to zeus branch as is without conflicts. Should still resend it separately for Zeus? From martin.jansa at gmail.com Wed Feb 5 02:42:38 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Wed, 5 Feb 2020 03:42:38 +0100 Subject: [OE-core] [PATCH 1/4] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh Message-ID: <20200205024241.27828-1-Martin.Jansa@gmail.com> * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot'] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/automake-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/libtool-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gmp-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/ncurses-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pkgconfig-native/fixmepath | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot:g; s:FIXMESTAGINGDIRHOST:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native:g' -e 's:FIXME_PSEUDO_SYSROOT:/OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pseudo-native:g' -e 's:FIXME_HOSTTOOLS_DIR:/OE/build/oe-core/tmp-glibc/hosttools:g' -e 's:FIXME_PKGDATA_DIR:/OE/build/oe-core/tmp-glibc/pkgdata/qemux86:g' -e 's:FIXME_PSEUDO_LOCALSTATEDIR:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/pseudo/:g' -e 's:FIXME_LOGFIFO:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/fifo.10476:g' DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme DEBUG: Shell function do_kernel_configme finished ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case but doesn't. The merge_config_build.log shows 5.4 specific error: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported but then it happily continues reporting what isn't applied in not created .config file --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 @@ -171,586 +171,5113 @@ HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE -# -# configuration written to .config -# +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' +make: *** [Makefile:179: sub-make] Error 2 +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION not in final .config +Requested value: CONFIG_LOCALVERSION="" +Actual value: + +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config +Requested value: # CONFIG_LOCALVERSION_AUTO is not set +Actual value: * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate commit so that it can be discussed there. Signed-off-by: Martin Jansa --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeafeb9..d2796b01bf 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -345,7 +345,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- 2.20.1 From martin.jansa at gmail.com Wed Feb 5 02:42:39 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Wed, 5 Feb 2020 03:42:39 +0100 Subject: [OE-core] [PATCH 2/4] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: <20200205024241.27828-1-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> Message-ID: <20200205024241.27828-2-Martin.Jansa@gmail.com> * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa --- meta/classes/kernel-yocto.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d2796b01bf..8e642cd999 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -318,8 +318,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -345,8 +343,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- 2.20.1 From martin.jansa at gmail.com Wed Feb 5 02:42:40 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Wed, 5 Feb 2020 03:42:40 +0100 Subject: [OE-core] [PATCH 3/4] kern-tools-native: pass LD variable from shell environment to the make call In-Reply-To: <20200205024241.27828-1-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> Message-ID: <20200205024241.27828-3-Martin.Jansa@gmail.com> * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa --- .../kern-tools/kern-tools-native_git.bb | 2 ++ ...pass-LD-variable-from-shell-environm.patch | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1abc6d..8053483355 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -22,3 +22,5 @@ do_install() { cd ${S}/git make DESTDIR=${D}${bindir} install } + +SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" diff --git a/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch b/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch new file mode 100644 index 0000000000..d7d3d9dd2b --- /dev/null +++ b/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch @@ -0,0 +1,32 @@ +From 091dbfede29c128a1a467d7f3c0aedc33ba3d2cb Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 5 Feb 2020 03:26:57 +0100 +Subject: [PATCH] merge_config.sh: pass LD variable from shell environment to + make + +* since 5.4 kernel Kconfig will fail immediately when it detects + that LD points to gold linker: + + scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported + +* in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh + but we need to pass it also into the make call here + +Signed-off-by: Martin Jansa +--- + tools/merge_config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/merge_config.sh b/tools/merge_config.sh +index 296e759..11f3085 100755 +--- a/tools/merge_config.sh ++++ b/tools/merge_config.sh +@@ -153,7 +153,7 @@ fi + # Use the merged file as the starting point for: + # alldefconfig: Fills in any missing symbols with Kconfig default + # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set +-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET ++make LD=$LD KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET + + + # Check all specified config values took (might have missed-dependency issues) -- 2.20.1 From martin.jansa at gmail.com Wed Feb 5 02:42:41 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Wed, 5 Feb 2020 03:42:41 +0100 Subject: [OE-core] [PATCH 4/4] kern-tools-native: use more common S value and oe_runmake In-Reply-To: <20200205024241.27828-1-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> Message-ID: <20200205024241.27828-4-Martin.Jansa@gmail.com> Signed-off-by: Martin Jansa --- .../kern-tools/kern-tools-native_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 8053483355..28080e510f 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" +SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" -- 2.20.1 From bruce.ashfield at gmail.com Wed Feb 5 02:52:37 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 4 Feb 2020 21:52:37 -0500 Subject: [OE-core] [PATCH 3/4] kern-tools-native: pass LD variable from shell environment to the make call In-Reply-To: <20200205024241.27828-3-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> <20200205024241.27828-3-Martin.Jansa@gmail.com> Message-ID: I'll take this into the repo directly and send a SRCREV bump after I've run it through a some of my kernel release steps. Cheers, Bruce On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: > > * since 5.4 kernel Kconfig will fail immediately when it detects > that LD points to gold linker: > > scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported > > * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh > but we need to pass it also into the make call here > > Signed-off-by: Martin Jansa > --- > .../kern-tools/kern-tools-native_git.bb | 2 ++ > ...pass-LD-variable-from-shell-environm.patch | 32 +++++++++++++++++++ > 2 files changed, 34 insertions(+) > create mode 100644 meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > index 57ec1abc6d..8053483355 100644 > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > @@ -22,3 +22,5 @@ do_install() { > cd ${S}/git > make DESTDIR=${D}${bindir} install > } > + > +SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" > diff --git a/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch b/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch > new file mode 100644 > index 0000000000..d7d3d9dd2b > --- /dev/null > +++ b/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch > @@ -0,0 +1,32 @@ > +From 091dbfede29c128a1a467d7f3c0aedc33ba3d2cb Mon Sep 17 00:00:00 2001 > +From: Martin Jansa > +Date: Wed, 5 Feb 2020 03:26:57 +0100 > +Subject: [PATCH] merge_config.sh: pass LD variable from shell environment to > + make > + > +* since 5.4 kernel Kconfig will fail immediately when it detects > + that LD points to gold linker: > + > + scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported > + > +* in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh > + but we need to pass it also into the make call here > + > +Signed-off-by: Martin Jansa > +--- > + tools/merge_config.sh | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/tools/merge_config.sh b/tools/merge_config.sh > +index 296e759..11f3085 100755 > +--- a/tools/merge_config.sh > ++++ b/tools/merge_config.sh > +@@ -153,7 +153,7 @@ fi > + # Use the merged file as the starting point for: > + # alldefconfig: Fills in any missing symbols with Kconfig default > + # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set > +-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET > ++make LD=$LD KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET > + > + > + # Check all specified config values took (might have missed-dependency issues) > -- > 2.20.1 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bruce.ashfield at gmail.com Wed Feb 5 02:54:35 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 4 Feb 2020 21:54:35 -0500 Subject: [OE-core] [PATCH 4/4] kern-tools-native: use more common S value and oe_runmake In-Reply-To: <20200205024241.27828-4-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> <20200205024241.27828-4-Martin.Jansa@gmail.com> Message-ID: On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: > > Signed-off-by: Martin Jansa > --- > .../kern-tools/kern-tools-native_git.bb | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > index 8053483355..28080e510f 100644 > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" > inherit native > > SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" > -S = "${WORKDIR}" > +S = "${WORKDIR}/git" While not common, this was on purpose. This isn't something that is typically patched, it is something I queue and bump for release. So I'm ok with the cleanup, but I'll drop the patch tweaking part when I queue for test, since I'll have the patch already in the repo. Bruce > UPSTREAM_CHECK_COMMITS = "1" > > +do_configure() { > + : > +} > + > do_compile() { > : > } > > do_install() { > - cd ${S}/git > - make DESTDIR=${D}${bindir} install > + oe_runmake DESTDIR=${D}${bindir} install > } > > -SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" > +SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" > -- > 2.20.1 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bruce.ashfield at gmail.com Wed Feb 5 03:00:36 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 4 Feb 2020 22:00:36 -0500 Subject: [OE-core] [PATCH 2/4] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: <20200205024241.27828-2-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> <20200205024241.27828-2-Martin.Jansa@gmail.com> Message-ID: On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: > > * for whatever reason, instead of silently continuing to build default kernel config > > Signed-off-by: Martin Jansa > --- > meta/classes/kernel-yocto.bbclass | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass > index d2796b01bf..8e642cd999 100644 > --- a/meta/classes/kernel-yocto.bbclass > +++ b/meta/classes/kernel-yocto.bbclass > @@ -318,8 +318,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" > do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" > do_kernel_configme[dirs] += "${S} ${B}" > do_kernel_configme() { > - set +e > - > # translate the kconfig_mode into something that merge_config.sh > # understands > case ${KCONFIG_MODE} in > @@ -345,8 +343,9 @@ do_kernel_configme() { > bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" > fi > > - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 > - if [ $? -ne 0 ]; then > + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > + At one point there was a modified merge_config that I used while the kernel caught up to the functionality that we needed, it didn't return zero in this scenario. Hence why just checking the return code was enough. This makes sense to me, and explains the difference between our runs, and why my clean oe-core + bitbake test worked as well. Bruce > + if [ $? -ne 0 -o ! -f ${B}/.config ]; then > bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" > fi > > -- > 2.20.1 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From patchwork at patchwork.openembedded.org Wed Feb 5 03:02:37 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 05 Feb 2020 03:02:37 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_=22kernel-?= =?utf-8?q?yocto=2Ebbclass=3A_set_KERN=2E=2E=2E=22_and_3_more?= In-Reply-To: <20200205024241.27828-1-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> Message-ID: <20200205030237.2274.69765@do> == Series Details == Series: "kernel-yocto.bbclass: set KERN..." and 3 more Revision: 1 URL : https://patchwork.openembedded.org/series/22426/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [2/4] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created Issue Commit shortlog is too long [test_shortlog_length] Suggested fix Edit shortlog so that it is 90 characters or less (currently 122 characters) * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From bruce.ashfield at gmail.com Wed Feb 5 03:03:02 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 4 Feb 2020 22:03:02 -0500 Subject: [OE-core] [PATCH 1/4] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: <20200205024241.27828-1-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> Message-ID: On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: > > * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything > useful in .config (and also include directory isn't created): > > tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: > total 164K > drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . > drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. > -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config > -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore > drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include > -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile > drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts > lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source > > tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: > total 28K > drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . > drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. > -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config > -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore > -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile > drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts > lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source > > $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config > CONFIG_LOCALVERSION="-yocto-standard" > > * and because the failure is silent, it will happily start building > kernel with default defconfig, which even builds OK for qemux86-64 > but on qemux86 I've noticed this issue, because incorrectly > configured kernel build fails with: > > $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile > LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o > AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a > HOSTCC scripts/mod/mk_elfconfig > CC scripts/mod/devicetable-offsets.s > CC scripts/mod/empty.o > cc1: error: code model 'kernel' not supported in the 32 bit mode > cc1: sorry, unimplemented: 64-bit mode not compiled in > make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 > make[2]: *** Waiting for unfinished jobs.... > cc1: error: code model 'kernel' not supported in the 32 bit mode > cc1: sorry, unimplemented: 64-bit mode not compiled in > make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 > make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 > make[1]: *** Waiting for unfinished jobs.... > LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o > /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool > LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool > make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 > WARNING: exit code 1 from a shell command. > > * the issue happens in log.do_kernel_configme, but the log is completely useless: > > cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme > DEBUG: Executing python function extend_recipe_sysroot > NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot'] > NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] > NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] > DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/automake-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/libtool-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gmp-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/ncurses-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pkgconfig-native/fixmepath | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot:g; s:FIXMESTAGINGDIRHOST:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native:g' -e 's:FIXME_PSEUDO_SYSROOT:/OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pseudo-native:g' -e 's:FIXME_HOSTTOOLS_DIR:/OE/build/oe-core/tmp-glibc/hosttools:g' -e 's:FIXME_PKGDATA_DIR:/OE/build/oe-core/tmp-glibc/pkgdata/qemux86:g' -e 's:FIXME_PSEUDO_LOCALSTATEDIR:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/pseudo/:g' -e 's:FIXME_LOGFIFO:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/fifo.10476:g' > DEBUG: Python function extend_recipe_sysroot finished > DEBUG: Executing shell function do_kernel_configme > DEBUG: Shell function do_kernel_configme finished > > ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log > and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case > but doesn't. > > The merge_config_build.log shows 5.4 specific error: > scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported > but then it happily continues reporting what isn't applied in not created > .config file > > --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 > +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 > @@ -171,586 +171,5113 @@ > HOSTCC scripts/kconfig/symbol.o > HOSTLD scripts/kconfig/conf > scripts/kconfig/conf --alldefconfig Kconfig > -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # > -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options > -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # > -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP > -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE > -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP > -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE > -# > -# configuration written to .config > -# > +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported > +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 > +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 > make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' > +make: *** [Makefile:179: sub-make] Error 2 > +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory > +Value requested for CONFIG_LOCALVERSION not in final .config > +Requested value: CONFIG_LOCALVERSION="" > +Actual value: > + > +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory > +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config > +Requested value: # CONFIG_LOCALVERSION_AUTO is not set > +Actual value: > > * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log > instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate > commit so that it can be discussed there. That's because there's a LOT of noise in the merge_config log, the separate task for doing the audit has heuristics to highlight important errors, and allows configuration fragments to override each other, have optional fragments, etc. I already have the various audit level variables in use for linux-yocto style kernels, at the highest level it could be dumped, but absolutely not by default. Cheers, Bruce > > Signed-off-by: Martin Jansa > --- > meta/classes/kernel-yocto.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass > index 141eeafeb9..d2796b01bf 100644 > --- a/meta/classes/kernel-yocto.bbclass > +++ b/meta/classes/kernel-yocto.bbclass > @@ -345,7 +345,7 @@ do_kernel_configme() { > bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" > fi > > - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 > + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 > if [ $? -ne 0 ]; then > bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" > fi > -- > 2.20.1 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bruce.ashfield at gmail.com Wed Feb 5 03:25:39 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 4 Feb 2020 22:25:39 -0500 Subject: [OE-core] [PATCH 2/4] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: <20200205024241.27828-2-Martin.Jansa@gmail.com> References: <20200205024241.27828-1-Martin.Jansa@gmail.com> <20200205024241.27828-2-Martin.Jansa@gmail.com> Message-ID: Richard, I've grabbed all 4 patches in this series and am running some additional tests, and will do a quick AB run to see if they interact with any of the other layers, etc. I'll send a consolidated pull request on Wednesday. Cheers, Bruce On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: > > * for whatever reason, instead of silently continuing to build default kernel config > > Signed-off-by: Martin Jansa > --- > meta/classes/kernel-yocto.bbclass | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass > index d2796b01bf..8e642cd999 100644 > --- a/meta/classes/kernel-yocto.bbclass > +++ b/meta/classes/kernel-yocto.bbclass > @@ -318,8 +318,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" > do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" > do_kernel_configme[dirs] += "${S} ${B}" > do_kernel_configme() { > - set +e > - > # translate the kconfig_mode into something that merge_config.sh > # understands > case ${KCONFIG_MODE} in > @@ -345,8 +343,9 @@ do_kernel_configme() { > bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" > fi > > - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 > - if [ $? -ne 0 ]; then > + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > + > + if [ $? -ne 0 -o ! -f ${B}/.config ]; then > bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" > fi > > -- > 2.20.1 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bruce.ashfield at gmail.com Wed Feb 5 03:46:10 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 4 Feb 2020 22:46:10 -0500 Subject: [OE-core] [PATCH] kernel-yocto: fix defconfig detection in find_sccs() In-Reply-To: <20200126053534.800346-1-gavinli@thegavinli.com> References: <20200126053534.800346-1-gavinli@thegavinli.com> Message-ID: I've staged this change and will send it along with my next pull request. Bruce On Sun, Jan 26, 2020 at 12:36 AM wrote: > > From: Gavin Li > > The current code would cause a file like "config.bin" to added to the > config sources list. I am sure the intention was to add any files with > defconfig in its name and not the other way around. > > Signed-off-by: Gavin Li > --- > meta/classes/kernel-yocto.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass > index 87c681f1c3..32b32ac291 100644 > --- a/meta/classes/kernel-yocto.bbclass > +++ b/meta/classes/kernel-yocto.bbclass > @@ -31,7 +31,7 @@ def find_sccs(d): > base, ext = os.path.splitext(os.path.basename(s)) > if ext and ext in [".scc", ".cfg"]: > sources_list.append(s) > - elif base and base in 'defconfig': > + elif base and 'defconfig' in base: > sources_list.append(s) > > return sources_list > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bruce.ashfield at gmail.com Wed Feb 5 04:00:25 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 4 Feb 2020 23:00:25 -0500 Subject: [OE-core] [PATCH 1/4] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: References: <20200205024241.27828-1-Martin.Jansa@gmail.com> Message-ID: On Tue, Feb 4, 2020 at 10:03 PM Bruce Ashfield wrote: > > On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: > > > > * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything > > useful in .config (and also include directory isn't created): > > > > tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: > > total 164K > > drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . > > drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. > > -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config > > -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore > > drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include > > -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile > > drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts > > lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source > > > > tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: > > total 28K > > drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . > > drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. > > -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config > > -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore > > -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile > > drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts > > lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source > > > > $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config > > CONFIG_LOCALVERSION="-yocto-standard" > > > > * and because the failure is silent, it will happily start building > > kernel with default defconfig, which even builds OK for qemux86-64 > > but on qemux86 I've noticed this issue, because incorrectly > > configured kernel build fails with: > > > > $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile > > LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o > > AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a > > HOSTCC scripts/mod/mk_elfconfig > > CC scripts/mod/devicetable-offsets.s > > CC scripts/mod/empty.o > > cc1: error: code model 'kernel' not supported in the 32 bit mode > > cc1: sorry, unimplemented: 64-bit mode not compiled in > > make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 > > make[2]: *** Waiting for unfinished jobs.... > > cc1: error: code model 'kernel' not supported in the 32 bit mode > > cc1: sorry, unimplemented: 64-bit mode not compiled in > > make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 > > make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 > > make[1]: *** Waiting for unfinished jobs.... > > LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o > > /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool > > LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool > > make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 > > WARNING: exit code 1 from a shell command. > > > > * the issue happens in log.do_kernel_configme, but the log is completely useless: > > > > cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme > > DEBUG: Executing python function extend_recipe_sysroot > > NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot'] > > NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] > > NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] > > DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/automake-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/libtool-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gmp-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/ncurses-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pkgconfig-native/fixmepath | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot:g; s:FIXMESTAGINGDIRHOST:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native:g' -e 's:FIXME_PSEUDO_SYSROOT:/OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pseudo-native:g' -e 's:FIXME_HOSTTOOLS_DIR:/OE/build/oe-core/tmp-glibc/hosttools:g' -e 's:FIXME_PKGDATA_DIR:/OE/build/oe-core/tmp-glibc/pkgdata/qemux86:g' -e 's:FIXME_PSEUDO_LOCALSTATEDIR:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/pseudo/:g' -e 's:FIXME_LOGFIFO:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/fifo.10476:g' > > DEBUG: Python function extend_recipe_sysroot finished > > DEBUG: Executing shell function do_kernel_configme > > DEBUG: Shell function do_kernel_configme finished > > > > ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log > > and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case > > but doesn't. > > > > The merge_config_build.log shows 5.4 specific error: > > scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported > > but then it happily continues reporting what isn't applied in not created > > .config file > > > > --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 > > +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 > > @@ -171,586 +171,5113 @@ > > HOSTCC scripts/kconfig/symbol.o > > HOSTLD scripts/kconfig/conf > > scripts/kconfig/conf --alldefconfig Kconfig > > -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # > > -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options > > -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # > > -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP > > -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE > > -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP > > -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE > > -# > > -# configuration written to .config > > -# > > +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported > > +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 > > +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 > > make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' > > +make: *** [Makefile:179: sub-make] Error 2 > > +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory > > +Value requested for CONFIG_LOCALVERSION not in final .config > > +Requested value: CONFIG_LOCALVERSION="" > > +Actual value: > > + > > +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory > > +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config > > +Requested value: # CONFIG_LOCALVERSION_AUTO is not set > > +Actual value: > > > > * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log > > instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate > > commit so that it can be discussed there. > > That's because there's a LOT of noise in the merge_config log, the > separate task for doing the audit has heuristics to highlight > important errors, and allows configuration fragments to override each > other, have optional fragments, etc. But of course, just allowing stderr into the log makes sense, since the fragment messages themselves are stdout. That way we can show any future traps/failures in the single log, and the audit step can offer some more nuanced processing of the output. I pulled together a patch that splits the output, and another value for the log level that will allow everything into logs .. and am running them through tests now. Cheers, Bruce > > I already have the various audit level variables in use for > linux-yocto style kernels, at the highest level it could be dumped, > but absolutely not by default. > > Cheers, > > Bruce > > > > > Signed-off-by: Martin Jansa > > --- > > meta/classes/kernel-yocto.bbclass | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass > > index 141eeafeb9..d2796b01bf 100644 > > --- a/meta/classes/kernel-yocto.bbclass > > +++ b/meta/classes/kernel-yocto.bbclass > > @@ -345,7 +345,7 @@ do_kernel_configme() { > > bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" > > fi > > > > - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 > > + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 > > if [ $? -ne 0 ]; then > > bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" > > fi > > -- > > 2.20.1 > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From raj.khem at gmail.com Wed Feb 5 05:41:19 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 4 Feb 2020 21:41:19 -0800 Subject: [OE-core] [PATCH 1/2] oeqa: Use cpio 2.13 as testcase Message-ID: <20200205054120.1461132-1-raj.khem@gmail.com> cpio 2.12 was released in 2015 and might have used older autotools which could result in errors like https://bugzilla.yoctoproject.org/show_bug.cgi?id=13779 Bumping to 2.13 will help in matching the tool versions A good change on top would be to run aclocal -I .; autoheader; autoconf; automake --add-missing -c before running configure step perhaps [YOCTO #13779] Signed-off-by: Khem Raj --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 4 ++-- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index f4e871e421..4bd72dd37e 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -12,7 +12,7 @@ class BuildCpioTest(OERuntimeTestCase): @classmethod def setUpClass(cls): - uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.12.tar.gz' + uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.13.tar.gz' cls.project = TargetBuildProject(cls.tc.target, uri, dl_dir = cls.tc.td['DL_DIR']) diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index 0a5e68d5fd..b0beafb38f 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -17,10 +17,10 @@ class BuildCpioTest(OESDKTestCase): """ def test_cpio(self): with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir: - tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz") + tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz") dirs = {} - dirs["source"] = os.path.join(testdir, "cpio-2.12") + dirs["source"] = os.path.join(testdir, "cpio-2.13") dirs["build"] = os.path.join(testdir, "build") dirs["install"] = os.path.join(testdir, "install") diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 03901a2f32..809142559a 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -40,7 +40,7 @@ class MetaIDE(OESelftestTestCase): def test_meta_ide_can_build_cpio_project(self): dl_dir = self.td.get('DL_DIR', None) self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path, - "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz", + "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() self.assertEqual(self.project.run_configure(), 0, -- 2.25.0 From raj.khem at gmail.com Wed Feb 5 05:41:20 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 4 Feb 2020 21:41:20 -0800 Subject: [OE-core] [PATCH 2/2] oeqa: autoreconf cpio before building In-Reply-To: <20200205054120.1461132-1-raj.khem@gmail.com> References: <20200205054120.1461132-1-raj.khem@gmail.com> Message-ID: <20200205054120.1461132-2-raj.khem@gmail.com> since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in [YOCTO #13779] Signed-off-by: Khem Raj --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd37e..9cc261c314 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('','autoreconf --force;') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb38f..ec10149d34 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) + self._run("cd {source} && autoreconf --force") self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 809142559a..46398c7e2d 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() - self.assertEqual(self.project.run_configure(), 0, + self.assertEqual(self.project.run_configure('','autoreconf --force;'), 0, msg="Running configure failed") self.assertEqual(self.project.run_make(), 0, msg="Running make failed") -- 2.25.0 From anuj.mittal at intel.com Wed Feb 5 07:39:36 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Wed, 5 Feb 2020 15:39:36 +0800 Subject: [OE-core] [zeus][PATCH 1/3] rsync: whitelist CVE-2017-16548 Message-ID: <20200205073938.38227-1-anuj.mittal@intel.com> From: Lee Chee Yang patch for this CVE applies to v3.1.3pre1 not for v3.1.3. patch already in v3.1.3. see https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce (From OE-Core rev: 1e2739c821312527010fb0afbde5a20cd3f03d24) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb index ffb1d061c0..152ff02a25 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb @@ -20,6 +20,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +# -16548 required for v3.1.3pre1. Already in v3.1.3. +CVE_CHECK_WHITELIST += " CVE-2017-16548 " + inherit autotools PACKAGECONFIG ??= "acl attr \ -- 2.24.1 From anuj.mittal at intel.com Wed Feb 5 07:39:37 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Wed, 5 Feb 2020 15:39:37 +0800 Subject: [OE-core] [zeus][PATCH 2/3] curl: fix CVE-2019-15601 In-Reply-To: <20200205073938.38227-1-anuj.mittal@intel.com> References: <20200205073938.38227-1-anuj.mittal@intel.com> Message-ID: <20200205073938.38227-2-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../curl/curl/CVE-2019-15601.patch | 46 +++++++++++++++++++ meta/recipes-support/curl/curl_7.66.0.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2019-15601.patch diff --git a/meta/recipes-support/curl/curl/CVE-2019-15601.patch b/meta/recipes-support/curl/curl/CVE-2019-15601.patch new file mode 100644 index 0000000000..7bfaae7b21 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2019-15601.patch @@ -0,0 +1,46 @@ +Upstream-Status: Backport [https://github.com/curl/curl/commit/1b71bc532bde8621fd3260843f8197182a467ff2] +CVE: CVE-2019-15601 +Signed-off-by: Anuj Mittal + +From 1b71bc532bde8621fd3260843f8197182a467ff2 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 7 Nov 2019 10:13:01 +0100 +Subject: [PATCH] file: on Windows, refuse paths that start with \\ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +... as that might cause an unexpected SMB connection to a given host +name. + +Reported-by: Fernando Mu?oz +CVE-2019-15601 +Bug: https://curl.haxx.se/docs/CVE-2019-15601.html +--- + lib/file.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/file.c b/lib/file.c +index d349cd9241..166931d7f1 100644 +--- a/lib/file.c ++++ b/lib/file.c +@@ -136,7 +136,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done) + struct Curl_easy *data = conn->data; + char *real_path; + struct FILEPROTO *file = data->req.protop; +- int fd; ++ int fd = -1; + #ifdef DOS_FILESYSTEM + size_t i; + char *actual_path; +@@ -181,7 +181,9 @@ static CURLcode file_connect(struct connectdata *conn, bool *done) + return CURLE_URL_MALFORMAT; + } + +- fd = open_readonly(actual_path, O_RDONLY|O_BINARY); ++ if(strncmp("\\\\", actual_path, 2)) ++ /* refuse to open path that starts with two backslashes */ ++ fd = open_readonly(actual_path, O_RDONLY|O_BINARY); + file->path = actual_path; + #else + if(memchr(real_path, 0, real_path_len)) { diff --git a/meta/recipes-support/curl/curl_7.66.0.bb b/meta/recipes-support/curl/curl_7.66.0.bb index d1975f2460..a54e0536e9 100644 --- a/meta/recipes-support/curl/curl_7.66.0.bb +++ b/meta/recipes-support/curl/curl_7.66.0.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=be5d9e1419c4363f4b32037a2d3b7ffa" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ + file://CVE-2019-15601.patch \ " SRC_URI[md5sum] = "c238aa394e3aa47ca4fcb0491774149f" -- 2.24.1 From anuj.mittal at intel.com Wed Feb 5 07:39:38 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Wed, 5 Feb 2020 15:39:38 +0800 Subject: [OE-core] [zeus][PATCH 3/3] cpio: fix CVE-2019-14866 In-Reply-To: <20200205073938.38227-1-anuj.mittal@intel.com> References: <20200205073938.38227-1-anuj.mittal@intel.com> Message-ID: <20200205073938.38227-3-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + 2 files changed, 317 insertions(+) create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch diff --git a/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch new file mode 100644 index 0000000000..5d587fc832 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch @@ -0,0 +1,316 @@ +CVE: CVE-2019-14866 +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=7554e3e42cd72f6f8304410c47fe6f8918e9bfd7] +Signed-off-by: Anuj Mittal + +From a052401293e45a13cded5959b258204dae6d0af5 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sun, 3 Nov 2019 23:59:39 +0200 +Subject: [PATCH] Fix CVE-2019-14866 + +* src/copyout.c (to_ascii): Additional argument nul controls whether +to add the terminating nul character. +(field_width_error): Improve diagnostics: print the actual and the +maximum allowed field value. +* src/extern.h (to_ascii, field_width_error): New prototypes. +* src/tar.c (to_oct): Remove. +(to_oct_or_error): New function. +(TO_OCT): New macro. +(write_out_tar_header): Use TO_OCT and to_ascii. Return 0 on +success, 1 on error. +--- + src/copyout.c | 49 ++++++++++++++++++++++-------------- + src/extern.h | 15 +++++++++-- + src/tar.c | 69 ++++++++++++++++++++++++--------------------------- + 3 files changed, 75 insertions(+), 58 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 1f0987a..1ae5477 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -269,26 +269,32 @@ writeout_final_defers (int out_des) + so it should be moved to paxutils too. + Allowed values for logbase are: 1 (binary), 2, 3 (octal), 4 (hex) */ + int +-to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase) ++to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, bool nul) + { + static char codetab[] = "0123456789ABCDEF"; +- int i = digits; +- +- do ++ ++ if (nul) ++ where[--digits] = 0; ++ while (digits > 0) + { +- where[--i] = codetab[(v & ((1 << logbase) - 1))]; ++ where[--digits] = codetab[(v & ((1 << logbase) - 1))]; + v >>= logbase; + } +- while (i); + + return v != 0; + } + +-static void +-field_width_error (const char *filename, const char *fieldname) ++void ++field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul) + { +- error (0, 0, _("%s: field width not sufficient for storing %s"), +- filename, fieldname); ++ char valbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%s"), ++ filename, fieldname, ++ STRINGIFY_BIGINT (value, valbuf), ++ STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8), ++ maxbuf)); + } + + static void +@@ -303,7 +309,7 @@ to_ascii_or_warn (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + field_width_warning (filename, fieldname); + } + +@@ -312,9 +318,9 @@ to_ascii_or_error (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + { +- field_width_error (filename, fieldname); ++ field_width_error (filename, fieldname, n, digits, false); + return 1; + } + return 0; +@@ -371,7 +377,7 @@ write_out_new_ascii_header (const char *magic_string, + _("name size"))) + return 1; + p += 8; +- to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16); ++ to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16, false); + + tape_buffered_write (ascii_header, out_des, sizeof ascii_header); + +@@ -388,7 +394,7 @@ write_out_old_ascii_header (dev_t dev, dev_t rdev, + char ascii_header[76]; + char *p = ascii_header; + +- to_ascii (p, file_hdr->c_magic, 6, LG_8); ++ to_ascii (p, file_hdr->c_magic, 6, LG_8, false); + p += 6; + to_ascii_or_warn (p, dev, 6, LG_8, file_hdr->c_name, _("device number")); + p += 6; +@@ -492,7 +498,10 @@ write_out_binary_header (dev_t rdev, + short_hdr.c_namesize = file_hdr->c_namesize & 0xFFFF; + if (short_hdr.c_namesize != file_hdr->c_namesize) + { +- field_width_error (file_hdr->c_name, _("name size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%u"), ++ file_hdr->c_name, _("name size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFu); + return 1; + } + +@@ -502,7 +511,10 @@ write_out_binary_header (dev_t rdev, + if (((off_t)short_hdr.c_filesizes[0] << 16) + short_hdr.c_filesizes[1] + != file_hdr->c_filesize) + { +- field_width_error (file_hdr->c_name, _("file size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%lu"), ++ file_hdr->c_name, _("file size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFFFFFlu); + return 1; + } + +@@ -552,8 +564,7 @@ write_out_header (struct cpio_file_stat *file_hdr, int out_des) + error (0, 0, _("%s: file name too long"), file_hdr->c_name); + return 1; + } +- write_out_tar_header (file_hdr, out_des); /* FIXME: No error checking */ +- return 0; ++ return write_out_tar_header (file_hdr, out_des); + + case arf_binary: + return write_out_binary_header (makedev (file_hdr->c_rdev_maj, +diff --git a/src/extern.h b/src/extern.h +index e27d662..f9ef56a 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -117,6 +117,10 @@ void print_name_with_quoting (char *p); + /* copyout.c */ + int write_out_header (struct cpio_file_stat *file_hdr, int out_des); + void process_copy_out (void); ++int to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, ++ bool nul); ++void field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul); + + /* copypass.c */ + void process_copy_pass (void); +@@ -145,7 +149,7 @@ int make_path (char *argpath, uid_t owner, gid_t group, + const char *verbose_fmt_string); + + /* tar.c */ +-void write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); ++int write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); + int null_block (long *block, int size); + void read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des); + int otoa (char *s, unsigned long *n); +@@ -204,9 +208,16 @@ void cpio_safer_name_suffix (char *name, bool link_target, + int cpio_create_dir (struct cpio_file_stat *file_hdr, int existing_dir); + void change_dir (void); + +-/* FIXME: These two defines should be defined in paxutils */ ++/* FIXME: The following three should be defined in paxutils */ + #define LG_8 3 + #define LG_16 4 ++/* The maximum uintmax_t value that can be represented with DIGITS digits, ++ assuming that each digit is BITS_PER_DIGIT wide. */ ++#define MAX_VAL_WITH_DIGITS(digits, bits_per_digit) \ ++ ((digits) * (bits_per_digit) < sizeof (uintmax_t) * CHAR_BIT \ ++ ? ((uintmax_t) 1 << ((digits) * (bits_per_digit))) - 1 \ ++ : (uintmax_t) -1) ++ + + uintmax_t from_ascii (char const *where, size_t digs, unsigned logbase); + +diff --git a/src/tar.c b/src/tar.c +index a2ce171..ef58027 100644 +--- a/src/tar.c ++++ b/src/tar.c +@@ -79,36 +79,17 @@ stash_tar_filename (char *prefix, char *filename) + return hold_tar_filename; + } + +-/* Convert a number into a string of octal digits. +- Convert long VALUE into a DIGITS-digit field at WHERE, +- including a trailing space and room for a NUL. DIGITS==3 means +- 1 digit, a space, and room for a NUL. +- +- We assume the trailing NUL is already there and don't fill it in. +- This fact is used by start_header and finish_header, so don't change it! +- +- This is be equivalent to: +- sprintf (where, "%*lo ", digits - 2, value); +- except that sprintf fills in the trailing NUL and we don't. */ +- +-static void +-to_oct (register long value, register int digits, register char *where) ++static int ++to_oct_or_error (uintmax_t value, size_t digits, char *where, char const *field, ++ char const *file) + { +- --digits; /* Leave the trailing NUL slot alone. */ +- +- /* Produce the digits -- at least one. */ +- do ++ if (to_ascii (where, value, digits, LG_8, true)) + { +- where[--digits] = '0' + (char) (value & 7); /* One octal digit. */ +- value >>= 3; ++ field_width_error (file, field, value, digits, true); ++ return 1; + } +- while (digits > 0 && value != 0); +- +- /* Add leading zeroes, if necessary. */ +- while (digits > 0) +- where[--digits] = '0'; ++ return 0; + } +- + + + /* Compute and return a checksum for TAR_HDR, +@@ -134,10 +115,22 @@ tar_checksum (struct tar_header *tar_hdr) + return sum; + } + ++#define TO_OCT(file_hdr, c_fld, digits, tar_hdr, tar_field) \ ++ do \ ++ { \ ++ if (to_oct_or_error (file_hdr -> c_fld, \ ++ digits, \ ++ tar_hdr -> tar_field, \ ++ #tar_field, \ ++ file_hdr->c_name)) \ ++ return 1; \ ++ } \ ++ while (0) ++ + /* Write out header FILE_HDR, including the file name, to file + descriptor OUT_DES. */ + +-void ++int + write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + { + int name_len; +@@ -166,11 +159,11 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + + /* Ustar standard (POSIX.1-1988) requires the mode to contain only 3 octal + digits */ +- to_oct (file_hdr->c_mode & MODE_ALL, 8, tar_hdr->mode); +- to_oct (file_hdr->c_uid, 8, tar_hdr->uid); +- to_oct (file_hdr->c_gid, 8, tar_hdr->gid); +- to_oct (file_hdr->c_filesize, 12, tar_hdr->size); +- to_oct (file_hdr->c_mtime, 12, tar_hdr->mtime); ++ TO_OCT (file_hdr, c_mode & MODE_ALL, 8, tar_hdr, mode); ++ TO_OCT (file_hdr, c_uid, 8, tar_hdr, uid); ++ TO_OCT (file_hdr, c_gid, 8, tar_hdr, gid); ++ TO_OCT (file_hdr, c_filesize, 12, tar_hdr, size); ++ TO_OCT (file_hdr, c_mtime, 12, tar_hdr, mtime); + + switch (file_hdr->c_mode & CP_IFMT) + { +@@ -182,7 +175,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); + tar_hdr->typeflag = LNKTYPE; +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + } + else + tar_hdr->typeflag = REGTYPE; +@@ -208,7 +201,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + than TARLINKNAMESIZE. */ + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + break; + #endif /* CP_IFLNK */ + } +@@ -227,13 +220,15 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + if (name) + strcpy (tar_hdr->gname, name); + +- to_oct (file_hdr->c_rdev_maj, 8, tar_hdr->devmajor); +- to_oct (file_hdr->c_rdev_min, 8, tar_hdr->devminor); ++ TO_OCT (file_hdr, c_rdev_maj, 8, tar_hdr, devmajor); ++ TO_OCT (file_hdr, c_rdev_min, 8, tar_hdr, devminor); + } + +- to_oct (tar_checksum (tar_hdr), 8, tar_hdr->chksum); ++ to_ascii (tar_hdr->chksum, tar_checksum (tar_hdr), 8, LG_8, true); + + tape_buffered_write ((char *) &tar_rec, out_des, TARRECORDSIZE); ++ ++ return 0; + } + + /* Return nonzero iff all the bytes in BLOCK are NUL. +-- +2.24.1 + diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb index 3713bf0b1f..5abe494ebc 100644 --- a/meta/recipes-extended/cpio/cpio_2.12.bb +++ b/meta/recipes-extended/cpio/cpio_2.12.bb @@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Fix-CVE-2015-1197.patch \ file://0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch \ file://0001-Fix-segfault-with-append.patch \ + file://CVE-2019-14866.patch \ " SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" -- 2.24.1 From patchwork at patchwork.openembedded.org Wed Feb 5 08:02:43 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 05 Feb 2020 08:02:43 -0000 Subject: [OE-core] =?utf-8?b?4pyXIHBhdGNodGVzdDogZmFpbHVyZSBmb3IgIlt6ZXVz?= =?utf-8?q?=5D_rsync=3A_whitelist_CVE-20=2E=2E=2E=22_and_2_more?= In-Reply-To: <20200205073938.38227-1-anuj.mittal@intel.com> References: <20200205073938.38227-1-anuj.mittal@intel.com> Message-ID: <20200205080243.2276.31140@do> == Series Details == Series: "[zeus] rsync: whitelist CVE-20..." and 2 more Revision: 1 URL : https://patchwork.openembedded.org/series/22429/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [zeus,1/3] rsync: whitelist CVE-2017-16548 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX" If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From richard.purdie at linuxfoundation.org Wed Feb 5 12:11:46 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 5 Feb 2020 12:11:46 +0000 Subject: [OE-core] [PATCH 1/6] opkg-utils: Fix reproducibility issues in opkg-build Message-ID: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> There is a sorting problem with opkg-build where the ipk generated is depending upon the order of files on disk. The reason is the --sort option to tar only influences the orders of files tar reads, not those passed by the -T option. Add in a sort call to resolve this issue. To ensure consistent sorting we also need to force to a specific locale (C) else the results are still not deterministic. Signed-off-by: Richard Purdie --- .../opkg-utils/fix-reproducibility.patch | 32 +++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.2.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 00000000000..945979bc8a7 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,32 @@ +Fix reproducibility issues in opkg-build + +There is a sorting problem with opkg-build where the ipk generated is depending +upon the order of files on disk. The reason is the --sort option to tar only +influences the orders of files tar reads, not those passed by the -T option. + +Add in a sort call to resolve this issue. To ensure consistent sorting we +also need to force to a specific locale (C) else the results are still not +deterministic. + +RP 2020/2/5 + +Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] +Signed-off-by: Richard Purdie + +Index: opkg-utils-0.4.2/opkg-build +=================================================================== +--- opkg-utils-0.4.2.orig/opkg-build ++++ opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 8e7ef00b087..eda73db6a4b 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- 2.20.1 From richard.purdie at linuxfoundation.org Wed Feb 5 12:11:47 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 5 Feb 2020 12:11:47 +0000 Subject: [OE-core] [PATCH 2/6] oeqa/reproducible: Improve test output and ensure deb+ipk compared In-Reply-To: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> References: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> Message-ID: <20200205121151.27880-2-richard.purdie@linuxfoundation.org> Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 04dc46f38a0..f6433c9a02b 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) # Clean up empty directories if self.save_results: -- 2.20.1 From richard.purdie at linuxfoundation.org Wed Feb 5 12:11:48 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 5 Feb 2020 12:11:48 +0000 Subject: [OE-core] [PATCH 3/6] mc: Set zipinfo presence determinstically In-Reply-To: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> References: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> Message-ID: <20200205121151.27880-3-richard.purdie@linuxfoundation.org> This value was floating causing differences in generated files. Set it determinstically. Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 95fa1dae78d..d8c8f8643e1 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -29,6 +29,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- 2.20.1 From richard.purdie at linuxfoundation.org Wed Feb 5 12:11:49 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 5 Feb 2020 12:11:49 +0000 Subject: [OE-core] [PATCH 4/6] mc: Fix manpage date indeterminism In-Reply-To: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> References: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> Message-ID: <20200205121151.27880-4-richard.purdie@linuxfoundation.org> The man page date can vary depending upon the host perl, e.g. in Russian some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. Rather than depend upon perl-native to fix this, just remove the date from the manpages. Signed-off-by: Richard Purdie --- .../recipes-extended/mc/files/nomandate.patch | 21 +++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-extended/mc/files/nomandate.patch diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 00000000000..48bd73b1102 --- /dev/null +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -0,0 +1,21 @@ +The man page date can vary depending upon the host perl, e.g. in Russian +some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. +Rather than depend upon perl-native to fix this, just remove the date from +the manpages. + +RP 2020/2/4 + +Upstream-Status: Inappropriate [OE specficic reproducibility workaround] +Signed-off-by: Richard Purdie + +Index: mc-4.8.23/doc/man/date-of-man-include.am +=================================================================== +--- mc-4.8.23.orig/doc/man/date-of-man-include.am ++++ mc-4.8.23/doc/man/date-of-man-include.am +@@ -1,5 +1,5 @@ + SED_PARAMETERS = \ +- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ ++ -e "s/%DATE_OF_MAN_PAGE%//g" \ + -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s{%prefix%{@prefix@{g" \ + -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index d8c8f8643e1..ead348b92e7 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -11,6 +11,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://0001-Add-option-to-control-configure-args.patch \ file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" -- 2.20.1 From richard.purdie at linuxfoundation.org Wed Feb 5 12:11:50 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 5 Feb 2020 12:11:50 +0000 Subject: [OE-core] [PATCH 5/6] patch: Extend to native/nativesdk and depend upon In-Reply-To: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> References: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> Message-ID: <20200205121151.27880-5-richard.purdie@linuxfoundation.org> There is a bug in patch 2.7.3 and earlier where index lines in patches can change file modes when they shouldn't: http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 This leaks into debug sources in particular (e.g. tcp-wrappers where source files are read-only). Add the dependency to target recipes to avoid this problem until we can rely on 2.7.4 or later. We could try and remove all index lines from patch files but it will be a losing battle. We could try and identify all the recipes which change modes on files in patches but again, its a losing battle. Instead, compromise and have patch-native as a dependency for target recipes. We use patch-replacement-native since patch-native is in ASSUME_PROVIDED. Also add nativesdk-patch to buildtools-tarball. [YOCTO #13777] Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 7 +++++++ meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 +++ 3 files changed, 11 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index cd241f1c848..25ec089ae12 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,6 +5,13 @@ QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" +# There is a bug in patch 2.7.3 and earlier where index lines +# in patches can change file modes when they shouldn't: +# http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 +# This leaks into debug sources in particular. Add the dependency +# to target recipes to avoid this problem until we can rely on 2.7.4 or later. +PATCHDEPENDENCY_append_class-target = " patch-replacement-native:do_populate_sysroot" + PATCH_GIT_USER_NAME ?= "OpenEmbedded" PATCH_GIT_USER_EMAIL ?= "oe.patch at oe" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 95ebda7fa15..aa55cde84a9 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-texinfo \ nativesdk-libnss-nis \ nativesdk-rpcsvc-proto \ + nativesdk-patch \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 5d7f55f8dc3..b5897b357ae 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -22,3 +22,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PROVIDES_append_class-native = " patch-replacement-native" + +BBCLASSEXTEND = "native nativesdk" -- 2.20.1 From richard.purdie at linuxfoundation.org Wed Feb 5 12:11:51 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 5 Feb 2020 12:11:51 +0000 Subject: [OE-core] [PATCH 6/6] xserver-xorg: Fix reproducibility issue In-Reply-To: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> References: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> Message-ID: <20200205121151.27880-6-richard.purdie@linuxfoundation.org> The host kernel version was being encoded into the Xorg binary. Set an appropriate configure option to avoid this and be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a0ae65c785d..14ba6bfee6c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -117,6 +117,7 @@ EXTRA_OECONF += "--with-fop=no \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ + --with-os-name=Linux \ " OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" -- 2.20.1 From nathan at nathanrossi.com Wed Feb 5 12:41:34 2020 From: nathan at nathanrossi.com (Nathan Rossi) Date: Wed, 5 Feb 2020 22:41:34 +1000 Subject: [OE-core] [PATCH v4 0/5] Microblaze tune updates In-Reply-To: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> References: <20200204210630.41960-1-mark.hatle@kernel.crashing.org> Message-ID: On Wed, 5 Feb 2020 at 07:06, Mark Hatle wrote: > > Version 4 of the patch set. > > I've collected all of the patches resently sent, and reworked them per > the comments on the mailing list. > > The patches are directly available at: > > git://git.openembedded.org/openembedded-core-contrib mgh/xilinx-microblaze > > The work was broken up into a few more individual pieces. This will allow > backports to Zeus for fixes vs new features. > > Mark Hatle (5): > microblaze tune: change microblazeeb to microblaze > microblaze tune: Allow no version to be set > microblaze tune: Enable 64-bit > microblaze tune: cleanup += > Microblaze: Adjust Linux items from microblazeeb to microblaze Looks good. I gave it a quick test, qemu big endian builds and boots core-image-minimal now. Thanks, Nathan From jpewhacker at gmail.com Wed Feb 5 13:49:24 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Wed, 5 Feb 2020 07:49:24 -0600 Subject: [OE-core] [PATCH 2/6] oeqa/reproducible: Improve test output and ensure deb+ipk compared In-Reply-To: <20200205121151.27880-2-richard.purdie@linuxfoundation.org> References: <20200205121151.27880-1-richard.purdie@linuxfoundation.org> <20200205121151.27880-2-richard.purdie@linuxfoundation.org> Message-ID: On Wed, Feb 5, 2020, 6:12 AM Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > Adding newline characters between the packages in the failure output > massively improves readability. > > Also ensure to output ipk failures when there are deb failures by > calling self.fail() at the end, else sometimes only partial differences > are returned. > > Signed-off-by: Richard Purdie > --- > meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py > b/meta/lib/oeqa/selftest/cases/reproducible.py > index 04dc46f38a0..f6433c9a02b 100644 > --- a/meta/lib/oeqa/selftest/cases/reproducible.py > +++ b/meta/lib/oeqa/selftest/cases/reproducible.py > @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): > # NOTE: The temp directories from the reproducible build are > purposely > # kept after the build so it can be diffed for debugging. > > + fails = [] > + > for c in self.package_classes: > with self.subTest(package_class=c): > It too bad subtests are broken. If we can't handle failed subtests, we can remove this line that creates the subtest in the first place. package_class = 'package_' + c > @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): > self.copy_file(d.test, '/'.join([save_dir, > d.test])) > > if result.missing or result.different: > - self.fail("The following %s packages are missing or > different: %s" % > - (c, ' '.join(r.test for r in (result.missing > + result.different)))) > + fails.append("The following %s packages are missing > or different: %s" % > + (c, '\n'.join(r.test for r in (result.missing > + result.different)))) > + > + if fails: > + self.fail('\n'.join(fails)) > > # Clean up empty directories > if self.save_results: > -- > 2.20.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From martin.jansa at gmail.com Wed Feb 5 13:57:17 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Wed, 5 Feb 2020 14:57:17 +0100 Subject: [OE-core] [PATCH 4/4] kern-tools-native: use more common S value and oe_runmake In-Reply-To: References: <20200205024241.27828-1-Martin.Jansa@gmail.com> <20200205024241.27828-4-Martin.Jansa@gmail.com> Message-ID: OK, the patchdir cleanup won't be needed as you've already applied that .patch file in the repo. But I have forgot to update LIC_FILES_CHKSUM, which shouldn't have the "git/" anymore as it's relative to ${S}. LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" Please adjust in your consolidated pull requests. On Wed, Feb 5, 2020 at 3:54 AM Bruce Ashfield wrote: > On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa > wrote: > > > > Signed-off-by: Martin Jansa > > --- > > .../kern-tools/kern-tools-native_git.bb | 11 +++++++---- > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > index 8053483355..28080e510f 100644 > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" > > inherit native > > > > SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" > > -S = "${WORKDIR}" > > +S = "${WORKDIR}/git" > > While not common, this was on purpose. This isn't something that is > typically patched, it is something I queue and bump for release. > > So I'm ok with the cleanup, but I'll drop the patch tweaking part when > I queue for test, since I'll have the patch already in the repo. > > Bruce > > > UPSTREAM_CHECK_COMMITS = "1" > > > > +do_configure() { > > + : > > +} > > + > > do_compile() { > > : > > } > > > > do_install() { > > - cd ${S}/git > > - make DESTDIR=${D}${bindir} install > > + oe_runmake DESTDIR=${D}${bindir} install > > } > > > > -SRC_URI += > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" > > +SRC_URI += > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" > > -- > > 2.20.1 > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Wed Feb 5 14:27:15 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 05 Feb 2020 14:27:15 +0000 Subject: [OE-core] Reproducible Builds Issue Status Message-ID: Good news is we're down to a set of specific issues and those issues seem "stable". The ones we haven't fixed yet with master-next are: /srv/autobuilder/autobuilder.yoctoproject.org/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl: (https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl/) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb (needs a bug) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13771) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/ncurses-doc_6.1+20191019-r0_amd64.deb (needs a bug) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/openssl-ptest_1.1.1d-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13770) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dbg_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13773) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dev_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-config-heavy_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13774) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-data-dumper_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-ptest_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar-dbg_1.32-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar_1.32-r0_amd64.deb (needs a bug) Also: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13776 (didn't show on this set of builds) Cheers, Richard From bruce.ashfield at gmail.com Wed Feb 5 14:39:25 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Wed, 5 Feb 2020 09:39:25 -0500 Subject: [OE-core] [PATCH 4/4] kern-tools-native: use more common S value and oe_runmake In-Reply-To: References: <20200205024241.27828-1-Martin.Jansa@gmail.com> <20200205024241.27828-4-Martin.Jansa@gmail.com> Message-ID: On Wed, Feb 5, 2020 at 8:57 AM Martin Jansa wrote: > > OK, the patchdir cleanup won't be needed as you've already applied that .patch file in the repo. > > But I have forgot to update LIC_FILES_CHKSUM, which shouldn't have the "git/" anymore as it's relative to ${S}. > > LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" > > Please adjust in your consolidated pull requests. Absolutely, I tweaked and squashed it here. But I've definitely taken the cleanups, since there's no valid reason to make it so hard to patch (even if I grab and merge things). Cheers, Bruce > > On Wed, Feb 5, 2020 at 3:54 AM Bruce Ashfield wrote: >> >> On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: >> > >> > Signed-off-by: Martin Jansa >> > --- >> > .../kern-tools/kern-tools-native_git.bb | 11 +++++++---- >> > 1 file changed, 7 insertions(+), 4 deletions(-) >> > >> > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> > index 8053483355..28080e510f 100644 >> > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> > @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" >> > inherit native >> > >> > SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" >> > -S = "${WORKDIR}" >> > +S = "${WORKDIR}/git" >> >> While not common, this was on purpose. This isn't something that is >> typically patched, it is something I queue and bump for release. >> >> So I'm ok with the cleanup, but I'll drop the patch tweaking part when >> I queue for test, since I'll have the patch already in the repo. >> >> Bruce >> >> > UPSTREAM_CHECK_COMMITS = "1" >> > >> > +do_configure() { >> > + : >> > +} >> > + >> > do_compile() { >> > : >> > } >> > >> > do_install() { >> > - cd ${S}/git >> > - make DESTDIR=${D}${bindir} install >> > + oe_runmake DESTDIR=${D}${bindir} install >> > } >> > >> > -SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" >> > +SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" >> > -- >> > 2.20.1 >> > >> >> >> -- >> - Thou shalt not follow the NULL pointer, for chaos and madness await >> thee at its end >> - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From martin.jansa at gmail.com Wed Feb 5 14:45:49 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Wed, 5 Feb 2020 15:45:49 +0100 Subject: [OE-core] [PATCH 4/4] kern-tools-native: use more common S value and oe_runmake In-Reply-To: References: <20200205024241.27828-1-Martin.Jansa@gmail.com> <20200205024241.27828-4-Martin.Jansa@gmail.com> Message-ID: <20200205144549.3cif3xrxuoxrrjfh@jama> On Wed, Feb 05, 2020 at 09:39:25AM -0500, Bruce Ashfield wrote: > On Wed, Feb 5, 2020 at 8:57 AM Martin Jansa wrote: > > > > OK, the patchdir cleanup won't be needed as you've already applied that .patch file in the repo. > > > > But I have forgot to update LIC_FILES_CHKSUM, which shouldn't have the "git/" anymore as it's relative to ${S}. > > > > LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" > > > > Please adjust in your consolidated pull requests. > > Absolutely, I tweaked and squashed it here. > > But I've definitely taken the cleanups, since there's no valid reason > to make it so hard to patch (even if I grab and merge things). BTW there is still another issue with gold enabled builds in runtime When running "bitbake -k -c testimage core-image-sato-sdk-ptest" to test my artifacts changes I've noticed: Stopped HTTPService on 0.0.0.0:0 Traceback (most recent call last): File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) [Previous line repeated 2 more times] File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/runtime/cases/kernelmodule.py", line 46, in test_kernel_module self.assertEqual(status, 0, msg='\n'.join([cmd, output])) AssertionError: 2 != 0 : cd /usr/src/kernel && make scripts prepare HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/confdata.o HOSTCC scripts/kconfig/expr.o LEX scripts/kconfig/lexer.lex.c YACC scripts/kconfig/parser.tab.[ch] HOSTCC scripts/kconfig/lexer.lex.o HOSTCC scripts/kconfig/parser.tab.o HOSTCC scripts/kconfig/preprocess.o HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --syncconfig Kconfig scripts/Kconfig.include:39: gold linker 'ld' not supported make[2]: *** [scripts/kconfig/Makefile:73: syncconfig] Error 1 make[1]: *** [Makefile:567: syncconfig] Error 2 make: *** [Makefile:678: include/config/auto.conf.cmd] Error 2 make: *** [include/config/auto.conf.cmd] Deleting file 'include/config/tristate.conf' Looks like kernelmodule.py also needs to be adjusted to pass KERNEL_LD as LD. Regards, > > On Wed, Feb 5, 2020 at 3:54 AM Bruce Ashfield wrote: > >> > >> On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: > >> > > >> > Signed-off-by: Martin Jansa > >> > --- > >> > .../kern-tools/kern-tools-native_git.bb | 11 +++++++---- > >> > 1 file changed, 7 insertions(+), 4 deletions(-) > >> > > >> > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > index 8053483355..28080e510f 100644 > >> > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" > >> > inherit native > >> > > >> > SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" > >> > -S = "${WORKDIR}" > >> > +S = "${WORKDIR}/git" > >> > >> While not common, this was on purpose. This isn't something that is > >> typically patched, it is something I queue and bump for release. > >> > >> So I'm ok with the cleanup, but I'll drop the patch tweaking part when > >> I queue for test, since I'll have the patch already in the repo. > >> > >> Bruce > >> > >> > UPSTREAM_CHECK_COMMITS = "1" > >> > > >> > +do_configure() { > >> > + : > >> > +} > >> > + > >> > do_compile() { > >> > : > >> > } > >> > > >> > do_install() { > >> > - cd ${S}/git > >> > - make DESTDIR=${D}${bindir} install > >> > + oe_runmake DESTDIR=${D}${bindir} install > >> > } > >> > > >> > -SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" > >> > +SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" > >> > -- > >> > 2.20.1 > >> > > >> > >> > >> -- > >> - Thou shalt not follow the NULL pointer, for chaos and madness await > >> thee at its end > >> - "Use the force Harry" - Gandalf, Star Trek II > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From richard.purdie at linuxfoundation.org Wed Feb 5 15:42:43 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 5 Feb 2020 15:42:43 +0000 Subject: [OE-core] [PATCH] tar: Fix build determinism, disable rsh Message-ID: <20200205154243.839-1-richard.purdie@linuxfoundation.org> rsh is insecure and obsolete but tar will enable support if the binary is on the host system. Some systems point it at ssh. Lets explictly disable it for now unless someone actually needs/uses this at which point it could become a packageconfig. Signed-off-by: Richard Purdie --- meta/recipes-extended/tar/tar_1.32.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb index 18f09b5711c..ebe6cb0dbdd 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.32.bb @@ -22,6 +22,8 @@ PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" +CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" + # Let aclocal use the relative path for the m4 file rather than the # absolute since tar has a lot of m4 files, otherwise there might # be an "Argument list too long" error when it is built in a long/deep -- 2.20.1 From alex.kanavin at gmail.com Wed Feb 5 15:49:49 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 5 Feb 2020 16:49:49 +0100 Subject: [OE-core] Reproducible Builds Issue Status In-Reply-To: References: Message-ID: Good to hear, I am still settling at the new workplace (there's no build machine yet that I can use, but it's apparently on the way). I'll try to use the auto builders to look into these issues from home, but can't promise quick patches. I think a green a-full looks within reach now! Alex On Wed, 5 Feb 2020 at 15:27, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > Good news is we're down to a set of specific issues and those issues > seem "stable". The ones we haven't fixed yet with master-next are: > > /srv/autobuilder/ > autobuilder.yoctoproject.org/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl > : > ( > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl/ > ) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb > (needs a bug) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13771) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/ncurses-doc_6.1+20191019-r0_amd64.deb > (needs a bug) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/openssl-ptest_1.1.1d-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13770) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dbg_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13773) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dev_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13772) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-config-heavy_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13774) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-data-dumper_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-ptest_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar-dbg_1.32-r0_amd64.deb > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar_1.32-r0_amd64.deb > (needs a bug) > > Also: > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13776 > (didn't show on this set of builds) > > Cheers, > > Richard > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Wed Feb 5 15:56:59 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 5 Feb 2020 15:56:59 +0000 Subject: [OE-core] [PATCH] libidn2: Fix reproducibility issue Message-ID: <20200205155659.1193-1-richard.purdie@linuxfoundation.org> The previous tweak for reproducibility didn't handle the duplicate whitepace left behind, fix this. [YOCTO #13771] Signed-off-by: Richard Purdie --- meta/recipes-extended/libidn/libidn2_2.3.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/libidn/libidn2_2.3.0.bb b/meta/recipes-extended/libidn/libidn2_2.3.0.bb index 8e7e6c0dbcb..7adf924aebf 100644 --- a/meta/recipes-extended/libidn/libidn2_2.3.0.bb +++ b/meta/recipes-extended/libidn/libidn2_2.3.0.bb @@ -22,7 +22,8 @@ EXTRA_OECONF += "--disable-rpath \ " do_install_append() { - sed -i -e 's|-L${STAGING_LIBDIR}||' ${D}${libdir}/pkgconfig/libidn2.pc + # Need to remove any duplicate whitespace too for reproducibility + sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -- 2.20.1 From bruce.ashfield at gmail.com Wed Feb 5 16:16:03 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Wed, 5 Feb 2020 11:16:03 -0500 Subject: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe In-Reply-To: <20200203221142.7jljrrrjxic3qtau@jama> References: <20200203212641.57611-1-bruce.ashfield@gmail.com> <20200203221142.7jljrrrjxic3qtau@jama> Message-ID: On Mon, Feb 3, 2020 at 5:11 PM Martin Jansa wrote: > > On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfield at gmail.com wrote: > > From: Bruce Ashfield > > > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > > python3 safe: > > > > - we explicitly call /usr/bin/env python3 > > - we full specifiy our symbols > > - do not assume that 'None' can be converted to a string > > > > Signed-off-by: Bruce Ashfield > > --- > > > > I didn't realized the v5.4 series had gone in, or I would have > > send this sooner. This should resolve the errors that are thrown > > when symbol_why is run to detect missing symbol dependencies. > > > > Bruce > > > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > index a4c0b6fb8a..57ec1abc6d 100644 > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > > > DEPENDS = "git-native" > > > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > > PR = "r12" > > PV = "0.2+git${SRCPV}" > > This needs a bit more cleanup for python3. Martin, I've got builds and tests running on the rest of the patches that have come in recently, and I wanted to loop back to this one. I'm dropping into a devshell and running the symbol_why.py script using python3 from the sysroot and I didn't see the same issues (But I do have changes for what's in your log). I'll double check once my build churns through the queued patches here, but I thought I'd check with you to see if you are still seeing this with the various fixes for the gold linker you've pulled together ? I'm guessing that now that it isn't aborting early, the warnings aren't triggering and hence it isn't even running (like it was in my runs), so you can't say one way or the other, I'm mainly interested to hear if it was a host python3 or the sysroot-native one that was tossing those errors, so I can detangle my last changes and test in a similar env. Cheers, Bruce > > DEBUG: Executing python function do_kernel_configcheck > Traceback (most recent call last): > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > res += args[int(new_args[0])] > ValueError: invalid literal for int() with base 10: 'error-if' > > During handling of the above exception, another exception occurred: > > Traceback (most recent call last): > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in > conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ > self._init(filename, warn, warn_to_stderr, encoding) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init > self._parse_block(None, self.top_node, self.top_node).next = None > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block > prev = self._parse_block(None, parent, prev) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block > while self._next_line(): > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line > self._tokens = self._tokenize(line) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize > self._parse_assignment(s) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment > s, i = self._expand_macro(s, i, ()) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro > res += self._fn_val(new_args) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val > return py_fn(self, *args) > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn > kconf.filename, kconf.linenr, msg)) > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported > Traceback (most recent call last): > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > res += args[int(new_args[0])] > ValueError: invalid literal for int() with base 10: 'error-if' > > During handling of the above exception, another exception occurred: > > and the log is full of this (the warnings at the end look the same as before) > > # wc -l /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > 11804 /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > > Maybe kernel_configcheck now needs KERNEL_LD exported as well? See: > https://patchwork.openembedded.org/patch/169702/ > which fixed do_configure with 5.4. -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From ross at burtonini.com Wed Feb 5 17:24:55 2020 From: ross at burtonini.com (Ross Burton) Date: Wed, 5 Feb 2020 17:24:55 +0000 Subject: [OE-core] [PATCH] gtk+3: sort resources for reproducible binaries Message-ID: <20200205172455.20928-1-ross@burtonini.com> From: Ross Burton The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. Signed-off-by: Ross Burton --- .../gtk+/gtk+3/sort-resources.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 00000000000..7f87372c52d --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ -- 2.20.1 From ross at burtonini.com Wed Feb 5 17:29:27 2020 From: ross at burtonini.com (Ross Burton) Date: Wed, 5 Feb 2020 17:29:27 +0000 Subject: [OE-core] Reproducible Builds Issue Status In-Reply-To: References: Message-ID: <0d407eca-e156-4457-9cc0-cb11581c7aca@burtonini.com> On 05/02/2020 14:27, Richard Purdie wrote: > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb I grabbed the library on the theory that this is just a single probem. The issue is that the gresources segment in libgdk.so (files embedded inside the binary) had the same files in a different order, so I just sent a patch to sort the $(wildcard). Hopefully that solves the problem. Ross From ross at burtonini.com Wed Feb 5 17:32:01 2020 From: ross at burtonini.com (Ross Burton) Date: Wed, 5 Feb 2020 17:32:01 +0000 Subject: [OE-core] [PATCH v2] gtk+3: sort resources for reproducible binaries Message-ID: <20200205173201.8669-1-ross@burtonini.com> From: Ross Burton The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. Signed-off-by: Ross Burton --- .../gtk+/gtk+3/sort-resources.patch | 19 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 00000000000..7f87372c52d --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb index 18976b54c5c..025d8870e23 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb @@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ + file://sort-resources.patch \ " SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686" SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9" -- 2.20.1 From martin.jansa at gmail.com Wed Feb 5 17:43:10 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Wed, 5 Feb 2020 18:43:10 +0100 Subject: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe In-Reply-To: References: <20200203212641.57611-1-bruce.ashfield@gmail.com> <20200203221142.7jljrrrjxic3qtau@jama> Message-ID: <20200205174310.avol4qigjn4hweda@jama> On Wed, Feb 05, 2020 at 11:16:03AM -0500, Bruce Ashfield wrote: > On Mon, Feb 3, 2020 at 5:11 PM Martin Jansa wrote: > > > > On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfield at gmail.com wrote: > > > From: Bruce Ashfield > > > > > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > > > python3 safe: > > > > > > - we explicitly call /usr/bin/env python3 > > > - we full specifiy our symbols > > > - do not assume that 'None' can be converted to a string > > > > > > Signed-off-by: Bruce Ashfield > > > --- > > > > > > I didn't realized the v5.4 series had gone in, or I would have > > > send this sooner. This should resolve the errors that are thrown > > > when symbol_why is run to detect missing symbol dependencies. > > > > > > Bruce > > > > > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > index a4c0b6fb8a..57ec1abc6d 100644 > > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > > > > > DEPENDS = "git-native" > > > > > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > > > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > > > PR = "r12" > > > PV = "0.2+git${SRCPV}" > > > > This needs a bit more cleanup for python3. > > Martin, > > I've got builds and tests running on the rest of the patches that have > come in recently, and I wanted to loop back to this one. > > I'm dropping into a devshell and running the symbol_why.py script > using python3 from the sysroot and I didn't see the same issues (But I > do have changes for what's in your log). > > I'll double check once my build churns through the queued patches > here, but I thought I'd check with you to see if you are still seeing > this with the various fixes for the gold linker you've pulled together > ? I'm guessing that now that it isn't aborting early, the warnings > aren't triggering and hence it isn't even running (like it was in my > runs), so you can't say one way or the other, > > I'm mainly interested to hear if it was a host python3 or the > sysroot-native one that was tossing those errors, so I can detangle my > last changes and test in a similar env. I think it was combination of gold triggering the error in Kbuild: > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported which was then incorrectly handled by kconfiglib.py, the error handling issue is very likely still there, just no longer triggered for me after passing KERNEL_LD. I still have your SRCREV bump included in my builds, but it seems to be unrelated to kconfiglib.py issue shown in my build http://git.yoctoproject.org/cgit/cgit.cgi/wr-kernel-tools/commit/?id=5358eb293399867db05fd73d04ce908d69a03bed With all the queued fixes for KERNEL_LD I was able to build whole image with ld-is-gold with log.kernel_configme not showing any python exceptions just couple symbols which then aren't included in log.kernel_configcheck, so I assume these are expected (whole log at the end). I was also able to boot it with qemu for testimage tasks There are 3 failing tests for core-image-sato-sdk-ptest: SUMMARY: core-image-sato-sdk-ptest () - Ran 62 tests in 7387.915s core-image-sato-sdk-ptest - FAIL - Required tests failed (successes=34, skipped=24, failures=3, errors=0) ERROR: core-image-sato-sdk-ptest-1.0-r0 do_testimage: core-image-sato-sdk-ptest - FAILED - check the task log and the ssh log RESULTS - kernelmodule.KernelModuleTest.test_kernel_module: FAILED (2.98s) RESULTS - rpm.RpmBasicTest.test_rpm_query: FAILED (0.22s) RESULTS - systemd.SystemdBasicTests.test_systemd_failed: FAILED (0.35s) Only the first one seems to be related to ld-is-gold and 5.4 kernel (as reported in separate e-mail before), rpm test failed probably because I'm using package_ipk not rpm and systemd test failed because of mdmon at md125.service failing. I don't have a good base build to compare with, I usually don't use testimage and all my previous tries failed even more badly :). log.kernel_configme: DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot'] NOTE: Installed into sysroot: [] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'gcc-cross-x86_64', 'bc-native', 'bison-native', 'quilt-native', 'binutils-cross-x86_64', 'libtool-native', 'gnu-config-native', 'xz-native', 'autoconf-native', 'flex-native', 'gettext-minimal-native', 'texinfo-dummy-native', 'automake-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'zlib-native', 'gmp-native', 'readline-native', 'm4-native', 'ncurses-native', 'pkgconfig-native'] DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme Using .kernel-meta/configs/v5.4/ktypes/base/base.cfg as base Merging .kernel-meta/configs/v5.4/standard/ktypes/standard/standard.cfg Merging .kernel-meta/configs/v5.4/standard/features/kgdb/kgdb.cfg Merging .kernel-meta/configs/v5.4/standard/features/kgdb/kgdb-x86.cfg Merging .kernel-meta/configs/v5.4/standard/features/firmware/firmware.cfg Value of CONFIG_FW_LOADER is redefined by fragment .kernel-meta/configs/v5.4/standard/features/firmware/firmware.cfg: Previous value: # CONFIG_FW_LOADER is not set New value: CONFIG_FW_LOADER=m Merging .kernel-meta/configs/v5.4/standard/features/lttng/lttng.cfg Merging .kernel-meta/configs/v5.4/standard/features/blktrace/blktrace.cfg Merging .kernel-meta/configs/v5.4/standard/features/systemtap/systemtap.cfg Value of CONFIG_DEBUG_INFO is redefined by fragment .kernel-meta/configs/v5.4/standard/features/systemtap/systemtap.cfg: Previous value: # CONFIG_DEBUG_INFO is not set New value: CONFIG_DEBUG_INFO=y Merging .kernel-meta/configs/v5.4/standard/features/kprobes/kprobes.cfg Merging .kernel-meta/configs/v5.4/standard/features/uprobe/uprobe.cfg Merging .kernel-meta/configs/v5.4/standard/features/utrace/utrace.cfg Merging .kernel-meta/configs/v5.4/standard/features/ftrace/ftrace.cfg Merging .kernel-meta/configs/v5.4/standard/features/hrt/hrt.cfg Merging .kernel-meta/configs/v5.4/standard/features/uprobe/uprobe.cfg Merging .kernel-meta/configs/v5.4/standard/features/kprobes/kprobes.cfg Merging .kernel-meta/configs/v5.4/standard/features/tmpfs/tmpfs-posix-acl.cfg Merging .kernel-meta/configs/v5.4/standard/features/cgroups/cgroups.cfg Merging .kernel-meta/configs/v5.4/standard/features/namespaces/namespaces.cfg Merging .kernel-meta/configs/v5.4/standard/features/net_sched/net_sched.cfg Merging .kernel-meta/configs/v5.4/standard/features/vdso/vdso.cfg Merging .kernel-meta/configs/v5.4/standard/features/fuse/fuse.cfg Merging .kernel-meta/configs/v5.4/standard/features/input/input.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/fs/devtmpfs.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/fs/debugfs.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/fs/btrfs.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/fs/ext4.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/net/ipsec.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/net/ipv6.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/net/ipsec.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/net/ipsec6.cfg Value of CONFIG_CRYPTO_SEQIV is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/net/ipsec6.cfg: Previous value: CONFIG_CRYPTO_SEQIV=y New value: CONFIG_CRYPTO_SEQIV=m Merging .kernel-meta/configs/v5.4/standard/cfg/net/ip_nf.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/net/ip6_nf.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/net/bridge.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/systemd.cfg Merging .kernel-meta/configs/v5.4/standard/features/rfkill/rfkill.cfg Merging .kernel-meta/configs/v5.4/standard/features/bpf/bpf.cfg Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/efi.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg Value of CONFIG_EFI_PARTITION is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg: Previous value: # CONFIG_EFI_PARTITION is not set New value: CONFIG_EFI_PARTITION=y Merging .kernel-meta/configs/v5.4/standard/cfg/efi.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/timer/no_hz.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg Value of CONFIG_NR_CPUS is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg: Previous value: CONFIG_NR_CPUS=24 New value: CONFIG_NR_CPUS=64 Merging .kernel-meta/configs/v5.4/standard/cfg/timer/hz_1000.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/amd.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/intel.cfg Merging .kernel-meta/configs/v5.4/standard/features/pci/pci.cfg Merging .kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg Merging .kernel-meta/configs/v5.4/standard/features/mmc/mmc-base.cfg Merging .kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/uhci-hcd.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/ohci-hcd.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/xhci-hcd.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg Merging .kernel-meta/configs/v5.4/standard/features/input/touchscreen.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb/touchscreen-composite.cfg Merging .kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg Merging .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e100.cfg Value of CONFIG_E100 is redefined by fragment .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e100.cfg: Previous value: CONFIG_E100=m New value: CONFIG_E100=y Merging .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg Value of CONFIG_E1000E is redefined by fragment .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg: Previous value: CONFIG_E1000E=m New value: CONFIG_E1000E=y Value of CONFIG_E1000 is redefined by fragment .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg: Previous value: CONFIG_E1000=m New value: CONFIG_E1000=y Merging .kernel-meta/configs/v5.4/standard/features/igb/igb.cfg Merging .kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg Merging .kernel-meta/configs/v5.4/standard/features/scsi/cdrom.cfg Merging .kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg Merging .kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg Value of CONFIG_BT is redefined by fragment .kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg: Previous value: # CONFIG_BT is not set New value: CONFIG_BT=y Merging .kernel-meta/configs/v5.4/standard/features/6lowpan/6lowpan.cfg Merging .kernel-meta/configs/v5.4/standard/features/power/intel.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/8250.cfg Merging .kernel-meta/configs/v5.4/standard/features/i915/i915.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/fs/vfat.cfg Value of CONFIG_NLS_CODEPAGE_437 is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/fs/vfat.cfg: Previous value: CONFIG_NLS_CODEPAGE_437=m New value: CONFIG_NLS_CODEPAGE_437=y Value of CONFIG_NLS_ISO8859_1 is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/fs/vfat.cfg: Previous value: CONFIG_NLS_ISO8859_1=m New value: CONFIG_NLS_ISO8859_1=y Merging .kernel-meta/configs/v5.4/standard/cfg/boot-live.cfg Value of CONFIG_BLK_DEV_LOOP is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/boot-live.cfg: Previous value: CONFIG_BLK_DEV_LOOP=m New value: CONFIG_BLK_DEV_LOOP=y Merging .kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg Merging .kernel-meta/configs/v5.4/standard/features/scsi/disk.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/fs/vfat.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/usb-mass-storage.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/virtio.cfg Merging .kernel-meta/configs/v5.4/standard//usb-base.cfg Merging .kernel-meta/configs/v5.4/standard/features/media/media.cfg Merging .kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg Merging .kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg Merging .kernel-meta/configs/v5.4/standard/features/nfsd/nfsd.cfg Merging .kernel-meta/configs/v5.4/standard/features/debug/printk.cfg Merging .kernel-meta/configs/v5.4/standard/features/kernel-sample/kernel-sample.cfg Merging .kernel-meta/configs/v5.4/standard/features/netfilter/netfilter.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/virtio.cfg Merging .kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/sound.cfg Value of CONFIG_SOUND is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/sound.cfg: Previous value: CONFIG_SOUND=y New value: CONFIG_SOUND=m Value of CONFIG_SND is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/sound.cfg: Previous value: CONFIG_SND=y New value: CONFIG_SND=m Merging .kernel-meta/configs/v5.4/standard/cfg/hv-guest.cfg Merging .kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg Merging .kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg Merging .kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' GEN Makefile HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/confdata.o HOSTCC scripts/kconfig/expr.o LEX scripts/kconfig/lexer.lex.c YACC scripts/kconfig/parser.tab.[ch] HOSTCC scripts/kconfig/lexer.lex.o HOSTCC scripts/kconfig/parser.tab.o HOSTCC scripts/kconfig/preprocess.o HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig ./.tmp.config.IzRt9b1cd6:2208:warning: unexpected data: # ./.tmp.config.IzRt9b1cd6:2209:warning: unexpected data: # Generic Driver Options ./.tmp.config.IzRt9b1cd6:2210:warning: unexpected data: # ./.tmp.config.IzRt9b1cd6:3092:warning: symbol value 'm' invalid for SAMPLE_SECCOMP ./.tmp.config.IzRt9b1cd6:3109:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE ./.tmp.config.IzRt9b1cd6:3110:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP ./.tmp.config.IzRt9b1cd6:3111:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE # # configuration written to .config # make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' Value requested for CONFIG_KALLSYMS_ALL not in final .config Requested value: # CONFIG_KALLSYMS_ALL is not set Actual value: Value requested for CONFIG_DEBUG_DRIVER not in final .config Requested value: # CONFIG_DEBUG_DRIVER is not set Actual value: Value requested for CONFIG_HUGETLB_PAGE not in final .config Requested value: # CONFIG_HUGETLB_PAGE is not set Actual value: Value requested for CONFIG_SCHEDSTATS not in final .config Requested value: # CONFIG_SCHEDSTATS is not set Actual value: Value requested for CONFIG_DEBUG_SLAB not in final .config Requested value: # CONFIG_DEBUG_SLAB is not set Actual value: Value requested for CONFIG_DEBUG_SPINLOCK not in final .config Requested value: # CONFIG_DEBUG_SPINLOCK is not set Actual value: Value requested for CONFIG_DEBUG_KOBJECT not in final .config Requested value: # CONFIG_DEBUG_KOBJECT is not set Actual value: Value requested for CONFIG_DEBUG_HIGHMEM not in final .config Requested value: # CONFIG_DEBUG_HIGHMEM is not set Actual value: Value requested for CONFIG_KEYS not in final .config Requested value: # CONFIG_KEYS is not set Actual value: CONFIG_KEYS=y Value requested for CONFIG_REISERFS_CHECK not in final .config Requested value: # CONFIG_REISERFS_CHECK is not set Actual value: Value requested for CONFIG_REISERFS_FS_SECURITY not in final .config Requested value: # CONFIG_REISERFS_FS_SECURITY is not set Actual value: Value requested for CONFIG_FAT_FS not in final .config Requested value: CONFIG_FAT_FS=m Actual value: CONFIG_FAT_FS=y Value requested for CONFIG_KGDB not in final .config Requested value: CONFIG_KGDB=y Actual value: Value requested for CONFIG_KGDB_KDB not in final .config Requested value: CONFIG_KGDB_KDB=y Actual value: Value requested for CONFIG_KDB_KEYBOARD not in final .config Requested value: CONFIG_KDB_KEYBOARD=y Actual value: Value requested for CONFIG_KGDB_LOW_LEVEL_TRAP not in final .config Requested value: CONFIG_KGDB_LOW_LEVEL_TRAP=y Actual value: Value requested for CONFIG_FW_LOADER not in final .config Requested value: CONFIG_FW_LOADER=m Actual value: CONFIG_FW_LOADER=y Value requested for CONFIG_DEBUG_INFO not in final .config Requested value: CONFIG_DEBUG_INFO=y Actual value: Value requested for CONFIG_CGROUP_DEBUG not in final .config Requested value: CONFIG_CGROUP_DEBUG=y Actual value: Value requested for CONFIG_BFQ_CGROUP_DEBUG not in final .config Requested value: # CONFIG_BFQ_CGROUP_DEBUG is not set Actual value: Value requested for CONFIG_CRYPTO_SEQIV not in final .config Requested value: CONFIG_CRYPTO_SEQIV=m Actual value: CONFIG_CRYPTO_SEQIV=y Value requested for CONFIG_BRIDGE_NETFILTER not in final .config Requested value: CONFIG_BRIDGE_NETFILTER=y Actual value: CONFIG_BRIDGE_NETFILTER=m Value requested for CONFIG_V4L2_MEM2MEM_DEV not in final .config Requested value: CONFIG_V4L2_MEM2MEM_DEV=m Actual value: Value requested for CONFIG_VIDEOBUF_GEN not in final .config Requested value: CONFIG_VIDEOBUF_GEN=m Actual value: Value requested for CONFIG_VIDEOBUF_DMA_SG not in final .config Requested value: CONFIG_VIDEOBUF_DMA_SG=m Actual value: Value requested for CONFIG_VIDEOBUF_DMA_CONTIG not in final .config Requested value: CONFIG_VIDEOBUF_DMA_CONTIG=m Actual value: Value requested for CONFIG_VIDEOBUF_VMALLOC not in final .config Requested value: CONFIG_VIDEOBUF_VMALLOC=m Actual value: Value requested for CONFIG_VIDEOBUF2_DMA_SG not in final .config Requested value: CONFIG_VIDEOBUF2_DMA_SG=m Actual value: Value requested for CONFIG_VIDEOBUF2_DMA_CONTIG not in final .config Requested value: CONFIG_VIDEOBUF2_DMA_CONTIG=m Actual value: Value requested for CONFIG_DVB_CORE not in final .config Requested value: CONFIG_DVB_CORE=y Actual value: Value requested for CONFIG_DVB_NET not in final .config Requested value: CONFIG_DVB_NET=y Actual value: Value requested for CONFIG_DVB_MAX_ADAPTERS not in final .config Requested value: CONFIG_DVB_MAX_ADAPTERS=8 Actual value: Value requested for CONFIG_DVB_DYNAMIC_MINORS not in final .config Requested value: CONFIG_DVB_DYNAMIC_MINORS=y Actual value: Value requested for CONFIG_MEDIA_ATTACH not in final .config Requested value: CONFIG_MEDIA_ATTACH=y Actual value: Value requested for CONFIG_NFSD_FAULT_INJECTION not in final .config Requested value: # CONFIG_NFSD_FAULT_INJECTION is not set Actual value: Value requested for CONFIG_TTY_PRINTK not in final .config Requested value: CONFIG_TTY_PRINTK=y Actual value: Value requested for CONFIG_SAMPLE_CONNECTOR not in final .config Requested value: CONFIG_SAMPLE_CONNECTOR=m Actual value: Value requested for CONFIG_SAMPLE_SECCOMP not in final .config Requested value: CONFIG_SAMPLE_SECCOMP=m Actual value: Value requested for CONFIG_NF_CT_PROTO_GRE not in final .config Requested value: CONFIG_NF_CT_PROTO_GRE=m Actual value: CONFIG_NF_CT_PROTO_GRE=y Value requested for CONFIG_NF_CT_PROTO_SCTP not in final .config Requested value: CONFIG_NF_CT_PROTO_SCTP=m Actual value: CONFIG_NF_CT_PROTO_SCTP=y Value requested for CONFIG_NF_CT_PROTO_UDPLITE not in final .config Requested value: CONFIG_NF_CT_PROTO_UDPLITE=m Actual value: CONFIG_NF_CT_PROTO_UDPLITE=y Value requested for CONFIG_NF_NAT_SNMP_BASIC not in final .config Requested value: CONFIG_NF_NAT_SNMP_BASIC=m Actual value: Value requested for CONFIG_SOUND_OSS_CORE not in final .config Requested value: # CONFIG_SOUND_OSS_CORE is not set Actual value: Value requested for CONFIG_SND_COMPRESS_OFFLOAD not in final .config Requested value: CONFIG_SND_COMPRESS_OFFLOAD=m Actual value: Value requested for CONFIG_SND_MIXER_OSS not in final .config Requested value: # CONFIG_SND_MIXER_OSS is not set Actual value: Value requested for CONFIG_SND_PCM_OSS not in final .config Requested value: # CONFIG_SND_PCM_OSS is not set Actual value: Value requested for CONFIG_SND_SEQUENCER_OSS not in final .config Requested value: # CONFIG_SND_SEQUENCER_OSS is not set Actual value: Value requested for CONFIG_SND_SOC_AC97_BUS not in final .config Requested value: CONFIG_SND_SOC_AC97_BUS=y Actual value: Value requested for CONFIG_SND_SOC_COMPRESS not in final .config Requested value: CONFIG_SND_SOC_COMPRESS=y Actual value: Value requested for CONFIG_SND_SOC_AMD_ACP not in final .config Requested value: CONFIG_SND_SOC_AMD_ACP=m Actual value: Value requested for CONFIG_SND_SST_ATOM_HIFI2_PLATFORM not in final .config Requested value: CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m Actual value: Value requested for CONFIG_SND_SST_IPC not in final .config Requested value: CONFIG_SND_SST_IPC=m Actual value: Value requested for CONFIG_SND_SST_IPC_ACPI not in final .config Requested value: CONFIG_SND_SST_IPC_ACPI=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_SST_FIRMWARE not in final .config Requested value: CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_HASWELL not in final .config Requested value: CONFIG_SND_SOC_INTEL_HASWELL=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_HASWELL_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_HASWELL_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_BXT_RT298_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_BROADWELL_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH not in final .config Requested value: CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m Actual value: Value requested for CONFIG_SND_SOC_INTEL_SKYLAKE not in final .config Requested value: CONFIG_SND_SOC_INTEL_SKYLAKE=m Actual value: Value requested for CONFIG_SND_SOC_AC97_CODEC not in final .config Requested value: CONFIG_SND_SOC_AC97_CODEC=m Actual value: Value requested for CONFIG_SND_SOC_AK4104 not in final .config Requested value: CONFIG_SND_SOC_AK4104=m Actual value: Value requested for CONFIG_SND_SOC_AK4554 not in final .config Requested value: CONFIG_SND_SOC_AK4554=m Actual value: Value requested for CONFIG_SND_SOC_AK4613 not in final .config Requested value: CONFIG_SND_SOC_AK4613=m Actual value: Value requested for CONFIG_SND_SOC_AK4642 not in final .config Requested value: CONFIG_SND_SOC_AK4642=m Actual value: Value requested for CONFIG_SND_SOC_AK5386 not in final .config Requested value: CONFIG_SND_SOC_AK5386=m Actual value: Value requested for CONFIG_SND_SOC_ALC5623 not in final .config Requested value: CONFIG_SND_SOC_ALC5623=m Actual value: Value requested for CONFIG_SND_SOC_CS35L32 not in final .config Requested value: CONFIG_SND_SOC_CS35L32=m Actual value: Value requested for CONFIG_SND_SOC_CS35L33 not in final .config Requested value: CONFIG_SND_SOC_CS35L33=m Actual value: Value requested for CONFIG_SND_SOC_CS42L51 not in final .config Requested value: CONFIG_SND_SOC_CS42L51=m Actual value: Value requested for CONFIG_SND_SOC_CS42L51_I2C not in final .config Requested value: CONFIG_SND_SOC_CS42L51_I2C=m Actual value: Value requested for CONFIG_SND_SOC_CS42L52 not in final .config Requested value: CONFIG_SND_SOC_CS42L52=m Actual value: Value requested for CONFIG_SND_SOC_CS42L56 not in final .config Requested value: CONFIG_SND_SOC_CS42L56=m Actual value: Value requested for CONFIG_SND_SOC_CS42L73 not in final .config Requested value: CONFIG_SND_SOC_CS42L73=m Actual value: Value requested for CONFIG_SND_SOC_CS4265 not in final .config Requested value: CONFIG_SND_SOC_CS4265=m Actual value: Value requested for CONFIG_SND_SOC_CS4270 not in final .config Requested value: CONFIG_SND_SOC_CS4270=m Actual value: Value requested for CONFIG_SND_SOC_CS4271 not in final .config Requested value: CONFIG_SND_SOC_CS4271=m Actual value: Value requested for CONFIG_SND_SOC_CS4271_I2C not in final .config Requested value: CONFIG_SND_SOC_CS4271_I2C=m Actual value: Value requested for CONFIG_SND_SOC_CS4271_SPI not in final .config Requested value: CONFIG_SND_SOC_CS4271_SPI=m Actual value: Value requested for CONFIG_SND_SOC_CS42XX8 not in final .config Requested value: CONFIG_SND_SOC_CS42XX8=m Actual value: Value requested for CONFIG_SND_SOC_CS42XX8_I2C not in final .config Requested value: CONFIG_SND_SOC_CS42XX8_I2C=m Actual value: Value requested for CONFIG_SND_SOC_CS4349 not in final .config Requested value: CONFIG_SND_SOC_CS4349=m Actual value: Value requested for CONFIG_SND_SOC_CS53L30 not in final .config Requested value: CONFIG_SND_SOC_CS53L30=m Actual value: Value requested for CONFIG_SND_SOC_DA7219 not in final .config Requested value: CONFIG_SND_SOC_DA7219=m Actual value: Value requested for CONFIG_SND_SOC_MAX98090 not in final .config Requested value: CONFIG_SND_SOC_MAX98090=m Actual value: Value requested for CONFIG_SND_SOC_MAX98357A not in final .config Requested value: CONFIG_SND_SOC_MAX98357A=m Actual value: Value requested for CONFIG_SND_SOC_PCM1681 not in final .config Requested value: CONFIG_SND_SOC_PCM1681=m Actual value: Value requested for CONFIG_SND_SOC_PCM179X not in final .config Requested value: CONFIG_SND_SOC_PCM179X=m Actual value: Value requested for CONFIG_SND_SOC_PCM179X_I2C not in final .config Requested value: CONFIG_SND_SOC_PCM179X_I2C=m Actual value: Value requested for CONFIG_SND_SOC_PCM179X_SPI not in final .config Requested value: CONFIG_SND_SOC_PCM179X_SPI=m Actual value: Value requested for CONFIG_SND_SOC_PCM3168A not in final .config Requested value: CONFIG_SND_SOC_PCM3168A=m Actual value: Value requested for CONFIG_SND_SOC_PCM3168A_I2C not in final .config Requested value: CONFIG_SND_SOC_PCM3168A_I2C=m Actual value: Value requested for CONFIG_SND_SOC_PCM3168A_SPI not in final .config Requested value: CONFIG_SND_SOC_PCM3168A_SPI=m Actual value: Value requested for CONFIG_SND_SOC_PCM512x not in final .config Requested value: CONFIG_SND_SOC_PCM512x=m Actual value: Value requested for CONFIG_SND_SOC_PCM512x_I2C not in final .config Requested value: CONFIG_SND_SOC_PCM512x_I2C=m Actual value: Value requested for CONFIG_SND_SOC_PCM512x_SPI not in final .config Requested value: CONFIG_SND_SOC_PCM512x_SPI=m Actual value: Value requested for CONFIG_SND_SOC_RL6231 not in final .config Requested value: CONFIG_SND_SOC_RL6231=m Actual value: Value requested for CONFIG_SND_SOC_RT298 not in final .config Requested value: CONFIG_SND_SOC_RT298=m Actual value: Value requested for CONFIG_SND_SOC_RT5616 not in final .config Requested value: CONFIG_SND_SOC_RT5616=m Actual value: Value requested for CONFIG_SND_SOC_RT5631 not in final .config Requested value: CONFIG_SND_SOC_RT5631=m Actual value: Value requested for CONFIG_SND_SOC_RT5640 not in final .config Requested value: CONFIG_SND_SOC_RT5640=m Actual value: Value requested for CONFIG_SND_SOC_RT5645 not in final .config Requested value: CONFIG_SND_SOC_RT5645=m Actual value: Value requested for CONFIG_SND_SOC_RT5651 not in final .config Requested value: CONFIG_SND_SOC_RT5651=m Actual value: Value requested for CONFIG_SND_SOC_RT5670 not in final .config Requested value: CONFIG_SND_SOC_RT5670=m Actual value: Value requested for CONFIG_SND_SOC_SPDIF not in final .config Requested value: CONFIG_SND_SOC_SPDIF=m Actual value: Value requested for CONFIG_SND_SOC_SSM4567 not in final .config Requested value: CONFIG_SND_SOC_SSM4567=m Actual value: Value requested for CONFIG_SND_SOC_TLV320AIC31XX not in final .config Requested value: CONFIG_SND_SOC_TLV320AIC31XX=m Actual value: Value requested for CONFIG_SND_SOC_TLV320AIC3X not in final .config Requested value: CONFIG_SND_SOC_TLV320AIC3X=m Actual value: Value requested for CONFIG_SND_SOC_TS3A227E not in final .config Requested value: CONFIG_SND_SOC_TS3A227E=m Actual value: Value requested for CONFIG_SND_SOC_WM8510 not in final .config Requested value: CONFIG_SND_SOC_WM8510=m Actual value: Value requested for CONFIG_SND_SOC_WM8523 not in final .config Requested value: CONFIG_SND_SOC_WM8523=m Actual value: Value requested for CONFIG_SND_SOC_WM8580 not in final .config Requested value: CONFIG_SND_SOC_WM8580=m Actual value: Value requested for CONFIG_SND_SOC_WM8711 not in final .config Requested value: CONFIG_SND_SOC_WM8711=m Actual value: Value requested for CONFIG_SND_SOC_WM8728 not in final .config Requested value: CONFIG_SND_SOC_WM8728=m Actual value: Value requested for CONFIG_SND_SOC_WM8731 not in final .config Requested value: CONFIG_SND_SOC_WM8731=m Actual value: Value requested for CONFIG_SND_SOC_WM8737 not in final .config Requested value: CONFIG_SND_SOC_WM8737=m Actual value: Value requested for CONFIG_SND_SOC_WM8741 not in final .config Requested value: CONFIG_SND_SOC_WM8741=m Actual value: Value requested for CONFIG_SND_SOC_WM8750 not in final .config Requested value: CONFIG_SND_SOC_WM8750=m Actual value: Value requested for CONFIG_SND_SOC_WM8753 not in final .config Requested value: CONFIG_SND_SOC_WM8753=m Actual value: Value requested for CONFIG_SND_SOC_WM8770 not in final .config Requested value: CONFIG_SND_SOC_WM8770=m Actual value: Value requested for CONFIG_SND_SOC_WM8776 not in final .config Requested value: CONFIG_SND_SOC_WM8776=m Actual value: Value requested for CONFIG_SND_SOC_WM8804 not in final .config Requested value: CONFIG_SND_SOC_WM8804=m Actual value: Value requested for CONFIG_SND_SOC_WM8804_I2C not in final .config Requested value: CONFIG_SND_SOC_WM8804_I2C=m Actual value: Value requested for CONFIG_SND_SOC_WM8804_SPI not in final .config Requested value: CONFIG_SND_SOC_WM8804_SPI=m Actual value: Value requested for CONFIG_SND_SOC_WM8903 not in final .config Requested value: CONFIG_SND_SOC_WM8903=m Actual value: Value requested for CONFIG_SND_SOC_WM8960 not in final .config Requested value: CONFIG_SND_SOC_WM8960=m Actual value: Value requested for CONFIG_SND_SOC_WM8962 not in final .config Requested value: CONFIG_SND_SOC_WM8962=m Actual value: Value requested for CONFIG_SND_SOC_WM8974 not in final .config Requested value: CONFIG_SND_SOC_WM8974=m Actual value: Value requested for CONFIG_SND_SOC_WM8978 not in final .config Requested value: CONFIG_SND_SOC_WM8978=m Actual value: Value requested for CONFIG_SND_SOC_WM8985 not in final .config Requested value: CONFIG_SND_SOC_WM8985=m Actual value: Value requested for CONFIG_SND_SOC_NAU8825 not in final .config Requested value: CONFIG_SND_SOC_NAU8825=m Actual value: Value requested for CONFIG_SND_SOC_TPA6130A2 not in final .config Requested value: CONFIG_SND_SOC_TPA6130A2=m Actual value: Value requested for CONFIG_SND_SIMPLE_CARD_UTILS not in final .config Requested value: CONFIG_SND_SIMPLE_CARD_UTILS=m Actual value: Value requested for CONFIG_SND_SIMPLE_CARD not in final .config Requested value: CONFIG_SND_SIMPLE_CARD=m Actual value: DEBUG: Shell function do_kernel_configme finished > > Cheers, > > Bruce > > > > > DEBUG: Executing python function do_kernel_configcheck > > Traceback (most recent call last): > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > > res += args[int(new_args[0])] > > ValueError: invalid literal for int() with base 10: 'error-if' > > > > During handling of the above exception, another exception occurred: > > > > Traceback (most recent call last): > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in > > conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ > > self._init(filename, warn, warn_to_stderr, encoding) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init > > self._parse_block(None, self.top_node, self.top_node).next = None > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block > > prev = self._parse_block(None, parent, prev) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block > > while self._next_line(): > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line > > self._tokens = self._tokenize(line) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize > > self._parse_assignment(s) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment > > s, i = self._expand_macro(s, i, ()) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro > > res += self._fn_val(new_args) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val > > return py_fn(self, *args) > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn > > kconf.filename, kconf.linenr, msg)) > > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported > > Traceback (most recent call last): > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > > res += args[int(new_args[0])] > > ValueError: invalid literal for int() with base 10: 'error-if' > > > > During handling of the above exception, another exception occurred: > > > > and the log is full of this (the warnings at the end look the same as before) > > > > # wc -l /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > > 11804 /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > > > > Maybe kernel_configcheck now needs KERNEL_LD exported as well? See: > > https://patchwork.openembedded.org/patch/169702/ > > which fixed do_configure with 5.4. > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From richard.purdie at linuxfoundation.org Wed Feb 5 19:02:04 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 05 Feb 2020 19:02:04 +0000 Subject: [OE-core] Reproducible Builds Issue Status In-Reply-To: References: Message-ID: <763401698becd74610d4771100229b0a5350847f.camel@linuxfoundation.org> On Wed, 2020-02-05 at 14:27 +0000, Richard Purdie wrote: > Good news is we're down to a set of specific issues and those issues > seem "stable". The ones we haven't fixed yet with master-next are: > > /srv/autobuilder/autobuilder.yoctoproject.org/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl: > (https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl/) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb > (needs a bug) Ross has a patch for the gtk3 issue (thanks!). > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13771) I've sent a patch for libidn2. > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/ncurses-doc_6.1+20191019-r0_amd64.deb > (needs a bug) Still needs a bug, not looked at. > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/openssl-ptest_1.1.1d-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13770) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dbg_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13773) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dev_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13772) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-config-heavy_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13774) 13772 is looking to be partially a dash vs bash issue. 13774 is partially a sorting issue from perl-cross, I've something locally I'm experimenting with. There are multiple perl issues intertwined and I suspect several more issues to find. > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-data-dumper_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-ptest_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar-dbg_1.32-r0_amd64.deb > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar_1.32-r0_amd64.deb > (needs a bug) This one is fixed, patch out for review. > Also: > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13776 > (didn't show on this set of builds) I looked at and commented on this but don't know how to reproduce. Cheers, Richard From pkj at axis.com Wed Feb 5 19:15:40 2020 From: pkj at axis.com (Peter Kjellerstedt) Date: Wed, 5 Feb 2020 20:15:40 +0100 Subject: [OE-core] [zeus][PATCH] devtool/standard.py: Allow recipe to disable menuconfig logic Message-ID: <20200205191540.9200-1-pkj@axis.com> From: Tom Hochstein u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie Signed-off-by: Peter Kjellerstedt --- scripts/lib/devtool/standard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 60c9a046f9..b43c725cf8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -940,8 +940,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' + ' cp ${B}/.config ${S}/.config.baseline\n' + ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- 2.21.1 From bruce.ashfield at gmail.com Wed Feb 5 19:42:58 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Wed, 5 Feb 2020 14:42:58 -0500 Subject: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe In-Reply-To: <20200205174310.avol4qigjn4hweda@jama> References: <20200203212641.57611-1-bruce.ashfield@gmail.com> <20200203221142.7jljrrrjxic3qtau@jama> <20200205174310.avol4qigjn4hweda@jama> Message-ID: On Wed, Feb 5, 2020 at 12:43 PM Martin Jansa wrote: > > On Wed, Feb 05, 2020 at 11:16:03AM -0500, Bruce Ashfield wrote: > > On Mon, Feb 3, 2020 at 5:11 PM Martin Jansa wrote: > > > > > > On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfield at gmail.com wrote: > > > > From: Bruce Ashfield > > > > > > > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > > > > python3 safe: > > > > > > > > - we explicitly call /usr/bin/env python3 > > > > - we full specifiy our symbols > > > > - do not assume that 'None' can be converted to a string > > > > > > > > Signed-off-by: Bruce Ashfield > > > > --- > > > > > > > > I didn't realized the v5.4 series had gone in, or I would have > > > > send this sooner. This should resolve the errors that are thrown > > > > when symbol_why is run to detect missing symbol dependencies. > > > > > > > > Bruce > > > > > > > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > > index a4c0b6fb8a..57ec1abc6d 100644 > > > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > > > > > > > DEPENDS = "git-native" > > > > > > > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > > > > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > > > > PR = "r12" > > > > PV = "0.2+git${SRCPV}" > > > > > > This needs a bit more cleanup for python3. > > > > Martin, > > > > I've got builds and tests running on the rest of the patches that have > > come in recently, and I wanted to loop back to this one. > > > > I'm dropping into a devshell and running the symbol_why.py script > > using python3 from the sysroot and I didn't see the same issues (But I > > do have changes for what's in your log). > > > > I'll double check once my build churns through the queued patches > > here, but I thought I'd check with you to see if you are still seeing > > this with the various fixes for the gold linker you've pulled together > > ? I'm guessing that now that it isn't aborting early, the warnings > > aren't triggering and hence it isn't even running (like it was in my > > runs), so you can't say one way or the other, > > > > I'm mainly interested to hear if it was a host python3 or the > > sysroot-native one that was tossing those errors, so I can detangle my > > last changes and test in a similar env. > > I think it was combination of gold triggering the error in Kbuild: > > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported > which was then incorrectly handled by kconfiglib.py, the error handling > issue is very likely still there, just no longer triggered for me > after passing KERNEL_LD. > Agreed, there's some conditionals in the processing that with your linker fixes, are being avoided. > I still have your SRCREV bump included in my builds, but it seems to be > unrelated to kconfiglib.py issue shown in my build > http://git.yoctoproject.org/cgit/cgit.cgi/wr-kernel-tools/commit/?id=5358eb293399867db05fd73d04ce908d69a03bed > I'll loop back and do some additional tests and ensure that I'm using a few variants of python3, since I have a test here that triggers symbol resolution even on a good pass. > With all the queued fixes for KERNEL_LD I was able to build whole > image with ld-is-gold > That is good news! > with log.kernel_configme not showing any python exceptions > just couple symbols which then aren't included in > log.kernel_configcheck, so I assume these are expected (whole log at the > end). Yah, that's the noise that I was talking about in the other reply. Due to the way some fragments are stacked there are some unavoidable warnings. The audit heuristics know they aren't critical for a boot and didn't come from a SRC_URI fragment, so it lets things keep running with those warnings. I'm still doing another pass through them to look if I should fix any, but what you are seeing is expected at the moment. > > I was also able to boot it with qemu for testimage tasks > > There are 3 failing tests for core-image-sato-sdk-ptest: > SUMMARY: > core-image-sato-sdk-ptest () - Ran 62 tests in 7387.915s > core-image-sato-sdk-ptest - FAIL - Required tests failed (successes=34, skipped=24, failures=3, errors=0) > ERROR: core-image-sato-sdk-ptest-1.0-r0 do_testimage: core-image-sato-sdk-ptest - FAILED - check the task log and the ssh log > > RESULTS - kernelmodule.KernelModuleTest.test_kernel_module: FAILED (2.98s) > RESULTS - rpm.RpmBasicTest.test_rpm_query: FAILED (0.22s) > RESULTS - systemd.SystemdBasicTests.test_systemd_failed: FAILED (0.35s) > > Only the first one seems to be related to ld-is-gold and 5.4 kernel (as > reported in separate e-mail before), rpm test failed probably because > I'm using package_ipk not rpm and systemd test failed because of > mdmon at md125.service failing. > > I don't have a good base build to compare with, I usually don't use > testimage and all my previous tries failed even more badly :). I feel the pain! Thanks for mucking through the gold linker issues, I do remember looking at the patch going into the mainline kernel to poison things if it was used, but I just didn't map it to something that would blow up that spectacularly in our builds. Bruce > > log.kernel_configme: > > DEBUG: Executing python function extend_recipe_sysroot > NOTE: Direct dependencies are ['/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot'] > NOTE: Installed into sysroot: [] > NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'gcc-cross-x86_64', 'bc-native', 'bison-native', 'quilt-native', 'binutils-cross-x86_64', 'libtool-native', 'gnu-config-native', 'xz-native', 'autoconf-native', 'flex-native', 'gettext-minimal-native', 'texinfo-dummy-native', 'automake-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'zlib-native', 'gmp-native', 'readline-native', 'm4-native', 'ncurses-native', 'pkgconfig-native'] > DEBUG: Python function extend_recipe_sysroot finished > DEBUG: Executing shell function do_kernel_configme > Using .kernel-meta/configs/v5.4/ktypes/base/base.cfg as base > Merging .kernel-meta/configs/v5.4/standard/ktypes/standard/standard.cfg > Merging .kernel-meta/configs/v5.4/standard/features/kgdb/kgdb.cfg > Merging .kernel-meta/configs/v5.4/standard/features/kgdb/kgdb-x86.cfg > Merging .kernel-meta/configs/v5.4/standard/features/firmware/firmware.cfg > Value of CONFIG_FW_LOADER is redefined by fragment .kernel-meta/configs/v5.4/standard/features/firmware/firmware.cfg: > Previous value: # CONFIG_FW_LOADER is not set > New value: CONFIG_FW_LOADER=m > > Merging .kernel-meta/configs/v5.4/standard/features/lttng/lttng.cfg > Merging .kernel-meta/configs/v5.4/standard/features/blktrace/blktrace.cfg > Merging .kernel-meta/configs/v5.4/standard/features/systemtap/systemtap.cfg > Value of CONFIG_DEBUG_INFO is redefined by fragment .kernel-meta/configs/v5.4/standard/features/systemtap/systemtap.cfg: > Previous value: # CONFIG_DEBUG_INFO is not set > New value: CONFIG_DEBUG_INFO=y > > Merging .kernel-meta/configs/v5.4/standard/features/kprobes/kprobes.cfg > Merging .kernel-meta/configs/v5.4/standard/features/uprobe/uprobe.cfg > Merging .kernel-meta/configs/v5.4/standard/features/utrace/utrace.cfg > Merging .kernel-meta/configs/v5.4/standard/features/ftrace/ftrace.cfg > Merging .kernel-meta/configs/v5.4/standard/features/hrt/hrt.cfg > Merging .kernel-meta/configs/v5.4/standard/features/uprobe/uprobe.cfg > Merging .kernel-meta/configs/v5.4/standard/features/kprobes/kprobes.cfg > Merging .kernel-meta/configs/v5.4/standard/features/tmpfs/tmpfs-posix-acl.cfg > Merging .kernel-meta/configs/v5.4/standard/features/cgroups/cgroups.cfg > Merging .kernel-meta/configs/v5.4/standard/features/namespaces/namespaces.cfg > Merging .kernel-meta/configs/v5.4/standard/features/net_sched/net_sched.cfg > Merging .kernel-meta/configs/v5.4/standard/features/vdso/vdso.cfg > Merging .kernel-meta/configs/v5.4/standard/features/fuse/fuse.cfg > Merging .kernel-meta/configs/v5.4/standard/features/input/input.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/fs/devtmpfs.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/fs/debugfs.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/fs/btrfs.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/fs/ext4.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/net/ipsec.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/net/ipv6.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/net/ipsec.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/net/ipsec6.cfg > Value of CONFIG_CRYPTO_SEQIV is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/net/ipsec6.cfg: > Previous value: CONFIG_CRYPTO_SEQIV=y > New value: CONFIG_CRYPTO_SEQIV=m > > Merging .kernel-meta/configs/v5.4/standard/cfg/net/ip_nf.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/net/ip6_nf.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/net/bridge.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/systemd.cfg > Merging .kernel-meta/configs/v5.4/standard/features/rfkill/rfkill.cfg > Merging .kernel-meta/configs/v5.4/standard/features/bpf/bpf.cfg > Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc-64/common-pc-64-cpu.cfg > Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-drivers.cfg > Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-eth.cfg > Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-gfx.cfg > Merging .kernel-meta/configs/v5.4/standard/bsp/common-pc/common-pc-wifi.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/efi.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg > Value of CONFIG_EFI_PARTITION is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/efi-ext.cfg: > Previous value: # CONFIG_EFI_PARTITION is not set > New value: CONFIG_EFI_PARTITION=y > > Merging .kernel-meta/configs/v5.4/standard/cfg/efi.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/timer/hpet.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/timer/no_hz.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/x86_base.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg > Value of CONFIG_NR_CPUS is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/smp_64.cfg: > Previous value: CONFIG_NR_CPUS=24 > New value: CONFIG_NR_CPUS=64 > > Merging .kernel-meta/configs/v5.4/standard/cfg/timer/hz_1000.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/x86_64.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/amd.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/intel.cfg > Merging .kernel-meta/configs/v5.4/standard/features/pci/pci.cfg > Merging .kernel-meta/configs/v5.4/standard/features/pci-iov/pci-iov.cfg > Merging .kernel-meta/configs/v5.4/standard/features/mmc/mmc-base.cfg > Merging .kernel-meta/configs/v5.4/standard/features/mmc/mmc-sdhci.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/ehci-hcd.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/uhci-hcd.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/ohci-hcd.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/xhci-hcd.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/usb-base.cfg > Merging .kernel-meta/configs/v5.4/standard/features/input/touchscreen.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb/touchscreen-composite.cfg > Merging .kernel-meta/configs/v5.4/standard/features/usb-net/usb-net.cfg > Merging .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e100.cfg > Value of CONFIG_E100 is redefined by fragment .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e100.cfg: > Previous value: CONFIG_E100=m > New value: CONFIG_E100=y > > Merging .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg > Value of CONFIG_E1000E is redefined by fragment .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg: > Previous value: CONFIG_E1000E=m > New value: CONFIG_E1000E=y > > Value of CONFIG_E1000 is redefined by fragment .kernel-meta/configs/v5.4/standard/features/intel-e1xxxx/intel-e1xxxx.cfg: > Previous value: CONFIG_E1000=m > New value: CONFIG_E1000=y > > Merging .kernel-meta/configs/v5.4/standard/features/igb/igb.cfg > Merging .kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg > Merging .kernel-meta/configs/v5.4/standard/features/scsi/cdrom.cfg > Merging .kernel-meta/configs/v5.4/standard/features/x2apic/x2apic.cfg > Merging .kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg > Value of CONFIG_BT is redefined by fragment .kernel-meta/configs/v5.4/standard/features/bluetooth/bluetooth.cfg: > Previous value: # CONFIG_BT is not set > New value: CONFIG_BT=y > > Merging .kernel-meta/configs/v5.4/standard/features/6lowpan/6lowpan.cfg > Merging .kernel-meta/configs/v5.4/standard/features/power/intel.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/8250.cfg > Merging .kernel-meta/configs/v5.4/standard/features/i915/i915.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/fs/vfat.cfg > Value of CONFIG_NLS_CODEPAGE_437 is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/fs/vfat.cfg: > Previous value: CONFIG_NLS_CODEPAGE_437=m > New value: CONFIG_NLS_CODEPAGE_437=y > > Value of CONFIG_NLS_ISO8859_1 is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/fs/vfat.cfg: > Previous value: CONFIG_NLS_ISO8859_1=m > New value: CONFIG_NLS_ISO8859_1=y > > Merging .kernel-meta/configs/v5.4/standard/cfg/boot-live.cfg > Value of CONFIG_BLK_DEV_LOOP is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/boot-live.cfg: > Previous value: CONFIG_BLK_DEV_LOOP=m > New value: CONFIG_BLK_DEV_LOOP=y > > Merging .kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg > Merging .kernel-meta/configs/v5.4/standard/features/scsi/disk.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/fs/vfat.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/usb-mass-storage.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/virtio.cfg > Merging .kernel-meta/configs/v5.4/standard//usb-base.cfg > Merging .kernel-meta/configs/v5.4/standard/features/media/media.cfg > Merging .kernel-meta/configs/v5.4/standard/features/media/media-usb-webcams.cfg > Merging .kernel-meta/configs/v5.4/standard/features/sound/snd_hda_intel.cfg > Merging .kernel-meta/configs/v5.4/standard/features/nfsd/nfsd.cfg > Merging .kernel-meta/configs/v5.4/standard/features/debug/printk.cfg > Merging .kernel-meta/configs/v5.4/standard/features/kernel-sample/kernel-sample.cfg > Merging .kernel-meta/configs/v5.4/standard/features/netfilter/netfilter.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/virtio.cfg > Merging .kernel-meta/configs/v5.4/standard/features/drm-bochs/drm-bochs.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/sound.cfg > Value of CONFIG_SOUND is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/sound.cfg: > Previous value: CONFIG_SOUND=y > New value: CONFIG_SOUND=m > > Value of CONFIG_SND is redefined by fragment .kernel-meta/configs/v5.4/standard/cfg/sound.cfg: > Previous value: CONFIG_SND=y > New value: CONFIG_SND=m > > Merging .kernel-meta/configs/v5.4/standard/cfg/hv-guest.cfg > Merging .kernel-meta/configs/v5.4/standard/cfg/paravirt_kvm.cfg > Merging .kernel-meta/configs/v5.4/standard/features/scsi/scsi.cfg > Merging .kernel-meta/configs/v5.4/standard/features/scsi/scsi-debug.cfg > make[1]: Entering directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > GEN Makefile > HOSTCC scripts/basic/fixdep > HOSTCC scripts/kconfig/conf.o > HOSTCC scripts/kconfig/confdata.o > HOSTCC scripts/kconfig/expr.o > LEX scripts/kconfig/lexer.lex.c > YACC scripts/kconfig/parser.tab.[ch] > HOSTCC scripts/kconfig/lexer.lex.o > HOSTCC scripts/kconfig/parser.tab.o > HOSTCC scripts/kconfig/preprocess.o > HOSTCC scripts/kconfig/symbol.o > HOSTLD scripts/kconfig/conf > scripts/kconfig/conf --alldefconfig Kconfig > ./.tmp.config.IzRt9b1cd6:2208:warning: unexpected data: # > ./.tmp.config.IzRt9b1cd6:2209:warning: unexpected data: # Generic Driver Options > ./.tmp.config.IzRt9b1cd6:2210:warning: unexpected data: # > ./.tmp.config.IzRt9b1cd6:3092:warning: symbol value 'm' invalid for SAMPLE_SECCOMP > ./.tmp.config.IzRt9b1cd6:3109:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE > ./.tmp.config.IzRt9b1cd6:3110:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP > ./.tmp.config.IzRt9b1cd6:3111:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE > # > # configuration written to .config > # > make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86_64-standard-build' > Value requested for CONFIG_KALLSYMS_ALL not in final .config > Requested value: # CONFIG_KALLSYMS_ALL is not set > Actual value: > > Value requested for CONFIG_DEBUG_DRIVER not in final .config > Requested value: # CONFIG_DEBUG_DRIVER is not set > Actual value: > > Value requested for CONFIG_HUGETLB_PAGE not in final .config > Requested value: # CONFIG_HUGETLB_PAGE is not set > Actual value: > > Value requested for CONFIG_SCHEDSTATS not in final .config > Requested value: # CONFIG_SCHEDSTATS is not set > Actual value: > > Value requested for CONFIG_DEBUG_SLAB not in final .config > Requested value: # CONFIG_DEBUG_SLAB is not set > Actual value: > > Value requested for CONFIG_DEBUG_SPINLOCK not in final .config > Requested value: # CONFIG_DEBUG_SPINLOCK is not set > Actual value: > > Value requested for CONFIG_DEBUG_KOBJECT not in final .config > Requested value: # CONFIG_DEBUG_KOBJECT is not set > Actual value: > > Value requested for CONFIG_DEBUG_HIGHMEM not in final .config > Requested value: # CONFIG_DEBUG_HIGHMEM is not set > Actual value: > > Value requested for CONFIG_KEYS not in final .config > Requested value: # CONFIG_KEYS is not set > Actual value: CONFIG_KEYS=y > > Value requested for CONFIG_REISERFS_CHECK not in final .config > Requested value: # CONFIG_REISERFS_CHECK is not set > Actual value: > > Value requested for CONFIG_REISERFS_FS_SECURITY not in final .config > Requested value: # CONFIG_REISERFS_FS_SECURITY is not set > Actual value: > > Value requested for CONFIG_FAT_FS not in final .config > Requested value: CONFIG_FAT_FS=m > Actual value: CONFIG_FAT_FS=y > > Value requested for CONFIG_KGDB not in final .config > Requested value: CONFIG_KGDB=y > Actual value: > > Value requested for CONFIG_KGDB_KDB not in final .config > Requested value: CONFIG_KGDB_KDB=y > Actual value: > > Value requested for CONFIG_KDB_KEYBOARD not in final .config > Requested value: CONFIG_KDB_KEYBOARD=y > Actual value: > > Value requested for CONFIG_KGDB_LOW_LEVEL_TRAP not in final .config > Requested value: CONFIG_KGDB_LOW_LEVEL_TRAP=y > Actual value: > > Value requested for CONFIG_FW_LOADER not in final .config > Requested value: CONFIG_FW_LOADER=m > Actual value: CONFIG_FW_LOADER=y > > Value requested for CONFIG_DEBUG_INFO not in final .config > Requested value: CONFIG_DEBUG_INFO=y > Actual value: > > Value requested for CONFIG_CGROUP_DEBUG not in final .config > Requested value: CONFIG_CGROUP_DEBUG=y > Actual value: > > Value requested for CONFIG_BFQ_CGROUP_DEBUG not in final .config > Requested value: # CONFIG_BFQ_CGROUP_DEBUG is not set > Actual value: > > Value requested for CONFIG_CRYPTO_SEQIV not in final .config > Requested value: CONFIG_CRYPTO_SEQIV=m > Actual value: CONFIG_CRYPTO_SEQIV=y > > Value requested for CONFIG_BRIDGE_NETFILTER not in final .config > Requested value: CONFIG_BRIDGE_NETFILTER=y > Actual value: CONFIG_BRIDGE_NETFILTER=m > > Value requested for CONFIG_V4L2_MEM2MEM_DEV not in final .config > Requested value: CONFIG_V4L2_MEM2MEM_DEV=m > Actual value: > > Value requested for CONFIG_VIDEOBUF_GEN not in final .config > Requested value: CONFIG_VIDEOBUF_GEN=m > Actual value: > > Value requested for CONFIG_VIDEOBUF_DMA_SG not in final .config > Requested value: CONFIG_VIDEOBUF_DMA_SG=m > Actual value: > > Value requested for CONFIG_VIDEOBUF_DMA_CONTIG not in final .config > Requested value: CONFIG_VIDEOBUF_DMA_CONTIG=m > Actual value: > > Value requested for CONFIG_VIDEOBUF_VMALLOC not in final .config > Requested value: CONFIG_VIDEOBUF_VMALLOC=m > Actual value: > > Value requested for CONFIG_VIDEOBUF2_DMA_SG not in final .config > Requested value: CONFIG_VIDEOBUF2_DMA_SG=m > Actual value: > > Value requested for CONFIG_VIDEOBUF2_DMA_CONTIG not in final .config > Requested value: CONFIG_VIDEOBUF2_DMA_CONTIG=m > Actual value: > > Value requested for CONFIG_DVB_CORE not in final .config > Requested value: CONFIG_DVB_CORE=y > Actual value: > > Value requested for CONFIG_DVB_NET not in final .config > Requested value: CONFIG_DVB_NET=y > Actual value: > > Value requested for CONFIG_DVB_MAX_ADAPTERS not in final .config > Requested value: CONFIG_DVB_MAX_ADAPTERS=8 > Actual value: > > Value requested for CONFIG_DVB_DYNAMIC_MINORS not in final .config > Requested value: CONFIG_DVB_DYNAMIC_MINORS=y > Actual value: > > Value requested for CONFIG_MEDIA_ATTACH not in final .config > Requested value: CONFIG_MEDIA_ATTACH=y > Actual value: > > Value requested for CONFIG_NFSD_FAULT_INJECTION not in final .config > Requested value: # CONFIG_NFSD_FAULT_INJECTION is not set > Actual value: > > Value requested for CONFIG_TTY_PRINTK not in final .config > Requested value: CONFIG_TTY_PRINTK=y > Actual value: > > Value requested for CONFIG_SAMPLE_CONNECTOR not in final .config > Requested value: CONFIG_SAMPLE_CONNECTOR=m > Actual value: > > Value requested for CONFIG_SAMPLE_SECCOMP not in final .config > Requested value: CONFIG_SAMPLE_SECCOMP=m > Actual value: > > Value requested for CONFIG_NF_CT_PROTO_GRE not in final .config > Requested value: CONFIG_NF_CT_PROTO_GRE=m > Actual value: CONFIG_NF_CT_PROTO_GRE=y > > Value requested for CONFIG_NF_CT_PROTO_SCTP not in final .config > Requested value: CONFIG_NF_CT_PROTO_SCTP=m > Actual value: CONFIG_NF_CT_PROTO_SCTP=y > > Value requested for CONFIG_NF_CT_PROTO_UDPLITE not in final .config > Requested value: CONFIG_NF_CT_PROTO_UDPLITE=m > Actual value: CONFIG_NF_CT_PROTO_UDPLITE=y > > Value requested for CONFIG_NF_NAT_SNMP_BASIC not in final .config > Requested value: CONFIG_NF_NAT_SNMP_BASIC=m > Actual value: > > Value requested for CONFIG_SOUND_OSS_CORE not in final .config > Requested value: # CONFIG_SOUND_OSS_CORE is not set > Actual value: > > Value requested for CONFIG_SND_COMPRESS_OFFLOAD not in final .config > Requested value: CONFIG_SND_COMPRESS_OFFLOAD=m > Actual value: > > Value requested for CONFIG_SND_MIXER_OSS not in final .config > Requested value: # CONFIG_SND_MIXER_OSS is not set > Actual value: > > Value requested for CONFIG_SND_PCM_OSS not in final .config > Requested value: # CONFIG_SND_PCM_OSS is not set > Actual value: > > Value requested for CONFIG_SND_SEQUENCER_OSS not in final .config > Requested value: # CONFIG_SND_SEQUENCER_OSS is not set > Actual value: > > Value requested for CONFIG_SND_SOC_AC97_BUS not in final .config > Requested value: CONFIG_SND_SOC_AC97_BUS=y > Actual value: > > Value requested for CONFIG_SND_SOC_COMPRESS not in final .config > Requested value: CONFIG_SND_SOC_COMPRESS=y > Actual value: > > Value requested for CONFIG_SND_SOC_AMD_ACP not in final .config > Requested value: CONFIG_SND_SOC_AMD_ACP=m > Actual value: > > Value requested for CONFIG_SND_SST_ATOM_HIFI2_PLATFORM not in final .config > Requested value: CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m > Actual value: > > Value requested for CONFIG_SND_SST_IPC not in final .config > Requested value: CONFIG_SND_SST_IPC=m > Actual value: > > Value requested for CONFIG_SND_SST_IPC_ACPI not in final .config > Requested value: CONFIG_SND_SST_IPC_ACPI=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_SST_FIRMWARE not in final .config > Requested value: CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_HASWELL not in final .config > Requested value: CONFIG_SND_SOC_INTEL_HASWELL=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_HASWELL_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_HASWELL_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_BXT_RT298_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_BROADWELL_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH not in final .config > Requested value: CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m > Actual value: > > Value requested for CONFIG_SND_SOC_INTEL_SKYLAKE not in final .config > Requested value: CONFIG_SND_SOC_INTEL_SKYLAKE=m > Actual value: > > Value requested for CONFIG_SND_SOC_AC97_CODEC not in final .config > Requested value: CONFIG_SND_SOC_AC97_CODEC=m > Actual value: > > Value requested for CONFIG_SND_SOC_AK4104 not in final .config > Requested value: CONFIG_SND_SOC_AK4104=m > Actual value: > > Value requested for CONFIG_SND_SOC_AK4554 not in final .config > Requested value: CONFIG_SND_SOC_AK4554=m > Actual value: > > Value requested for CONFIG_SND_SOC_AK4613 not in final .config > Requested value: CONFIG_SND_SOC_AK4613=m > Actual value: > > Value requested for CONFIG_SND_SOC_AK4642 not in final .config > Requested value: CONFIG_SND_SOC_AK4642=m > Actual value: > > Value requested for CONFIG_SND_SOC_AK5386 not in final .config > Requested value: CONFIG_SND_SOC_AK5386=m > Actual value: > > Value requested for CONFIG_SND_SOC_ALC5623 not in final .config > Requested value: CONFIG_SND_SOC_ALC5623=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS35L32 not in final .config > Requested value: CONFIG_SND_SOC_CS35L32=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS35L33 not in final .config > Requested value: CONFIG_SND_SOC_CS35L33=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS42L51 not in final .config > Requested value: CONFIG_SND_SOC_CS42L51=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS42L51_I2C not in final .config > Requested value: CONFIG_SND_SOC_CS42L51_I2C=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS42L52 not in final .config > Requested value: CONFIG_SND_SOC_CS42L52=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS42L56 not in final .config > Requested value: CONFIG_SND_SOC_CS42L56=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS42L73 not in final .config > Requested value: CONFIG_SND_SOC_CS42L73=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS4265 not in final .config > Requested value: CONFIG_SND_SOC_CS4265=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS4270 not in final .config > Requested value: CONFIG_SND_SOC_CS4270=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS4271 not in final .config > Requested value: CONFIG_SND_SOC_CS4271=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS4271_I2C not in final .config > Requested value: CONFIG_SND_SOC_CS4271_I2C=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS4271_SPI not in final .config > Requested value: CONFIG_SND_SOC_CS4271_SPI=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS42XX8 not in final .config > Requested value: CONFIG_SND_SOC_CS42XX8=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS42XX8_I2C not in final .config > Requested value: CONFIG_SND_SOC_CS42XX8_I2C=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS4349 not in final .config > Requested value: CONFIG_SND_SOC_CS4349=m > Actual value: > > Value requested for CONFIG_SND_SOC_CS53L30 not in final .config > Requested value: CONFIG_SND_SOC_CS53L30=m > Actual value: > > Value requested for CONFIG_SND_SOC_DA7219 not in final .config > Requested value: CONFIG_SND_SOC_DA7219=m > Actual value: > > Value requested for CONFIG_SND_SOC_MAX98090 not in final .config > Requested value: CONFIG_SND_SOC_MAX98090=m > Actual value: > > Value requested for CONFIG_SND_SOC_MAX98357A not in final .config > Requested value: CONFIG_SND_SOC_MAX98357A=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM1681 not in final .config > Requested value: CONFIG_SND_SOC_PCM1681=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM179X not in final .config > Requested value: CONFIG_SND_SOC_PCM179X=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM179X_I2C not in final .config > Requested value: CONFIG_SND_SOC_PCM179X_I2C=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM179X_SPI not in final .config > Requested value: CONFIG_SND_SOC_PCM179X_SPI=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM3168A not in final .config > Requested value: CONFIG_SND_SOC_PCM3168A=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM3168A_I2C not in final .config > Requested value: CONFIG_SND_SOC_PCM3168A_I2C=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM3168A_SPI not in final .config > Requested value: CONFIG_SND_SOC_PCM3168A_SPI=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM512x not in final .config > Requested value: CONFIG_SND_SOC_PCM512x=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM512x_I2C not in final .config > Requested value: CONFIG_SND_SOC_PCM512x_I2C=m > Actual value: > > Value requested for CONFIG_SND_SOC_PCM512x_SPI not in final .config > Requested value: CONFIG_SND_SOC_PCM512x_SPI=m > Actual value: > > Value requested for CONFIG_SND_SOC_RL6231 not in final .config > Requested value: CONFIG_SND_SOC_RL6231=m > Actual value: > > Value requested for CONFIG_SND_SOC_RT298 not in final .config > Requested value: CONFIG_SND_SOC_RT298=m > Actual value: > > Value requested for CONFIG_SND_SOC_RT5616 not in final .config > Requested value: CONFIG_SND_SOC_RT5616=m > Actual value: > > Value requested for CONFIG_SND_SOC_RT5631 not in final .config > Requested value: CONFIG_SND_SOC_RT5631=m > Actual value: > > Value requested for CONFIG_SND_SOC_RT5640 not in final .config > Requested value: CONFIG_SND_SOC_RT5640=m > Actual value: > > Value requested for CONFIG_SND_SOC_RT5645 not in final .config > Requested value: CONFIG_SND_SOC_RT5645=m > Actual value: > > Value requested for CONFIG_SND_SOC_RT5651 not in final .config > Requested value: CONFIG_SND_SOC_RT5651=m > Actual value: > > Value requested for CONFIG_SND_SOC_RT5670 not in final .config > Requested value: CONFIG_SND_SOC_RT5670=m > Actual value: > > Value requested for CONFIG_SND_SOC_SPDIF not in final .config > Requested value: CONFIG_SND_SOC_SPDIF=m > Actual value: > > Value requested for CONFIG_SND_SOC_SSM4567 not in final .config > Requested value: CONFIG_SND_SOC_SSM4567=m > Actual value: > > Value requested for CONFIG_SND_SOC_TLV320AIC31XX not in final .config > Requested value: CONFIG_SND_SOC_TLV320AIC31XX=m > Actual value: > > Value requested for CONFIG_SND_SOC_TLV320AIC3X not in final .config > Requested value: CONFIG_SND_SOC_TLV320AIC3X=m > Actual value: > > Value requested for CONFIG_SND_SOC_TS3A227E not in final .config > Requested value: CONFIG_SND_SOC_TS3A227E=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8510 not in final .config > Requested value: CONFIG_SND_SOC_WM8510=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8523 not in final .config > Requested value: CONFIG_SND_SOC_WM8523=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8580 not in final .config > Requested value: CONFIG_SND_SOC_WM8580=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8711 not in final .config > Requested value: CONFIG_SND_SOC_WM8711=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8728 not in final .config > Requested value: CONFIG_SND_SOC_WM8728=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8731 not in final .config > Requested value: CONFIG_SND_SOC_WM8731=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8737 not in final .config > Requested value: CONFIG_SND_SOC_WM8737=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8741 not in final .config > Requested value: CONFIG_SND_SOC_WM8741=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8750 not in final .config > Requested value: CONFIG_SND_SOC_WM8750=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8753 not in final .config > Requested value: CONFIG_SND_SOC_WM8753=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8770 not in final .config > Requested value: CONFIG_SND_SOC_WM8770=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8776 not in final .config > Requested value: CONFIG_SND_SOC_WM8776=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8804 not in final .config > Requested value: CONFIG_SND_SOC_WM8804=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8804_I2C not in final .config > Requested value: CONFIG_SND_SOC_WM8804_I2C=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8804_SPI not in final .config > Requested value: CONFIG_SND_SOC_WM8804_SPI=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8903 not in final .config > Requested value: CONFIG_SND_SOC_WM8903=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8960 not in final .config > Requested value: CONFIG_SND_SOC_WM8960=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8962 not in final .config > Requested value: CONFIG_SND_SOC_WM8962=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8974 not in final .config > Requested value: CONFIG_SND_SOC_WM8974=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8978 not in final .config > Requested value: CONFIG_SND_SOC_WM8978=m > Actual value: > > Value requested for CONFIG_SND_SOC_WM8985 not in final .config > Requested value: CONFIG_SND_SOC_WM8985=m > Actual value: > > Value requested for CONFIG_SND_SOC_NAU8825 not in final .config > Requested value: CONFIG_SND_SOC_NAU8825=m > Actual value: > > Value requested for CONFIG_SND_SOC_TPA6130A2 not in final .config > Requested value: CONFIG_SND_SOC_TPA6130A2=m > Actual value: > > Value requested for CONFIG_SND_SIMPLE_CARD_UTILS not in final .config > Requested value: CONFIG_SND_SIMPLE_CARD_UTILS=m > Actual value: > > Value requested for CONFIG_SND_SIMPLE_CARD not in final .config > Requested value: CONFIG_SND_SIMPLE_CARD=m > Actual value: > > DEBUG: Shell function do_kernel_configme finished > > > > > Cheers, > > > > Bruce > > > > > > > > DEBUG: Executing python function do_kernel_configcheck > > > Traceback (most recent call last): > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > > > res += args[int(new_args[0])] > > > ValueError: invalid literal for int() with base 10: 'error-if' > > > > > > During handling of the above exception, another exception occurred: > > > > > > Traceback (most recent call last): > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", line 295, in > > > conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 947, in __init__ > > > self._init(filename, warn, warn_to_stderr, encoding) > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 1085, in _init > > > self._parse_block(None, self.top_node, self.top_node).next = None > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2982, in _parse_block > > > prev = self._parse_block(None, parent, prev) > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2907, in _parse_block > > > while self._next_line(): > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2234, in _next_line > > > self._tokens = self._tokenize(line) > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2364, in _tokenize > > > self._parse_assignment(s) > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2604, in _parse_assignment > > > s, i = self._expand_macro(s, i, ()) > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2780, in _expand_macro > > > res += self._fn_val(new_args) > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2843, in _fn_val > > > return py_fn(self, *args) > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 6769, in _error_if_fn > > > kconf.filename, kconf.linenr, msg)) > > > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker 'x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot ' not supported > > > Traceback (most recent call last): > > > File "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", line 2776, in _expand_macro > > > res += args[int(new_args[0])] > > > ValueError: invalid literal for int() with base 10: 'error-if' > > > > > > During handling of the above exception, another exception occurred: > > > > > > and the log is full of this (the warnings at the end look the same as before) > > > > > > # wc -l /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > > > 11804 /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configcheck.28364 > > > > > > Maybe kernel_configcheck now needs KERNEL_LD exported as well? See: > > > https://patchwork.openembedded.org/patch/169702/ > > > which fixed do_configure with 5.4. > > > > > > > > -- > > - Thou shalt not follow the NULL pointer, for chaos and madness await > > thee at its end > > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bruce.ashfield at gmail.com Wed Feb 5 23:12:41 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:41 -0500 Subject: [OE-core] [PATCH 0/9] kernel-yocto: consolidated pull request Message-ID: From: Bruce Ashfield Hi all, I've kept the v5.4 content changes, as well as the kernel version default changes out of this series and instead focused it on the collection of kernel-yocto and kern-tools tweaks that I've gethered over the past few weeks. I have Martin's gold linker fixes included, as well as the re-org'ing of the linux-yocto tasks that Paul Barker did to make it usable as a single inherit of the bbclass. I also have a defconfig detection fix included that was sent to the list. I was able to confirm that my configuration was the same with this series enabled, and I was able to boot. That being said, I'll keep my eye out for any AB fallout and will continue some more build locally .. but I wanted to get this out today as promised. Cheers, Bruce The following changes since commit 3c6978c8db59f152693f9fae65dbab13ecfcaad4: kernel-yocto.bbclass: export LD in the environment used by kconf_check (2020-02-04 15:56:29 +0000) are available in the Git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (2): kern-tools: tweak symbol_why to be python safe kern-tools: integrate merge_config fix for gold linker Gavin Li (1): kernel-yocto: fix defconfig detection in find_sccs() Martin Jansa (3): kern-tools-native: use more common S value and oe_runmake kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created Paul Barker (3): kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass kernel-yocto: Drop setting of unused variables in do_kernel_metadata kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set meta/classes/kernel-yocto.bbclass | 43 +++++++++++++------ .../kern-tools/kern-tools-native_git.bb | 13 +++--- meta/recipes-kernel/linux/linux-yocto.inc | 21 --------- 3 files changed, 37 insertions(+), 40 deletions(-) -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:42 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:42 -0500 Subject: [OE-core] [PATCH 1/9] kern-tools: tweak symbol_why to be python safe In-Reply-To: References: Message-ID: From: Bruce Ashfield Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6fb8a..57ec1abc6d 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:43 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:43 -0500 Subject: [OE-core] [PATCH 2/9] kern-tools: integrate merge_config fix for gold linker In-Reply-To: References: Message-ID: <380f2a65d776b678f454c8dd4b2722aeb41da081.1580944129.git.bruce.ashfield@gmail.com> From: Bruce Ashfield Bumping the SRCREV to pickup the following fix: Author: Martin Jansa Date: Wed Feb 5 03:26:57 2020 +0100 merge_config.sh: pass LD variable from shell environment to make * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1abc6d..3f9cfe7fe5 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" +SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:44 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:44 -0500 Subject: [OE-core] [PATCH 3/9] kern-tools-native: use more common S value and oe_runmake In-Reply-To: References: Message-ID: <52b98a7fb4dea5caf2629ebe3339a559bf8e7ef0.1580944129.git.bruce.ashfield@gmail.com> From: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- .../kern-tools/kern-tools-native_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 3f9cfe7fe5..f263421234 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" DEPENDS = "git-native" @@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:45 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:45 -0500 Subject: [OE-core] [PATCH 4/9] kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass In-Reply-To: References: Message-ID: <8cdfd5e7fd2571a9e7ecaab332dad336bceb711b.1580944129.git.bruce.ashfield@gmail.com> From: Paul Barker This allows the kernel-yocto bbclass to be inherited in a recipe without needing to include linux-yocto.inc. The bbclass should stand on its own and linux-yocto.inc does a few things which may not be desired in other kernel recipes (such as modifying KERNEL_FEATURES). The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes may not want this setting in place. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeafeb9..a0362f6acb 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" +# The distro or local.conf should set this, but if nobody cares... +LINUX_KERNEL_TYPE ??= "standard" + +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" +SRCREV_FORMAT ?= "meta_machine" + +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" + # returns local (absolute) path names for all valid patches in the # src_uri def find_patches(d,subdir): @@ -475,3 +491,8 @@ python () { if 'do_diffconfig' in d: bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) } + +# extra tasks +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask validate_branches before do_patch after do_kernel_checkout +addtask kernel_configcheck after do_configure before do_compile diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index f191946f2a..91df9c1cd5 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -69,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:46 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:46 -0500 Subject: [OE-core] [PATCH 5/9] kernel-yocto: Drop setting of unused variables in do_kernel_metadata In-Reply-To: References: Message-ID: From: Paul Barker The machine_branch and machine_srcrev variables were set but not used in do_kernel_metadata. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a0362f6acb..9a4d2864eb 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -99,13 +99,6 @@ do_kernel_metadata() { fi fi - machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" - machine_srcrev="${SRCREV_machine}" - if [ -z "${machine_srcrev}" ]; then - # fallback to SRCREV if a non machine_meta tree is being built - machine_srcrev="${SRCREV}" - fi - # In a similar manner to the kernel itself: # # defconfig: $(obj)/conf -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:47 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:47 -0500 Subject: [OE-core] [PATCH 6/9] kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set In-Reply-To: References: Message-ID: <308b2425ab2d20304fe33ada34a3089967a24af8.1580944129.git.bruce.ashfield@gmail.com> From: Paul Barker CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9a4d2864eb..e8a9b1f18e 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -359,8 +359,10 @@ do_kernel_configme() { bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi - echo "# Global settings from linux recipe" >> ${B}/.config - echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then + echo "# Global settings from linux recipe" >> ${B}/.config + echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + fi } addtask kernel_configme before do_configure after do_patch -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:48 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:48 -0500 Subject: [OE-core] [PATCH 7/9] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: References: Message-ID: <14beb4fa55a56a8c5cc95f314073623f6c1b0039.1580944129.git.bruce.ashfield@gmail.com> From: Martin Jansa * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot'] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/automake-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/libtool-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gmp-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/ncurses-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pkgconfig-native/fixmepath | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot:g; s:FIXMESTAGINGDIRHOST:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native:g' -e 's:FIXME_PSEUDO_SYSROOT:/OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pseudo-native:g' -e 's:FIXME_HOSTTOOLS_DIR:/OE/build/oe-core/tmp-glibc/hosttools:g' -e 's:FIXME_PKGDATA_DIR:/OE/build/oe-core/tmp-glibc/pkgdata/qemux86:g' -e 's:FIXME_PSEUDO_LOCALSTATEDIR:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/pseudo/:g' -e 's:FIXME_LOGFIFO:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/fifo.10476:g' DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme DEBUG: Shell function do_kernel_configme finished ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case but doesn't. The merge_config_build.log shows 5.4 specific error: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported but then it happily continues reporting what isn't applied in not created .config file --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 @@ -171,586 +171,5113 @@ HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE -# -# configuration written to .config -# +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' +make: *** [Makefile:179: sub-make] Error 2 +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION not in final .config +Requested value: CONFIG_LOCALVERSION="" +Actual value: + +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config +Requested value: # CONFIG_LOCALVERSION_AUTO is not set +Actual value: * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate commit so that it can be discussed there. Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index e8a9b1f18e..f71aa7d0a6 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -354,7 +354,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:49 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:49 -0500 Subject: [OE-core] [PATCH 8/9] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: References: Message-ID: From: Martin Jansa * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f71aa7d0a6..d961901b74 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -354,8 +352,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- 2.19.1 From bruce.ashfield at gmail.com Wed Feb 5 23:12:50 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Wed, 5 Feb 2020 18:12:50 -0500 Subject: [OE-core] [PATCH 9/9] kernel-yocto: fix defconfig detection in find_sccs() In-Reply-To: References: Message-ID: <36300ff0f34f374ade66d2a35d0f9771a187ec7e.1580944129.git.bruce.ashfield@gmail.com> From: Gavin Li The current code would cause a file like "config.bin" to added to the config sources list. I am sure the intention was to add any files with defconfig in its name and not the other way around. Signed-off-by: Gavin Li Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d961901b74..918d101d3d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -47,7 +47,7 @@ def find_sccs(d): base, ext = os.path.splitext(os.path.basename(s)) if ext and ext in [".scc", ".cfg"]: sources_list.append(s) - elif base and base in 'defconfig': + elif base and 'defconfig' in base: sources_list.append(s) return sources_list -- 2.19.1 From patchwork at patchwork.openembedded.org Wed Feb 5 23:32:00 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 05 Feb 2020 23:32:00 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_kernel-yoc?= =?utf-8?q?to=3A_consolidated_pull_request?= In-Reply-To: References: Message-ID: <20200205233200.2276.7050@do> == Series Details == Series: kernel-yocto: consolidated pull request Revision: 1 URL : https://patchwork.openembedded.org/series/22442/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [8/9] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created Issue Commit shortlog is too long [test_shortlog_length] Suggested fix Edit shortlog so that it is 90 characters or less (currently 122 characters) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From randy.macleod at windriver.com Wed Feb 5 23:42:04 2020 From: randy.macleod at windriver.com (Randy MacLeod) Date: Wed, 5 Feb 2020 18:42:04 -0500 Subject: [OE-core] Reproducible Builds Issue Status In-Reply-To: <763401698becd74610d4771100229b0a5350847f.camel@linuxfoundation.org> References: <763401698becd74610d4771100229b0a5350847f.camel@linuxfoundation.org> Message-ID: <390369cc-1e42-86cb-f2d3-4f1ee240fd23@windriver.com> On 2/5/20 2:02 PM, Richard Purdie wrote: > On Wed, 2020-02-05 at 14:27 +0000, Richard Purdie wrote: >> Good news is we're down to a set of specific issues and those issues >> seem "stable". The ones we haven't fixed yet with master-next are: >> >> /srv/autobuilder/autobuilder.yoctoproject.org/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl: >> (https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl/) >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb >> (needs a bug) > > Ross has a patch for the gtk3 issue (thanks!). > >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb >> (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13771) > > I've sent a patch for libidn2. > >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/ncurses-doc_6.1+20191019-r0_amd64.deb >> (needs a bug) > > Still needs a bug, not looked at. Minimal bug report created: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13781 Richard claimed that the rest are in hand there are no other defects to file. ../Randy > >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/openssl-ptest_1.1.1d-r0_amd64.deb >> (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13770) >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dbg_5.30.1-r0_amd64.deb >> (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13773) >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dev_5.30.1-r0_amd64.deb >> (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13772) >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-config-heavy_5.30.1-r0_amd64.deb >> (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13774) > > 13772 is looking to be partially a dash vs bash issue. > 13774 is partially a sorting issue from perl-cross, I've something > locally I'm experimenting with. > > There are multiple perl issues intertwined and I suspect several more > issues to find. > >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-data-dumper_5.30.1-r0_amd64.deb >> (unfiled, may be related to above 13772) >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-ptest_5.30.1-r0_amd64.deb >> (unfiled, may be related to above 13772) >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl_5.30.1-r0_amd64.deb >> (unfiled, may be related to above 13772) >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar-dbg_1.32-r0_amd64.deb >> /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar_1.32-r0_amd64.deb >> (needs a bug) > > This one is fixed, patch out for review. > >> Also: >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=13776 >> (didn't show on this set of builds) > > I looked at and commented on this but don't know how to reproduce. > > Cheers, > > Richard > > -- # Randy MacLeod # Wind River Linux From anuj.mittal at intel.com Thu Feb 6 00:03:10 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Thu, 6 Feb 2020 08:03:10 +0800 Subject: [OE-core] [zeus][PATCH] Revert "bzip2: Fix CVE-2019-12900" Message-ID: <20200206000310.109984-1-anuj.mittal@intel.com> This reverts commit 175e6cb75ce328d51a9d4ad18c7e09d9fb92c2e1. This change is already in bzip2 1.0.7. The change fixing a regression caused by this change is in 1.0.8 which is the current version in zeus. This isn't resulting in failures because the patch file isn't included in SRC_URI. Signed-off-by: Anuj Mittal --- .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch deleted file mode 100644 index 9859d9d1a2..0000000000 --- a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 28 May 2019 19:35:18 +0200 -Subject: [PATCH] Make sure nSelectors is not out of range - -nSelectors is used in a loop from 0 to nSelectors to access selectorMtf -which is -UChar selectorMtf[BZ_MAX_SELECTORS]; -so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid memory -access -Fixes out of bounds access discovered while fuzzying karchive - -Link: https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc.patch - -Upstream-Status: Backport -CVE: CVE-2019-12900.patch -Signed-off-by: Saloni Jain ---- - decompress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/decompress.c b/decompress.c -index ab6a624..f3db91d 100644 ---- a/decompress.c -+++ b/decompress.c -@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s ) - GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); -- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); -+ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { --- -2.22.0 -- 2.24.1 From jaewon.lee at xilinx.com Thu Feb 6 00:57:29 2020 From: jaewon.lee at xilinx.com (Jaewon Lee) Date: Wed, 5 Feb 2020 16:57:29 -0800 Subject: [OE-core] [PATCH] sstate.bbclass: fix issue while handling long sstate filenames Message-ID: <1580950649-8807-1-git-send-email-jaewon.lee@xilinx.com> When moving to python3, divison using '/' now returns float instead of an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1 sstate filenames longer than the limit are changed to just include necessary info + 3 fields just for information. The space left over after the necessary info is divided into 3 for each of the fields. Casting the outcome of that division to int to solve the following error message: avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 > components[2] = components[2][:avail] components[3] = components[3][:avail] TypeError: slice indices must be integers or None or have an __index__ method Signed-off-by: Jaewon Lee Signed-off-by: Mark Hatle --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index faa6470..53a6d06 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d): components = spec.split(":") # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information # 7 is for the separators - avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 + avail = int((254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3) components[2] = components[2][:avail] components[3] = components[3][:avail] components[4] = components[4][:avail] -- 2.7.4 From anuj.mittal at intel.com Thu Feb 6 03:34:33 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Thu, 6 Feb 2020 03:34:33 +0000 Subject: [OE-core] [PATCH] gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' In-Reply-To: References: <20200204022006.714-1-takondra@cisco.com> , Message-ID: <0d7fe14fd49e80118841764cbda78f36dc63b4b5.camel@intel.com> On Wed, 2020-02-05 at 01:25 +0000, Taras Kondratiuk (takondra) via Openembedded-core wrote: > The patch applies to zeus branch as is without conflicts. > Should still resend it separately for Zeus? I have picked this up along with some other patches for zeus-next. Thanks, Anuj From jupiter.hce at gmail.com Thu Feb 6 06:34:55 2020 From: jupiter.hce at gmail.com (JH) Date: Thu, 6 Feb 2020 17:34:55 +1100 Subject: [OE-core] Support UBI u-boot Message-ID: Hi, Sorry for cross-posting, I have been asking for helping solving the issue many days ago, but could not get those work. (1) UBI support I added NAND and UBIFS support to my Yocto layer machine config file: UBOOT_CONFIG = "nand" UBOOT_CONFIG[nand] += "mx6ull_14x14_evk_config" UBOOT_CONFIG[nand] += "mx6ull_14x14_evk_nand_config" UBOOT_CONFIG[nand] += "ubi" UBOOT_CONFIG[nand] += "ubifs" But my u-boot.imx-nand still could not support ubi: => ubi part rootfs Unknown command 'ubi' - try 'help' What I could be missing here? (2) Patch u-boot parameters I am not clear how you do to change u-boot parameters, it seems to me I have to create my own u-boot-imx_2017.03.bbappend and patch files to mx6ullevk.h, to change u-boot parameters of mtdparts, NAND_ROOT_UBI, bootcmd, etc based on my configuration. But Yocto won't allow the patch running unless that the patch is committed to the git repository in https://source.codeaurora.org/external/imx/uboot-imx.git. Ideally, I thought all u-boot parameters can be changed in a bbappend file, could you advise if it is possible to do that way or not? If so, how to do it? If not, what is the policy for making parches and commit to the git repository https://source.codeaurora.org/external/imx/uboot-imx.git? Thank you. Kind regards, - jh From wangmy at cn.fujitsu.com Thu Feb 6 14:52:26 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 6 Feb 2020 06:52:26 -0800 Subject: [OE-core] [PATCH] lighttpd: upgrade 1.4.54 -> 1.4.55 Message-ID: <1581000746-42975-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} (96%) diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb similarity index 96% rename from meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb rename to meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb index 20ce698729..7a255ce2f2 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb @@ -19,8 +19,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[md5sum] = "7abc776243c811e9872f73ab38b7f8b5" -SRC_URI[sha256sum] = "cf14cce2254a96d8fcb6d3181e1a3c29a8f832531c3e86ff6f2524ecda9a8721" +SRC_URI[md5sum] = "be4bda2c28bcbdac6eb941528f6edf03" +SRC_URI[sha256sum] = "6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -- 2.17.1 From wangmy at cn.fujitsu.com Thu Feb 6 14:53:22 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 6 Feb 2020 06:53:22 -0800 Subject: [OE-core] [PATCH] dhcp: upgrade 4.4.1 -> 4.4.2 Message-ID: <1581000802-43030-1-git-send-email-wangmy@cn.fujitsu.com> 0001-Fix-a-NSUPDATE-compiling-issue.patch 0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch Removed since they are included in 4.4.2. refresh the following patch: 0004-Fix-out-of-tree-builds.patch Signed-off-by: Wang Mingyu --- .../0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 ---------------- ...ludes-of-new-BIND9-compatibility-hea.patch | 79 ------------------- .../dhcp/0004-Fix-out-of-tree-builds.patch | 6 +- .../dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} | 6 +- 4 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch rename meta/recipes-connectivity/dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} (74%) diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch deleted file mode 100644 index f12a112fcf..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001 -From: Ming Liu -Date: Tue, 14 May 2019 11:07:15 +0200 -Subject: [PATCH] Fix a NSUPDATE compiling issue - -Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16] - -A following error was observed when NSUPDATE is not defined: -| omapip/isclib.c: In function 'dns_client_init': -| omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| if (dhcp_gbl_ctx.dnsclient == NULL) { -| ^ -| omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| &dhcp_gbl_ctx.dnsclient, -| ^ -| omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4' -| (dhcp_gbl_ctx.use_local4 ? -| ^ -| omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr' -| &dhcp_gbl_ctx.local4_sockaddr -| ^ -| omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6' -| (dhcp_gbl_ctx.use_local6 ? -| ^ -| omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr' -| &dhcp_gbl_ctx.local6_sockaddr - -Fix it by adding NSUPDATE conditional checking. - -Signed-off-by: Ming Liu ---- - includes/omapip/isclib.h | 2 ++ - omapip/isclib.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 538b927..6c20584 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -141,6 +141,8 @@ void isclib_cleanup(void); - void dhcp_signal_handler(int signal); - extern int shutdown_signal; - -+#if defined (NSUPDATE) - isc_result_t dns_client_init(); -+#endif - - #endif /* ISCLIB_H */ -diff --git a/omapip/isclib.c b/omapip/isclib.c -index db3b895..ce4b4a1 100644 ---- a/omapip/isclib.c -+++ b/omapip/isclib.c -@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) { - } - } - -+#if defined (NSUPDATE) - isc_result_t dns_client_init() { - isc_result_t result; - if (dhcp_gbl_ctx.dnsclient == NULL) { -@@ -387,3 +388,4 @@ isc_result_t dns_client_init() { - - return ISC_R_SUCCESS; - } -+#endif --- -2.7.4 - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch deleted file mode 100644 index 1bc1422475..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Fri, 14 Sep 2018 13:41:41 -0400 -Subject: [master] Added includes of new BIND9 compatibility headers - - Merges in rt48072. - -Upstream-Status: Backport -Signed-off-by: Adrian Bunk - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 75a87ff6..538b927f 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -48,6 +48,9 @@ - #include - #include - -+#include -+#include -+ - #include - #include - #include -diff --git a/includes/omapip/result.h b/includes/omapip/result.h -index 91243e1b..860298f6 100644 ---- a/includes/omapip/result.h -+++ b/includes/omapip/result.h -@@ -26,6 +26,7 @@ - #ifndef DHCP_RESULT_H - #define DHCP_RESULT_H 1 - -+#include - #include - #include - #include -diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f98..cde4f617 100644 ---- a/server/dhcpv6.c -+++ b/server/dhcpv6.c -@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, - shared_name, - inet_ntop(AF_INET6, &lease->addr, - tmp_addr, sizeof(tmp_addr)), -- used, count); -+ (long long unsigned)(used), -+ (long long unsigned)(count)); - } - return; - } -@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, - "address: %s; high threshold %d%% %llu/%llu.", - shared_name, - inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), -- poolhigh, used, count); -+ poolhigh, (long long unsigned)(used), -+ (long long unsigned)(count)); - - /* handle the low threshold now, if we don't - * have one we default to 0. */ -@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - " 2^64-1 < total, %llu active, %llu abandoned", -- shared_name, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } else { - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - "%llu total, %llu active, %llu abandoned", -- shared_name, total, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(total), -+ (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } - - return ISC_R_NORESOURCES; - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch index b71c93dd6d..7b57730ffb 100644 --- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch +++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch @@ -85,9 +85,11 @@ Index: dhcp-4.4.1/relay/Makefile.am =================================================================== --- dhcp-4.4.1.orig/relay/Makefile.am +++ dhcp-4.4.1/relay/Makefile.am -@@ -1,4 +1,4 @@ +@@ -1,6 +1,6 @@ + SUBDIRS = . tests + -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes - + sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb similarity index 74% rename from meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb rename to meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb index 020777b8f2..b56a204821 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb @@ -9,13 +9,11 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat file://0009-remove-dhclient-script-bash-dependency.patch \ file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \ file://0013-fixup_use_libbind.patch \ - file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \ - file://0001-Fix-a-NSUPDATE-compiling-issue.patch \ file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \ " -SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" -SRC_URI[sha256sum] = "2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608" +SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1" +SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" LDFLAGS_append = " -pthread" -- 2.17.1 From anuj.mittal at intel.com Thu Feb 6 07:53:34 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Thu, 6 Feb 2020 15:53:34 +0800 Subject: [OE-core] [PATCH] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON Message-ID: <20200206075334.835418-1-anuj.mittal@intel.com> Use the correct variable so options actually get used. qt5 support is currently automagically detected with meson and having an explicit disabled doesn't do anything. Remove it so it can be handled in qt layer with appropriate DEPENDS added. Signed-off-by: Anuj Mittal --- .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb index a6eb9986dd..e78162172a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb @@ -50,12 +50,12 @@ PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx" PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" -# qt5 support is disabled, because it is not present in OE core, and requires more work than -# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). +# qt5 support is disabled by default unless dependencies are present. Enabling it requires +# more work than just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). # This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig # in a gstreamer1.0-plugins-good bbappend). -EXTRA_OECONF += " \ +EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ -Ddv=disabled \ @@ -64,7 +64,6 @@ EXTRA_OECONF += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ - -Dqt=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- 2.24.1 From martin at geanix.com Thu Feb 6 07:52:52 2020 From: martin at geanix.com (=?UTF-8?Q?Martin_Hundeb=c3=b8ll?=) Date: Thu, 6 Feb 2020 08:52:52 +0100 Subject: [OE-core] [PATCH] sstate.bbclass: fix issue while handling long sstate filenames In-Reply-To: <1580950649-8807-1-git-send-email-jaewon.lee@xilinx.com> References: <1580950649-8807-1-git-send-email-jaewon.lee@xilinx.com> Message-ID: <57d3655a-a20f-f7df-f335-9958075465e5@geanix.com> On 06/02/2020 01.57, Jaewon Lee wrote: > When moving to python3, divison using '/' now returns float instead of > an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1 > sstate filenames longer than the limit are changed to just include > necessary info + 3 fields just for information. The space left over > after the necessary info is divided into 3 for each of the fields. > Casting the outcome of that division to int to solve the following error > message: > > avail = (254 - len(hash + "_" + taskname + extension) - > len(components[0]) - len(components[1]) - len(components[5]) - > len(components[6]) - 7) / 3 > > components[2] = components[2][:avail] > components[3] = components[3][:avail] > TypeError: slice indices must be integers or None or have an __index__ > method > > Signed-off-by: Jaewon Lee > Signed-off-by: Mark Hatle > --- > meta/classes/sstate.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass > index faa6470..53a6d06 100644 > --- a/meta/classes/sstate.bbclass > +++ b/meta/classes/sstate.bbclass > @@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d): > components = spec.split(":") > # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information > # 7 is for the separators > - avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 > + avail = int((254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3) Python has a nifty // operator that resembles integer division from C: >>> 3 / 2 1.5 >>> 3 // 2 1 // Martin > components[2] = components[2][:avail] > components[3] = components[3][:avail] > components[4] = components[4][:avail] > From richard.purdie at linuxfoundation.org Thu Feb 6 09:03:54 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 06 Feb 2020 09:03:54 +0000 Subject: [OE-core] [PATCH 0/9] kernel-yocto: consolidated pull request In-Reply-To: References: Message-ID: <81d55204978a296d27ecaff359d270dfc0f473eb.camel@linuxfoundation.org> Hi Bruce, On Wed, 2020-02-05 at 18:12 -0500, bruce.ashfield at gmail.com wrote: > From: Bruce Ashfield > > Hi all, > > I've kept the v5.4 content changes, as well as the kernel version > default > changes out of this series and instead focused it on the collection > of > kernel-yocto and kern-tools tweaks that I've gethered over the past > few > weeks. > > I have Martin's gold linker fixes included, as well as the re-org'ing > of > the linux-yocto tasks that Paul Barker did to make it usable as a > single > inherit of the bbclass. > > I also have a defconfig detection fix included that was sent to the > list. > > I was able to confirm that my configuration was the same with this > series > enabled, and I was able to boot. > > That being said, I'll keep my eye out for any AB fallout and will > continue > some more build locally .. but I wanted to get this out today as > promised. qemuarm64 seems unhappy: https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/1524 (the builds on the arm native machine also failed but it looks related) I think everything else passed testing for this series. Cheers, Richard From martin.jansa at gmail.com Thu Feb 6 09:37:23 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Thu, 6 Feb 2020 10:37:23 +0100 Subject: [OE-core] [PATCH] bison: Upgrade to 3.5.1 In-Reply-To: <20200205010819.4172914-1-raj.khem@gmail.com> References: <20200205010819.4172914-1-raj.khem@gmail.com> Message-ID: <20200206093723.6hq2anenujgnqiq5@jama> On Tue, Feb 04, 2020 at 05:08:19PM -0800, Khem Raj wrote: > Minor upgrade on 3.5 release series Acked-by: Martin Jansa Minor upgrade with added benefits that bison-native doesn't fail to build for me when using yoe-distro. Strangely I haven't seen this error in any other build yet. 86_64-linux/bison-native/3.5-r0/recipe-sysroot-native/usr/include -O2 -pipe -c -o lib/libbison_a-pipe2.o `test -f 'lib/pipe2.c' || echo '../bison-3.5/'`lib/pipe2.c In file included from ../bison-3.5/lib/pipe2.c:25: ../bison-3.5/lib/binary-io.h: In function '__gl_setmode': ../bison-3.5/lib/binary-io.h:52:10: error: 'O_BINARY' undeclared (first use in this function) 52 | return O_BINARY; | ^~~~~~~~ ../bison-3.5/lib/binary-io.h:52:10: note: each undeclared identifier is reported only once for each function it appears in ../bison-3.5/lib/pipe2.c: In function 'rpl_pipe2': ../bison-3.5/lib/pipe2.c:70:43: error: 'O_BINARY' undeclared (first use in this function); did you mean 'SET_BINARY'? 70 | if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_BINARY | O_TEXT)) != 0) | ^~~~~~~~ | SET_BINARY ../bison-3.5/lib/pipe2.c:70:54: error: 'O_TEXT' undeclared (first use in this function); did you mean 'F_TEST'? 70 | if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_BINARY | O_TEXT)) != 0) | ^~~~~~ | F_TEST make: *** [Makefile:4827: lib/libbison_a-pipe2.o] Error 1 WARNING: exit code 1 from a shell command. > > Signed-off-by: Khem Raj > --- > meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} (90%) > > diff --git a/meta/recipes-devtools/bison/bison_3.5.bb b/meta/recipes-devtools/bison/bison_3.5.1.bb > similarity index 90% > rename from meta/recipes-devtools/bison/bison_3.5.bb > rename to meta/recipes-devtools/bison/bison_3.5.1.bb > index 3d8f6579b9..e70252d974 100644 > --- a/meta/recipes-devtools/bison/bison_3.5.bb > +++ b/meta/recipes-devtools/bison/bison_3.5.1.bb > @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ > # No point in hardcoding path to m4, just use PATH > EXTRA_OECONF += "M4=m4" > > -SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" > -SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" > +SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" > +SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" > > inherit autotools gettext texinfo > > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From jupiter.hce at gmail.com Thu Feb 6 10:07:46 2020 From: jupiter.hce at gmail.com (JH) Date: Thu, 6 Feb 2020 21:07:46 +1100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: Thanks Gabriele and Andy, On 2/6/20, Gabriele Zampieri wrote: > Hi JH, > > have you tried what we suggested you in your last thread? More specifically > adding your defconfig and tweaking it through menuconfig. and then specify > the UBOOT_MACHINE. Yes, as I posted in another thread, the MTD, UBI are all set in my Linux kernel defconfig, I have also added UBOOT_CONFIG = "nand" in my layer machine config. What I missed is u-boot overlay, as you and Andy alluded. I added UBOOT_CONFIG[nand] += "mx6ull_14x14_evk_nand_config", but strange enough, that mx6ull_14x14_evk_nand_config, did not set CONFIG_CMD_UBI in its config. I think I need to add an appended recipes-bsp to my layer just like I added the recipes-kernel to my layer to overwrite kernel defconfig, I need to overwrite u-boot defconfig. In kernel, to overwrite defconfig, I run bitbake -c menuconfig virtual/kernel, how can I generate u-boot defconfig, to run bitbake -c menuconfig u-boot? Thank you. Kind regards, - jh From jupiter.hce at gmail.com Thu Feb 6 10:39:44 2020 From: jupiter.hce at gmail.com (JH) Date: Thu, 6 Feb 2020 21:39:44 +1100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: On 2/6/20, JH wrote: > I think I need to add an appended recipes-bsp to my layer just like I > added the recipes-kernel to my layer to overwrite kernel defconfig, I > need to overwrite u-boot defconfig. > > In kernel, to overwrite defconfig, I run bitbake -c menuconfig > virtual/kernel, how can I generate u-boot defconfig, to run bitbake -c > menuconfig u-boot? Hmm, more complicated than I thought, it does not have defconfig in u-boot like kernel does, how do you overwrite u-boot config in Yocto? From wangmy at cn.fujitsu.com Thu Feb 6 19:02:54 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 6 Feb 2020 11:02:54 -0800 Subject: [OE-core] [PATCH] mesa: upgrade 19.3.1 -> 19.3.3 Message-ID: <1581015774-46438-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} | 0 meta/recipes-graphics/mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/mesa/{mesa-gl_19.3.1.bb => mesa-gl_19.3.3.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_19.3.1.bb => mesa_19.3.3.bb} (88%) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.1.bb rename to meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb diff --git a/meta/recipes-graphics/mesa/mesa_19.3.1.bb b/meta/recipes-graphics/mesa/mesa_19.3.3.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.1.bb rename to meta/recipes-graphics/mesa/mesa_19.3.3.bb index b889f092e3..7e0c5d6500 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.1.bb +++ b/meta/recipes-graphics/mesa/mesa_19.3.3.bb @@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "5c5965db31993af47fee82c9a7ccba5e" -SRC_URI[sha256sum] = "cd951db69c56a97ff0570a7ab2c0e39e6c5323f4cd8f4eb8274723e033beae59" +SRC_URI[md5sum] = "00010e0bb8f6641276ff6cb3e9386114" +SRC_URI[sha256sum] = "81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- 2.17.1 From yi.zhao at windriver.com Thu Feb 6 11:18:12 2020 From: yi.zhao at windriver.com (Yi Zhao) Date: Thu, 6 Feb 2020 19:18:12 +0800 Subject: [OE-core] [PATCH] procps: upgrade 3.3.15 -> 3.3.16 Message-ID: <20200206111812.28970-1-yi.zhao@windriver.com> Drop 0001-Fix-out-of-tree-builds.patch since it has been merged upstream. Signed-off-by: Yi Zhao --- .../procps/0001-Fix-out-of-tree-builds.patch | 24 ------------------- .../{procps_3.3.15.bb => procps_3.3.16.bb} | 5 ++-- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch rename meta/recipes-extended/procps/{procps_3.3.15.bb => procps_3.3.16.bb} (93%) diff --git a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch deleted file mode 100644 index e548194362..0000000000 --- a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 4 Apr 2018 14:09:45 +0300 -Subject: [PATCH] Fix out of tree builds - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - include/nls.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/nls.h b/include/nls.h -index 1166b7b..f5abe05 100644 ---- a/include/nls.h -+++ b/include/nls.h -@@ -6,7 +6,7 @@ - #define PROCPS_NG_NLS_H - - /* programs issuing textdomain() need PACKAGE string */ --#include "../config.h" -+#include "config.h" - - /* programs issuing bindtextdomain() also need LOCALEDIR string */ - #ifndef LOCALEDIR diff --git a/meta/recipes-extended/procps/procps_3.3.15.bb b/meta/recipes-extended/procps/procps_3.3.16.bb similarity index 93% rename from meta/recipes-extended/procps/procps_3.3.15.bb rename to meta/recipes-extended/procps/procps_3.3.16.bb index 17abd96dca..60f90976bb 100644 --- a/meta/recipes-extended/procps/procps_3.3.15.bb +++ b/meta/recipes-extended/procps/procps_3.3.16.bb @@ -14,11 +14,10 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ file://sysctl.conf \ - file://0001-Fix-out-of-tree-builds.patch \ " -SRC_URI[md5sum] = "2b0717a7cb474b3d6dfdeedfbad2eccc" -SRC_URI[sha256sum] = "10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" +SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" +SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" S = "${WORKDIR}/procps-ng-${PV}" -- 2.17.1 From crg7475 at mailbox.org Thu Feb 6 11:41:35 2020 From: crg7475 at mailbox.org (Carlos Rafael Giani) Date: Thu, 6 Feb 2020 12:41:35 +0100 Subject: [OE-core] [PATCH] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: <20200206075334.835418-1-anuj.mittal@intel.com> References: <20200206075334.835418-1-anuj.mittal@intel.com> Message-ID: Shouldn't this be split into two commits, one that fixes EXTRA_OECONF, and one that fixes the qt5 support? Also, are we sure that meson's qt5 moc/rcc/uic autodetection won't cause any problems in OE? Typically, we disable such "automagical" detections to ensure deterministic builds. On 06.02.20 08:53, Anuj Mittal wrote: > Use the correct variable so options actually get used. > > qt5 support is currently automagically detected with meson and having an > explicit disabled doesn't do anything. Remove it so it can be handled > in qt layer with appropriate DEPENDS added. > > Signed-off-by: Anuj Mittal > --- > .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > index a6eb9986dd..e78162172a 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > @@ -50,12 +50,12 @@ PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx" > PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" > PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > > -# qt5 support is disabled, because it is not present in OE core, and requires more work than > -# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). > +# qt5 support is disabled by default unless dependencies are present. Enabling it requires > +# more work than just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). > # This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig > # in a gstreamer1.0-plugins-good bbappend). > > -EXTRA_OECONF += " \ > +EXTRA_OEMESON += " \ > -Daalib=disabled \ > -Ddirectsound=disabled \ > -Ddv=disabled \ > @@ -64,7 +64,6 @@ EXTRA_OECONF += " \ > -Doss4=disabled \ > -Dosxaudio=disabled \ > -Dosxvideo=disabled \ > - -Dqt=disabled \ > -Dshout2=disabled \ > -Dtwolame=disabled \ > -Dwaveform=disabled \ From bruce.ashfield at gmail.com Thu Feb 6 13:25:13 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Thu, 6 Feb 2020 08:25:13 -0500 Subject: [OE-core] [PATCH 0/9] kernel-yocto: consolidated pull request In-Reply-To: <81d55204978a296d27ecaff359d270dfc0f473eb.camel@linuxfoundation.org> References: <81d55204978a296d27ecaff359d270dfc0f473eb.camel@linuxfoundation.org> Message-ID: On Thu, Feb 6, 2020 at 4:03 AM Richard Purdie wrote: > > Hi Bruce, > > On Wed, 2020-02-05 at 18:12 -0500, bruce.ashfield at gmail.com wrote: > > From: Bruce Ashfield > > > > Hi all, > > > > I've kept the v5.4 content changes, as well as the kernel version > > default > > changes out of this series and instead focused it on the collection > > of > > kernel-yocto and kern-tools tweaks that I've gethered over the past > > few > > weeks. > > > > I have Martin's gold linker fixes included, as well as the re-org'ing > > of > > the linux-yocto tasks that Paul Barker did to make it usable as a > > single > > inherit of the bbclass. > > > > I also have a defconfig detection fix included that was sent to the > > list. > > > > I was able to confirm that my configuration was the same with this > > series > > enabled, and I was able to boot. > > > > That being said, I'll keep my eye out for any AB fallout and will > > continue > > some more build locally .. but I wanted to get this out today as > > promised. > > qemuarm64 seems unhappy: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/1524 Bugger. I'll fix and resend a v2 pull request. Bruce > > (the builds on the arm native machine also failed but it looks related) > > I think everything else passed testing for this series. > > Cheers, > > Richard > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From trevor.gamblin at windriver.com Thu Feb 6 14:13:20 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Thu, 6 Feb 2020 09:13:20 -0500 Subject: [OE-core] [PATCH] bitbake-buildall: automate build testing for qemu MACHINEs Message-ID: <20200206141320.2074733-1-trevor.gamblin@windriver.com> bitbake-buildall simplifies the process of build testing an upgraded or patched recipe by cycling through the build steps for each available qemu target, with desired LIBC specified by the user as an option (defaulting to both glibc and musl if no option is provided). While building, a log file with the name "-buildall.log" is written, containing a PASS or FAIL line upon completion of the build for each architecture. For now, qemu targets are not selectable (i.e. the recipe is built for all qemu targets found in meta/conf/machine), but this functionality can be added in the future along with other useful options. The log file created by bitbake-buildall also includes some basic system info (e.g. build start time, hostname, host OS, host kernel). Since it is not guaranteed that tools such as lsb_release will be available on the host (it isn't by default on my Fedora machine), this information is collected manually. Additionally, the previous run's log is retained for comparison by renaming it in the format -buildall.log.old once a new set of builds is triggered for the same recipe. Sample log output: BITBAKE-BUILDALL LOG FOR aspell START TIME: 2020-02-05_15:57:41 HOSTNAME: yow-tgamblin-fedora2 HOST OS: Fedora 31 (Server Edition) HOST KERNEL: 5.4.10-200.fc31.x86_64 =============== BUILD RESULTS: [glibc] PASS: qemuarmv5 PASS: qemux86 PASS: qemuppc PASS: qemumips64 FAIL: qemux86-64 FAIL: qemumips FAIL: qemuarm FAIL: qemuarm64 FAIL: qemuriscv64 [musl] PASS: qemuarmv5 PASS: qemux86 PASS: qemuppc PASS: qemumips64 PASS: qemux86-64 PASS: qemumips PASS: qemuarm PASS: qemuarm64 PASS: qemuriscv64 =============== PASSED: 13 FAILED: 5 Signed-off-by: Trevor Gamblin --- scripts/bitbake-buildall | 121 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100755 scripts/bitbake-buildall diff --git a/scripts/bitbake-buildall b/scripts/bitbake-buildall new file mode 100755 index 0000000000..5ef148ecf7 --- /dev/null +++ b/scripts/bitbake-buildall @@ -0,0 +1,121 @@ +#!/bin/sh +# Copyright (c) 2020 Wind River Systems, Inc. +# +# SPDX-License-Identifier: GPL-2.0-only +# +# bitbake-buildall: a tool for automating build testing of recipes +# TODO: Add support for selecting which qemu architectures to build +# TODO: Add support for queueing up multiple recipe builds +# TODO: Add more logging options (e.g. local.conf info, bitbake env info) + +usage () +{ + base=$(basename "$0") + echo "Usage: $base [options] [recipename/target]" + echo "Executes a build of a given target for selected LIBCs. With no options, default to both libc and musl." + echo "Options:" + echo "-l, --libc Specify one of \"libc\" or \"musl\"" +} + + +buildall () +{ + # Get path to oe-core directory. Since oe-init-build-env prepends $PATH with + # the path to the scripts directory, get it from there + SCRIPTS_PATH="$(echo "$PATH" | cut -d ":" -f 1)" + OE_CORE_PATH=$(echo "$SCRIPTS_PATH" | sed 's|\(.*\)/.*|\1|') + + # Get target list and host machine information + TARGET_LIST=$(find "$OE_CORE_PATH"/meta/conf/machine -maxdepth 1 -type f | grep qemu | sed 's|.*/||' | sed -e 's/\.conf//') + + # Set LIBC value to use for the builds based on options provided by the user + if [ -n "$2" ] + then + LIBC_LIST="$2" + echo "$LIBC_LIST" + else + LIBC_LIST="glibc musl" + echo "$LIBC_LIST" + fi + + START_TIME=$(date "+%Y-%m-%d_%H:%M:%S") + LOG_FILE="$1-buildall.log" + OS_INFO=$(grep "PRETTY_NAME=" /etc/os-release | awk -F "=" '{print $2}' | sed -e 's/^"//' -e 's/"$//') + + # Append an existing log file for this build with .old if one exists + if [ -f "${LOG_FILE}" ] + then + mv "${LOG_FILE}" "${LOG_FILE}.old" + else + touch "${LOG_FILE}" + fi + + # Fill the log file with build and host info + echo "BITBAKE-BUILDALL LOG FOR $1" >> "${LOG_FILE}" + echo "START TIME: ${START_TIME}" >> "${LOG_FILE}" + echo "HOSTNAME: $(uname -n)" >> "${LOG_FILE}" + echo "HOST OS: ${OS_INFO}" >> "${LOG_FILE}" + echo "HOST KERNEL: $(uname -r)" >> "${LOG_FILE}" + echo "===============" >> "${LOG_FILE}" + echo "BUILD RESULTS:" >> "${LOG_FILE}" + + # start the builds for each MACHINE and TCLIBC + for j in ${LIBC_LIST} + do + echo "[$j]" >> "${LOG_FILE}" + for i in ${TARGET_LIST} + do + echo "$i" "$j"; \ + TCLIBC=$j MACHINE=$i bitbake "$1" && echo "PASS: $i" >> "${LOG_FILE}" || echo "FAIL: $i" >> "${LOG_FILE}" + done + done + + # Get pass/fail totals and add them to the end of the log + PASSED=$(grep "PASS:" "${LOG_FILE}" | wc -l) + FAILED=$(grep "FAIL:" "${LOG_FILE}" | wc -l) + + echo "===============" >> "${LOG_FILE}" + echo "PASSED: ${PASSED}" >> "${LOG_FILE}" + echo "FAILED: ${FAILED}" >> "${LOG_FILE}" +} + + +# fail entire script if any command fails +set -e +set -o pipefail + +# print usage and exit if not enough args given +[ $# -eq 0 ] && usage && exit 1 + +# handle arguments +RECIPE= +while [ $# -gt 0 ] +do + arg=$1 + case $arg in + -l|--libc) + if [ "$2" = "glibc" ] || [ "$2" = "musl" ] + then + LIBC_LIST="$2" + else + echo "Unrecognized libc option." + usage && exit 1 + fi + shift + shift + ;; + *) + RECIPE="$1" + shift + ;; + esac +done + +set -- "$RECIPE" + +# run buildall for the given recipe and LIBC +if [ -n "$1" ] +then + buildall "$1" "$LIBC_LIST" +fi + -- 2.24.1 From alex.kiernan at gmail.com Thu Feb 6 16:48:13 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Thu, 6 Feb 2020 16:48:13 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: upgrade 243.4 -> 244.1 Message-ID: <20200206164813.128977-1-alex.kiernan@gmail.com> Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a variant on which was introduced in 2c1047310970 ("Upgrade to systemd 211+") in 2014. The oldest supported build machine is now CentOS 7 which has --relative support in ln, so there no longer appears to be any need for this change. Rebase/refresh musl patches: - replace missing.h with specific missing_... header - fix additional WRITE_STRING_FILE_DISABLE_BUFFER - fix more places that need netinet/if_ether.h Signed-off-by: Alex Kiernan --- ...md-boot_243.4.bb => systemd-boot_244.1.bb} | 0 ...md-conf_243.2.bb => systemd-conf_244.1.bb} | 0 meta/recipes-core/systemd/systemd.inc | 6 +- ...tall-dependency-links-at-install-tim.patch | 33 +- ...-not-disable-buffer-in-writing-files.patch | 168 ++++---- ...002-don-t-use-glibc-specific-qsort_r.patch | 26 +- ...ogin-brightness.c-include-sys-wait.h.patch | 8 +- ...instead-of-looking-for-relative-opti.patch | 63 --- ...implment-systemd-sysv-install-for-OE.patch | 10 +- ...dd-__compare_fn_t-and-comparison_fn_.patch | 37 +- ...03-src-basic-copy.c-include-signal.h.patch | 12 +- ...k-parse_printf_format-implementation.patch | 29 +- ...set-util.h-add-__cpu_mask-definition.patch | 10 +- ...missing.h-check-for-missing-strndupa.patch | 381 ++++++++++++++---- .../0006-Include-netinet-if_ether.h.patch | 101 +++-- ...LOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch | 30 +- ...008-add-missing-FTW_-macros-for-musl.patch | 10 +- ..._register_atfork-for-non-glibc-build.patch | 14 +- ...11-Use-uintmax_t-for-handling-rlim_t.patch | 22 +- ...sable-tests-for-missing-typedefs-in-.patch | 15 +- ...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 20 +- ...patible-basename-for-non-glibc-syste.patch | 18 +- ...uffering-when-writing-to-oom_score_a.patch | 9 +- ...compliant-strerror_r-from-GNU-specif.patch | 14 +- ...S_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 10 +- ...ype.h-add-__compar_d_fn_t-definition.patch | 10 +- ...definition-of-prctl_mm_map-structure.patch | 10 +- ...ead-of-TIME_T_MAX-for-timerfd_settim.patch | 10 +- .../0024-test-json.c-define-M_PIl.patch | 12 +- .../{systemd_243.4.bb => systemd_244.1.bb} | 2 +- 30 files changed, 659 insertions(+), 431 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_243.4.bb => systemd-boot_244.1.bb} (100%) rename meta/recipes-core/systemd/{systemd-conf_243.2.bb => systemd-conf_244.1.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch rename meta/recipes-core/systemd/{systemd_243.4.bb => systemd_244.1.bb} (99%) diff --git a/meta/recipes-core/systemd/systemd-boot_243.4.bb b/meta/recipes-core/systemd/systemd-boot_244.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_243.4.bb rename to meta/recipes-core/systemd/systemd-boot_244.1.bb diff --git a/meta/recipes-core/systemd/systemd-conf_243.2.bb b/meta/recipes-core/systemd/systemd-conf_244.1.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_243.2.bb rename to meta/recipes-core/systemd/systemd-conf_244.1.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 2fca6dca64b7..8c05a96ecc4f 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,10 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "70e8c1978a9a688662eb1b3983370dd1cc415083" -SRCBRANCH = "v243-stable" +SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" -PV = "243.4+git${SRCPV}" - S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index ea37680221f2..6eaaec71c533 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,8 +1,8 @@ -From 98254e4798e79d52ac6b562616cd244120f6e239 Mon Sep 17 00:00:00 2001 +From c73a87871df31b4f8d96c9d443759c6f702935f6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH 1/5] binfmt: Don't install dependency links at install time - for the binfmt services +Subject: [PATCH] binfmt: Don't install dependency links at install time for + the binfmt services use [Install] blocks so that they get created when the service is enabled like a traditional service. @@ -18,16 +18,17 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- units/meson.build | 6 ++---- units/proc-sys-fs-binfmt_misc.automount | 3 +++ units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build +diff --git a/units/meson.build b/units/meson.build +index 6a3a0d0dea22..bbb1b78618c3 100644 +--- a/units/meson.build ++++ b/units/meson.build @@ -46,8 +46,7 @@ units = [ ['poweroff.target', '', 'runlevel0.target'], @@ -48,10 +49,10 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-boot-system-token.service', 'ENABLE_EFI', -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 30a6bc991844..4231f3b70fe9 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] @@ -59,11 +60,11 @@ Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in -@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index 0c0f26451b67..763c4c466c16 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in +@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index d6d68a09ac9b..f1c7181ef971 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch @@ -1,4 +1,4 @@ -From 85e3c3046562ec24fc2f09ebfd08bf9f168091d5 Mon Sep 17 00:00:00 2001 +From f4a0caaea346b70cf5064f9159a53a1b8020071e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Mar 2019 15:22:15 +0800 Subject: [PATCH] do not disable buffer in writing files @@ -18,8 +18,9 @@ Signed-off-by: Chen Qi Signed-off-by: Andrej Valek [rebased for systemd 243] Signed-off-by: Scott Murray + --- - src/basic/cgroup-util.c | 14 +++++++------- + src/basic/cgroup-util.c | 10 +++++----- src/basic/procfs-util.c | 4 ++-- src/basic/smack-util.c | 2 +- src/basic/util.c | 2 +- @@ -31,25 +32,19 @@ Signed-off-by: Scott Murray src/login/logind-dbus.c | 2 +- src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn.c | 6 +++--- + src/shared/cgroup-setup.c | 4 ++-- src/shared/sysctl-util.c | 2 +- - src/sleep/sleep.c | 10 +++++----- + src/sleep/sleep.c | 8 ++++---- src/udev/udevadm-trigger.c | 2 +- src/udev/udevd.c | 2 +- src/vconsole/vconsole-setup.c | 2 +- - 17 files changed, 36 insertions(+), 36 deletions(-) + 18 files changed, 35 insertions(+), 35 deletions(-) +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index a5141f4cbedd..04c06e7a55cb 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co - - xsprintf(c, PID_FMT "\n", pid); - -- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(fs, c, 0); - if (r < 0) - return r; - -@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char +@@ -739,7 +739,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -58,7 +53,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char +@@ -757,7 +757,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -67,7 +62,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha +@@ -784,7 +784,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -76,7 +71,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha +@@ -794,7 +794,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -85,7 +80,7 @@ Signed-off-by: Scott Murray if (r < 0) return r; -@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control +@@ -1650,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -94,18 +89,11 @@ Signed-off-by: Scott Murray } int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { -@@ -2697,7 +2697,7 @@ int cg_enable_everywhere( - return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); - } - -- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_stream(f, s, 0); - if (r < 0) { - log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", - FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c +index da7e836f143e..2138f20bcc03 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi +@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -121,9 +109,11 @@ Signed-off-by: Scott Murray if (r < 0) { uint64_t threads_max; +diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c +index da9a2139d31a..5e91f5b8f5d9 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c -@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const +@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -132,9 +122,11 @@ Signed-off-by: Scott Murray if (r < 0) return r; +diff --git a/src/basic/util.c b/src/basic/util.c +index 2b3b3918a32f..aff8d0fcd473 100644 --- a/src/basic/util.c +++ b/src/basic/util.c -@@ -294,7 +294,7 @@ void disable_coredumps(void) { +@@ -267,7 +267,7 @@ void disable_coredumps(void) { if (detect_container() > 0) return; @@ -143,9 +135,11 @@ Signed-off-by: Scott Murray if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } +diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c +index 7ff844c78c3a..5c5721d7c2f7 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c -@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) +@@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); @@ -154,7 +148,7 @@ Signed-off-by: Scott Murray } static int apply_rule(const char *rule) { -@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) +@@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { (void) delete_rule(rule); @@ -163,7 +157,7 @@ Signed-off-by: Scott Murray if (r < 0) return log_error_errno(r, "Failed to add binary format: %m"); -@@ -213,7 +213,7 @@ static int run(int argc, char *argv[]) { +@@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) { } /* Flush out all rules */ @@ -172,9 +166,11 @@ Signed-off-by: Scott Murray STRV_FOREACH(f, files) { k = apply_file(*f, true); +diff --git a/src/core/main.c b/src/core/main.c +index c24b696b1663..195be7d2df0d 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void +@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void) { if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -183,7 +179,7 @@ Signed-off-by: Scott Murray if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool +@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; @@ -192,9 +188,11 @@ Signed-off-by: Scott Murray if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } +diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c +index 4427397f2715..8aeb5c829513 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) +@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { } #ifdef SMACK_RUN_LABEL @@ -216,6 +214,8 @@ Signed-off-by: Scott Murray if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif +diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c +index 17e7cd1a009b..87a766771663 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { @@ -227,9 +227,11 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; +diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c +index f35612fe12bc..20351bf7fa70 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value +@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; @@ -238,9 +240,11 @@ Signed-off-by: Scott Murray if (r < 0) { if (r == -ELOOP) return -EINVAL; +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 69b59948786f..b4973c596d48 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd +@@ -1322,7 +1322,7 @@ static int trigger_device(Manager *m, sd_device *d) { if (!t) return -ENOMEM; @@ -249,9 +253,11 @@ Signed-off-by: Scott Murray } return 0; +diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c +index f5048d9473cb..b6383ab5c97e 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified +@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -260,9 +266,11 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 873a76596f0b..4e496548bb94 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { +@@ -2425,7 +2425,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -271,7 +279,7 @@ Signed-off-by: Scott Murray if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { +@@ -3633,13 +3633,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); @@ -287,9 +295,33 @@ Signed-off-by: Scott Murray if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); +diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c +index e8398cbde5ba..ba682ec0c9e7 100644 +--- a/src/shared/cgroup-setup.c ++++ b/src/shared/cgroup-setup.c +@@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { + + xsprintf(c, PID_FMT "\n", pid); + +- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(fs, c, 0); + if (r < 0) + return r; + +@@ -817,7 +817,7 @@ int cg_enable_everywhere( + return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); + } + +- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_stream(f, s, 0); + if (r < 0) { + log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", + FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c +index 12fb3ef7ea0e..132ac847c091 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-util.c -@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con +@@ -87,7 +87,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c log_debug("Setting '%s' to '%s'", p, value); @@ -298,35 +330,29 @@ Signed-off-by: Scott Murray } int sysctl_read(const char *property, char **content) { +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index 89b80367f8f4..33dbb21364d0 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -54,7 +54,7 @@ static int write_hibernate_location_info +@@ -45,7 +45,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + assert(hibernate_location->swap); + assert(hibernate_location->resume); - /* if it's a swap partition, we just write the disk to /sys/power/resume */ - if (streq(type, "partition")) { -- r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); - -@@ -98,14 +98,14 @@ static int write_hibernate_location_info +- r = write_string_file("/sys/power/resume", hibernate_location->resume, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file("/sys/power/resume", hibernate_location->resume, 0); + if (r < 0) + return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", + hibernate_location->swap->device, hibernate_location->resume); +@@ -72,7 +72,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca + } - offset = fiemap->fm_extents[0].fe_physical / page_size(); - xsprintf(offset_str, "%" PRIu64, offset); + xsprintf(offset_str, "%" PRIu64, hibernate_location->resume_offset); - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file("/sys/power/resume_offset", offset_str, 0); if (r < 0) - return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); - - log_debug("Wrote calculated resume_offset value to /sys/power/resume_offset: %s", offset_str); - - xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); -- r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/sys/power/resume", device_str, 0); - if (r < 0) - return log_debug_errno(r, "Failed to write device '%s': %m", device_str); - -@@ -121,7 +121,7 @@ static int write_mode(char **modes) { + return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", + hibernate_location->swap->device, offset_str); +@@ -89,7 +89,7 @@ static int write_mode(char **modes) { STRV_FOREACH(mode, modes) { int k; @@ -335,7 +361,7 @@ Signed-off-by: Scott Murray if (k >= 0) return 0; -@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** +@@ -108,7 +108,7 @@ static int write_state(FILE **f, char **states) { STRV_FOREACH(state, states) { int k; @@ -344,9 +370,11 @@ Signed-off-by: Scott Murray if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); +diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c +index 60c68b5029cf..fdca03d3d42c 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c -@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato +@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se if (!filename) return log_oom(); @@ -355,9 +383,11 @@ Signed-off-by: Scott Murray if (r < 0) { bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 7678331897f5..6871cde7aa65 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c -@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi +@@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { filename = strjoina(syspath, "/uevent"); log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); @@ -366,9 +396,11 @@ Signed-off-by: Scott Murray if (r < 0) return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); return 0; +diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c +index 9d706085fb47..30dcfa86f4d0 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na +@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { static int toggle_utf8_sysfs(bool utf8) { int r; diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index c6213ab88e7e..6b85ff0f8915 100644 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,7 +1,7 @@ -From 1eb84534dea05d41afed1d898cba212ad7d310dd Mon Sep 17 00:00:00 2001 +From 49501c80d32c1bc5ecb07f40c324feb82af0b057 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:41:41 +0800 -Subject: [PATCH 02/24] don't use glibc-specific qsort_r +Subject: [PATCH] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] @@ -10,14 +10,15 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek + --- - src/basic/sort-util.h | 14 -------------- - src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- - src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ + src/basic/sort-util.h | 14 ------------ + src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- + src/shared/format-table.c | 36 ++++++++++++++++++++---------- 3 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f8646e..27d68b341c 100644 +index e029f8646eb0..27d68b341cf3 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn @@ -39,7 +40,7 @@ index e029f8646e..27d68b341c 100644 - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ - }) diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c -index c83575c7c8..72f8f3a050 100644 +index c83575c7c876..72f8f3a05048 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.c +++ b/src/libsystemd/sd-hwdb/hwdb-util.c @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { @@ -83,10 +84,10 @@ index c83575c7c8..72f8f3a050 100644 } diff --git a/src/shared/format-table.c b/src/shared/format-table.c -index a5c0a99b08..d595cbe372 100644 +index 4617ae8badc4..17d6b9616256 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c -@@ -850,31 +850,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t +@@ -1109,31 +1109,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return CMP(index_a, index_b); } @@ -130,7 +131,7 @@ index a5c0a99b08..d595cbe372 100644 } /* Order identical lines by the order there were originally added in */ -@@ -1107,7 +1109,12 @@ int table_print(Table *t, FILE *f) { +@@ -1533,7 +1535,12 @@ int table_print(Table *t, FILE *f) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -144,7 +145,7 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) -@@ -1534,7 +1541,12 @@ int table_to_json(Table *t, JsonVariant **ret) { +@@ -1997,7 +2004,12 @@ int table_to_json(Table *t, JsonVariant **ret) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -158,6 +159,3 @@ index a5c0a99b08..d595cbe372 100644 } if (t->display_map) --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch index dcae668dcb91..ba7424d8767a 100644 --- a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch +++ b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch @@ -1,4 +1,7 @@ -Include sys/wait.h +From 106922335ec502bcb4451c54a89be49f88fa54de Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Include sys/wait.h Fixes: src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? @@ -8,12 +11,13 @@ src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in Upstream-Status: Pending Signed-off-by: Scott Murray + --- src/login/logind-brightness.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c -index 8dfa97d7ae..bddd4a2727 100644 +index 3f4b65e1fdf1..5af7e3d5ce3f 100644 --- a/src/login/logind-brightness.c +++ b/src/login/logind-brightness.c @@ -1,5 +1,6 @@ diff --git a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch deleted file mode 100644 index 49a334d0909e..000000000000 --- a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bdbafe18c3bf99b3b691cd52b9ccff60f313892d Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Wed, 27 Jun 2018 16:09:24 +0800 -Subject: [PATCH 2/5] use lnr wrapper instead of looking for --relative option - for ln - -Remove file manually to avoid the 'File Exists' error when creating -symlink. This is because the original 'ln' command uses '-f' option. - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj -Signed-off-by: Chen Qi -[rebased for systemd 243] -Signed-off-by: Scott Murray ---- - meson.build | 4 ---- - tools/meson-make-symlink.sh | 3 ++- - units/meson-add-wants.sh | 7 ++++++- - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index e5ceb1e169..79b762faeb 100644 ---- a/meson.build -+++ b/meson.build -@@ -579,10 +579,6 @@ endforeach - - conf.set_quoted('TELINIT', get_option('telinit-path')) - --if run_command('ln', '--relative', '--help').returncode() != 0 -- error('ln does not support --relative (added in coreutils 8.16)') --endif -- - ############################################################ - - gperf = find_program('gperf') -diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh -index da0d13a341..90bc0a93c2 100755 ---- a/tools/meson-make-symlink.sh -+++ b/tools/meson-make-symlink.sh -@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" - if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" - else -- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" -+ rm -f "${DESTDIR:-}$2" -+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2" - fi -diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh -index a483d75b86..3c01c523f1 100755 ---- a/units/meson-add-wants.sh -+++ b/units/meson-add-wants.sh -@@ -25,4 +25,9 @@ case "$target" in - ;; - esac - --ln -vfs --relative "$unitpath" "$dir" -+if [ -d "$dir" ]; then -+ rm -f "$dir/$unit" -+ lnr "$unitpath" "$dir/$unit" -+else -+ lnr "$unitpath" "$dir" -+fi diff --git a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch index 6695d5680443..c6204786b3cd 100644 --- a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch +++ b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch @@ -1,7 +1,7 @@ -From 47864989388bcd04d647ecf618ad7e260399dbb6 Mon Sep 17 00:00:00 2001 +From f9078501a1495c9991431d1435d081cd2e830328 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 5 Sep 2015 06:31:47 +0000 -Subject: [PATCH 3/5] implment systemd-sysv-install for OE +Subject: [PATCH] implment systemd-sysv-install for OE Use update-rc.d for enabling/disabling and status command to check the status of the sysv service @@ -9,12 +9,13 @@ to check the status of the sysv service Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj + --- src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON -index 8c16cf9..9f078a1 100755 +index 8c16cf99913f..9f078a121469 100755 --- a/src/systemctl/systemd-sysv-install.SKELETON +++ b/src/systemctl/systemd-sysv-install.SKELETON @@ -32,17 +32,17 @@ case "$1" in @@ -38,6 +39,3 @@ index 8c16cf9..9f078a1 100755 ;; *) usage ;; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 2e39f7a2e19b..140489514335 100644 --- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -1,24 +1,28 @@ -From a9421d55102fc84f77f7c21a2479fcd00652b896 Mon Sep 17 00:00:00 2001 +From 233de872b9b033ec842c2135152d2e006ac44c16 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH 03/24] missing_type.h: add __compare_fn_t and comparison_fn_t +Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t Make it work with musl where comparison_fn_t and __compare_fn_t is not provided. Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Alex Kiernan +[Rebased for v244] Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek + --- src/basic/missing_type.h | 9 +++++++++ src/basic/sort-util.h | 1 + + src/core/kmod-setup.c | 1 + src/journal/catalog.c | 1 + - 3 files changed, 11 insertions(+) + 4 files changed, 12 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index bf8a6caa1b..2134fe5095 100644 +index bf8a6caa1b46..c487e65e7bde 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,12 @@ @@ -35,29 +39,38 @@ index bf8a6caa1b..2134fe5095 100644 +typedef int (*__compar_fn_t)(const void *, const void *); +#endif diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index e029f86..7247d40 100644 +index 27d68b341cf3..307ea4ac0e8e 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ #include #include "macro.h" -+#include "missing.h" ++#include "missing_type.h" void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *arg); +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index 128674327362..09ccd613e32c 100644 +--- a/src/core/kmod-setup.c ++++ b/src/core/kmod-setup.c +@@ -10,6 +10,7 @@ + #include "kmod-setup.h" + #include "macro.h" + #include "string-util.h" ++#include "missing_type.h" + + #if HAVE_KMOD + #include "module-util.h" diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index 7beffc1e1a..4818a2e5cc 100644 +index 70b2c8b46c4e..d574a64586f1 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c -@@ -29,6 +29,7 @@ +@@ -28,6 +28,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -+#include "missing.h" ++#include "missing_type.h" const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch index 7ee0d48fa671..538a99c7d7e0 100644 --- a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch +++ b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch @@ -1,4 +1,7 @@ -Include signal.h +From 082d2eb2a65525890a913723764e67a36ee75384 Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Include signal.h Fixes several signal set related errors: src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] @@ -9,17 +12,18 @@ src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [ Upstream-Status: Pending Signed-off-by: Scott Murray + --- src/basic/copy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/copy.c b/src/basic/copy.c -index ca311e021e..3cf7fc1697 100644 +index 9028868f696d..5168586fa522 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c -@@ -12,6 +12,7 @@ +@@ -8,6 +8,7 @@ + #include #include - #include #include +#include diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch index a2aad40ac252..71e52c49674e 100644 --- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001 +From 142dcaef0d24a78d3c0c94168b66fdf234497e97 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:04:21 +0800 -Subject: [PATCH 04/24] add fallback parse_printf_format implementation +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -10,11 +10,12 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- meson.build | 1 + src/basic/meson.build | 5 + - src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++++++++++ - src/basic/parse-printf-format.h | 57 +++++++++ + src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++ + src/basic/parse-printf-format.h | 57 +++++++ src/basic/stdio-util.h | 2 +- src/journal/journal-send.c | 2 +- 6 files changed, 338 insertions(+), 2 deletions(-) @@ -22,10 +23,10 @@ Signed-off-by: Scott Murray create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 79b762faeb..7f8c679411 100644 +index 21d6968abdf4..bab0bf84806c 100644 --- a/meson.build +++ b/meson.build -@@ -613,6 +613,7 @@ endif +@@ -628,6 +628,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -34,10 +35,10 @@ index 79b762faeb..7f8c679411 100644 'valgrind/memcheck.h', 'valgrind/valgrind.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index d6caf28f14..32c1acf349 100644 +index f70d1b8bf8a0..4cd57373e10d 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build -@@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''], +@@ -311,6 +311,11 @@ foreach item : [['af', af_list_txt, 'af', ''], endforeach basic_sources += generated_gperf_headers @@ -51,7 +52,7 @@ index d6caf28f14..32c1acf349 100644 'gcrypt-util.h') diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c new file mode 100644 -index 0000000000..49437e5445 +index 000000000000..49437e544540 --- /dev/null +++ b/src/basic/parse-printf-format.c @@ -0,0 +1,273 @@ @@ -330,7 +331,7 @@ index 0000000000..49437e5445 +} diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h new file mode 100644 -index 0000000000..47be7522d7 +index 000000000000..47be7522d7fa --- /dev/null +++ b/src/basic/parse-printf-format.h @@ -0,0 +1,57 @@ @@ -392,7 +393,7 @@ index 0000000000..47be7522d7 + +#endif /* HAVE_PRINTF_H */ diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h -index c3b9448d4f..2937aa13b1 100644 +index c3b9448d4f4f..2937aa13b178 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -1,13 +1,13 @@ @@ -411,7 +412,7 @@ index c3b9448d4f..2937aa13b1 100644 #define snprintf_ok(buf, len, fmt, ...) \ ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 5ef11fa1a4..6384ab620c 100644 +index 912ecef73cce..43ed756bda53 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -2,7 +2,6 @@ @@ -420,9 +421,9 @@ index 5ef11fa1a4..6384ab620c 100644 #include -#include #include - #include #include -@@ -21,6 +20,7 @@ + #include +@@ -20,6 +19,7 @@ #include "stdio-util.h" #include "string-util.h" #include "tmpfile-util.h" diff --git a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch index 0f75e8c12dee..685df01a10ee 100644 --- a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch @@ -1,4 +1,7 @@ -Handle __cpu_mask usage +From 6883ffc99168056101c667c6421f8353d5ad675a Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Fri, 13 Sep 2019 19:26:27 -0400 +Subject: [PATCH] Handle __cpu_mask usage Fixes errors: @@ -15,13 +18,14 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Scott Murray + --- src/shared/cpu-set-util.h | 2 ++ src/test/test-sizeof.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h -index 27812dfd59..f698f9df83 100644 +index 27812dfd5923..0ab40731ea93 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@ @@ -34,7 +38,7 @@ index 27812dfd59..f698f9df83 100644 typedef struct CPUSet { cpu_set_t *set; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index a710db5370..d1601ad929 100644 +index a710db5370b8..d1601ad9292d 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,6 +1,5 @@ diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index adfc3b78618f..aa4bb063c92d 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,7 @@ -From 399fd3eda3045636a70da438a0fd1406cc332ed1 Mon Sep 17 00:00:00 2001 +From 9597196234a0ccf30d7f65cf185a8c24cb3158b3 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH 05/24] src/basic/missing.h: check for missing strndupa +Subject: [PATCH] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -13,28 +13,47 @@ Signed-off-by: Chen Qi Signed-off-by: Andrej Valek [rebased for systemd 243] Signed-off-by: Scott Murray +Signed-off-by: Alex Kiernan +[rebased for systemd 244] + --- meson.build | 1 + src/backlight/backlight.c | 1 + + src/basic/cgroup-util.c | 1 + src/basic/env-util.c | 1 + + src/basic/log.c | 1 + src/basic/missing_stdlib.h | 12 ++++++++++++ src/basic/mkdir.c | 1 + src/basic/parse-util.c | 1 + src/basic/proc-cmdline.c | 1 + src/basic/procfs-util.c | 1 + + src/basic/selinux-util.c | 1 + src/basic/time-util.c | 1 + + src/boot/bless-boot.c | 1 + src/core/dbus-cgroup.c | 1 + + src/core/dbus-execute.c | 1 + src/core/dbus-util.c | 1 + + src/core/execute.c | 1 + src/core/kmod-setup.c | 1 + src/core/service.c | 1 + + src/coredump/coredump-vacuum.c | 1 + + src/journal-remote/journal-remote-main.c | 1 + src/journal/journalctl.c | 1 + src/libsystemd/sd-bus/bus-message.c | 1 + src/libsystemd/sd-bus/bus-objects.c | 1 + + src/libsystemd/sd-bus/bus-socket.c | 1 + + src/libsystemd/sd-bus/sd-bus.c | 1 + src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + src/locale/keymap-util.c | 1 + src/login/pam_systemd.c | 1 + src/network/generator/network-generator.c | 1 + src/nspawn/nspawn-settings.c | 1 + + src/nss-mymachines/nss-mymachines.c | 1 + + src/portable/portable.c | 1 + + src/resolve/resolvectl.c | 1 + + src/shared/bus-unit-procs.c | 1 + + src/shared/bus-unit-util.c | 1 + + src/shared/bus-util.c | 1 + src/shared/dns-domain.c | 1 + src/shared/journal-importer.c | 1 + src/shared/logs-show.c | 1 + @@ -46,13 +65,13 @@ Signed-off-by: Scott Murray src/udev/udev-builtin-path_id.c | 1 + src/udev/udev-event.c | 1 + src/udev/udev-rules.c | 1 + - 32 files changed, 43 insertions(+) + 48 files changed, 59 insertions(+) diff --git a/meson.build b/meson.build -index 7f8c679411..81c061b768 100644 +index bab0bf84806c..f4e1736cf09e 100644 --- a/meson.build +++ b/meson.build -@@ -506,6 +506,7 @@ foreach ident : [ +@@ -517,6 +517,7 @@ foreach ident : [ #include '''], ['get_mempolicy', '''#include #include '''], @@ -61,31 +80,55 @@ index 7f8c679411..81c061b768 100644 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index dfd6805398..c2b2ace6ec 100644 +index 048441429025..01d74ea0ed4e 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -17,6 +17,7 @@ #include "string-util.h" #include "strv.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { const char *subsystem, *sysname, *value; +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index 54fc6ecf8b20..a5141f4cbedd 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -37,6 +37,7 @@ + #include "strv.h" + #include "unit-name.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { + _cleanup_free_ char *fs = NULL; diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index a6503cf2b6..ceef9a62c8 100644 +index b8dc98915f81..5049b37594bc 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c -@@ -16,6 +16,7 @@ +@@ -15,6 +15,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define VALID_CHARS_ENV_NAME \ DIGITS LETTERS \ +diff --git a/src/basic/log.c b/src/basic/log.c +index 17557e1844b2..6cec4d324aab 100644 +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -34,6 +34,7 @@ + #include "terminal-util.h" + #include "time-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 188a8d4406..1e16ec287a 100644 +index 188a8d44066a..1e16ec287aad 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -105,338 +148,506 @@ index 188a8d4406..1e16ec287a 100644 + }) +#endif diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index 6b82eab640..51c6b78615 100644 +index fa682d4c438e..37902551490a 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c -@@ -14,6 +14,7 @@ +@@ -13,6 +13,7 @@ #include "stat-util.h" #include "stdio-util.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { struct stat st; diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 115a1494a2..07a34bfd53 100644 +index aec6099c9cc1..744b9b134ce4 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c -@@ -20,6 +20,7 @@ +@@ -18,6 +18,7 @@ #include "process-util.h" #include "stat-util.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index 09169cf963..f411ba897f 100644 +index d3d99d9a7f90..e0b9efad03a2 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ #include "string-util.h" #include "util.h" #include "virt.h" -+#include "missing.h" ++#include "missing_stdlib.h" int proc_cmdline(char **ret) { const char *e; diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 7aaf95bfce..42ce53d5aa 100644 +index 7aaf95bfced2..da7e836f143e 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ #include "procfs-util.h" #include "stdio-util.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int procfs_tasks_get_limit(uint64_t *ret) { _cleanup_free_ char *value = NULL; +diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c +index f35e760233be..e4b0a8aa445e 100644 +--- a/src/basic/selinux-util.c ++++ b/src/basic/selinux-util.c +@@ -26,6 +26,7 @@ + #include "selinux-util.h" + #include "stdio-util.h" + #include "time-util.h" ++#include "missing_stdlib.h" + + #if HAVE_SELINUX + DEFINE_TRIVIAL_CLEANUP_FUNC(char*, freecon); diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 3018e81acb..4e2b3b66c1 100644 +index bfe2c60da173..d7ef30d2fe52 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static clockid_t map_clock_id(clockid_t c) { +diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c +index b96e1f927fff..cba979baca3e 100644 +--- a/src/boot/bless-boot.c ++++ b/src/boot/bless-boot.c +@@ -18,6 +18,7 @@ + #include "util.h" + #include "verbs.h" + #include "virt.h" ++#include "missing_stdlib.h" + + static char **arg_path = NULL; + diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 2f2313c599..c9937f9d62 100644 +index 27dc9e43c3e2..b1a83023600b 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -15,6 +15,7 @@ #include "fileio.h" #include "limits-util.h" #include "path-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" - static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); + BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); + +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 1d0bc1ede3cb..313654913345 100644 +--- a/src/core/dbus-execute.c ++++ b/src/core/dbus-execute.c +@@ -41,6 +41,7 @@ + #include "unit-printf.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); + static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index 7862beaacb..19f6968cfe 100644 +index 7862beaacb6d..3b1ea53a5f0d 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -7,6 +7,7 @@ #include "unit-printf.h" #include "user-util.h" #include "unit.h" -+#include "missing.h" ++#include "missing_stdlib.h" int bus_property_get_triggered_unit( sd_bus *bus, +diff --git a/src/core/execute.c b/src/core/execute.c +index abc164ff5bef..f04b8ba05002 100644 +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -88,6 +88,7 @@ + #include "unit.h" + #include "user-util.h" + #include "utmp-wtmp.h" ++#include "missing_stdlib.h" + + #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) + #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index a91cfebc67..a45961013f 100644 +index 09ccd613e32c..f4e64fa283e9 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ - #include "kmod-setup.h" #include "macro.h" #include "string-util.h" -+#include "missing.h" + #include "missing_type.h" ++#include "missing_stdlib.h" #if HAVE_KMOD - #include + #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index 73b3c9c316..ef74f00a08 100644 +index 49ad166c2604..c3b14067e201 100644 --- a/src/core/service.c +++ b/src/core/service.c -@@ -43,6 +43,7 @@ +@@ -41,6 +41,7 @@ #include "unit.h" #include "utf8.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, +diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c +index 35885dfb47c4..bb9f0660a6a0 100644 +--- a/src/coredump/coredump-vacuum.c ++++ b/src/coredump/coredump-vacuum.c +@@ -16,6 +16,7 @@ + #include "string-util.h" + #include "time-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ + #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ +diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c +index ac2bf648d2af..06c86f0201af 100644 +--- a/src/journal-remote/journal-remote-main.c ++++ b/src/journal-remote/journal-remote-main.c +@@ -21,6 +21,7 @@ + #include "stat-util.h" + #include "string-table.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" + #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 6d6bb1cf63..6666349a35 100644 +index 95b6bfee172a..e0bcfb9d4233 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c -@@ -70,6 +70,7 @@ +@@ -68,6 +68,7 @@ #include "unit-name.h" #include "user-util.h" #include "varlink.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index eb029e4453..f31fe9d5a8 100644 +index eb029e445326..8da2c5d51a75 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -21,6 +21,7 @@ #include "strv.h" #include "time-util.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index ae643cacc7..1b752271a5 100644 +index ae643cacc740..f766e235206d 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -13,6 +13,7 @@ #include "set.h" #include "string-util.h" #include "strv.h" -+#include "missing.h" ++#include "missing_stdlib.h" static int node_vtable_get_userdata( sd_bus *bus, +diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c +index 18d30d010a20..be2ab703f8ed 100644 +--- a/src/libsystemd/sd-bus/bus-socket.c ++++ b/src/libsystemd/sd-bus/bus-socket.c +@@ -28,6 +28,7 @@ + #include "string-util.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + #define SNDBUF_SIZE (8*1024*1024) + +diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c +index 058492a83eec..54c896f572b9 100644 +--- a/src/libsystemd/sd-bus/sd-bus.c ++++ b/src/libsystemd/sd-bus/sd-bus.c +@@ -41,6 +41,7 @@ + #include "process-util.h" + #include "string-util.h" + #include "strv.h" ++#include "missing_stdlib.h" + + #define log_debug_bus_message(m) \ + do { \ diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c -index 8de0a859ee..4fd0a2e692 100644 +index 8de0a859ee94..58044b6ba908 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ #include "missing_resource.h" #include "time-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define MAX_SIZE (2*1024*1024) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c -index f8c36c94f5..41f5606aea 100644 +index 519dd0d188cf..a8f536915bb2 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c -@@ -22,6 +22,7 @@ +@@ -21,6 +21,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static bool startswith_comma(const char *s, const char *prefix) { s = startswith(s, prefix); diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index 3f762cbbc3..005cfea658 100644 +index aa6e5ea7aca8..c439c21b2872 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -28,6 +28,7 @@ #include "hostname-util.h" #include "login-util.h" #include "macro.h" -+#include "missing.h" ++#include "missing_stdlib.h" #include "parse-util.h" #include "path-util.h" #include "process-util.h" diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index 0b5af33566..9c808cd014 100644 +index 81afa9530762..2c5328f97c63 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ #include "string-table.h" #include "string-util.h" #include "strv.h" -+#include "missing.h" ++#include "missing_stdlib.h" /* # .network diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index 3a99736813..279fea4d88 100644 +index 5fb5b49bbcc3..785ccc2da307 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -16,6 +16,7 @@ #include "strv.h" #include "user-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" Settings *settings_new(void) { Settings *s; +diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c +index 364356da5622..47d4ea44e40f 100644 +--- a/src/nss-mymachines/nss-mymachines.c ++++ b/src/nss-mymachines/nss-mymachines.c +@@ -19,6 +19,7 @@ + #include "signal-util.h" + #include "string-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); + NSS_GETPW_PROTOTYPES(mymachines); +diff --git a/src/portable/portable.c b/src/portable/portable.c +index 34b123e84692..5a48504d00ac 100644 +--- a/src/portable/portable.c ++++ b/src/portable/portable.c +@@ -29,6 +29,7 @@ + #include "strv.h" + #include "tmpfile-util.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); + +diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c +index 0a96a18b3836..432d6ebc3730 100644 +--- a/src/resolve/resolvectl.c ++++ b/src/resolve/resolvectl.c +@@ -31,6 +31,7 @@ + #include "strv.h" + #include "terminal-util.h" + #include "verbs.h" ++#include "missing_stdlib.h" + + static int arg_family = AF_UNSPEC; + static int arg_ifindex = 0; +diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c +index b21fe393265f..af2640005c1d 100644 +--- a/src/shared/bus-unit-procs.c ++++ b/src/shared/bus-unit-procs.c +@@ -10,6 +10,7 @@ + #include "sort-util.h" + #include "string-util.h" + #include "terminal-util.h" ++#include "missing_stdlib.h" + + struct CGroupInfo { + char *cgroup_path; +diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c +index 22a15493d7f3..3f4c51975675 100644 +--- a/src/shared/bus-unit-util.c ++++ b/src/shared/bus-unit-util.c +@@ -34,6 +34,7 @@ + #include "unit-def.h" + #include "user-util.h" + #include "utf8.h" ++#include "missing_stdlib.h" + + int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { + assert(message); +diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c +index aea46d311996..223426298144 100644 +--- a/src/shared/bus-util.c ++++ b/src/shared/bus-util.c +@@ -34,6 +34,7 @@ + #include "stdio-util.h" + #include "strv.h" + #include "user-util.h" ++#include "missing_stdlib.h" + + static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + sd_event *e = userdata; diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c -index f62ad0a0f5..f1a27e158d 100644 +index b812665315f6..8e68f7f8fc6c 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c -@@ -24,6 +24,7 @@ +@@ -23,6 +23,7 @@ #include "string-util.h" #include "strv.h" #include "utf8.h" -+#include "missing.h" ++#include "missing_stdlib.h" int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 7c4fc7021d..a6ff2214df 100644 +index 7c4fc7021dec..3fbaf5a63969 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -14,6 +14,7 @@ #include "parse-util.h" #include "string-util.h" #include "unaligned.h" -+#include "missing.h" ++#include "missing_stdlib.h" enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index b615c70dff..75b26e9c21 100644 +index 95b2e3376e9a..facc23aaecd5 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c -@@ -39,6 +39,7 @@ +@@ -37,6 +37,7 @@ #include "time-util.h" #include "utf8.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 diff --git a/src/shared/pager.c b/src/shared/pager.c -index 7c20b100b4..e4209d3a95 100644 +index 1fe9db179176..67954b5cab93 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c -@@ -25,6 +25,7 @@ +@@ -23,6 +23,7 @@ #include "strv.h" #include "terminal-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static pid_t pager_pid = 0; diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 6bf0ff0316..f6c8009cd2 100644 +index 5b1620974536..0e7cd1c2af12 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c -@@ -20,6 +20,7 @@ +@@ -19,6 +19,7 @@ #include "tmpfile-util.h" #include "user-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c -index 7cb7d8a477..8b12b91084 100644 +index 7cb7d8a477e9..8e7d7f9e7ca6 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ #include "sort-util.h" #include "uid-range.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c -index abbbc9f2d6..6179b5851e 100644 +index 2fb9c854fa50..58cef31458f7 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "socket-util.h" #include "string-util.h" #include "util.h" -+#include "missing.h" ++#include "missing_stdlib.h" #define BUFFER_SIZE (256 * 1024) diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index 52217429b1..a05e7782f6 100644 +index 52217429b154..70708dedf318 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ #include "hexdecoct.h" #include "macro.h" #include "string-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index e8f1ce1354..8693cb02a4 100644 +index ca38f5608791..9d8cf4d2807b 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c -@@ -23,6 +23,7 @@ +@@ -22,6 +22,7 @@ #include "strv.h" #include "sysexits.h" #include "udev-builtin.h" -+#include "missing.h" ++#include "missing_stdlib.h" _printf_(2,3) static void path_prepend(char **path, const char *fmt, ...) { diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index 8cfa2cdf23..b0670c77ec 100644 +index 58d484280aa5..90eab6806b55 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c -@@ -35,6 +35,7 @@ +@@ -34,6 +34,7 @@ #include "udev-util.h" #include "udev-watch.h" #include "user-util.h" -+#include "missing.h" ++#include "missing_stdlib.h" typedef struct Spawn { sd_device *device; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index 1642f10535..fe2aa75478 100644 +index 6168b332d3b2..245fe0a64d22 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c -@@ -28,6 +28,7 @@ - #include "udev-event.h" +@@ -30,6 +30,7 @@ #include "udev-rules.h" #include "user-util.h" -+#include "missing.h" + #include "virt.h" ++#include "missing_stdlib.h" #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index 6d73d715ce37..ea003fd7dab7 100644 --- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch @@ -1,4 +1,7 @@ -Include netinet/if_ether.h +From 3932ce7f6c8ace5e1210aad20e1a141cb29329b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 26 Oct 2017 22:10:42 -0700 +Subject: [PATCH] Include netinet/if_ether.h Fixes /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' @@ -26,11 +29,15 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/libsystemd-network/sd-dhcp6-client.c | 1 - src/libsystemd/sd-netlink/netlink-types.c | 1 + src/machine/machine-dbus.c | 1 + + src/network/netdev/bond.c | 1 + + src/network/netdev/bridge.c | 1 + src/network/netdev/macsec.c | 1 + + src/network/netdev/netdev-gperf.gperf | 1 + src/network/netdev/netdev.c | 1 + src/network/networkd-brvlan.c | 1 + src/network/networkd-dhcp-common.c | 1 + @@ -38,26 +45,27 @@ Signed-off-by: Scott Murray src/network/networkd-dhcp6.c | 2 +- src/network/networkd-link.c | 2 +- src/network/networkd-network.c | 1 + + src/network/test-network-tables.c | 1 + src/shared/ethtool-util.c | 1 + src/shared/ethtool-util.h | 1 + src/udev/net/link-config.c | 1 + src/udev/udev-builtin-net_setup_link.c | 1 + - 15 files changed, 14 insertions(+), 4 deletions(-) + 19 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index d7a5349c70..68b41dfb6c 100644 +index 5417ba8c5feb..d3aba928dd96 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c -@@ -6,7 +6,6 @@ +@@ -5,7 +5,6 @@ + #include - #include #include -#include #include #include "sd-dhcp6-client.h" diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c -index de9b8b21ab..f64f6500f7 100644 +index a55460f03407..6f9cd527c800 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -3,6 +3,7 @@ @@ -69,19 +77,41 @@ index de9b8b21ab..f64f6500f7 100644 #include #include diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 0d58b5eb8b..01093c1f62 100644 +index 3b2ac3829859..760ccb445cd0 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -4,6 +4,7 @@ - #include +@@ -3,6 +3,7 @@ + #include #include #include +#include /* When we include libgen.h because we need dirname() we immediately * undefine basename() since libgen.h defines it as a macro to the POSIX +diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c +index 185b155440e7..dc1cd236c814 100644 +--- a/src/network/netdev/bond.c ++++ b/src/network/netdev/bond.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include + #include "alloc-util.h" + #include "bond.h" + #include "conf-parser.h" +diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c +index 59a40faef8fa..8e821a3216b3 100644 +--- a/src/network/netdev/bridge.c ++++ b/src/network/netdev/bridge.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include + #include + + #include "bridge.h" diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c -index cf281e75a6..269dc618ff 100644 +index 25dc23ff0338..f20d11fbcf53 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -1,5 +1,6 @@ @@ -91,8 +121,20 @@ index cf281e75a6..269dc618ff 100644 #include #include #include +diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf +index 09a5f4822e03..873299b1f98a 100644 +--- a/src/network/netdev/netdev-gperf.gperf ++++ b/src/network/netdev/netdev-gperf.gperf +@@ -2,6 +2,7 @@ + #if __GNUC__ >= 7 + _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") + #endif ++#include + #include + #include "bond.h" + #include "bridge.h" diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c -index 7735b455b7..ed4eda4a44 100644 +index 6908c4e811b0..e0d8c459ab63 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -1,5 +1,6 @@ @@ -103,7 +145,7 @@ index 7735b455b7..ed4eda4a44 100644 #include diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c -index c3c5d535ac..ebea408c89 100644 +index c3c5d535ac66..ebea408c89a8 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -4,6 +4,7 @@ @@ -115,19 +157,19 @@ index c3c5d535ac..ebea408c89 100644 #include diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c -index 626b975839..42fe92f320 100644 +index 6465a8cfe9c7..bd4b2cdfac15 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c -@@ -1,6 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - +@@ -4,6 +4,7 @@ + #include "escape.h" + #include "in-addr-util.h" #include "networkd-dhcp-common.h" +#include #include "networkd-network.h" #include "parse-util.h" #include "string-table.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index 662770b50e..c6ab62a94d 100644 +index 8ca87d99d4db..a66284896cf3 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,8 +1,8 @@ @@ -139,9 +181,9 @@ index 662770b50e..c6ab62a94d 100644 -#include #include "alloc-util.h" - #include "hostname-util.h" + #include "dhcp-client-internal.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index 8ad736a82b..f41b4d834e 100644 +index 647623ac3778..325c641c6231 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ @@ -156,7 +198,7 @@ index 8ad736a82b..f41b4d834e 100644 #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index f5bb78890a..f13a36b791 100644 +index 2e60adbf7818..05aa8672d585 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ @@ -170,7 +212,7 @@ index f5bb78890a..f13a36b791 100644 #include "alloc-util.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c -index 2b8d0eb2fb..2f79ef25cd 100644 +index 6e443975f171..d1aab0ca5ba2 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1,5 +1,6 @@ @@ -180,8 +222,17 @@ index 2b8d0eb2fb..2f79ef25cd 100644 #include #include #include +diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c +index 25b939639775..530e4928835c 100644 +--- a/src/network/test-network-tables.c ++++ b/src/network/test-network-tables.c +@@ -1,3 +1,4 @@ ++#include + #include "bond.h" + #include "dhcp6-internal.h" + #include "dhcp6-protocol.h" diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c -index b0961df72e..53fcbbd84b 100644 +index 3119b2b92e3b..927ddd067eef 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -1,5 +1,6 @@ @@ -192,7 +243,7 @@ index b0961df72e..53fcbbd84b 100644 #include #include diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h -index 8b32b243f3..262b819976 100644 +index d408bcd90a0b..7a1e399af023 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -2,6 +2,7 @@ @@ -204,7 +255,7 @@ index 8b32b243f3..262b819976 100644 #include "conf-parser.h" diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index d44af64d5e..fd052f1591 100644 +index 7b07e2f38fa8..18680a8e5484 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -1,5 +1,6 @@ @@ -215,7 +266,7 @@ index d44af64d5e..fd052f1591 100644 #include diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c -index ee3ca9fa38..9aa4e82874 100644 +index ee3ca9fa3846..9aa4e828741f 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch index 34f7f5fb7486..580c49fecfbd 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch @@ -1,8 +1,7 @@ -From f8a239b182158ca0a537ba053cb0e6bad9c3a2fb Mon Sep 17 00:00:00 2001 +From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 07/24] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not - defined +Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined If the standard library doesn't provide brace expansion users just won't get it. @@ -17,6 +16,7 @@ Signed-off-by: Khem Raj Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/basic/glob-util.c | 12 ++++++++++++ src/test/test-glob-util.c | 16 ++++++++++++++++ @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray 3 files changed, 38 insertions(+) diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c -index b335af8d97..2cdfc11f16 100644 +index e3aa6c2e152b..38070b79c83a 100644 --- a/src/basic/glob-util.c +++ b/src/basic/glob-util.c -@@ -14,6 +14,12 @@ +@@ -12,6 +12,12 @@ #include "path-util.h" #include "strv.h" @@ -40,7 +40,7 @@ index b335af8d97..2cdfc11f16 100644 static void closedir_wrapper(void* v) { (void) closedir(v); } -@@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) { +@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) { int safe_glob(const char *path, int flags, glob_t *pglob) { int k; @@ -48,7 +48,7 @@ index b335af8d97..2cdfc11f16 100644 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ assert(!(flags & GLOB_ALTDIRFUNC)); -@@ -34,9 +41,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { +@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { pglob->gl_lstat = lstat; if (!pglob->gl_stat) pglob->gl_stat = stat; @@ -64,10 +64,10 @@ index b335af8d97..2cdfc11f16 100644 return -ENOENT; if (k == GLOB_NOSPACE) diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index b4f41445fe..f0d474ed14 100644 +index 667d15335fbf..76a84443aacf 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c -@@ -13,6 +13,12 @@ +@@ -12,6 +12,12 @@ #include "rm-rf.h" #include "tmpfile-util.h" @@ -80,7 +80,7 @@ index b4f41445fe..f0d474ed14 100644 static void test_glob_exists(void) { char name[] = "/tmp/test-glob_exists.XXXXXX"; int fd = -1; -@@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { +@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { const char *fn; _cleanup_globfree_ glob_t g = { @@ -94,7 +94,7 @@ index b4f41445fe..f0d474ed14 100644 }; int r; -@@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { +@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { assert_se(mkdtemp(template)); fn = strjoina(template, "/*"); @@ -115,10 +115,10 @@ index b4f41445fe..f0d474ed14 100644 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 3c30612af1..14bc428085 100644 +index 193ed0bc781b..2f94fd2efd8f 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c -@@ -63,6 +63,12 @@ +@@ -58,6 +58,12 @@ #include "umask-util.h" #include "user-util.h" @@ -131,7 +131,7 @@ index 3c30612af1..14bc428085 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -1853,7 +1859,9 @@ finish: +@@ -1850,7 +1856,9 @@ finish: static int glob_item(Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -141,7 +141,7 @@ index 3c30612af1..14bc428085 100644 }; int r = 0, k; char **fn; -@@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) { +@@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) { static int glob_item_recursively(Item *i, fdaction_t action) { _cleanup_globfree_ glob_t g = { diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index d5f2349f2b58..1f618932ea58 100644 --- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From 6cd17c753d2c0a90fc791f69bbc694cbc8556a4f Mon Sep 17 00:00:00 2001 +From 7c440cfc53aa52c9dc91c3a8c105bcf314c53af6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 08/24] add missing FTW_ macros for musl +Subject: [PATCH] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -10,12 +10,13 @@ This is to avoid build failures like below for musl. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_type.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index c487e65..23602eb 100644 +index c487e65e7bde..23602ebbd533 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); @@ -42,6 +43,3 @@ index c487e65..23602eb 100644 +#ifndef FTW_SKIP_SIBLINGS +#define FTW_SKIP_SIBLINGS 3 +#endif --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 8bacd0289d67..0de1121906d3 100644 --- a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -1,20 +1,21 @@ -From f1f4b4f9684fed185bfa8b9ed409cdf241657e99 Mon Sep 17 00:00:00 2001 +From 5166a6657570d4072cdce118621791e4a8186e07 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:03:47 +0800 -Subject: [PATCH 10/24] fix missing of __register_atfork for non-glibc builds +Subject: [PATCH] fix missing of __register_atfork for non-glibc builds Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/process-util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 78ce43b..aec2daf 100644 +index 9b6c4c31f713..24fec5ecb53a 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -22,6 +22,9 @@ +@@ -18,6 +18,9 @@ #if HAVE_VALGRIND_VALGRIND_H #include #endif @@ -24,7 +25,7 @@ index 78ce43b..aec2daf 100644 #include "alloc-util.h" #include "architecture.h" -@@ -1160,11 +1163,15 @@ void reset_cached_pid(void) { +@@ -1114,11 +1117,15 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -40,6 +41,3 @@ index 78ce43b..aec2daf 100644 pid_t getpid_cached(void) { static bool installed = false; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch index d6eda9c038fb..e00600ab7c32 100644 --- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,7 +1,7 @@ -From e3f847bd0338d27aff3335b42661d8a4b66b965e Mon Sep 17 00:00:00 2001 +From f6df7f25a6bb00d5540915216adfff8afefec2b0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH 11/24] Use uintmax_t for handling rlim_t +Subject: [PATCH] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to @@ -20,6 +20,7 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199] Signed-off-by: Khem Raj [Rebased for v241] Signed-off-by: Chen Qi + --- src/basic/format-util.h | 8 +------- src/basic/rlimit-util.c | 10 +++++----- @@ -27,10 +28,10 @@ Signed-off-by: Chen Qi 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/basic/format-util.h b/src/basic/format-util.h -index dece5d3..dbb87bc 100644 +index 59622508a333..779b6826d50e 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h -@@ -42,13 +42,7 @@ +@@ -44,13 +44,7 @@ # define PRI_TIMEX "li" #endif @@ -46,10 +47,10 @@ index dece5d3..dbb87bc 100644 #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index 74b3a02..b02c03c 100644 +index 2dc13eabc30d..0633cc67f417 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c -@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { +@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) s = strdup("infinity"); else if (rl->rlim_cur >= RLIM_INFINITY) @@ -67,7 +68,7 @@ index 74b3a02..b02c03c 100644 if (!s) return -ENOMEM; -@@ -404,7 +404,7 @@ int rlimit_nofile_safe(void) { +@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) { rl.rlim_cur = FD_SETSIZE; if (setrlimit(RLIMIT_NOFILE, &rl) < 0) @@ -77,10 +78,10 @@ index 74b3a02..b02c03c 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index a708231..e2b8748 100644 +index f04b8ba05002..084cf1420078 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -4220,9 +4220,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -4455,9 +4455,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", @@ -92,6 +93,3 @@ index a708231..e2b8748 100644 } if (c->ioprio_set) { --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index 914589dbd38e..aa23c7ab7d08 100644 --- a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch @@ -1,22 +1,22 @@ -From d3d65d4036670cbd5129fe55c09ca391286ef4b3 Mon Sep 17 00:00:00 2001 +From 7874912817b5ac7ed7f8557359a12d9d4b2f53eb Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 28 Feb 2018 21:25:22 -0800 -Subject: [PATCH 14/24] test-sizeof.c: Disable tests for missing typedefs in - musl +Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj Signed-off-by: Chen Qi + --- src/test/test-sizeof.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c -index 35b0876..e78e7ca 100644 +index 7fc16a62b656..a710db5370b8 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c -@@ -41,8 +41,10 @@ int main(void) { +@@ -42,8 +42,10 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); @@ -27,7 +27,7 @@ index 35b0876..e78e7ca 100644 info(float); info(double); -@@ -60,7 +62,9 @@ int main(void) { +@@ -61,7 +63,9 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); @@ -37,6 +37,3 @@ index 35b0876..e78e7ca 100644 info(pid_t); info(uid_t); info(gid_t); --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index fd407f604d66..efeef072950b 100644 --- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,7 +1,7 @@ -From 48c628f532f6025c2d1646b6819cd81eb789d7fb Mon Sep 17 00:00:00 2001 +From e6f871078d8d6f076c84f908fa57af15417ab87d Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH 15/24] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See: @@ -25,16 +25,17 @@ just historical and not actually necessary or desired behaviour? Upstream-Status: Inappropriate [musl specific] Signed-off-by: Andre McCurdy + --- src/basic/fs-util.h | 22 +++++++++++++++++++++- src/shared/base-filesystem.c | 6 +++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 7ad030b..d4cb1e9 100644 +index 78d68be9fd85..c5dc84d41868 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h -@@ -32,7 +32,27 @@ int fchmod_opath(int fd, mode_t m); +@@ -40,7 +40,27 @@ int fchmod_opath(int fd, mode_t m); int fd_warn_permissions(const char *path, int fd); @@ -64,10 +65,10 @@ index 7ad030b..d4cb1e9 100644 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 89d7a7d..34b4ad5 100644 +index 657407da2d37..fbd5782d84fc 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c -@@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { return log_error_errno(errno, "Failed to open root file system: %m"); for (i = 0; i < ELEMENTSOF(table); i ++) { @@ -76,7 +77,7 @@ index 89d7a7d..34b4ad5 100644 continue; if (table[i].target) { -@@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) { @@ -85,7 +86,7 @@ index 89d7a7d..34b4ad5 100644 continue; /* check if a specific file exists at the target path */ -@@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom(); @@ -94,6 +95,3 @@ index 89d7a7d..34b4ad5 100644 continue; } --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch index d5565698aa28..19a3eef84701 100644 --- a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,8 +1,7 @@ -From af76c973e41929360a6e021f2ff9a7fc1d7994e9 Mon Sep 17 00:00:00 2001 +From ec335ef3bb903a7eaf054103cc51411e71e6448c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH 16/24] Define glibc compatible basename() for non-glibc - systems +Subject: [PATCH] Define glibc compatible basename() for non-glibc systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out @@ -10,25 +9,24 @@ using non-posix basename implementation, we have a way out Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj + --- - src/machine/machine-dbus.c | 4 ++++ - 1 file changed, 4 insertions(+) + src/machine/machine-dbus.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 7a558df..eca7d4b 100644 +index 760ccb445cd0..0df20f3864b3 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c -@@ -11,6 +11,10 @@ +@@ -11,6 +11,11 @@ #include #undef basename +#if !defined(__GLIBC__) ++#include +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + #include "alloc-util.h" #include "bus-common-errors.h" #include "bus-internal.h" --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 24e24e8e5a4a..56f45381de0a 100644 --- a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,7 +1,7 @@ -From c7a4efb8bccb52e1714c151929c23e12bde59b82 Mon Sep 17 00:00:00 2001 +From a6f3359042219abaa8ae06dfcce41a4721e8c21f Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH 17/24] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error. @@ -19,15 +19,16 @@ Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi [rebased for systemd 243] Signed-off-by: Scott Murray + --- src/basic/process-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index b1c08fcade..0a7a1f7d89 100644 +index 24fec5ecb53a..642b02443c85 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -1474,7 +1474,7 @@ int set_oom_score_adjust(int value) { +@@ -1492,7 +1492,7 @@ int set_oom_score_adjust(int value) { sprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t, diff --git a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index 5901772998c4..84a492f2904f 100644 --- a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,7 +1,7 @@ -From fffb2810611b4a26f5c6c0958093b5b3b7d4cd99 Mon Sep 17 00:00:00 2001 +From 4938705454cf46cfe8deac8ce457d5d2432cbead Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH 18/24] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. @@ -18,16 +18,17 @@ assigned to (char *) variable, resulting in segment fault. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/journal/journal-send.c | 5 +++++ src/libsystemd/sd-bus/bus-error.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c -index 3fea912..4f1e592 100644 +index 43ed756bda53..227ea64dbb48 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c -@@ -337,7 +337,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove +@@ -336,7 +336,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove char* j; errno = 0; @@ -41,7 +42,7 @@ index 3fea912..4f1e592 100644 char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index dc95237..bdda30f 100644 +index f760f0fdd21c..28a5159c4480 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { @@ -57,6 +58,3 @@ index dc95237..bdda30f 100644 if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch index 35cc66ff6652..3b8064677f16 100644 --- a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch @@ -1,7 +1,7 @@ -From 969ab9e68249fd383f4b513b1c9306bdac4ae9b2 Mon Sep 17 00:00:00 2001 +From 1c4c73a7cc0fb59eb68ab70699f7f51af5c163b2 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:18:00 +0800 -Subject: [PATCH 19/24] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP +Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP for currently unknown reasons they get exported to the shared libries even without being listed in the sym file @@ -11,12 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj [Rebased for v241] Signed-off-by: Chen Qi + --- src/libsystemd/sd-bus/bus-error.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index bdda30f..e21853c 100644 +index 28a5159c4480..962a4de10c56 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { @@ -30,6 +31,3 @@ index bdda30f..e21853c 100644 /* Additional maps registered with sd_bus_error_add_map() are in this * NULL terminated array */ --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch index 753d5116ac91..db4041bbb1bb 100644 --- a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch +++ b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch @@ -1,7 +1,7 @@ -From 75c06e3e2a4760b36fffd95cdf5535b8ad73c481 Mon Sep 17 00:00:00 2001 +From 8303d49cabaf3ab8890ba1d266972c721dfe6ee8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:27:54 +0800 -Subject: [PATCH 20/24] missing_type.h: add __compar_d_fn_t definition +Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition Fix the following compile failure: src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? @@ -9,12 +9,13 @@ src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_type.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 7d7c1e4..85902ab 100644 +index 23602ebbd533..917d314a81bf 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -13,6 +13,7 @@ @@ -25,6 +26,3 @@ index 7d7c1e4..85902ab 100644 #endif #ifndef __COMPAR_FN_T --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch index cdddf838907d..7dacc3683737 100644 --- a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,7 +1,7 @@ -From 3fbf61d54b82fc9bf21d8039bfd89dc9efc5bbcd Mon Sep 17 00:00:00 2001 +From 6364ff5534678c158a7fb8d4e50d0a6ce72c1ad8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH 21/24] avoid redefinition of prctl_mm_map structure +Subject: [PATCH] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map' @@ -9,12 +9,13 @@ error: redefinition of 'struct prctl_mm_map' Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/basic/missing_prctl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h -index f80cd17..47e4893 100644 +index f80cd17f346b..47e489354053 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@ @@ -27,6 +28,3 @@ index f80cd17..47e4893 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch index e266b9b125d5..33c575871c64 100644 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch @@ -1,4 +1,4 @@ -From 6bcf562bd1e541c7aa46923d9a14201c7f785261 Mon Sep 17 00:00:00 2001 +From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Dec 2019 12:49:07 -0800 Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout @@ -11,15 +11,16 @@ purposes Upstream-Status: Pending Signed-off-by: Khem Raj Upstream-Status: Pending + --- src/basic/time-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index bfe2c60da1..8cf682b36a 100644 +index d7ef30d2fe52..4d3219f114b5 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1486,7 +1486,7 @@ int time_change_fd(void) { +@@ -1487,7 +1487,7 @@ int time_change_fd(void) { /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ static const struct itimerspec its = { @@ -28,6 +29,3 @@ index bfe2c60da1..8cf682b36a 100644 }; _cleanup_close_ int fd; --- -2.24.1 - diff --git a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch index 0e5629d37b5b..80beada3d386 100644 --- a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch +++ b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch @@ -1,7 +1,7 @@ -From 902412c271e0c5d9cb93b10ec0fb5b119b393474 Mon Sep 17 00:00:00 2001 +From a05cc5fb3dc0e51682c40196285cdda34ec90783 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 16:53:06 +0800 -Subject: [PATCH 24/24] test-json.c: define M_PIl +Subject: [PATCH] test-json.c: define M_PIl Fix the following compile failure: src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? @@ -9,15 +9,16 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi + --- src/test/test-json.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-json.c b/src/test/test-json.c -index 9b8a2a9..efc746c 100644 +index a6613043b924..ca823ea79f05 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c -@@ -11,6 +11,10 @@ +@@ -12,6 +12,10 @@ #include "tests.h" #include "util.h" @@ -28,6 +29,3 @@ index 9b8a2a9..efc746c 100644 static void test_tokenizer(const char *data, ...) { unsigned line = 0, column = 0; void *state = NULL; --- -2.11.0 - diff --git a/meta/recipes-core/systemd/systemd_243.4.bb b/meta/recipes-core/systemd/systemd_244.1.bb similarity index 99% rename from meta/recipes-core/systemd/systemd_243.4.bb rename to meta/recipes-core/systemd/systemd_244.1.bb index a0d10e03beb4..b6865194822b 100644 --- a/meta/recipes-core/systemd/systemd_243.4.bb +++ b/meta/recipes-core/systemd/systemd_244.1.bb @@ -18,7 +18,6 @@ SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ - file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://99-default.preset \ " @@ -591,6 +590,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/ata_id \ ${rootlibexecdir}/udev/cdrom_id \ ${rootlibexecdir}/udev/collect \ + ${rootlibexecdir}/udev/fido_id \ ${rootlibexecdir}/udev/findkeyboards \ ${rootlibexecdir}/udev/keyboard-force-release.sh \ ${rootlibexecdir}/udev/keymap \ -- 2.17.1 From raj.khem at gmail.com Thu Feb 6 16:53:48 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 6 Feb 2020 08:53:48 -0800 Subject: [OE-core] [PATCH] bison: Upgrade to 3.5.1 In-Reply-To: <20200206093723.6hq2anenujgnqiq5@jama> References: <20200205010819.4172914-1-raj.khem@gmail.com> <20200206093723.6hq2anenujgnqiq5@jama> Message-ID: On Thu, Feb 6, 2020 at 1:37 AM Martin Jansa wrote: > > On Tue, Feb 04, 2020 at 05:08:19PM -0800, Khem Raj wrote: > > Minor upgrade on 3.5 release series > > Acked-by: Martin Jansa > > Minor upgrade with added benefits that bison-native doesn't fail to > build for me when using yoe-distro. Strangely I haven't seen this error > in any other build yet. > > 86_64-linux/bison-native/3.5-r0/recipe-sysroot-native/usr/include -O2 -pipe -c -o lib/libbison_a-pipe2.o `test -f 'lib/pipe2.c' || echo '../bison-3.5/'`lib/pipe2.c > In file included from ../bison-3.5/lib/pipe2.c:25: > ../bison-3.5/lib/binary-io.h: In function '__gl_setmode': > ../bison-3.5/lib/binary-io.h:52:10: error: 'O_BINARY' undeclared (first use in this function) > 52 | return O_BINARY; > | ^~~~~~~~ > ../bison-3.5/lib/binary-io.h:52:10: note: each undeclared identifier is reported only once for each function it appears in > ../bison-3.5/lib/pipe2.c: In function 'rpl_pipe2': > ../bison-3.5/lib/pipe2.c:70:43: error: 'O_BINARY' undeclared (first use in this function); did you mean 'SET_BINARY'? > 70 | if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_BINARY | O_TEXT)) != 0) > | ^~~~~~~~ > | SET_BINARY > ../bison-3.5/lib/pipe2.c:70:54: error: 'O_TEXT' undeclared (first use in this function); did you mean 'F_TEST'? > 70 | if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_BINARY | O_TEXT)) != 0) > | ^~~~~~ > | F_TEST > make: *** [Makefile:4827: lib/libbison_a-pipe2.o] Error 1 > WARNING: exit code 1 from a shell command. > I have seen this error too, I think BUILT_SOURCES keyword is not being handled rightly, I don't see this error when I don't use make -l option, Perhaps its a bug in make, I don't know. > > > > Signed-off-by: Khem Raj > > --- > > meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > rename meta/recipes-devtools/bison/{bison_3.5.bb => bison_3.5.1.bb} (90%) > > > > diff --git a/meta/recipes-devtools/bison/bison_3.5.bb b/meta/recipes-devtools/bison/bison_3.5.1.bb > > similarity index 90% > > rename from meta/recipes-devtools/bison/bison_3.5.bb > > rename to meta/recipes-devtools/bison/bison_3.5.1.bb > > index 3d8f6579b9..e70252d974 100644 > > --- a/meta/recipes-devtools/bison/bison_3.5.bb > > +++ b/meta/recipes-devtools/bison/bison_3.5.1.bb > > @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ > > # No point in hardcoding path to m4, just use PATH > > EXTRA_OECONF += "M4=m4" > > > > -SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" > > -SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" > > +SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" > > +SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" > > > > inherit autotools gettext texinfo > > > > -- > > 2.25.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core From bruce.ashfield at gmail.com Thu Feb 6 17:35:43 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:43 -0500 Subject: [OE-core] [PATCH 00/10][v2] kernel-yocto: consolidated pull request Message-ID: From: Bruce Ashfield v2 adds a 10th patch to the series to fixup a config issue seen with qemuarm64. The other patches are unchanged. The original pull request text follows: --------- Hi all, I've kept the v5.4 content changes, as well as the kernel version default changes out of this series and instead focused it on the collection of kernel-yocto and kern-tools tweaks that I've gethered over the past few weeks. I have Martin's gold linker fixes included, as well as the re-org'ing of the linux-yocto tasks that Paul Barker did to make it usable as a single inherit of the bbclass. I also have a defconfig detection fix included that was sent to the list. I was able to confirm that my configuration was the same with this series enabled, and I was able to boot. That being said, I'll keep my eye out for any AB fallout and will continue some more build locally .. but I wanted to get this out today as promised. Cheers, Bruce The following changes since commit 3c6978c8db59f152693f9fae65dbab13ecfcaad4: kernel-yocto.bbclass: export LD in the environment used by kconf_check (2020-02-04 15:56:29 +0000) are available in the Git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (3): kern-tools: tweak symbol_why to be python safe kern-tools: integrate merge_config fix for gold linker kern-tools: fix merge_config when LD contains parameters Gavin Li (1): kernel-yocto: fix defconfig detection in find_sccs() Martin Jansa (3): kern-tools-native: use more common S value and oe_runmake kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created Paul Barker (3): kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass kernel-yocto: Drop setting of unused variables in do_kernel_metadata kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set meta/classes/kernel-yocto.bbclass | 49 +++++++++++++------ .../kern-tools/kern-tools-native_git.bb | 13 +++-- meta/recipes-kernel/linux/linux-yocto.inc | 21 -------- 3 files changed, 42 insertions(+), 41 deletions(-) -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:44 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:44 -0500 Subject: [OE-core] [PATCH 01/10] kern-tools: tweak symbol_why to be python safe In-Reply-To: References: Message-ID: From: Bruce Ashfield Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6fb8a..57ec1abc6d 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:45 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:45 -0500 Subject: [OE-core] [PATCH 02/10] kern-tools: integrate merge_config fix for gold linker In-Reply-To: References: Message-ID: <380f2a65d776b678f454c8dd4b2722aeb41da081.1581010425.git.bruce.ashfield@gmail.com> From: Bruce Ashfield Bumping the SRCREV to pickup the following fix: Author: Martin Jansa Date: Wed Feb 5 03:26:57 2020 +0100 merge_config.sh: pass LD variable from shell environment to make * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1abc6d..3f9cfe7fe5 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" +SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:46 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:46 -0500 Subject: [OE-core] [PATCH 03/10] kern-tools-native: use more common S value and oe_runmake In-Reply-To: References: Message-ID: <52b98a7fb4dea5caf2629ebe3339a559bf8e7ef0.1581010425.git.bruce.ashfield@gmail.com> From: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- .../kern-tools/kern-tools-native_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 3f9cfe7fe5..f263421234 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" DEPENDS = "git-native" @@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:47 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:47 -0500 Subject: [OE-core] [PATCH 04/10] kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass In-Reply-To: References: Message-ID: <8cdfd5e7fd2571a9e7ecaab332dad336bceb711b.1581010425.git.bruce.ashfield@gmail.com> From: Paul Barker This allows the kernel-yocto bbclass to be inherited in a recipe without needing to include linux-yocto.inc. The bbclass should stand on its own and linux-yocto.inc does a few things which may not be desired in other kernel recipes (such as modifying KERNEL_FEATURES). The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes may not want this setting in place. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeafeb9..a0362f6acb 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" +# The distro or local.conf should set this, but if nobody cares... +LINUX_KERNEL_TYPE ??= "standard" + +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" +SRCREV_FORMAT ?= "meta_machine" + +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" + # returns local (absolute) path names for all valid patches in the # src_uri def find_patches(d,subdir): @@ -475,3 +491,8 @@ python () { if 'do_diffconfig' in d: bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) } + +# extra tasks +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask validate_branches before do_patch after do_kernel_checkout +addtask kernel_configcheck after do_configure before do_compile diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index f191946f2a..91df9c1cd5 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -69,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:48 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:48 -0500 Subject: [OE-core] [PATCH 05/10] kernel-yocto: Drop setting of unused variables in do_kernel_metadata In-Reply-To: References: Message-ID: From: Paul Barker The machine_branch and machine_srcrev variables were set but not used in do_kernel_metadata. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a0362f6acb..9a4d2864eb 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -99,13 +99,6 @@ do_kernel_metadata() { fi fi - machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" - machine_srcrev="${SRCREV_machine}" - if [ -z "${machine_srcrev}" ]; then - # fallback to SRCREV if a non machine_meta tree is being built - machine_srcrev="${SRCREV}" - fi - # In a similar manner to the kernel itself: # # defconfig: $(obj)/conf -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:49 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:49 -0500 Subject: [OE-core] [PATCH 06/10] kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set In-Reply-To: References: Message-ID: <308b2425ab2d20304fe33ada34a3089967a24af8.1581010425.git.bruce.ashfield@gmail.com> From: Paul Barker CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9a4d2864eb..e8a9b1f18e 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -359,8 +359,10 @@ do_kernel_configme() { bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi - echo "# Global settings from linux recipe" >> ${B}/.config - echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then + echo "# Global settings from linux recipe" >> ${B}/.config + echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + fi } addtask kernel_configme before do_configure after do_patch -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:50 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:50 -0500 Subject: [OE-core] [PATCH 07/10] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh In-Reply-To: References: Message-ID: <14beb4fa55a56a8c5cc95f314073623f6c1b0039.1581010425.git.bruce.ashfield@gmail.com> From: Martin Jansa * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot'] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native'] DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/automake-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/libtool-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gmp-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/ncurses-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pkgconfig-native/fixmepath | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot:g; s:FIXMESTAGINGDIRHOST:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native:g' -e 's:FIXME_PSEUDO_SYSROOT:/OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pseudo-native:g' -e 's:FIXME_HOSTTOOLS_DIR:/OE/build/oe-core/tmp-glibc/hosttools:g' -e 's:FIXME_PKGDATA_DIR:/OE/build/oe-core/tmp-glibc/pkgdata/qemux86:g' -e 's:FIXME_PSEUDO_LOCALSTATEDIR:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/pseudo/:g' -e 's:FIXME_LOGFIFO:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/fifo.10476:g' DEBUG: Python function extend_recipe_sysroot finished DEBUG: Executing shell function do_kernel_configme DEBUG: Shell function do_kernel_configme finished ]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case but doesn't. The merge_config_build.log shows 5.4 specific error: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported but then it happily continues reporting what isn't applied in not created .config file --- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100 +++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100 @@ -171,586 +171,5113 @@ HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --alldefconfig Kconfig -./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options -./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: # -./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP -./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE -./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP -./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE -# -# configuration written to .config -# +scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported +make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1 +make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2 make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build' +make: *** [Makefile:179: sub-make] Error 2 +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION not in final .config +Requested value: CONFIG_LOCALVERSION="" +Actual value: + +grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory +Value requested for CONFIG_LOCALVERSION_AUTO not in final .config +Requested value: # CONFIG_LOCALVERSION_AUTO is not set +Actual value: * I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate commit so that it can be discussed there. Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index e8a9b1f18e..f71aa7d0a6 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -354,7 +354,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:51 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:51 -0500 Subject: [OE-core] [PATCH 08/10] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created In-Reply-To: References: Message-ID: From: Martin Jansa * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f71aa7d0a6..d961901b74 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -354,8 +352,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:52 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:52 -0500 Subject: [OE-core] [PATCH 09/10] kernel-yocto: fix defconfig detection in find_sccs() In-Reply-To: References: Message-ID: <36300ff0f34f374ade66d2a35d0f9771a187ec7e.1581010425.git.bruce.ashfield@gmail.com> From: Gavin Li The current code would cause a file like "config.bin" to added to the config sources list. I am sure the intention was to add any files with defconfig in its name and not the other way around. Signed-off-by: Gavin Li Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d961901b74..918d101d3d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -47,7 +47,7 @@ def find_sccs(d): base, ext = os.path.splitext(os.path.basename(s)) if ext and ext in [".scc", ".cfg"]: sources_list.append(s) - elif base and base in 'defconfig': + elif base and 'defconfig' in base: sources_list.append(s) return sources_list -- 2.19.1 From bruce.ashfield at gmail.com Thu Feb 6 17:35:53 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Thu, 6 Feb 2020 12:35:53 -0500 Subject: [OE-core] [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters In-Reply-To: References: Message-ID: From: Bruce Ashfield To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 10 +++++++--- .../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101d3d..31ea42580c 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421234..4f1af731d6 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 From patchwork at patchwork.openembedded.org Thu Feb 6 18:02:39 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Thu, 06 Feb 2020 18:02:39 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_kernel-yoc?= =?utf-8?q?to=3A_consolidated_pull_request?= In-Reply-To: References: Message-ID: <20200206180239.2276.80607@do> == Series Details == Series: kernel-yocto: consolidated pull request Revision: 1 URL : https://patchwork.openembedded.org/series/22454/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [08/10] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created Issue Commit shortlog is too long [test_shortlog_length] Suggested fix Edit shortlog so that it is 90 characters or less (currently 122 characters) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From bruce.ashfield at gmail.com Thu Feb 6 19:12:49 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Thu, 6 Feb 2020 14:12:49 -0500 Subject: [OE-core] [PATCH 00/10][v2] kernel-yocto: consolidated pull request In-Reply-To: References: Message-ID: On Thu, Feb 6, 2020 at 12:35 PM wrote: > > From: Bruce Ashfield > > v2 adds a 10th patch to the series to fixup a config issue seen > with qemuarm64. The other patches are unchanged. Hold on queuing this quite yet. On a clean build/test on a second machine, I saw the error pop back up. I'll follow up shortly, once I've had a chance to look at that and see if I missed something. Bruce > > The original pull request text follows: > > --------- > > Hi all, > > I've kept the v5.4 content changes, as well as the kernel version default > changes out of this series and instead focused it on the collection of > kernel-yocto and kern-tools tweaks that I've gethered over the past few > weeks. > > I have Martin's gold linker fixes included, as well as the re-org'ing of > the linux-yocto tasks that Paul Barker did to make it usable as a single > inherit of the bbclass. > > I also have a defconfig detection fix included that was sent to the list. > > I was able to confirm that my configuration was the same with this series > enabled, and I was able to boot. > > That being said, I'll keep my eye out for any AB fallout and will continue > some more build locally .. but I wanted to get this out today as promised. > > Cheers, > > Bruce > > The following changes since commit 3c6978c8db59f152693f9fae65dbab13ecfcaad4: > > kernel-yocto.bbclass: export LD in the environment used by kconf_check (2020-02-04 15:56:29 +0000) > > are available in the Git repository at: > > git://git.pokylinux.org/poky-contrib zedd/kernel > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel > > Bruce Ashfield (3): > kern-tools: tweak symbol_why to be python safe > kern-tools: integrate merge_config fix for gold linker > kern-tools: fix merge_config when LD contains parameters > > Gavin Li (1): > kernel-yocto: fix defconfig detection in find_sccs() > > Martin Jansa (3): > kern-tools-native: use more common S value and oe_runmake > kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh > kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, > merge_config_build.log and fail when /.config wasn't created > > Paul Barker (3): > kernel-yocto: Move defaults and tasks from linux-yocto.inc into > bbclass > kernel-yocto: Drop setting of unused variables in do_kernel_metadata > kernel-yocto: Only override CONFIG_LOCALVERSION if > LINUX_VERSION_EXTENSION is set > > meta/classes/kernel-yocto.bbclass | 49 +++++++++++++------ > .../kern-tools/kern-tools-native_git.bb | 13 +++-- > meta/recipes-kernel/linux/linux-yocto.inc | 21 -------- > 3 files changed, 42 insertions(+), 41 deletions(-) > > -- > 2.19.1 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bruce.ashfield at gmail.com Thu Feb 6 20:33:19 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Thu, 6 Feb 2020 15:33:19 -0500 Subject: [OE-core] [PATCH 00/10][v2] kernel-yocto: consolidated pull request In-Reply-To: References: Message-ID: On Thu, Feb 6, 2020 at 2:12 PM Bruce Ashfield wrote: > > On Thu, Feb 6, 2020 at 12:35 PM wrote: > > > > From: Bruce Ashfield > > > > v2 adds a 10th patch to the series to fixup a config issue seen > > with qemuarm64. The other patches are unchanged. > > Hold on queuing this quite yet. > > On a clean build/test on a second machine, I saw the error pop back > up. I'll follow up shortly, once I've had a chance to look at that and > see if I missed something. There were some missing directories during the builds that showed errors, but I've since removed tmp and things are building through the kernel now. As such, I don't have an updated patch and this series should be good .. but I'll be waiting to see if the AB runs into what I saw. Bruce > > Bruce > > > > > The original pull request text follows: > > > > --------- > > > > Hi all, > > > > I've kept the v5.4 content changes, as well as the kernel version default > > changes out of this series and instead focused it on the collection of > > kernel-yocto and kern-tools tweaks that I've gethered over the past few > > weeks. > > > > I have Martin's gold linker fixes included, as well as the re-org'ing of > > the linux-yocto tasks that Paul Barker did to make it usable as a single > > inherit of the bbclass. > > > > I also have a defconfig detection fix included that was sent to the list. > > > > I was able to confirm that my configuration was the same with this series > > enabled, and I was able to boot. > > > > That being said, I'll keep my eye out for any AB fallout and will continue > > some more build locally .. but I wanted to get this out today as promised. > > > > Cheers, > > > > Bruce > > > > The following changes since commit 3c6978c8db59f152693f9fae65dbab13ecfcaad4: > > > > kernel-yocto.bbclass: export LD in the environment used by kconf_check (2020-02-04 15:56:29 +0000) > > > > are available in the Git repository at: > > > > git://git.pokylinux.org/poky-contrib zedd/kernel > > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel > > > > Bruce Ashfield (3): > > kern-tools: tweak symbol_why to be python safe > > kern-tools: integrate merge_config fix for gold linker > > kern-tools: fix merge_config when LD contains parameters > > > > Gavin Li (1): > > kernel-yocto: fix defconfig detection in find_sccs() > > > > Martin Jansa (3): > > kern-tools-native: use more common S value and oe_runmake > > kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh > > kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, > > merge_config_build.log and fail when /.config wasn't created > > > > Paul Barker (3): > > kernel-yocto: Move defaults and tasks from linux-yocto.inc into > > bbclass > > kernel-yocto: Drop setting of unused variables in do_kernel_metadata > > kernel-yocto: Only override CONFIG_LOCALVERSION if > > LINUX_VERSION_EXTENSION is set > > > > meta/classes/kernel-yocto.bbclass | 49 +++++++++++++------ > > .../kern-tools/kern-tools-native_git.bb | 13 +++-- > > meta/recipes-kernel/linux/linux-yocto.inc | 21 -------- > > 3 files changed, 42 insertions(+), 41 deletions(-) > > > > -- > > 2.19.1 > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From scott.branden at broadcom.com Thu Feb 6 20:57:43 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Thu, 6 Feb 2020 12:57:43 -0800 Subject: [OE-core] [PATCH] cryptodev: update to Jan.23, 2020 Message-ID: <20200206205743.5388-1-scott.branden@broadcom.com> * Remove backported patches: 0001-Fix-module-loading-with-Linux-v5.0-rc5.patch Update to latest cryptodev dated Jan.23, 2020. Fixes build on kernel v5.5+ Signed-off-by: Scott Branden --- meta/recipes-kernel/cryptodev/cryptodev.inc | 3 +- ...x-module-loading-with-Linux-v5.0-rc5.patch | 59 ------------------- 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index 9d8ba44058..f99f8bc9f0 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -4,9 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \ - file://0001-Fix-module-loading-with-Linux-v5.0-rc5.patch \ " -SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29" +SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch deleted file mode 100644 index 34ec87272f..0000000000 --- a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch +++ /dev/null @@ -1,59 +0,0 @@ -Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0c] - -Backport patch from upstream to fix module cryptodev loading error. - -Signed-off-by: Kai Kang - -From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001 -From: "Derald D. Woods" -Date: Sun, 10 Feb 2019 13:22:19 -0600 -Subject: [PATCH] Fix module loading with Linux v5.0-rc5 - -This commit fixes this module load error: -[...] -[ 29.112091] cryptodev: loading out-of-tree module taints kernel. -[ 29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -[ 29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter -[...] - -Upstream Linux support for unused GIVCIPHER, and others, was dropped here: - -c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators) - -Signed-off-by: Derald D. Woods ---- - cryptlib.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/cryptlib.c b/cryptlib.c -index 6e66698..4a87037 100644 ---- a/cryptlib.c -+++ b/cryptlib.c -@@ -38,7 +38,9 @@ - #include "cryptodev_int.h" - #include "cipherapi.h" - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) - extern const struct crypto_type crypto_givcipher_type; -+#endif - - static void cryptodev_complete(struct crypto_async_request *req, int err) - { -@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) - tfm = crypto_skcipher_tfm(out->async.s); -- if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) || -- (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) { -+ if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) -+ || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) -+#endif -+ ) { - struct ablkcipher_alg *alg; - - alg = &tfm->__crt_alg->cra_ablkcipher; --- -2.20.0 - -- 2.17.1 From jaewon.lee at xilinx.com Thu Feb 6 21:45:11 2020 From: jaewon.lee at xilinx.com (Jaewon Lee) Date: Thu, 6 Feb 2020 13:45:11 -0800 Subject: [OE-core] [PATCH v2] sstate.bbclass: fix issue while handling long sstate filenames Message-ID: <1581025511-18119-1-git-send-email-jaewon.lee@xilinx.com> When moving to python3, divison using '/' now returns float instead of an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1 sstate filenames longer than the limit are changed to just include necessary info + 3 fields just for information. The space left over after the necessary info is divided into 3 for each of the fields. Using '//' instead to do the division to solve the following error message: avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 > components[2] = components[2][:avail] components[3] = components[3][:avail] TypeError: slice indices must be integers or None or have an __index__ method Signed-off-by: Jaewon Lee Signed-off-by: Mark Hatle --- v2: used '//' instead of casting to int --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index faa6470..0beeb33 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d): components = spec.split(":") # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information # 7 is for the separators - avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 + avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) // 3 components[2] = components[2][:avail] components[3] = components[3][:avail] components[4] = components[4][:avail] -- 2.7.4 From ross at burtonini.com Thu Feb 6 22:07:04 2020 From: ross at burtonini.com (Ross Burton) Date: Thu, 6 Feb 2020 22:07:04 +0000 Subject: [OE-core] [PATCH] perl: don't package the host configuration Message-ID: <20200206220704.1109-1-ross@burtonini.com> From: Ross Burton `make install` installs xconfig.h, which is the configuration of the *build host* used when building miniperl, used to bootstrap the Perl build. As this changes depending on the build host, remove don't install it. [ YOCTO #13372 ] Signed-off-by: Ross Burton --- meta/recipes-devtools/perl/perl_5.30.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index d4b6bb32b43..8af9dfa4a2c 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -139,6 +139,10 @@ do_install() { # Fix up shared library rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so + + # This is the native configuration for the bootstrap perl, don't need it + # packaged. + rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h } do_install_append_class-target() { -- 2.20.1 From alex.kanavin at gmail.com Thu Feb 6 22:14:38 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 6 Feb 2020 23:14:38 +0100 Subject: [OE-core] [PATCH] perl: do not install files that contain build host specific data Message-ID: <20200206221438.2090-1-alex.kanavin@gmail.com> This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057762..9e708f791d 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 3634122686..dcdabb692d 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -144,6 +144,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- 2.25.0 From jpuhlman at mvista.com Thu Feb 6 22:16:22 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Thu, 6 Feb 2020 14:16:22 -0800 Subject: [OE-core] [PATCH] perl: don't package the host configuration In-Reply-To: <20200206220704.1109-1-ross@burtonini.com> References: <20200206220704.1109-1-ross@burtonini.com> Message-ID: <5bbb4e00-46c4-8196-e9ae-1b665479aa2b@mvista.com> Should that bug number be 13772 not 13372? On 2/6/2020 2:07 PM, Ross Burton wrote: > From: Ross Burton > > `make install` installs xconfig.h, which is the configuration of the > *build host* used when building miniperl, used to bootstrap the Perl > build. > > As this changes depending on the build host, remove don't install it. > > [ YOCTO #13372 ] > > Signed-off-by: Ross Burton > --- > meta/recipes-devtools/perl/perl_5.30.1.bb | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb > index d4b6bb32b43..8af9dfa4a2c 100644 > --- a/meta/recipes-devtools/perl/perl_5.30.1.bb > +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb > @@ -139,6 +139,10 @@ do_install() { > # Fix up shared library > rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so > ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so > + > + # This is the native configuration for the bootstrap perl, don't need it > + # packaged. > + rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h > } > > do_install_append_class-target() { -- Jeremy A. Puhlman jpuhlman at mvista.com From alex.kanavin at gmail.com Thu Feb 6 22:16:42 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 6 Feb 2020 23:16:42 +0100 Subject: [OE-core] [PATCH] perl: don't package the host configuration In-Reply-To: <20200206220704.1109-1-ross@burtonini.com> References: <20200206220704.1109-1-ross@burtonini.com> Message-ID: My patch is more comprehensive, as it also adjusts the ptests ;) Alex On Thu, 6 Feb 2020 at 23:07, Ross Burton wrote: > From: Ross Burton > > `make install` installs xconfig.h, which is the configuration of the > *build host* used when building miniperl, used to bootstrap the Perl > build. > > As this changes depending on the build host, remove don't install it. > > [ YOCTO #13372 ] > > Signed-off-by: Ross Burton > --- > meta/recipes-devtools/perl/perl_5.30.1.bb | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb > b/meta/recipes-devtools/perl/perl_5.30.1.bb > index d4b6bb32b43..8af9dfa4a2c 100644 > --- a/meta/recipes-devtools/perl/perl_5.30.1.bb > +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb > @@ -139,6 +139,10 @@ do_install() { > # Fix up shared library > rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so > ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo > ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so > + > + # This is the native configuration for the bootstrap perl, don't need > it > + # packaged. > + rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h > } > > do_install_append_class-target() { > -- > 2.20.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From ross at burtonini.com Thu Feb 6 22:37:05 2020 From: ross at burtonini.com (Ross Burton) Date: Thu, 6 Feb 2020 22:37:05 +0000 Subject: [OE-core] [PATCH] perl: don't package the host configuration In-Reply-To: References: <20200206220704.1109-1-ross@burtonini.com> Message-ID: Note to self: it?s time to stop working. On Thu, 6 Feb 2020 at 22:16, Alexander Kanavin wrote: > My patch is more comprehensive, as it also adjusts the ptests ;) > > Alex > > On Thu, 6 Feb 2020 at 23:07, Ross Burton wrote: > >> From: Ross Burton >> >> `make install` installs xconfig.h, which is the configuration of the >> *build host* used when building miniperl, used to bootstrap the Perl >> build. >> >> As this changes depending on the build host, remove don't install it. >> >> [ YOCTO #13372 ] >> >> Signed-off-by: Ross Burton >> --- >> meta/recipes-devtools/perl/perl_5.30.1.bb | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb >> b/meta/recipes-devtools/perl/perl_5.30.1.bb >> index d4b6bb32b43..8af9dfa4a2c 100644 >> --- a/meta/recipes-devtools/perl/perl_5.30.1.bb >> +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb >> @@ -139,6 +139,10 @@ do_install() { >> # Fix up shared library >> rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so >> ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo >> ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so >> + >> + # This is the native configuration for the bootstrap perl, don't >> need it >> + # packaged. >> + rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h >> } >> >> do_install_append_class-target() { >> -- >> 2.20.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Thu Feb 6 22:48:49 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 6 Feb 2020 22:48:49 +0000 Subject: [OE-core] [PATCH] openssl: Fix reproducibility issue Message-ID: <20200206224849.17737-1-richard.purdie@linuxfoundation.org> There was a build architecture leaking into the target ptest which could vary depending upon host. Remove it as its cosmetic. [YOCTO #13770] Signed-off-by: Richard Purdie --- .../openssl/openssl/reproducible.patch | 32 +++++++++++++++++++ .../openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch new file mode 100644 index 00000000000..a24260c95d0 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch @@ -0,0 +1,32 @@ +The value for perl_archname can vary depending on the host, e.g. +x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which +makes the ptest package non-reproducible. Its unused other than +these references so drop it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: openssl-1.1.1d/Configure +=================================================================== +--- openssl-1.1.1d.orig/Configure ++++ openssl-1.1.1d/Configure +@@ -286,7 +286,7 @@ if (defined env($local_config_envname)) + # Save away perl command information + $config{perl_cmd} = $^X; + $config{perl_version} = $Config{version}; +-$config{perl_archname} = $Config{archname}; ++#$config{perl_archname} = $Config{archname}; + + $config{prefix}=""; + $config{openssldir}=""; +@@ -2517,7 +2517,7 @@ _____ + @{$config{perlargv}}), "\n"; + print "\nPerl information:\n\n"; + print ' ',$config{perl_cmd},"\n"; +- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; ++ print ' ',$config{perl_version},"\n"; + } + if ($dump || $options) { + my $longest = 0; diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 7fd0f9a269c..c2ba005f47f 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.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-1551.patch \ + file://reproducible.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.20.1 From richard.purdie at linuxfoundation.org Fri Feb 7 00:00:39 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 7 Feb 2020 00:00:39 +0000 Subject: [OE-core] [PATCH 1/3] iputils: Fix build determinism Message-ID: <20200207000041.19304-1-richard.purdie@linuxfoundation.org> The suid/setcap code depends on whether setcap is on the host system or not with suid as a fallback. Disable this functionality to be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index a672ccdb7c0..e0d2ae160ee 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -34,7 +34,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson update-alternatives -EXTRA_OEMESON += "--prefix=${root_prefix}/" +# Have to disable setcap/suid as its not deterministic +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" ALTERNATIVE_PRIORITY = "100" -- 2.20.1 From richard.purdie at linuxfoundation.org Fri Feb 7 00:00:40 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 7 Feb 2020 00:00:40 +0000 Subject: [OE-core] [PATCH 2/3] libinput: Fix determinism issue In-Reply-To: <20200207000041.19304-1-richard.purdie@linuxfoundation.org> References: <20200207000041.19304-1-richard.purdie@linuxfoundation.org> Message-ID: <20200207000041.19304-2-richard.purdie@linuxfoundation.org> The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../wayland/libinput/determinism.patch | 21 +++++++++++++++++++ .../wayland/libinput_1.14.3.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch new file mode 100644 index 00000000000..cb554030cf3 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.14.3.bb index 46d46c54eeb..bc5a76dc9af 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.14.3.bb @@ -14,6 +14,7 @@ DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32" SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7" -- 2.20.1 From richard.purdie at linuxfoundation.org Fri Feb 7 00:00:41 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 7 Feb 2020 00:00:41 +0000 Subject: [OE-core] [PATCH 3/3] libgcrypt: Fix determinism issue In-Reply-To: <20200207000041.19304-1-richard.purdie@linuxfoundation.org> References: <20200207000041.19304-1-richard.purdie@linuxfoundation.org> Message-ID: <20200207000041.19304-3-richard.purdie@linuxfoundation.org> The build was injection git information from the wrong git tree, stop this to allow reproducible builds. Signed-off-by: Richard Purdie --- .../libgcrypt/files/determinism.patch | 32 +++++++++++++++++++ .../libgcrypt/libgcrypt_1.8.5.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 00000000000..ad0b8c79500 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb index 04785574f2f..4e0eb0a1697 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-Prefetch-GCM-look-up-tables.patch \ file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743" SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3" -- 2.20.1 From jupiter.hce at gmail.com Fri Feb 7 01:55:18 2020 From: jupiter.hce at gmail.com (JH) Date: Fri, 7 Feb 2020 12:55:18 +1100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: Hi Gabriele, On 2/6/20, Gabriele Zampieri wrote: > As far as I know uboot (usually virtual/bootloader) does not have a task to > run menuconfig directly from bitbake. > I usually have a local clone of uboot and I simply run `make [...] > menuconfig|savedefconfig` , then I create a patch > to add my defconfig (custom_defconfig) to configs/ and specify > UBOOT_MACHINE = "custom_defconfig" Are there any document to use cross compiler tools to build u-boot-imx on Ubuntu 18 host machine? It seems that build environment will not be the same as the Yocto build environment I am currently running on Ubuntu 18 host. Thank you Gabriele for great helps. Kind regards, - jh From rahulchauhankitps at gmail.com Fri Feb 7 03:06:22 2020 From: rahulchauhankitps at gmail.com (Rahul Chauhan) Date: Fri, 7 Feb 2020 08:36:22 +0530 Subject: [OE-core] [warrior] libxml2: Fix CVE-2019-19956 Message-ID: <1581044782-4481-1-git-send-email-rahulk@mvista.com> Signed-off-by: Rahul Chauhan --- .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch new file mode 100644 index 0000000..43c3589 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch @@ -0,0 +1,38 @@ +From 3cd2b25ddb04740be2880cfd78d60038452228b1 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Wed, 7 Aug 2019 17:39:17 +0800 +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover + +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to +NULL and free newDoc will cause a memory leak. + +Found with libFuzzer. + +Closes #82. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549] +CVE: CVE-2019-19956 + +Signed-off-by: Rahul Chauhan +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index b7ecd65..491f5c9 100644 +--- a/parser.c ++++ b/parser.c +@@ -13899,7 +13899,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, + xmlFreeParserCtxt(ctxt); + newDoc->intSubset = NULL; + newDoc->extSubset = NULL; +- newDoc->oldNs = NULL; ++ if(doc != NULL) ++ newDoc->oldNs = NULL; + xmlFreeDoc(newDoc); + + return(ret); +-- +2.7.4 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 62643bc..67c2d4f 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb @@ -23,6 +23,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-CVE-2017-8872.patch \ file://fix-CVE-2018-14404.patch \ file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ + file://fix-CVE-2019-19956.patch \ " SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 7 04:14:51 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Fri, 7 Feb 2020 04:14:51 +0000 Subject: [OE-core] [PATCH] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: References: <20200206075334.835418-1-anuj.mittal@intel.com> Message-ID: <265ac69eb8eb8d129d9f66f6d037d44242c42e57.camel@intel.com> On Thu, 2020-02-06 at 12:41 +0100, Carlos Rafael Giani wrote: > Shouldn't this be split into two commits, one that fixes > EXTRA_OECONF, > and one that fixes the qt5 support? > > Also, are we sure that meson's qt5 moc/rcc/uic autodetection won't > cause > any problems in OE? > Typically, we disable such "automagical" detections to ensure > deterministic builds. Right. I will send v2 and keep it disabled explicitly. Thanks, Anuj > > On 06.02.20 08:53, Anuj Mittal wrote: > > Use the correct variable so options actually get used. > > > > qt5 support is currently automagically detected with meson and > > having an > > explicit disabled doesn't do anything. Remove it so it can be > > handled > > in qt layer with appropriate DEPENDS added. > > > > Signed-off-by: Anuj Mittal > > --- > > .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 7 > > +++---- > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > > plugins-good_1.16.1.bb b/meta/recipes- > > multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > > index a6eb9986dd..e78162172a 100644 > > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- > > good_1.16.1.bb > > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- > > good_1.16.1.bb > > @@ -50,12 +50,12 @@ PACKAGECONFIG[vpx] = "-Dvpx=enabled,- > > Dvpx=disabled,libvpx" > > PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,- > > Dwavpack=disabled,wavpack" > > PACKAGECONFIG[x11] = > > "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > > > > -# qt5 support is disabled, because it is not present in OE core, > > and requires more work than > > -# just adding a packageconfig (it requires access to moc, uic, > > rcc, and qmake paths). > > +# qt5 support is disabled by default unless dependencies are > > present. Enabling it requires > > +# more work than just adding a packageconfig (it requires access > > to moc, uic, rcc, and qmake paths). > > # This is better done in a separate qt5 layer (which then should > > add a "qt5" packageconfig > > # in a gstreamer1.0-plugins-good bbappend). > > > > -EXTRA_OECONF += " \ > > +EXTRA_OEMESON += " \ > > -Daalib=disabled \ > > -Ddirectsound=disabled \ > > -Ddv=disabled \ > > @@ -64,7 +64,6 @@ EXTRA_OECONF += " \ > > -Doss4=disabled \ > > -Dosxaudio=disabled \ > > -Dosxvideo=disabled \ > > - -Dqt=disabled \ > > -Dshout2=disabled \ > > -Dtwolame=disabled \ > > -Dwaveform=disabled \ From jupiter.hce at gmail.com Fri Feb 7 04:32:59 2020 From: jupiter.hce at gmail.com (JH) Date: Fri, 7 Feb 2020 15:32:59 +1100 Subject: [OE-core] Support UBI u-boot In-Reply-To: References: Message-ID: Hi Andy, On 2/6/20, Andy Pont wrote: > JH wrote... > > >>I added NAND and UBIFS support to my Yocto layer machine config file: >> >>UBOOT_CONFIG = "nand" >>UBOOT_CONFIG[nand] += "mx6ull_14x14_evk_config" >>UBOOT_CONFIG[nand] += "mx6ull_14x14_evk_nand_config" >>UBOOT_CONFIG[nand] += "ubi" >>UBOOT_CONFIG[nand] += "ubifs" >> >>But my u-boot.imx-nand still could not support ubi: >> >>=> ubi part rootfs >>Unknown command 'ubi' - try ?help? > You need to start to read through the various sources to figure out for > yourself what is going on! > > Starting from the bottom, in U-Boot 2017.03 all of the command sources > are in the ?cmd? directory. The ?ubi ?? command are all in ubi.c. > Reading cmd/Makefile shows that file gets added into the build if > CONFIG_CMD_UBI is enabled. You are right, that CONFIG_CMD_UBI is not enabled, but I could not find any conf or bb files I could change or enable CONFIG_CMD_UBI in meta-freescale layer. Desperately, I hacked to run "make menuconfig" at U-Boot 2017.03 build directory, selected and enabled CONFIG_CMD_UBI and saved to .config file in that build directory, but then to run bitbake to build u-boot again, the .config was removed and replaced by an old one disabled CONFIG_CMD_UBI again. Other people recommended to build u-boot in a standalone environment out of OE / Yocto build system. Since I have set up everything in OE / Yocto environment, I thought it could be easier if I could modify one line of u-boot config file in a recipe. Any idea where is the recipe in meta-freescale to allow me to change / enable CONFIG_CMD_UBI? Am I the only one unable to change u-boot config file in OE / Yoctu build? That makes me very sad :-(. > The next place to look is whether or not that is set in your defconfig > for U-Boot or overwritten somewhere in a recipe in your Yocto build > environment. Yeah, I'll been searched all day, could not find a recipe Yocto build environment, I was told OE / Yocto does not have that stack and mechanism to set and change u-boot config, is it true? Thank you very much. Kind regards, - jh From changqing.li at windriver.com Fri Feb 7 06:07:43 2020 From: changqing.li at windriver.com (changqing.li at windriver.com) Date: Fri, 7 Feb 2020 14:07:43 +0800 Subject: [OE-core] [PATCH 1/2] python3: fix the installation path of libpython3.7m.a for multilib Message-ID: <1581055664-311654-1-git-send-email-changqing.li@windriver.com> From: Changqing Li Fix the installation path of libpython3.7m.a on mulitlib lib64 platform to lib64 instead of lib Signed-off-by: Li Zhou Signed-off-by: Changqing Li --- .../python3/0001-configure.ac-fix-LIBPL.patch | 35 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 5 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch diff --git a/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch b/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch new file mode 100644 index 0000000..123ce3a --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch @@ -0,0 +1,35 @@ +From acce3d441e7eadadd2d3ce38654155dc43f1f607 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 7 Feb 2020 09:36:25 +0800 +Subject: [PATCH] configure.ac: fix LIBPL + +Use LIBDIR rather than prefix/lib, so that it would work when lib64. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Robert Yang +Signed-off-by: Li Zhou +Signed-off-by: Changqing Li +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ce04258..915f475 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4532,9 +4532,9 @@ fi + dnl define LIBPL after ABIFLAGS and LDVERSION is defined. + AC_SUBST(PY_ENABLE_SHARED) + if test x$PLATFORM_TRIPLET = x; then +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" + else +- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" ++ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" + fi + AC_SUBST(LIBPL) + +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index a71c207..981b52e 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -29,6 +29,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ + file://0001-configure.ac-fix-LIBPL.patch \ " SRC_URI_append_class-native = " \ @@ -174,7 +175,7 @@ py_package_preprocess () { -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${RECIPE_SYSROOT}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - ${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ + ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \ ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config @@ -322,7 +323,7 @@ RPROVIDES_${PN}-venv += "python3-pyvenv" # package libpython3 PACKAGES =+ "libpython3 libpython3-staticdev" FILES_libpython3 = "${libdir}/libpython*.so.*" -FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" +FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" INSANE_SKIP_${PN}-dev += "dev-elf" # catch all the rest (unsorted) -- 2.7.4 From changqing.li at windriver.com Fri Feb 7 06:07:44 2020 From: changqing.li at windriver.com (changqing.li at windriver.com) Date: Fri, 7 Feb 2020 14:07:44 +0800 Subject: [OE-core] [PATCH 2/2] python3: Do not hardcode "lib" for distutils In-Reply-To: <1581055664-311654-1-git-send-email-changqing.li@windriver.com> References: <1581055664-311654-1-git-send-email-changqing.li@windriver.com> Message-ID: <1581055664-311654-2-git-send-email-changqing.li@windriver.com> From: Changqing Li Get the sys.lib from python3 itself and do not use hardcoded value of 'lib' for distutils. Solve the error below that occurs when run "python3 setup.py install" on lib64 multilib platform: [Errno 2] No such file or directory: '/usr/lib/python3.7/site-packages/test-easy-install-1828.write-test' Signed-off-by: Li Zhou Signed-off-by: Changqing Li --- ...python3-Do-not-hardcode-lib-for-distutils.patch | 43 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch diff --git a/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch b/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch new file mode 100644 index 0000000..fe031b9 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-python3-Do-not-hardcode-lib-for-distutils.patch @@ -0,0 +1,43 @@ +From bb711b53f10d32a90a27ccf4b0dc51e4a701d862 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 7 Feb 2020 09:42:09 +0800 +Subject: [PATCH] python3: Do not hardcode "lib" for distutils + +Get the sys.lib from python3 itself and do not use +hardcoded value of 'lib' for distutils. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Li Zhou +Signed-off-by: Changqing Li +--- + Lib/distutils/command/install.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index c625c95..8e32f54 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -19,6 +19,8 @@ from site import USER_BASE + from site import USER_SITE + HAS_USER_SITE = True + ++libname = sys.lib ++ + WINDOWS_SCHEME = { + 'purelib': '$base/Lib/site-packages', + 'platlib': '$base/Lib/site-packages', +@@ -29,8 +31,8 @@ WINDOWS_SCHEME = { + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/' + libname + '/python$py_version_short/site-packages', ++ 'platlib': '$platbase/' + libname + '/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index 981b52e..c836066 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -30,6 +30,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ + file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ " SRC_URI_append_class-native = " \ -- 2.7.4 From alex.kiernan at gmail.com Fri Feb 7 08:16:18 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Fri, 7 Feb 2020 08:16:18 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... Message-ID: Hi We've got a couple of multiconfig builds with different configurations in one bitbake run (whether it needs to be like this a different question - I suspect we had something that worked and stopped there!) However, for sometime we've been seeing errors like this on master (the recipes vary): ERROR: mc:forensic:ca-certificates-20190110-r0 do_deploy_source_date_epoch: Cache unihash 37d2546973a2b7c16fbcb1a8dd4939e4a1bba8c3d6d2dfb6e7204ca08d437ace doesn't match BB_UNIHASH 09baf78bd9316acdd308980c42ea4ed1eacea61bcc0d840c36293d1a5a22db69 Coupled with deadlock messages: WARNING: Runqeueue deadlocked on deferred tasks, forcing task mc:factory:virtual:native:/var/lib/jenkins/workspace/nanohub_master/build/../poky/meta/recipes-support/sqlite/sqlite3_3.31.1.bb:do_populate_sysroot Any pointers to whereabouts I should be looking for what we've got wrong? -- Alex Kiernan From richard.purdie at linuxfoundation.org Fri Feb 7 08:31:47 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 07 Feb 2020 08:31:47 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: Message-ID: On Fri, 2020-02-07 at 08:16 +0000, Alex Kiernan wrote: > Hi > > We've got a couple of multiconfig builds with different > configurations in one bitbake run (whether it needs to be like this a > different question - I suspect we had something that worked and > stopped there!) > > However, for sometime we've been seeing errors like this on master > (the recipes vary): > > ERROR: mc:forensic:ca-certificates-20190110-r0 > do_deploy_source_date_epoch: Cache unihash > 37d2546973a2b7c16fbcb1a8dd4939e4a1bba8c3d6d2dfb6e7204ca08d437ace > doesn't match BB_UNIHASH > 09baf78bd9316acdd308980c42ea4ed1eacea61bcc0d840c36293d1a5a22db69 This is an internal sanity test. It means the hash that it had in the task/worker context didn't match what the server thought the unihash should be. There have been changes in this area to try and fix various things, I'm wondering if we introduced a bug with multiconfig handling. There are some patches in master-next related to this area so it would be interesting to know if that made things better/worse. > Coupled with deadlock messages: > > WARNING: Runqeueue deadlocked on deferred tasks, forcing task > mc:factory:virtual:native:/var/lib/jenkins/workspace/nanohub_master/b > uild/../poky/meta/recipes- > support/sqlite/sqlite3_3.31.1.bb:do_populate_sysroot This happens if a build has multiple different components with matching hashes. It builds the "first" one and defers the others since they could become available in sstate after the first one builds. You should see messages from runqueue.py: bb.note("Deferring %s after %s" % (tid, sqdata.hashes[h])) The behaviour should be to therefore prioritise one multiconfig. I worry that the sorting isn't quite right and its building bits of several multiconfigs and deadlocking? Do you have the logs with the Deferring XXX after YYY messages in you could share? I suspect its a sorting problem. Cheers, Richard From jupiter.hce at gmail.com Fri Feb 7 08:52:35 2020 From: jupiter.hce at gmail.com (JH) Date: Fri, 7 Feb 2020 19:52:35 +1100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: Hi Pelle, Aplogize for cross posting. On 2/7/20, Pelle Windestam wrote: > In my case u-boot uses a default config called imx8qxp_var_som_defconfig > stored under the configs directory in u-boot (not sure if its in the > official repositories, I use a vendor supplied u-boot repo, but the > procedure should be the same either way), then I have created a > .bbappend-file for the u-boot recipe, and added a patch that modifies the > defconfig file to include the options I want to enable. Then as u-boot is > built, it will use the patched defconfig with the appropriate options > enabled. In the meta-freescale layer the u-boot recipes are under > meta-freescale/recipes-bsp/u-boot. Thanks for the tip, that is quite helpful. I created bbappend file, run the make menuconfig to enable NAND and CONFIG_CMD_UBI, but then failed in build, missing all MTD, NAND, UBI references, the MTD, NAND, UBI are all selected, what I could be missing? /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/cmd/ubi.c:448: undefined reference to `mtdparts_init' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/cmd/ubi.c:468: undefined reference to `del_mtd_partitions' | arm-oe-linux-gnueabi-ld.bfd: cmd/built-in.o: in function `ubi_part': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/cmd/ubi.c:489: undefined reference to `find_dev_and_part' | arm-oe-linux-gnueabi-ld.bfd: cmd/built-in.o: in function `ubi_dev_scan': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/cmd/ubi.c:415: undefined reference to `find_dev_and_part' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/cmd/ubi.c:423: undefined reference to `add_mtd_partitions' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/cmd/ubi.c:437: undefined reference to `del_mtd_partitions' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `add_volume': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:294: undefined reference to `rb_insert_color' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ubi_add_to_av': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:589: undefined reference to `rb_insert_color' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ubi_remove_av': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:634: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:640: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:636: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `scan_all': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1265: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `self_check_ai': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1515: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1558: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `scan_all': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1266: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1265: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1266: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `self_check_ai': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1558: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1515: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1629: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1631: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1629: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1631: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1717: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1717: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1718: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/attach.c:1718: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `get_bad_peb_limit': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/build.c:623: undefined reference to `mtd_get_device_size' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `process_lvol': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/vtbl.c:407: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/vtbl.c:407: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ltree_add_entry': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/eba.c:180: undefined reference to `rb_insert_color' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `leb_read_unlock': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/eba.c:225: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ubi_eba_init': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/eba.c:1423: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ubi_move_aeb_to_list': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/include/../drivers/mtd/ubi/ubi.h:1013: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ubi_eba_init': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/eba.c:1423: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `find_wl_entry': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:314: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `wl_tree_add': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:170: undefined reference to `rb_insert_color' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `get_peb_for_wl': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:1777: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ensure_wear_leveling': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:992: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `wear_leveling_worker': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:721: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:736: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:742: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:748: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ubi_wl_put_peb': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:1226: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:1229: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ubi_wl_scrub_peb': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:1298: undefined reference to `rb_erase' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `ubi_wl_init': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:1569: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:1570: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:1570: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:1569: undefined reference to `rb_next' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `find_mean_wl_entry': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:355: undefined reference to `rb_first' | arm-oe-linux-gnueabi-ld.bfd: /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:356: undefined reference to `rb_last' | arm-oe-linux-gnueabi-ld.bfd: drivers/mtd/ubi/built-in.o: in function `wl_get_wle': | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/drivers/mtd/ubi/wl.c:395: undefined reference to `rb_erase' | /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/Makefile:1234: recipe for target 'u-boot' failed | make[1]: *** [u-boot] Error 1 | make[1]: Leaving directory '/build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/build/mx6ull_14x14_evk_config' | Makefile:150: recipe for target 'sub-make' failed | make: *** [sub-make] Error 2 | make: Leaving directory '/build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git' | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/temp/log.do_compile.11257) $ cat # # Automatically generated file; DO NOT EDIT. # U-Boot 2017.03 Configuration # CONFIG_CREATE_ARCH_SYMLINK=y # CONFIG_ARC is not set CONFIG_ARM=y # CONFIG_AVR32 is not set # CONFIG_BLACKFIN is not set # CONFIG_M68K is not set # CONFIG_MICROBLAZE is not set # CONFIG_MIPS is not set # CONFIG_NDS32 is not set # CONFIG_NIOS2 is not set # CONFIG_OPENRISC is not set # CONFIG_PPC is not set # CONFIG_SANDBOX is not set # CONFIG_SH is not set # CONFIG_SPARC is not set # CONFIG_X86 is not set # CONFIG_XTENSA is not set CONFIG_SYS_ARCH="arm" CONFIG_SYS_CPU="armv7" CONFIG_SYS_SOC="mx6" CONFIG_SYS_VENDOR="freescale" CONFIG_SYS_BOARD="mx6ullevk" CONFIG_SYS_CONFIG_NAME="mx6ullevk" # # ARM architecture # CONFIG_HAS_VBAR=y CONFIG_HAS_THUMB2=y CONFIG_CPU_V7=y CONFIG_SYS_ARM_ARCH=7 CONFIG_SYS_CACHE_SHIFT_6=y CONFIG_SYS_CACHELINE_SIZE=64 # CONFIG_ARM_SMCCC is not set # CONFIG_SEMIHOSTING is not set CONFIG_SYS_L2CACHE_OFF=y # CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK is not set CONFIG_USE_ARCH_MEMCPY=y CONFIG_SPL_USE_ARCH_MEMCPY=y CONFIG_USE_ARCH_MEMSET=y CONFIG_SPL_USE_ARCH_MEMSET=y # CONFIG_ARM64_SUPPORT_AARCH32 is not set # CONFIG_ARCH_AT91 is not set # CONFIG_TARGET_EDB93XX is not set # CONFIG_TARGET_ASPENITE is not set # CONFIG_TARGET_GPLUGD is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_KIRKWOOD is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_TARGET_DEVKIT3250 is not set # CONFIG_TARGET_WORK_92105 is not set # CONFIG_TARGET_MX25PDK is not set # CONFIG_TARGET_ZMX25 is not set # CONFIG_TARGET_APF27 is not set # CONFIG_TARGET_APX4DEVKIT is not set # CONFIG_TARGET_XFI3 is not set # CONFIG_TARGET_M28EVK is not set # CONFIG_TARGET_MX23EVK is not set # CONFIG_TARGET_MX28EVK is not set # CONFIG_TARGET_MX23_OLINUXINO is not set # CONFIG_TARGET_BG0900 is not set # CONFIG_TARGET_SANSA_FUZE_PLUS is not set # CONFIG_TARGET_SC_SPS_1 is not set # CONFIG_ORION5X is not set # CONFIG_TARGET_SPEAR300 is not set # CONFIG_TARGET_SPEAR310 is not set # CONFIG_TARGET_SPEAR320 is not set # CONFIG_TARGET_SPEAR600 is not set # CONFIG_TARGET_STV0991 is not set # CONFIG_TARGET_X600 is not set # CONFIG_TARGET_IMX31_PHYCORE is not set # CONFIG_TARGET_IMX31_PHYCORE_EET is not set # CONFIG_TARGET_MX31ADS is not set # CONFIG_TARGET_MX31PDK is not set # CONFIG_TARGET_WOODBURN is not set # CONFIG_TARGET_WOODBURN_SD is not set # CONFIG_TARGET_FLEA3 is not set # CONFIG_TARGET_MX35PDK is not set # CONFIG_ARCH_BCM283X is not set # CONFIG_TARGET_VEXPRESS_CA15_TC2 is not set # CONFIG_TARGET_VEXPRESS_CA5X2 is not set # CONFIG_TARGET_VEXPRESS_CA9X4 is not set # CONFIG_TARGET_BRXRE1 is not set # CONFIG_TARGET_BRPPT1 is not set # CONFIG_TARGET_DRACO is not set # CONFIG_TARGET_THUBAN is not set # CONFIG_TARGET_RASTABAN is not set # CONFIG_TARGET_ETAMIN is not set # CONFIG_TARGET_PXM2 is not set # CONFIG_TARGET_RUT is not set # CONFIG_TARGET_TI814X_EVM is not set # CONFIG_TARGET_TI816X_EVM is not set # CONFIG_TARGET_BCM23550_W1D is not set # CONFIG_TARGET_BCM28155_AP is not set # CONFIG_TARGET_BCMCYGNUS is not set # CONFIG_TARGET_BCMNSP is not set # CONFIG_ARCH_EXYNOS is not set # CONFIG_ARCH_S5PC1XX is not set # CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_KEYSTONE is not set # CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MX7ULP is not set # CONFIG_ARCH_MX7 is not set CONFIG_ARCH_MX6=y # CONFIG_ARCH_MX5 is not set # CONFIG_TARGET_M53EVK is not set # CONFIG_TARGET_MX51EVK is not set # CONFIG_TARGET_MX53ARD is not set # CONFIG_TARGET_MX53EVK is not set # CONFIG_TARGET_MX53LOCO is not set # CONFIG_TARGET_MX53SMD is not set # CONFIG_OMAP34XX is not set # CONFIG_OMAP44XX is not set # CONFIG_OMAP54XX is not set # CONFIG_AM43XX is not set # CONFIG_AM33XX is not set # CONFIG_ARCH_RMOBILE is not set # CONFIG_TARGET_S32V234EVB is not set # CONFIG_ARCH_SNAPDRAGON is not set # CONFIG_ARCH_SOCFPGA is not set # CONFIG_TARGET_CM_T43 is not set # CONFIG_ARCH_SUNXI is not set # CONFIG_TARGET_TS4600 is not set # CONFIG_TARGET_TS4800 is not set # CONFIG_TARGET_VF610TWR is not set # CONFIG_TARGET_COLIBRI_VF is not set # CONFIG_TARGET_PCM052 is not set # CONFIG_TARGET_BK4R1 is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set # CONFIG_ARCH_IMX8 is not set # CONFIG_ARCH_IMX8M is not set # CONFIG_TEGRA is not set # CONFIG_TARGET_VEXPRESS64_AEMV8A is not set # CONFIG_TARGET_VEXPRESS64_BASE_FVP is not set # CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM is not set # CONFIG_TARGET_VEXPRESS64_JUNO is not set # CONFIG_TARGET_LS2080A_EMU is not set # CONFIG_TARGET_LS2080A_SIMU is not set # CONFIG_TARGET_LS2080AQDS is not set # CONFIG_TARGET_LS2080ARDB is not set # CONFIG_TARGET_HIKEY is not set # CONFIG_TARGET_LS1012AQDS is not set # CONFIG_TARGET_LS1012ARDB is not set # CONFIG_TARGET_LS1012AFRDM is not set # CONFIG_TARGET_LS1021AQDS is not set # CONFIG_TARGET_LS1021ATWR is not set # CONFIG_TARGET_LS1021AIOT is not set # CONFIG_TARGET_LS1043AQDS is not set # CONFIG_TARGET_LS1043ARDB is not set # CONFIG_TARGET_LS1046AQDS is not set # CONFIG_TARGET_LS1046ARDB is not set # CONFIG_TARGET_H2200 is not set # CONFIG_TARGET_ZIPITZ2 is not set # CONFIG_TARGET_COLIBRI_PXA270 is not set # CONFIG_ARCH_UNIPHIER is not set # CONFIG_STM32 is not set # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_TARGET_THUNDERX_88XX is not set # CONFIG_ARCH_ASPEED is not set CONFIG_SYS_MALLOC_F_LEN=0x400 # CONFIG_SECURE_BOOT is not set CONFIG_MX6=y CONFIG_MX6UL=y CONFIG_MX6ULL=y # CONFIG_LDO_BYPASS_CHECK is not set # CONFIG_CMD_BEE is not set # CONFIG_MODULE_FUSE is not set # CONFIG_TARGET_ADVANTECH_DMS_BA16 is not set # CONFIG_TARGET_APALIS_IMX6 is not set # CONFIG_TARGET_ARISTAINETOS is not set # CONFIG_TARGET_ARISTAINETOS2 is not set # CONFIG_TARGET_ARISTAINETOS2B is not set # CONFIG_TARGET_CGTQMX6EVAL is not set # CONFIG_TARGET_CM_FX6 is not set # CONFIG_TARGET_COLIBRI_IMX6 is not set # CONFIG_TARGET_EMBESTMX6BOARDS is not set # CONFIG_TARGET_GE_B450V3 is not set # CONFIG_TARGET_GE_B650V3 is not set # CONFIG_TARGET_GE_B850V3 is not set # CONFIG_TARGET_GW_VENTANA is not set # CONFIG_TARGET_KOSAGI_NOVENA is not set # CONFIG_TARGET_MCCMON6 is not set # CONFIG_TARGET_MX6CUBOXI is not set # CONFIG_TARGET_MX6QARM2 is not set # CONFIG_TARGET_MX6Q_ICORE is not set # CONFIG_TARGET_MX6Q_ICORE_RQS is not set # CONFIG_TARGET_MX6QSABREAUTO is not set # CONFIG_TARGET_MX6SABRESD is not set # CONFIG_TARGET_MX6SLEVK is not set # CONFIG_TARGET_MX6SLLEVK is not set # CONFIG_TARGET_MX6SLL_ARM2 is not set # CONFIG_TARGET_MX6SXSABRESD is not set # CONFIG_TARGET_MX6SXSABREAUTO is not set # CONFIG_TARGET_MX6SX_14X14_ARM2 is not set # CONFIG_TARGET_MX6SX_17X17_ARM2 is not set # CONFIG_TARGET_MX6SX_19X19_ARM2 is not set # CONFIG_TARGET_MX6UL_9X9_EVK is not set # CONFIG_TARGET_MX6UL_14X14_EVK is not set # CONFIG_TARGET_MX6UL_NXPU_IOPB is not set # CONFIG_TARGET_MX6UL_14X14_DDR3_ARM2 is not set # CONFIG_TARGET_MX6UL_14X14_LPDDR2_ARM2 is not set # CONFIG_TARGET_MX6UL_GEAM is not set # CONFIG_TARGET_MX6ULL_DDR3_ARM2 is not set CONFIG_TARGET_MX6ULL_14X14_EVK=y # CONFIG_TARGET_MX6ULL_9X9_EVK is not set # CONFIG_TARGET_PICOSOM_IMX6UL is not set # CONFIG_TARGET_PICO_IMX6DL is not set # CONFIG_TARGET_MX6UL_SPRIOT is not set # CONFIG_TARGET_NITROGEN6X is not set # CONFIG_TARGET_OT1200 is not set # CONFIG_TARGET_PICO_IMX6UL is not set # CONFIG_TARGET_LITEBOARD is not set # CONFIG_TARGET_PLATINUM_PICON is not set # CONFIG_TARGET_PLATINUM_TITANIUM is not set # CONFIG_TARGET_PCM058 is not set # CONFIG_TARGET_SECOMX6 is not set # CONFIG_TARGET_TBS2910 is not set # CONFIG_TARGET_TITANIUM is not set # CONFIG_TARGET_TQMA6 is not set # CONFIG_TARGET_UDOO is not set # CONFIG_TARGET_UDOO_NEO is not set # CONFIG_TARGET_SAMTEC_VINING_2000 is not set # CONFIG_TARGET_WANDBOARD is not set # CONFIG_TARGET_WARP is not set # CONFIG_TARGET_XPRESS is not set # CONFIG_TARGET_ZC5202 is not set # CONFIG_TARGET_ZC5601 is not set # CONFIG_TARGET_MX6DQSCM is not set # CONFIG_TARGET_MX6SXSCM is not set # CONFIG_ARMV7_LPAE is not set # CONFIG_IMX_OPTEE is not set # CONFIG_GPT_TIMER is not set CONFIG_ROM_UNIFIED_SECTIONS=y # CONFIG_IMX_RDC is not set # CONFIG_IMX_BOOTAUX is not set # CONFIG_USE_IMXIMG_PLUGIN is not set # CONFIG_DBG_MONITOR is not set # CONFIG_IMX_TRUSTY_OS is not set # CONFIG_SYS_ARM_CACHE_WRITEALLOC is not set CONFIG_IDENT_STRING="" # CONFIG_PRE_CONSOLE_BUFFER is not set CONFIG_VIDEO=y # # ARM debug # # CONFIG_DEBUG_LL is not set CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk-gpmi-weim" CONFIG_SMBIOS_PRODUCT_NAME="mx6ullevk" # CONFIG_AHCI is not set # # General setup # CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_XEN is not set # CONFIG_DISTRO_DEFAULTS is not set CONFIG_SYS_MALLOC_F=y CONFIG_EXPERT=y CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y # CONFIG_TOOLS_DEBUG is not set # CONFIG_PHYS_64BIT is not set # # Boot images # # CONFIG_FIT is not set # CONFIG_OF_BOARD_SETUP is not set # CONFIG_OF_SYSTEM_SETUP is not set # CONFIG_OF_STDOUT_VIA_ALIAS is not set CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg" CONFIG_ARCH_FIXUP_FDT_MEMORY=y # # API # # CONFIG_API is not set # # Boot timing # # CONFIG_BOOTSTAGE is not set CONFIG_BOOTSTAGE_USER_COUNT=20 CONFIG_BOOTSTAGE_STASH_ADDR=0 CONFIG_BOOTSTAGE_STASH_SIZE=4096 # # Boot media # CONFIG_NAND_BOOT=y # CONFIG_ONENAND_BOOT is not set # CONFIG_QSPI_BOOT is not set # CONFIG_SATA_BOOT is not set # CONFIG_SD_BOOT is not set # CONFIG_SPI_BOOT is not set CONFIG_BOOTDELAY=3 # # Console # # CONFIG_CONSOLE_RECORD is not set # CONFIG_SILENT_CONSOLE is not set CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set # CONFIG_SYS_CONSOLE_ENV_OVERWRITE is not set # CONFIG_SYS_CONSOLE_INFO_QUIET is not set # CONFIG_SYS_STDIO_DEREGISTER is not set CONFIG_DEFAULT_FDT_FILE="" # CONFIG_VERSION_VARIABLE is not set CONFIG_BOARD_LATE_INIT=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y # # Start-up hooks # # CONFIG_ARCH_EARLY_INIT_R is not set # CONFIG_ARCH_MISC_INIT is not set CONFIG_BOARD_EARLY_INIT_F=y # # SPL / TPL # # # Command line interface # CONFIG_CMDLINE=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="=> " # # Autoboot options # CONFIG_AUTOBOOT=y # CONFIG_AUTOBOOT_KEYED is not set # # FASTBOOT # # CONFIG_FASTBOOT is not set # # Commands # # # Info commands # CONFIG_CMD_BDI=y # CONFIG_CMD_CONFIG is not set CONFIG_CMD_CONSOLE=y # CONFIG_CMD_CPU is not set # CONFIG_CMD_LICENSE is not set # # Boot commands # CONFIG_CMD_BOOTD=y CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTEFI=y CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y # CONFIG_CMD_BOOTEFI_HELLO is not set # CONFIG_CMD_BOOTMENU is not set CONFIG_CMD_ELF=y CONFIG_CMD_FDT=y CONFIG_CMD_GO=y CONFIG_CMD_RUN=y CONFIG_CMD_IMI=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_XIMG=y # # Environment commands # # CONFIG_CMD_ASKENV is not set CONFIG_CMD_EXPORTENV=y CONFIG_CMD_IMPORTENV=y CONFIG_CMD_EDITENV=y # CONFIG_CMD_GREPENV is not set CONFIG_CMD_SAVEENV=y CONFIG_CMD_ENV_EXISTS=y # # Memory commands # CONFIG_CMD_MEMORY=y CONFIG_CMD_CRC32=y # CONFIG_LOOPW is not set CONFIG_CMD_MEMTEST=y # CONFIG_CMD_MX_CYCLIC is not set # CONFIG_CMD_MEMINFO is not set # CONFIG_CMD_UNZIP is not set # CONFIG_CMD_ZIP is not set # # Device access commands # CONFIG_CMD_DM=y # CONFIG_CMD_DEMO is not set CONFIG_CMD_LOADB=y CONFIG_CMD_LOADS=y CONFIG_CMD_FLASH=y # CONFIG_CMD_GPT is not set # CONFIG_CMD_ARMFLASH is not set # CONFIG_CMD_MMC is not set CONFIG_CMD_NAND=y # CONFIG_CMD_PART is not set # CONFIG_CMD_SF is not set # CONFIG_CMD_SPI is not set CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_DFU is not set # CONFIG_CMD_USB_SDP is not set # CONFIG_CMD_USB_MASS_STORAGE is not set CONFIG_CMD_FPGA=y CONFIG_CMD_GPIO=y # # Shell scripting commands # CONFIG_CMD_ECHO=y CONFIG_CMD_ITEST=y CONFIG_CMD_SOURCE=y CONFIG_CMD_SETEXPR=y # # Network commands # CONFIG_CMD_NET=y # CONFIG_CMD_TFTPPUT is not set # CONFIG_CMD_TFTPSRV is not set # CONFIG_CMD_RARP is not set CONFIG_CMD_DHCP=y # CONFIG_CMD_PXE is not set CONFIG_CMD_NFS=y # CONFIG_CMD_MII is not set CONFIG_CMD_PING=y # CONFIG_CMD_CDP is not set # CONFIG_CMD_SNTP is not set # CONFIG_CMD_DNS is not set # CONFIG_CMD_LINK_LOCAL is not set # # Misc commands # CONFIG_CMD_CACHE=y # CONFIG_CMD_TIME is not set CONFIG_CMD_MISC=y # CONFIG_CMD_TIMER is not set # CONFIG_CMD_QFW is not set # # Power commands # # CONFIG_CMD_REGULATOR is not set # # Security commands # # # Firmware commands # # # Filesystem commands # CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y # # Partition Types # CONFIG_PARTITIONS=y # CONFIG_MAC_PARTITION is not set CONFIG_DOS_PARTITION=y # CONFIG_ISO_PARTITION is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # CONFIG_PARTITION_UUIDS is not set CONFIG_SUPPORT_OF_CONTROL=y # # Device Tree Control # CONFIG_OF_CONTROL=y CONFIG_OF_SEPARATE=y # CONFIG_OF_EMBED is not set CONFIG_NET=y # CONFIG_NET_RANDOM_ETHADDR is not set # CONFIG_NETCONSOLE is not set CONFIG_NET_TFTP_VARS=y CONFIG_BOOTP_PXE_CLIENTARCH=0x15 CONFIG_BOOTP_VCI_STRING="U-Boot.armv7" # # Device Drivers # # # Generic Driver Options # CONFIG_DM=y CONFIG_DM_WARN=y CONFIG_DM_DEVICE_REMOVE=y CONFIG_DM_STDIO=y CONFIG_DM_SEQ_ALIAS=y # CONFIG_SPL_DM_SEQ_ALIAS is not set # CONFIG_REGMAP is not set # CONFIG_SPL_REGMAP is not set CONFIG_DEVRES=y # CONFIG_DEBUG_DEVRES is not set CONFIG_SIMPLE_BUS=y CONFIG_OF_TRANSLATE=y # CONFIG_ADC is not set # CONFIG_ADC_EXYNOS is not set # CONFIG_ADC_SANDBOX is not set # CONFIG_BLK is not set # CONFIG_BLOCK_CACHE is not set # # SATA/SCSI device support # # # Clock # # CONFIG_CLK is not set # CONFIG_CPU is not set # # Hardware crypto devices # # CONFIG_FSL_CAAM is not set CONFIG_SYS_FSL_SEC_COMPAT_4=y # CONFIG_SYS_FSL_SEC_BE is not set CONFIG_SYS_FSL_SEC_LE=y # # Demo for driver model # # CONFIG_DM_DEMO is not set # CONFIG_IMX8M_DRAM is not set # CONFIG_IMX8M_LPDDR4 is not set # CONFIG_IMX8M_DDR4 is not set CONFIG_SAVED_DRAM_TIMING_BASE=0x180000 # # DFU support # # # DMA Support # # CONFIG_DMA is not set # CONFIG_TI_EDMA3 is not set # # FPGA support # # CONFIG_FPGA_ALTERA is not set # CONFIG_FPGA_XILINX is not set # # GPIO Support # CONFIG_DM_GPIO=y # CONFIG_ALTERA_PIO is not set # CONFIG_DWAPB_GPIO is not set # CONFIG_ATMEL_PIO4 is not set # CONFIG_INTEL_BROADWELL_GPIO is not set # CONFIG_IMX_RGPIO2P is not set # CONFIG_LPC32XX_GPIO is not set # CONFIG_MSM_GPIO is not set # CONFIG_PCF8575_GPIO is not set # CONFIG_ROCKCHIP_GPIO is not set # CONFIG_TEGRA_GPIO is not set # CONFIG_TEGRA186_GPIO is not set # CONFIG_VYBRID_GPIO is not set CONFIG_DM_74X164=y # CONFIG_DM_PCA953X is not set # CONFIG_MPC85XX_GPIO is not set # # I2C support # CONFIG_DM_I2C=y # CONFIG_DM_I2C_COMPAT is not set # CONFIG_DM_I2C_GPIO is not set # CONFIG_SYS_I2C_FSL is not set # CONFIG_SYS_I2C_DW is not set # CONFIG_SYS_I2C_INTEL is not set # CONFIG_SYS_I2C_MXC is not set # CONFIG_SYS_I2C_ROCKCHIP is not set # CONFIG_SYS_I2C_MVTWSI is not set # CONFIG_I2C_MUX is not set # CONFIG_DM_KEYBOARD is not set # CONFIG_CROS_EC_KEYB is not set # # LED Support # # CONFIG_LED is not set # CONFIG_LED_STATUS is not set # # Mailbox Controller Support # # CONFIG_DM_MAILBOX is not set # # Memory Controller drivers # # # Multifunction device drivers # # CONFIG_MISC is not set # CONFIG_CROS_EC is not set # CONFIG_FSL_SEC_MON is not set # CONFIG_MXC_OCOTP is not set # CONFIG_NUVOTON_NCT6102D is not set # CONFIG_PWRSEQ is not set # CONFIG_PCA9551_LED is not set # CONFIG_WINBOND_W83627 is not set # # MMC Host controller Support # CONFIG_MMC=y CONFIG_GENERIC_MMC=y CONFIG_DM_MMC=y # CONFIG_DM_MMC_OPS is not set # CONFIG_SPL_MMC_TINY is not set # CONFIG_MMC_DW is not set # CONFIG_MMC_MXC is not set # CONFIG_MMC_MXS is not set # CONFIG_MMC_OMAP_HS is not set # CONFIG_MMC_SDHCI is not set # # MTD Support # CONFIG_MTD=y # CONFIG_MTD_NOR_FLASH is not set # CONFIG_CFI_FLASH is not set # CONFIG_ALTERA_QSPI is not set # # NAND Device Support # # CONFIG_NAND_DENALI is not set # CONFIG_NAND_VF610_NFC is not set # CONFIG_NAND_PXA3XX is not set # CONFIG_NAND_ARASAN is not set # CONFIG_NAND_MXS is not set # CONFIG_NAND_ZYNQ is not set # # Generic NAND options # # # SPI Flash Support # # CONFIG_DM_SPI_FLASH is not set # CONFIG_SPI_FLASH is not set # # UBI support # CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_BITBANGMII is not set # CONFIG_MV88E6352_SWITCH is not set # CONFIG_PHYLIB is not set CONFIG_DM_ETH=y CONFIG_NETDEVICES=y # CONFIG_ALTERA_TSE is not set # CONFIG_DWC_ETH_QOS is not set # CONFIG_E1000 is not set # CONFIG_ETH_DESIGNWARE is not set # CONFIG_ETHOC is not set # CONFIG_FEC_MXC is not set # CONFIG_MACB is not set # CONFIG_RTL8139 is not set # CONFIG_RTL8169 is not set # CONFIG_SUN8I_EMAC is not set # CONFIG_PCI is not set # CONFIG_MVEBU_COMPHY_SUPPORT is not set # # Pin controllers # CONFIG_PINCTRL=y CONFIG_PINCTRL_FULL=y CONFIG_PINCTRL_GENERIC=y CONFIG_PINMUX=y # CONFIG_PINCONF is not set # CONFIG_ROCKCHIP_RK3036_PINCTRL is not set # CONFIG_ROCKCHIP_RK3288_PINCTRL is not set # CONFIG_PINCTRL_AT91PIO4 is not set # CONFIG_ROCKCHIP_RK3399_PINCTRL is not set CONFIG_PINCTRL_IMX=y CONFIG_PINCTRL_IMX6=y # # Power # # # Power Domain Support # # CONFIG_POWER_DOMAIN is not set # CONFIG_DM_PMIC is not set # CONFIG_POWER_MC34VR500 is not set CONFIG_DM_REGULATOR=y # CONFIG_SPL_DM_REGULATOR is not set # CONFIG_REGULATOR_PWM is not set CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y # CONFIG_DM_PWM is not set # CONFIG_RAM is not set # # Remote Processor drivers # # # Reset Controller Support # # CONFIG_DM_RESET is not set # # Real Time Clock # # CONFIG_DM_RTC is not set # # Serial drivers # # CONFIG_DM_SERIAL is not set # CONFIG_DEBUG_UART is not set # CONFIG_DEBUG_UART_SKIP_INIT is not set # CONFIG_ATMEL_USART is not set # CONFIG_FSL_LPUART is not set # CONFIG_MVEBU_A3700_UART is not set # CONFIG_MXC_UART is not set # CONFIG_SYS_NS16550 is not set # CONFIG_PXA_SERIAL is not set # # Sound support # # CONFIG_SOUND is not set # # SPI Support # CONFIG_DM_SPI=y # CONFIG_ALTERA_SPI is not set # CONFIG_CADENCE_QSPI is not set # CONFIG_DESIGNWARE_SPI is not set # CONFIG_EXYNOS_SPI is not set # CONFIG_FSL_DSPI is not set # CONFIG_ICH_SPI is not set # CONFIG_MVEBU_A3700_SPI is not set # CONFIG_ROCKCHIP_SPI is not set # CONFIG_TEGRA114_SPI is not set # CONFIG_TEGRA20_SFLASH is not set # CONFIG_TEGRA20_SLINK is not set # CONFIG_TEGRA210_QSPI is not set # CONFIG_XILINX_SPI is not set # CONFIG_OMAP3_SPI is not set # CONFIG_SOFT_SPI is not set # CONFIG_FSL_ESPI is not set # CONFIG_FSL_FSPI is not set # CONFIG_FSL_QSPI is not set # CONFIG_TI_QSPI is not set # # SPMI support # # CONFIG_SPMI is not set # # System reset device drivers # # CONFIG_SYSRESET is not set CONFIG_DM_THERMAL=y # CONFIG_IMX_THERMAL is not set # # Timer Support # # CONFIG_TIMER is not set # # TPM support # CONFIG_USB=y CONFIG_DM_USB=y # # USB Host Controller Drivers # CONFIG_USB_HOST=y # CONFIG_USB_XHCI_HCD is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI=y CONFIG_USB_EHCI_MX6=y # CONFIG_MXC_USB_OTG_HACTIVE is not set # CONFIG_USB_EHCI_MSM is not set # CONFIG_USB_EHCI_GENERIC is not set # CONFIG_USB_OHCI_HCD is not set # CONFIG_USB_UHCI_HCD is not set # # MUSB Controller Driver # # CONFIG_USB_MUSB_HOST is not set # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_TI is not set # # ULPI drivers # # # USB peripherals # CONFIG_USB_STORAGE=y # CONFIG_USB_KEYBOARD is not set # CONFIG_USB_GADGET is not set # # Graphics support # # CONFIG_DM_VIDEO is not set # # TrueType Fonts # # CONFIG_VIDEO_VESA is not set # CONFIG_VIDEO_LCD_ANX9804 is not set # CONFIG_VIDEO_LCD_SSD2828 is not set # CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set # CONFIG_VIDEO_MVEBU is not set # CONFIG_I2C_EDID is not set # CONFIG_DISPLAY is not set # CONFIG_VIDEO_TEGRA20 is not set # CONFIG_VIDEO_BRIDGE is not set # CONFIG_VIDEO_IPUV3 is not set CONFIG_CFB_CONSOLE=y # CONFIG_CFB_CONSOLE_ANSI is not set CONFIG_VGA_AS_SINGLE_DEVICE=y CONFIG_VIDEO_SW_CURSOR=y # CONFIG_CONSOLE_EXTRA_INFO is not set CONFIG_CONSOLE_SCROLL_LINES=1 # CONFIG_VIDEO_CT69000 is not set CONFIG_SYS_CONSOLE_BG_COL=0x00 CONFIG_SYS_CONSOLE_FG_COL=0xa0 # CONFIG_LCD is not set # # WATCHDOG support # # CONFIG_ULP_WATCHDOG is not set # CONFIG_PHYS_TO_BUS is not set # # File systems # # # Library routines # # CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set CONFIG_HAVE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_SYS_HZ=1000 # CONFIG_USE_TINY_PRINTF is not set CONFIG_REGEX=y # CONFIG_LIB_RAND is not set # CONFIG_AVB_ATX is not set # CONFIG_DUAL_BOOTLOADER is not set # CONFIG_CMD_DHRYSTONE is not set # CONFIG_RSA is not set # CONFIG_TPM is not set # # Hashing Support # # CONFIG_SHA1 is not set # CONFIG_SHA256 is not set # CONFIG_SHA_HW_ACCEL is not set # # Compression Support # # CONFIG_LZ4 is not set # CONFIG_ERRNO_STR is not set CONFIG_OF_LIBFDT=y # CONFIG_LOAD_FDT_FROM_PART is not set # CONFIG_OF_LIBFDT_OVERLAY is not set # CONFIG_SPL_OF_LIBFDT is not set # CONFIG_FDT_FIXUP_PARTITIONS is not set # # System tables # CONFIG_GENERATE_SMBIOS_TABLE=y CONFIG_SMBIOS_MANUFACTURER="freescale" CONFIG_EFI_LOADER=y # CONFIG_UNIT_TEST is not set Thank you. - jh From alex.kiernan at gmail.com Fri Feb 7 09:12:53 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Fri, 7 Feb 2020 09:12:53 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: Message-ID: On Fri, Feb 7, 2020 at 8:31 AM Richard Purdie wrote: > > On Fri, 2020-02-07 at 08:16 +0000, Alex Kiernan wrote: > > Hi > > > > We've got a couple of multiconfig builds with different > > configurations in one bitbake run (whether it needs to be like this a > > different question - I suspect we had something that worked and > > stopped there!) > > > > However, for sometime we've been seeing errors like this on master > > (the recipes vary): > > > > ERROR: mc:forensic:ca-certificates-20190110-r0 > > do_deploy_source_date_epoch: Cache unihash > > 37d2546973a2b7c16fbcb1a8dd4939e4a1bba8c3d6d2dfb6e7204ca08d437ace > > doesn't match BB_UNIHASH > > 09baf78bd9316acdd308980c42ea4ed1eacea61bcc0d840c36293d1a5a22db69 > > This is an internal sanity test. It means the hash that it had in the > task/worker context didn't match what the server thought the unihash > should be. There have been changes in this area to try and fix various > things, I'm wondering if we introduced a bug with multiconfig handling. > > There are some patches in master-next related to this area so it would > be interesting to know if that made things better/worse. > I can pull those in, if it'd be useful to test? > > Coupled with deadlock messages: > > > > WARNING: Runqeueue deadlocked on deferred tasks, forcing task > > mc:factory:virtual:native:/var/lib/jenkins/workspace/nanohub_master/b > > uild/../poky/meta/recipes- > > support/sqlite/sqlite3_3.31.1.bb:do_populate_sysroot > > This happens if a build has multiple different components with matching > hashes. It builds the "first" one and defers the others since they > could become available in sstate after the first one builds. > > You should see messages from runqueue.py: > > bb.note("Deferring %s after %s" % (tid, sqdata.hashes[h])) > > The behaviour should be to therefore prioritise one multiconfig. I > worry that the sorting isn't quite right and its building bits of > several multiconfigs and deadlocking? > > Do you have the logs with the Deferring XXX after YYY messages in you > could share? I suspect its a sorting problem. > Sure - I'll mail it over separately. -- Alex Kiernan From quentin.schulz at streamunlimited.com Fri Feb 7 11:55:21 2020 From: quentin.schulz at streamunlimited.com (Quentin Schulz) Date: Fri, 7 Feb 2020 12:55:21 +0100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: <20200207115521.i7flzwf6e24obq5r@qschulz> Hi JH, On Fri, Feb 07, 2020 at 07:52:35PM +1100, JH wrote: > Hi Pelle, > > Aplogize for cross posting. > > On 2/7/20, Pelle Windestam wrote: > > In my case u-boot uses a default config called imx8qxp_var_som_defconfig > > stored under the configs directory in u-boot (not sure if its in the > > official repositories, I use a vendor supplied u-boot repo, but the > > procedure should be the same either way), then I have created a > > .bbappend-file for the u-boot recipe, and added a patch that modifies the > > defconfig file to include the options I want to enable. Then as u-boot is > > built, it will use the patched defconfig with the appropriate options > > enabled. In the meta-freescale layer the u-boot recipes are under > > meta-freescale/recipes-bsp/u-boot. > > Thanks for the tip, that is quite helpful. I created bbappend file, > run the make menuconfig to enable NAND and CONFIG_CMD_UBI, but then > failed in build, missing all MTD, NAND, UBI references, the MTD, NAND, > UBI are all selected, what I could be missing? > > /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/cmd/ubi.c:448: > undefined reference to `mtdparts_init' This function is not defined. So you look it up in the sources, find where it's defined. Is it in a file which is compiled/included somewhere? Is it surrounded by #ifdef? And by surrounded, I mean the #ifdef can be several thousands of lines above the function definition. In that case, I couldn't find the sources of u-boot-imx (didn't take the time) but from upstream: https://elixir.bootlin.com/u-boot/v2017.03/source/cmd/nand.c#L35 It's surrounded by #if defined(CONFIG_CMD_MTDPARTS) so you need CMD_MTDPARTS to be enabled. Do the same for all the other calls. There's no magic thing, you thus have to look it up yourself most of the time. Even though arguably, that's a mistake from upstream (there should be a dependency on MTDPARTS in Kconfig, anyway...). Quentin From wangmy at cn.fujitsu.com Fri Feb 7 20:27:55 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 7 Feb 2020 12:27:55 -0800 Subject: [OE-core] [PATCH] pciutils: upgrade 3.6.2 -> 3.6.4 Message-ID: <1581107275-6540-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} (92%) diff --git a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb similarity index 92% rename from meta/recipes-bsp/pciutils/pciutils_3.6.2.bb rename to meta/recipes-bsp/pciutils/pciutils_3.6.4.bb index 413421cd8a..034bb63dc9 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb @@ -11,8 +11,8 @@ DEPENDS = "zlib kmod" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" -SRC_URI[md5sum] = "77963796d1be4f451b83e6da28ba4f82" -SRC_URI[sha256sum] = "db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" +SRC_URI[md5sum] = "4343b37e19f319ce8f3d59c30031790e" +SRC_URI[sha256sum] = "f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055" inherit multilib_header pkgconfig -- 2.17.1 From jupiter.hce at gmail.com Fri Feb 7 13:01:17 2020 From: jupiter.hce at gmail.com (JH) Date: Sat, 8 Feb 2020 00:01:17 +1100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: <20200207115521.i7flzwf6e24obq5r@qschulz> References: <20200207115521.i7flzwf6e24obq5r@qschulz> Message-ID: Hi Quentin, Thanks for your response, so glad you help me here again :-). On 2/7/20, Quentin Schulz wrote: >> /build/Installer/sa_platform_build/Source/Yocto/build/tmp-glibc/work/solar-oe-linux-gnueabi/u-boot-imx/2017.03-r0/git/cmd/ubi.c:448: >> undefined reference to `mtdparts_init' > > This function is not defined. So you look it up in the sources, find > where it's defined. That is a function call in cmd/ubi.c: int ubi_detach(void) { if (mtdparts_init() != 0) { printf("Error initializing mtdparts!\n"); return 1; } ..... That function is in cmd/mtdparts.c: int mtdparts_init(void) { ....... } It is in the same source directory, I'll have to look it deep, why it does not compile cmd/mtdparts.c? > Is it in a file which is compiled/included somewhere? > Is it surrounded by #ifdef? And by surrounded, I mean the #ifdef can > be several thousands of lines above the function definition. Actually, there is no macros to surround that function. > In that case, I couldn't find the sources of u-boot-imx (didn't take the > time) but from upstream: > https://elixir.bootlin.com/u-boot/v2017.03/source/cmd/nand.c#L35 The meta-freescale downloaded the u-boot source from https://source.codeaurora.org/external/imx/uboot-imx.git > It's surrounded by #if defined(CONFIG_CMD_MTDPARTS) so you need > CMD_MTDPARTS to be enabled. Do the same for all the other calls. There's > no magic thing, you thus have to look it up yourself most of the time. > Even though arguably, that's a mistake from upstream (there should be a > dependency on MTDPARTS in Kconfig, anyway...). You are right, the CONFIG_CMD_MTDPARTS is defined in many defconfig except it is not in my mx6ull_14x14_evk_defconfig, there are lots of definitions are defined in other defconfig, but missing in mx6ull_14x14_evk_defconfig. When I run make menuconfig, I enabled all MTD, NAND and UBI parts except UBI Fastmap (Experimental feature) in menuconfig, but I still could not find CONFIG_CMD_MTDPARTS and other definitions. Need to look it carefully. I suspect that to run make menuconfig might not be right command, I tried bitbake -c menuconfig u-boot: ERROR: Task do_menuconfig does not exist for target u-boot (./meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb:do_menuconfig). Close matches: do_configure To run kernel menuconfig, I can add KERNEL_CONFIG_COMMAND = "oe_runmake_call -C ${S} O=${B} imx_v6_v7_defconfig" to a bbappend file to run bitbake -c menuconfig kernel. Is there an equivelent UBOOT_CONFIG_COMMAND to run oe_runmake? Thank you. - jh From trevor.gamblin at windriver.com Fri Feb 7 13:46:52 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Fri, 7 Feb 2020 08:46:52 -0500 Subject: [OE-core] [PATCH] qemurunner.py: add try/except for pid handling race Message-ID: <20200207134652.2093308-1-trevor.gamblin@windriver.com> In some instances, attempts to remove the qemu pidfile within the stop() method fail despite the os.path.exists() call immediately before implying that the file is present. Add a try/except block to log a warning if this occurs, rather than failing outright, since the process simply appears to be exiting at an inconvenient time. Signed-off-by: Trevor Gamblin --- meta/lib/oeqa/utils/qemurunner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 2cada35d48..4704422211 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -406,7 +406,10 @@ class QemuRunner: self.qemupid = None self.ip = None if os.path.exists(self.qemu_pidfile): - os.remove(self.qemu_pidfile) + try: + os.remove(self.qemu_pidfile) + except FileNotFoundError as e: + self.logger.warning('qemu pidfile is no longer present') if self.monitorpipe: self.monitorpipe.close() -- 2.24.1 From martin.jansa at gmail.com Fri Feb 7 14:19:53 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Fri, 7 Feb 2020 15:19:53 +0100 Subject: [OE-core] [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters In-Reply-To: References: Message-ID: With the LD="${KERNEL_LD}" removed here, the build with ld-is-gold doesn't work anymore again. Why did you remove it? On Thu, Feb 6, 2020 at 6:37 PM wrote: > From: Bruce Ashfield > > To ensure that the kernel linker is used when allno/mod/yes config > merge_config steps were executed, the call to make was tweaked to > explicitly pass LD. > > But since the variable wasn't quoted, any parameters to LD (like > the sysroot) were mistakenly passed to make, and hence could trigger > an error on some architectures. > > We also tweak the logging to hightlight errors like this in the > future and avoid losing it in the noise of merge configs sometimes > overly verbose output. > > Signed-off-by: Bruce Ashfield > --- > meta/classes/kernel-yocto.bbclass | 10 +++++++--- > .../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/kernel-yocto.bbclass > b/meta/classes/kernel-yocto.bbclass > index 918d101d3d..31ea42580c 100644 > --- a/meta/classes/kernel-yocto.bbclass > +++ b/meta/classes/kernel-yocto.bbclass > @@ -352,10 +352,14 @@ do_kernel_configme() { > bbfatal_log "Could not find configuration queue > (${meta_dir}/config.queue)" > fi > > - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} > ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" > LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} > ${configs} > - > + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} > ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" > ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > > ${meta_dir}/cfg/merge_config_build.log 2>&1 > if [ $? -ne 0 -o ! -f ${B}/.config ]; then > - bbfatal_log "Could not configure > ${KMACHINE}-${LINUX_KERNEL_TYPE}" > + bberror "Could not generate a .config for > ${KMACHINE}-${LINUX_KERNEL_TYPE}" > + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then > + bbfatal_log "`cat > ${meta_dir}/cfg/merge_config_build.log`" > + else > + bbfatal_log "Details can be found at: > ${S}/${meta_dir}/cfg/merge_config_build.log" > + fi > fi > > if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > index f263421234..4f1af731d6 100644 > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = > "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 > > DEPENDS = "git-native" > > -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" > +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" > PR = "r12" > PV = "0.2+git${SRCPV}" > > -- > 2.19.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Fri Feb 7 14:23:59 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 07 Feb 2020 14:23:59 +0000 Subject: [OE-core] Reproducible Build Status Message-ID: <836aaccb82a2781c00e26249ab896d7ef0e25a27.camel@linuxfoundation.org> I think we're now down to: sudo path issues (Ross is poking) ncurses-doc issue (assigned to JPEW) perl host compiler flags issue sysvinit missing group problem (assigned to Mingli Yu at present) (thanks Alex for spotting the obvious I couldn't see with one of the perl issues!) I wanted to document some of the interesting quirks we've seen with reproducibile build failures in case anyone else runs into these kinds of issues. First is the "embedded git hash" problem where a source tree embeds the output of "git describe" or the hash from a git command, even though the source has come from an upstream tarball. These commands travel back up the directory structure and find the hash or description (e.g. 3.1M1-XXXX) for our own metadata (poky or OE- Core). These are consistent as long as the same revision of the metadata is built. As soon as there are new commits or a rebase, they change and trigger the reproducible builds failure. This means they usually pass for master-next and break on master. Second is setcap issues. A number of recipes look for setcap on the host system and then change behaviour depending on whether they find it. Some of our workers have it as part of their default install some don't. Some recipes fall back to suid bits if setcap isn't present too just to confuse things. Third is the weird group problem for sysvinit. In this case its because the do_package_write_ipk was running against do_package from sstate and that gave different output to a full build due to the differing sysroot contents (missing etc/group file). The reproducer is simple once you realise what is breaking: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f Were also seeing a smattering of more well known issues like hardcoded hosttool paths (/bin/mv vs /usr/bin/mv), dash vs bash, sorting issues in generated header/C files and some host variable infection problems. Cheers, Richard From ross at burtonini.com Fri Feb 7 14:29:28 2020 From: ross at burtonini.com (Ross Burton) Date: Fri, 7 Feb 2020 14:29:28 +0000 Subject: [OE-core] [PATCH] sudo: specify where target tools are Message-ID: <20200207142928.13703-1-ross@burtonini.com> From: Ross Burton sudo uses AC_PATH_PROG to find target paths, which means at best potential host-contamination (and reproducible issues) and at worst it thinks sh is at /your/build/path/hosttools/sh. Solve this by explicitly passing the correct paths to configure. Signed-off-by: Ross Burton --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.30.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 67815fa8584..3b314dd4a9b 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.30.bb index 6ea06a90409..9d014d294b3 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.30.bb @@ -13,8 +13,15 @@ SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ -- 2.20.1 From richard.purdie at linuxfoundation.org Fri Feb 7 14:40:55 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 7 Feb 2020 14:40:55 +0000 Subject: [OE-core] [PATCH 1/3] sysvinit: Fix Reproducibility issue Message-ID: <20200207144057.6121-1-richard.purdie@linuxfoundation.org> With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 2b146b1ef8f..349ea71837d 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -29,6 +29,7 @@ B = "${S}/src" inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- 2.20.1 From richard.purdie at linuxfoundation.org Fri Feb 7 14:40:56 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 7 Feb 2020 14:40:56 +0000 Subject: [OE-core] [PATCH 2/3] libevdev: Fix determinism issue In-Reply-To: <20200207144057.6121-1-richard.purdie@linuxfoundation.org> References: <20200207144057.6121-1-richard.purdie@linuxfoundation.org> Message-ID: <20200207144057.6121-2-richard.purdie@linuxfoundation.org> We need to sort python dict output to be deterministic and generate consistent header files. Signed-off-by: Richard Purdie --- .../libevdev/libevdev/determinism.patch | 34 +++++++++++++++++++ .../libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 00000000000..33a6076b781 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 84274987d71..46ed5d786ae 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- 2.20.1 From richard.purdie at linuxfoundation.org Fri Feb 7 14:40:57 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 7 Feb 2020 14:40:57 +0000 Subject: [OE-core] [PATCH 3/3] perl: Fix various reproducibile build issues In-Reply-To: <20200207144057.6121-1-richard.purdie@linuxfoundation.org> References: <20200207144057.6121-1-richard.purdie@linuxfoundation.org> Message-ID: <20200207144057.6121-3-richard.purdie@linuxfoundation.org> Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 Signed-off-by: Richard Purdie --- .../perl/files/determinism.patch | 81 +++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/determinism.patch diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 00000000000..ed4d06f5ec6 --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index dcdabb692dd..5d762710df3 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- 2.20.1 From chris.laplante at agilent.com Fri Feb 7 14:43:15 2020 From: chris.laplante at agilent.com (chris.laplante at agilent.com) Date: Fri, 7 Feb 2020 14:43:15 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: Message-ID: Hi Richard, > On Fri, 2020-02-07 at 08:16 +0000, Alex Kiernan wrote: > > Hi > > > > We've got a couple of multiconfig builds with different > > configurations in one bitbake run (whether it needs to be like this a > > different question - I suspect we had something that worked and > > stopped there!) > > > > However, for sometime we've been seeing errors like this on master > > (the recipes vary): > > > > ERROR: mc:forensic:ca-certificates-20190110-r0 > > do_deploy_source_date_epoch: Cache unihash > > 37d2546973a2b7c16fbcb1a8dd4939e4a1bba8c3d6d2dfb6e7204ca08d437ace > > doesn't match BB_UNIHASH > > 09baf78bd9316acdd308980c42ea4ed1eacea61bcc0d840c36293d1a5a22db69 > > This is an internal sanity test. It means the hash that it had in the > task/worker context didn't match what the server thought the unihash > should be. There have been changes in this area to try and fix various > things, I'm wondering if we introduced a bug with multiconfig handling. > > There are some patches in master-next related to this area so it would > be interesting to know if that made things better/worse. Anecdotally, we are running Zeus for nightly builds with three multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: fixup" patches and haven't seen any of the BB_UNIHASH errors since. Granted it's only been a week. But before that, hash equiv + multiconfig was unusable due to the BB_UNIHASH errors. Thanks, Chris From bruce.ashfield at gmail.com Fri Feb 7 14:45:21 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Fri, 7 Feb 2020 09:45:21 -0500 Subject: [OE-core] [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters In-Reply-To: References: Message-ID: On Fri, Feb 7, 2020 at 9:20 AM Martin Jansa wrote: > > With the LD="${KERNEL_LD}" removed here, the build with ld-is-gold doesn't work anymore again. > > Why did you remove it? I removed it by mistake, and fixed it .. but apparently sent the wrong version of the patch. I'll send a v2 shortly! Bruce > > On Thu, Feb 6, 2020 at 6:37 PM wrote: >> >> From: Bruce Ashfield >> >> To ensure that the kernel linker is used when allno/mod/yes config >> merge_config steps were executed, the call to make was tweaked to >> explicitly pass LD. >> >> But since the variable wasn't quoted, any parameters to LD (like >> the sysroot) were mistakenly passed to make, and hence could trigger >> an error on some architectures. >> >> We also tweak the logging to hightlight errors like this in the >> future and avoid losing it in the noise of merge configs sometimes >> overly verbose output. >> >> Signed-off-by: Bruce Ashfield >> --- >> meta/classes/kernel-yocto.bbclass | 10 +++++++--- >> .../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- >> 2 files changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass >> index 918d101d3d..31ea42580c 100644 >> --- a/meta/classes/kernel-yocto.bbclass >> +++ b/meta/classes/kernel-yocto.bbclass >> @@ -352,10 +352,14 @@ do_kernel_configme() { >> bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" >> fi >> >> - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} >> - >> + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 >> if [ $? -ne 0 -o ! -f ${B}/.config ]; then >> - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" >> + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" >> + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then >> + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" >> + else >> + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" >> + fi >> fi >> >> if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then >> diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> index f263421234..4f1af731d6 100644 >> --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 >> >> DEPENDS = "git-native" >> >> -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" >> +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" >> PR = "r12" >> PV = "0.2+git${SRCPV}" >> >> -- >> 2.19.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From martin.jansa at gmail.com Fri Feb 7 14:46:45 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Fri, 7 Feb 2020 15:46:45 +0100 Subject: [OE-core] [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters In-Reply-To: References: Message-ID: Awesome, thanks! On Fri, Feb 7, 2020 at 3:45 PM Bruce Ashfield wrote: > On Fri, Feb 7, 2020 at 9:20 AM Martin Jansa > wrote: > > > > With the LD="${KERNEL_LD}" removed here, the build with ld-is-gold > doesn't work anymore again. > > > > Why did you remove it? > > I removed it by mistake, and fixed it .. but apparently sent the wrong > version of the patch. > > I'll send a v2 shortly! > > Bruce > > > > > On Thu, Feb 6, 2020 at 6:37 PM wrote: > >> > >> From: Bruce Ashfield > >> > >> To ensure that the kernel linker is used when allno/mod/yes config > >> merge_config steps were executed, the call to make was tweaked to > >> explicitly pass LD. > >> > >> But since the variable wasn't quoted, any parameters to LD (like > >> the sysroot) were mistakenly passed to make, and hence could trigger > >> an error on some architectures. > >> > >> We also tweak the logging to hightlight errors like this in the > >> future and avoid losing it in the noise of merge configs sometimes > >> overly verbose output. > >> > >> Signed-off-by: Bruce Ashfield > >> --- > >> meta/classes/kernel-yocto.bbclass | 10 +++++++--- > >> .../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > >> 2 files changed, 8 insertions(+), 4 deletions(-) > >> > >> diff --git a/meta/classes/kernel-yocto.bbclass > b/meta/classes/kernel-yocto.bbclass > >> index 918d101d3d..31ea42580c 100644 > >> --- a/meta/classes/kernel-yocto.bbclass > >> +++ b/meta/classes/kernel-yocto.bbclass > >> @@ -352,10 +352,14 @@ do_kernel_configme() { > >> bbfatal_log "Could not find configuration queue > (${meta_dir}/config.queue)" > >> fi > >> > >> - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} > ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" > LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} > ${configs} > >> - > >> + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} > ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" > ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > > ${meta_dir}/cfg/merge_config_build.log 2>&1 > >> if [ $? -ne 0 -o ! -f ${B}/.config ]; then > >> - bbfatal_log "Could not configure > ${KMACHINE}-${LINUX_KERNEL_TYPE}" > >> + bberror "Could not generate a .config for > ${KMACHINE}-${LINUX_KERNEL_TYPE}" > >> + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then > >> + bbfatal_log "`cat > ${meta_dir}/cfg/merge_config_build.log`" > >> + else > >> + bbfatal_log "Details can be found at: > ${S}/${meta_dir}/cfg/merge_config_build.log" > >> + fi > >> fi > >> > >> if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then > >> diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> index f263421234..4f1af731d6 100644 > >> --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = > "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 > >> > >> DEPENDS = "git-native" > >> > >> -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" > >> +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" > >> PR = "r12" > >> PV = "0.2+git${SRCPV}" > >> > >> -- > >> 2.19.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bruce.ashfield at gmail.com Fri Feb 7 14:52:04 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 7 Feb 2020 09:52:04 -0500 Subject: [OE-core] [PATCH v2] kern-tools: fix merge_config when LD contains parameters Message-ID: <20200207145204.35747-1-bruce.ashfield@gmail.com> From: Bruce Ashfield To ensure that the kernel linker is used when allno/mod/yes config merge_config steps were executed, the call to make was tweaked to explicitly pass LD. But since the variable wasn't quoted, any parameters to LD (like the sysroot) were mistakenly passed to make, and hence could trigger an error on some architectures. We also tweak the logging to hightlight errors like this in the future and avoid losing it in the noise of merge configs sometimes overly verbose output. Signed-off-by: Bruce Ashfield --- Martin noticed that I sent a WIP version as part of my series when I was shuffling LD around to various locations. This is the final version and should replace 10/10 in my last series. Bruce meta/classes/kernel-yocto.bbclass | 10 +++++++--- .../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 918d101d3d..44863adc27 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -352,10 +352,14 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} - + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`" + else + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log" + fi fi if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f263421234..4f1af731d6 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249 DEPENDS = "git-native" -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 From patchwork at patchwork.openembedded.org Fri Feb 7 15:02:32 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 07 Feb 2020 15:02:32 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_=22sysvini?= =?utf-8?q?t=3A_Fix_Reproducibility_=2E=2E=2E=22_and_2_more?= In-Reply-To: <20200207144057.6121-1-richard.purdie@linuxfoundation.org> References: <20200207144057.6121-1-richard.purdie@linuxfoundation.org> Message-ID: <20200207150232.2273.46761@do> == Series Details == Series: "sysvinit: Fix Reproducibility ..." and 2 more Revision: 1 URL : https://patchwork.openembedded.org/series/22469/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Upstream-Status is Submitted, but it is not mentioned where [test_upstream_status_presence_format] Suggested fix Include where determinism.patch was submitted Current Upstream-Status: Pending [75% submitted] Standard format Upstream-Status: Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From patchwork at patchwork.openembedded.org Fri Feb 7 15:02:33 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 07 Feb 2020 15:02:33 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_kern-tools?= =?utf-8?q?=3A_fix_merge=5Fconfig_when_LD_contains_parameters?= In-Reply-To: <20200207145204.35747-1-bruce.ashfield@gmail.com> References: <20200207145204.35747-1-bruce.ashfield@gmail.com> Message-ID: <20200207150233.2273.72494@do> == Series Details == Series: kern-tools: fix merge_config when LD contains parameters Revision: 1 URL : https://patchwork.openembedded.org/series/22470/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 6f6a6bbac6) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From richard.purdie at linuxfoundation.org Fri Feb 7 15:05:58 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 07 Feb 2020 15:05:58 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: Message-ID: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> On Fri, 2020-02-07 at 14:43 +0000, chris.laplante at agilent.com wrote: > Hi Richard, > > > On Fri, 2020-02-07 at 08:16 +0000, Alex Kiernan wrote: > > > Hi > > > > > > We've got a couple of multiconfig builds with different > > > configurations in one bitbake run (whether it needs to be like > > > this a > > > different question - I suspect we had something that worked and > > > stopped there!) > > > > > > However, for sometime we've been seeing errors like this on > > > master > > > (the recipes vary): > > > > > > ERROR: mc:forensic:ca-certificates-20190110-r0 > > > do_deploy_source_date_epoch: Cache unihash > > > 37d2546973a2b7c16fbcb1a8dd4939e4a1bba8c3d6d2dfb6e7204ca08d437ace > > > doesn't match BB_UNIHASH > > > 09baf78bd9316acdd308980c42ea4ed1eacea61bcc0d840c36293d1a5a22db69 > > > > This is an internal sanity test. It means the hash that it had in > > the > > task/worker context didn't match what the server thought the > > unihash > > should be. There have been changes in this area to try and fix > > various > > things, I'm wondering if we introduced a bug with multiconfig > > handling. > > > > There are some patches in master-next related to this area so it > > would > > be interesting to know if that made things better/worse. > > Anecdotally, we are running Zeus for nightly builds with three > multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: > fixup" patches and haven't seen any of the BB_UNIHASH errors since. > Granted it's only been a week. But before that, hash equiv + > multiconfig was unusable due to the BB_UNIHASH errors. That is a really helpful data point, thanks. I should probably clean up those bitbake patches and get them merged then, I couldn't decide if they were right or not... Cheers, Richard From chris.laplante at agilent.com Fri Feb 7 15:08:52 2020 From: chris.laplante at agilent.com (chris.laplante at agilent.com) Date: Fri, 7 Feb 2020 15:08:52 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> References: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> Message-ID: > > Anecdotally, we are running Zeus for nightly builds with three > > multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: > > fixup" patches and haven't seen any of the BB_UNIHASH errors since. > > Granted it's only been a week. But before that, hash equiv + > > multiconfig was unusable due to the BB_UNIHASH errors. > > That is a really helpful data point, thanks. I should probably clean up > those bitbake patches and get them merged then, I couldn't decide if > they were right or not... Sure thing! I should note, I did delete my hashserv.db (on the hash equiv server) out of caution after applying those patches. Chris From richard.purdie at linuxfoundation.org Fri Feb 7 15:28:03 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 7 Feb 2020 15:28:03 +0000 Subject: [OE-core] [PATCH] ncurses: Fix reproducibility issue Message-ID: <20200207152803.9633-1-richard.purdie@linuxfoundation.org> The build was deciding whether to rename manpages based upon the presence of /etc/debian_version. Be explicit about the configuration instead and ensure determinism. [YOCTO #13781] Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc358233..b7bf4c0d81c 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. -- 2.20.1 From alex.kiernan at gmail.com Fri Feb 7 15:44:29 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Fri, 7 Feb 2020 15:44:29 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> References: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> Message-ID: On Fri, Feb 7, 2020 at 3:06 PM Richard Purdie wrote: > > On Fri, 2020-02-07 at 14:43 +0000, chris.laplante at agilent.com wrote: > > Hi Richard, > > > > > On Fri, 2020-02-07 at 08:16 +0000, Alex Kiernan wrote: > > > > Hi > > > > > > > > We've got a couple of multiconfig builds with different > > > > configurations in one bitbake run (whether it needs to be like > > > > this a > > > > different question - I suspect we had something that worked and > > > > stopped there!) > > > > > > > > However, for sometime we've been seeing errors like this on > > > > master > > > > (the recipes vary): > > > > > > > > ERROR: mc:forensic:ca-certificates-20190110-r0 > > > > do_deploy_source_date_epoch: Cache unihash > > > > 37d2546973a2b7c16fbcb1a8dd4939e4a1bba8c3d6d2dfb6e7204ca08d437ace > > > > doesn't match BB_UNIHASH > > > > 09baf78bd9316acdd308980c42ea4ed1eacea61bcc0d840c36293d1a5a22db69 > > > > > > This is an internal sanity test. It means the hash that it had in > > > the > > > task/worker context didn't match what the server thought the > > > unihash > > > should be. There have been changes in this area to try and fix > > > various > > > things, I'm wondering if we introduced a bug with multiconfig > > > handling. > > > > > > There are some patches in master-next related to this area so it > > > would > > > be interesting to know if that made things better/worse. > > > > Anecdotally, we are running Zeus for nightly builds with three > > multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: > > fixup" patches and haven't seen any of the BB_UNIHASH errors since. > > Granted it's only been a week. But before that, hash equiv + > > multiconfig was unusable due to the BB_UNIHASH errors. > > That is a really helpful data point, thanks. I should probably clean up > those bitbake patches and get them merged then, I couldn't decide if > they were right or not... > I just picked all your pending changes out of master-next into our local patch queue - will let you know how it looks when it's finished cooking! -- Alex Kiernan From peter.kjellerstedt at axis.com Fri Feb 7 16:27:18 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Fri, 7 Feb 2020 16:27:18 +0000 Subject: [OE-core] [OE-Core][PATCH] rootfs: Make BUILDNAME a weak default in reproducible_build_simple In-Reply-To: <20200118054107.101203-1-alex.kiernan@gmail.com> References: <20200118054107.101203-1-alex.kiernan@gmail.com> Message-ID: <9242b01969234918b10a8d1c2f494590@XBOX03.axis.com> > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Alex Kiernan > Sent: den 18 januari 2020 06:41 > To: openembedded-core at lists.openembedded.org > Subject: [OE-core] [OE-Core][PATCH] rootfs: Make BUILDNAME a weak default > in reproducible_build_simple > > 11e45082ad00 ("rootfs-postcommands.bbclass: improve binary > reproducibility") fixed binary reproducibility of /etc/version, but with > the move to reproducibilty in all builds, setting /etc/version to > anything other than the default fixed timestamp is tricky because > rootfs_reproducible() runs very late. > > rootfs.py uses BUILDNAME if set for /etc/version, so introduce a weak > default for BUILDNAME of "REPRODUCIBLE_TIMESTAMP_ROOTFS", when enabling > reproducible builds hence allowing BUILDNAME to be overridden elsewhere. > > Signed-off-by: Alex Kiernan > --- > > meta/classes/reproducible_build_simple.bbclass | 1 + > meta/classes/rootfs-postcommands.bbclass | 5 ----- > 2 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass > index d0842f0f902a..153a07607219 100644 > --- a/meta/classes/reproducible_build_simple.bbclass > +++ b/meta/classes/reproducible_build_simple.bbclass > @@ -7,5 +7,6 @@ export PERL_HASH_SEED = "0" > export SOURCE_DATE_EPOCH ??= "1520598896" > > REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" > +BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" Can we please revert this change? This breaks (all?) other usages of ${BUILDNAME}. E.g., the information in tmp/buildstats is totally useless now since all builds end up in the same directory "tmp/buildstats/1520598896", overwriting each other... > > inherit podfix > diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass > index fdc63bb64d55..ebf96be7e85f 100644 > --- a/meta/classes/rootfs-postcommands.bbclass > +++ b/meta/classes/rootfs-postcommands.bbclass > @@ -356,11 +356,6 @@ python rootfs_log_check_recommends() { > # Perform any additional adjustments needed to make rootf binary reproducible > rootfs_reproducible () { > if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" != "" ]; then > - # Convert UTC into %4Y%2m%2d%2H%2M%2S > - sformatted=`date -u -d @${REPRODUCIBLE_TIMESTAMP_ROOTFS} +%4Y%2m%2d%2H%2M%2S` > - echo $sformatted > ${IMAGE_ROOTFS}/etc/version > - bbnote "rootfs_reproducible: set /etc/version to $sformatted" > - > if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then > find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name '%gconf.xml' -print0 | xargs -0r \ > sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g' > -- > 2.17.1 //Peter From alex.kiernan at gmail.com Fri Feb 7 17:03:37 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Fri, 7 Feb 2020 17:03:37 +0000 Subject: [OE-core] [OE-Core][PATCH] rootfs: Make BUILDNAME a weak default in reproducible_build_simple In-Reply-To: <9242b01969234918b10a8d1c2f494590@XBOX03.axis.com> References: <20200118054107.101203-1-alex.kiernan@gmail.com> <9242b01969234918b10a8d1c2f494590@XBOX03.axis.com> Message-ID: On Fri, Feb 7, 2020 at 4:27 PM Peter Kjellerstedt wrote: > > > -----Original Message----- > > From: openembedded-core-bounces at lists.openembedded.org > bounces at lists.openembedded.org> On Behalf Of Alex Kiernan > > Sent: den 18 januari 2020 06:41 > > To: openembedded-core at lists.openembedded.org > > Subject: [OE-core] [OE-Core][PATCH] rootfs: Make BUILDNAME a weak default > > in reproducible_build_simple > > > > 11e45082ad00 ("rootfs-postcommands.bbclass: improve binary > > reproducibility") fixed binary reproducibility of /etc/version, but with > > the move to reproducibilty in all builds, setting /etc/version to > > anything other than the default fixed timestamp is tricky because > > rootfs_reproducible() runs very late. > > > > rootfs.py uses BUILDNAME if set for /etc/version, so introduce a weak > > default for BUILDNAME of "REPRODUCIBLE_TIMESTAMP_ROOTFS", when enabling > > reproducible builds hence allowing BUILDNAME to be overridden elsewhere. > > > > Signed-off-by: Alex Kiernan > > --- > > > > meta/classes/reproducible_build_simple.bbclass | 1 + > > meta/classes/rootfs-postcommands.bbclass | 5 ----- > > 2 files changed, 1 insertion(+), 5 deletions(-) > > > > diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass > > index d0842f0f902a..153a07607219 100644 > > --- a/meta/classes/reproducible_build_simple.bbclass > > +++ b/meta/classes/reproducible_build_simple.bbclass > > @@ -7,5 +7,6 @@ export PERL_HASH_SEED = "0" > > export SOURCE_DATE_EPOCH ??= "1520598896" > > > > REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" > > +BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" > > Can we please revert this change? This breaks (all?) other usages > of ${BUILDNAME}. E.g., the information in tmp/buildstats is totally > useless now since all builds end up in the same directory > "tmp/buildstats/1520598896", overwriting each other... > +1; I'd agree that seems rather more broken than the problem I was trying to fix here. -- Alex Kiernan From mark.hatle at kernel.crashing.org Fri Feb 7 17:43:37 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Fri, 7 Feb 2020 11:43:37 -0600 Subject: [OE-core] [PATCH 1/1] populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK In-Reply-To: <20200207174337.110342-1-mark.hatle@kernel.crashing.org> References: <20200207174337.110342-1-mark.hatle@kernel.crashing.org> Message-ID: <20200207174337.110342-2-mark.hatle@kernel.crashing.org> Since the features are processed by a python fragment, we need to explicitly list the variables that should affect the resulting hash, and thus sstate re-use. Signed-off-by: Mark Hatle --- meta/classes/populate_sdk_base.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index d03465b6fc..3248bb01c3 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -21,6 +21,7 @@ def complementary_globs(featurevar, d): SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs src-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}" SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' +SDKIMAGE_INSTALL_COMPLEMENTARY[vardeps] += "SDKIMAGE_FEATURES" PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target" SDK_PACKAGE_ARCHS += "sdk-provides-dummy-${SDKPKGSUFFIX}" -- 2.17.1 From mark.hatle at kernel.crashing.org Fri Feb 7 17:43:36 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Fri, 7 Feb 2020 11:43:36 -0600 Subject: [OE-core] [PATCH 0/1] Fix vardeps issue with SDK generation Message-ID: <20200207174337.110342-1-mark.hatle@kernel.crashing.org> I sent this before, but I suspect it got lost in the unrelated microblaze rework. No changes from the prior version, just resending to make it easier to find. Mark Hatle (1): populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK meta/classes/populate_sdk_base.bbclass | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 From richard.purdie at linuxfoundation.org Fri Feb 7 18:09:28 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 07 Feb 2020 18:09:28 +0000 Subject: [OE-core] [PATCH 2/2] oeqa: autoreconf cpio before building In-Reply-To: <20200205054120.1461132-2-raj.khem@gmail.com> References: <20200205054120.1461132-1-raj.khem@gmail.com> <20200205054120.1461132-2-raj.khem@gmail.com> Message-ID: <396189a7541b8b73d5bfff4949d9873ab5079fd2.camel@linuxfoundation.org> On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote: > since the versions of autotools might differ in OE especially > so recreate config.h.in, aclocal.m4, configure, and Makefile.in > > [YOCTO #13779] > > Signed-off-by: Khem Raj > --- > meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- > meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + > meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py > b/meta/lib/oeqa/runtime/cases/buildcpio.py > index 4bd72dd37e..9cc261c314 100644 > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): > @OEHasPackage(['autoconf']) > def test_cpio(self): > self.project.download_archive() > - self.project.run_configure() > + self.project.run_configure('','autoreconf --force;') > self.project.run_make() > self.project.run_install() > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py > b/meta/lib/oeqa/sdk/cases/buildcpio.py > index b0beafb38f..ec10149d34 100644 > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py > @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): > self.assertTrue(os.path.isdir(dirs["source"])) > os.makedirs(dirs["build"]) > > + self._run("cd {source} && autoreconf --force") > self._run("cd {build} && {source}/configure > $CONFIGURE_FLAGS".format(**dirs)) > self._run("cd {build} && make -j".format(**dirs)) > self._run("cd {build} && make install > DESTDIR={install}".format(**dirs)) > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py > b/meta/lib/oeqa/selftest/cases/meta_ide.py > index 809142559a..46398c7e2d 100644 > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py > @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): > " > https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", > self.tmpdir_metaideQA, self.td['DATETIME'], > dl_dir=dl_dir) > self.project.download_archive() > - self.assertEqual(self.project.run_configure(), 0, > + self.assertEqual(self.project.run_configure('','autoreconf > --force;'), 0, > msg="Running configure failed") > self.assertEqual(self.project.run_make(), 0, > msg="Running make failed") > -- > 2.25.0 This breaks the SDK everywhere: https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c (and many more) Cheers, Richard From armccurdy at gmail.com Fri Feb 7 18:18:29 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Fri, 7 Feb 2020 10:18:29 -0800 Subject: [OE-core] [PATCH 2/2] oeqa: autoreconf cpio before building In-Reply-To: <396189a7541b8b73d5bfff4949d9873ab5079fd2.camel@linuxfoundation.org> References: <20200205054120.1461132-1-raj.khem@gmail.com> <20200205054120.1461132-2-raj.khem@gmail.com> <396189a7541b8b73d5bfff4949d9873ab5079fd2.camel@linuxfoundation.org> Message-ID: On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie wrote: > > On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote: > > since the versions of autotools might differ in OE especially > > so recreate config.h.in, aclocal.m4, configure, and Makefile.in > > > > [YOCTO #13779] > > > > Signed-off-by: Khem Raj > > --- > > meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- > > meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + > > meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- > > 3 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py > > b/meta/lib/oeqa/runtime/cases/buildcpio.py > > index 4bd72dd37e..9cc261c314 100644 > > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > > @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): > > @OEHasPackage(['autoconf']) > > def test_cpio(self): > > self.project.download_archive() > > - self.project.run_configure() > > + self.project.run_configure('','autoreconf --force;') > > self.project.run_make() > > self.project.run_install() > > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py > > b/meta/lib/oeqa/sdk/cases/buildcpio.py > > index b0beafb38f..ec10149d34 100644 > > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py > > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py > > @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): > > self.assertTrue(os.path.isdir(dirs["source"])) > > os.makedirs(dirs["build"]) > > > > + self._run("cd {source} && autoreconf --force") > > self._run("cd {build} && {source}/configure > > $CONFIGURE_FLAGS".format(**dirs)) > > self._run("cd {build} && make -j".format(**dirs)) > > self._run("cd {build} && make install > > DESTDIR={install}".format(**dirs)) > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py > > b/meta/lib/oeqa/selftest/cases/meta_ide.py > > index 809142559a..46398c7e2d 100644 > > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py > > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py > > @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): > > " > > https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", > > self.tmpdir_metaideQA, self.td['DATETIME'], > > dl_dir=dl_dir) > > self.project.download_archive() > > - self.assertEqual(self.project.run_configure(), 0, > > + self.assertEqual(self.project.run_configure('','autoreconf > > --force;'), 0, > > msg="Running configure failed") > > self.assertEqual(self.project.run_make(), 0, > > msg="Running make failed") > > -- > > 2.25.0 > > This breaks the SDK everywhere: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c > > (and many more) Configuring with --disable-maintainer-mode might be a better fix for the original problem? https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html From raj.khem at gmail.com Fri Feb 7 18:25:42 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 7 Feb 2020 10:25:42 -0800 Subject: [OE-core] [PATCH v2] oeqa: Touch cpio configure script before building Message-ID: <20200207182542.300768-1-raj.khem@gmail.com> since the versions of autotools might differ, and difference in timestamps for configure and system can result in reconfigure lets avoid that by touching the configure script to match system time Avoids error: newly created file is older than distributed files! [YOCTO #13779] Signed-off-by: Khem Raj --- v2: Touch configure to match timestamps with system Move the touch cmd to configure step itself meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd37e..a2cc8148db 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('','touch ./configure;') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb38f..e412ee189f 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && touch {source}/configure && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 809142559a..16acd1154d 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() - self.assertEqual(self.project.run_configure(), 0, + self.assertEqual(self.project.run_configure('','touch configure;'), 0, msg="Running configure failed") self.assertEqual(self.project.run_make(), 0, msg="Running make failed") -- 2.25.0 From raj.khem at gmail.com Fri Feb 7 18:26:31 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 7 Feb 2020 10:26:31 -0800 Subject: [OE-core] [PATCH 2/2] oeqa: autoreconf cpio before building In-Reply-To: <396189a7541b8b73d5bfff4949d9873ab5079fd2.camel@linuxfoundation.org> References: <20200205054120.1461132-1-raj.khem@gmail.com> <20200205054120.1461132-2-raj.khem@gmail.com> <396189a7541b8b73d5bfff4949d9873ab5079fd2.camel@linuxfoundation.org> Message-ID: On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie wrote: > > On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote: > > since the versions of autotools might differ in OE especially > > so recreate config.h.in, aclocal.m4, configure, and Makefile.in > > > > [YOCTO #13779] > > > > Signed-off-by: Khem Raj > > --- > > meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- > > meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + > > meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- > > 3 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py > > b/meta/lib/oeqa/runtime/cases/buildcpio.py > > index 4bd72dd37e..9cc261c314 100644 > > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > > @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): > > @OEHasPackage(['autoconf']) > > def test_cpio(self): > > self.project.download_archive() > > - self.project.run_configure() > > + self.project.run_configure('','autoreconf --force;') > > self.project.run_make() > > self.project.run_install() > > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py > > b/meta/lib/oeqa/sdk/cases/buildcpio.py > > index b0beafb38f..ec10149d34 100644 > > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py > > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py > > @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): > > self.assertTrue(os.path.isdir(dirs["source"])) > > os.makedirs(dirs["build"]) > > > > + self._run("cd {source} && autoreconf --force") > > self._run("cd {build} && {source}/configure > > $CONFIGURE_FLAGS".format(**dirs)) > > self._run("cd {build} && make -j".format(**dirs)) > > self._run("cd {build} && make install > > DESTDIR={install}".format(**dirs)) > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py > > b/meta/lib/oeqa/selftest/cases/meta_ide.py > > index 809142559a..46398c7e2d 100644 > > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py > > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py > > @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): > > " > > https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", > > self.tmpdir_metaideQA, self.td['DATETIME'], > > dl_dir=dl_dir) > > self.project.download_archive() > > - self.assertEqual(self.project.run_configure(), 0, > > + self.assertEqual(self.project.run_configure('','autoreconf > > --force;'), 0, > > msg="Running configure failed") > > self.assertEqual(self.project.run_make(), 0, > > msg="Running make failed") > > -- > > 2.25.0 > > This breaks the SDK everywhere: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c > > (and many more) > yes obvious oversight, I have sent a v2, anyway this patch was not fixing original problem too. > Cheers, > > Richard > > From raj.khem at gmail.com Fri Feb 7 18:28:22 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 7 Feb 2020 10:28:22 -0800 Subject: [OE-core] [PATCH 2/2] oeqa: autoreconf cpio before building In-Reply-To: References: <20200205054120.1461132-1-raj.khem@gmail.com> <20200205054120.1461132-2-raj.khem@gmail.com> <396189a7541b8b73d5bfff4949d9873ab5079fd2.camel@linuxfoundation.org> Message-ID: On Fri, Feb 7, 2020 at 10:18 AM Andre McCurdy wrote: > > On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie > wrote: > > > > On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote: > > > since the versions of autotools might differ in OE especially > > > so recreate config.h.in, aclocal.m4, configure, and Makefile.in > > > > > > [YOCTO #13779] > > > > > > Signed-off-by: Khem Raj > > > --- > > > meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- > > > meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + > > > meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- > > > 3 files changed, 3 insertions(+), 2 deletions(-) > > > > > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py > > > b/meta/lib/oeqa/runtime/cases/buildcpio.py > > > index 4bd72dd37e..9cc261c314 100644 > > > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > > > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > > > @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): > > > @OEHasPackage(['autoconf']) > > > def test_cpio(self): > > > self.project.download_archive() > > > - self.project.run_configure() > > > + self.project.run_configure('','autoreconf --force;') > > > self.project.run_make() > > > self.project.run_install() > > > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py > > > b/meta/lib/oeqa/sdk/cases/buildcpio.py > > > index b0beafb38f..ec10149d34 100644 > > > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py > > > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py > > > @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): > > > self.assertTrue(os.path.isdir(dirs["source"])) > > > os.makedirs(dirs["build"]) > > > > > > + self._run("cd {source} && autoreconf --force") > > > self._run("cd {build} && {source}/configure > > > $CONFIGURE_FLAGS".format(**dirs)) > > > self._run("cd {build} && make -j".format(**dirs)) > > > self._run("cd {build} && make install > > > DESTDIR={install}".format(**dirs)) > > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py > > > b/meta/lib/oeqa/selftest/cases/meta_ide.py > > > index 809142559a..46398c7e2d 100644 > > > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py > > > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py > > > @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): > > > " > > > https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", > > > self.tmpdir_metaideQA, self.td['DATETIME'], > > > dl_dir=dl_dir) > > > self.project.download_archive() > > > - self.assertEqual(self.project.run_configure(), 0, > > > + self.assertEqual(self.project.run_configure('','autoreconf > > > --force;'), 0, > > > msg="Running configure failed") > > > self.assertEqual(self.project.run_make(), 0, > > > msg="Running make failed") > > > -- > > > 2.25.0 > > > > This breaks the SDK everywhere: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c > > > > (and many more) > > Configuring with --disable-maintainer-mode might be a better fix for > the original problem? > yes, or just touch configure, which I have sent as v2, but I am still miffed with why its happening on mips64 box alone. > https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html From patchwork at patchwork.openembedded.org Fri Feb 7 18:32:28 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 07 Feb 2020 18:32:28 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_oeqa=3A_To?= =?utf-8?q?uch_cpio_configure_script_before_building?= In-Reply-To: <20200207182542.300768-1-raj.khem@gmail.com> References: <20200207182542.300768-1-raj.khem@gmail.com> Message-ID: <20200207183228.2276.35737@do> == Series Details == Series: oeqa: Touch cpio configure script before building Revision: 1 URL : https://patchwork.openembedded.org/series/22476/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 6f6a6bbac6) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From scott.branden at broadcom.com Fri Feb 7 18:36:19 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Fri, 7 Feb 2020 10:36:19 -0800 Subject: [OE-core] [PATCH] cryptodev: update to Jan.23, 2020 In-Reply-To: <20200206205743.5388-1-scott.branden@broadcom.com> References: <20200206205743.5388-1-scott.branden@broadcom.com> Message-ID: <290a23c4-ec41-18e5-a795-f6e66859fa79@broadcom.com> Hi, cryptodev and perf don't build with the latest 5.5+ kernel in yocto. Just wondering if I need to do anything else I need to do for this patch to be accepted? Also, I see perf patches in the mailing list and was wondering if there were ready to try as well? On 2020-02-06 12:57 p.m., Scott Branden wrote: > * Remove backported patches: > 0001-Fix-module-loading-with-Linux-v5.0-rc5.patch > > Update to latest cryptodev dated Jan.23, 2020. > Fixes build on kernel v5.5+ > > Signed-off-by: Scott Branden > --- > meta/recipes-kernel/cryptodev/cryptodev.inc | 3 +- > ...x-module-loading-with-Linux-v5.0-rc5.patch | 59 ------------------- > 2 files changed, 1 insertion(+), 61 deletions(-) > delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch > > diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc > index 9d8ba44058..f99f8bc9f0 100644 > --- a/meta/recipes-kernel/cryptodev/cryptodev.inc > +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc > @@ -4,9 +4,8 @@ LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \ > - file://0001-Fix-module-loading-with-Linux-v5.0-rc5.patch \ > " > -SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29" > +SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b" > > S = "${WORKDIR}/git" > > diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch > deleted file mode 100644 > index 34ec87272f..0000000000 > --- a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch > +++ /dev/null > @@ -1,59 +0,0 @@ > -Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0c] > - > -Backport patch from upstream to fix module cryptodev loading error. > - > -Signed-off-by: Kai Kang > - > -From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001 > -From: "Derald D. Woods" > -Date: Sun, 10 Feb 2019 13:22:19 -0600 > -Subject: [PATCH] Fix module loading with Linux v5.0-rc5 > - > -This commit fixes this module load error: > -[...] > -[ 29.112091] cryptodev: loading out-of-tree module taints kernel. > -[ 29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2) > -[ 29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2) > -modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter > -[...] > - > -Upstream Linux support for unused GIVCIPHER, and others, was dropped here: > - > -c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators) > - > -Signed-off-by: Derald D. Woods > ---- > - cryptlib.c | 9 +++++++-- > - 1 file changed, 7 insertions(+), 2 deletions(-) > - > -diff --git a/cryptlib.c b/cryptlib.c > -index 6e66698..4a87037 100644 > ---- a/cryptlib.c > -+++ b/cryptlib.c > -@@ -38,7 +38,9 @@ > - #include "cryptodev_int.h" > - #include "cipherapi.h" > - > -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) > - extern const struct crypto_type crypto_givcipher_type; > -+#endif > - > - static void cryptodev_complete(struct crypto_async_request *req, int err) > - { > -@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, > - > - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) > - tfm = crypto_skcipher_tfm(out->async.s); > -- if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) || > -- (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) { > -+ if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) > -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) > -+ || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) > -+#endif > -+ ) { > - struct ablkcipher_alg *alg; > - > - alg = &tfm->__crt_alg->cra_ablkcipher; > --- > -2.20.0 > - From armccurdy at gmail.com Fri Feb 7 18:39:49 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Fri, 7 Feb 2020 10:39:49 -0800 Subject: [OE-core] [PATCH v2] oeqa: Touch cpio configure script before building In-Reply-To: <20200207182542.300768-1-raj.khem@gmail.com> References: <20200207182542.300768-1-raj.khem@gmail.com> Message-ID: On Fri, Feb 7, 2020 at 10:25 AM Khem Raj wrote: > > since the versions of autotools might differ, and difference in > timestamps for configure and system can result in reconfigure lets avoid > that by touching the configure script to match system time This is probably only a partial fix. If you look at the various dependencies in Makefile.in, ensuring that configure is newer than $(am__configure_deps) is only one case that needs to be handled. You also need to ensure that e.g. Makefile.in is newer than $(srcdir)/Makefile.am $(srcdir)/Make.rules $(am__configure_deps), that aclocal.m4 is newer than $(am__aclocal_m4_deps), etc. Touching various files in the right order can be made to work, but there's more to it than just touching configure. Configuring with --disable-maintainer-mode and therefore disabling all these autotools rules is probably a more robust solution. > Avoids > error: newly created file is older than distributed files! > > [YOCTO #13779] > > Signed-off-by: Khem Raj > --- > v2: Touch configure to match timestamps with system > Move the touch cmd to configure step itself > > meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- > meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- > meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py > index 4bd72dd37e..a2cc8148db 100644 > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): > @OEHasPackage(['autoconf']) > def test_cpio(self): > self.project.download_archive() > - self.project.run_configure() > + self.project.run_configure('','touch ./configure;') > self.project.run_make() > self.project.run_install() > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py > index b0beafb38f..e412ee189f 100644 > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py > @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): > self.assertTrue(os.path.isdir(dirs["source"])) > os.makedirs(dirs["build"]) > > - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) > + self._run("cd {build} && touch {source}/configure && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) > self._run("cd {build} && make -j".format(**dirs)) > self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py > index 809142559a..16acd1154d 100644 > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py > @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): > "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", > self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) > self.project.download_archive() > - self.assertEqual(self.project.run_configure(), 0, > + self.assertEqual(self.project.run_configure('','touch configure;'), 0, > msg="Running configure failed") > self.assertEqual(self.project.run_make(), 0, > msg="Running make failed") > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From armccurdy at gmail.com Fri Feb 7 18:47:54 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Fri, 7 Feb 2020 10:47:54 -0800 Subject: [OE-core] [PATCH 2/2] oeqa: autoreconf cpio before building In-Reply-To: References: <20200205054120.1461132-1-raj.khem@gmail.com> <20200205054120.1461132-2-raj.khem@gmail.com> <396189a7541b8b73d5bfff4949d9873ab5079fd2.camel@linuxfoundation.org> Message-ID: On Fri, Feb 7, 2020 at 10:28 AM Khem Raj wrote: > > On Fri, Feb 7, 2020 at 10:18 AM Andre McCurdy wrote: > > > > On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie > > wrote: > > > > > > On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote: > > > > since the versions of autotools might differ in OE especially > > > > so recreate config.h.in, aclocal.m4, configure, and Makefile.in > > > > > > > > [YOCTO #13779] > > > > > > > > Signed-off-by: Khem Raj > > > > --- > > > > meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- > > > > meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + > > > > meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- > > > > 3 files changed, 3 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py > > > > b/meta/lib/oeqa/runtime/cases/buildcpio.py > > > > index 4bd72dd37e..9cc261c314 100644 > > > > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > > > > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > > > > @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): > > > > @OEHasPackage(['autoconf']) > > > > def test_cpio(self): > > > > self.project.download_archive() > > > > - self.project.run_configure() > > > > + self.project.run_configure('','autoreconf --force;') > > > > self.project.run_make() > > > > self.project.run_install() > > > > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py > > > > b/meta/lib/oeqa/sdk/cases/buildcpio.py > > > > index b0beafb38f..ec10149d34 100644 > > > > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py > > > > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py > > > > @@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): > > > > self.assertTrue(os.path.isdir(dirs["source"])) > > > > os.makedirs(dirs["build"]) > > > > > > > > + self._run("cd {source} && autoreconf --force") > > > > self._run("cd {build} && {source}/configure > > > > $CONFIGURE_FLAGS".format(**dirs)) > > > > self._run("cd {build} && make -j".format(**dirs)) > > > > self._run("cd {build} && make install > > > > DESTDIR={install}".format(**dirs)) > > > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py > > > > b/meta/lib/oeqa/selftest/cases/meta_ide.py > > > > index 809142559a..46398c7e2d 100644 > > > > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py > > > > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py > > > > @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): > > > > " > > > > https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", > > > > self.tmpdir_metaideQA, self.td['DATETIME'], > > > > dl_dir=dl_dir) > > > > self.project.download_archive() > > > > - self.assertEqual(self.project.run_configure(), 0, > > > > + self.assertEqual(self.project.run_configure('','autoreconf > > > > --force;'), 0, > > > > msg="Running configure failed") > > > > self.assertEqual(self.project.run_make(), 0, > > > > msg="Running make failed") > > > > -- > > > > 2.25.0 > > > > > > This breaks the SDK everywhere: > > > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c > > > > > > (and many more) > > > > Configuring with --disable-maintainer-mode might be a better fix for > > the original problem? > > > > yes, or just touch configure, which I have sent as v2 If only it was that easy! :-) From raj.khem at gmail.com Fri Feb 7 19:01:20 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 7 Feb 2020 11:01:20 -0800 Subject: [OE-core] [PATCH v2] oeqa: Touch cpio configure script before building In-Reply-To: References: <20200207182542.300768-1-raj.khem@gmail.com> Message-ID: On Fri, Feb 7, 2020 at 10:40 AM Andre McCurdy wrote: > > On Fri, Feb 7, 2020 at 10:25 AM Khem Raj wrote: > > > > since the versions of autotools might differ, and difference in > > timestamps for configure and system can result in reconfigure lets avoid > > that by touching the configure script to match system time > > This is probably only a partial fix. If you look at the various > dependencies in Makefile.in, ensuring that configure is newer than > $(am__configure_deps) is only one case that needs to be handled. You > also need to ensure that e.g. Makefile.in is newer than > $(srcdir)/Makefile.am $(srcdir)/Make.rules $(am__configure_deps), that > aclocal.m4 is newer than $(am__aclocal_m4_deps), etc. > > Touching various files in the right order can be made to work, but > there's more to it than just touching configure. Configuring with > --disable-maintainer-mode and therefore disabling all these autotools > rules is probably a more robust solution. right. Lets see if we run into that as well, I would send a v3 if this is effective then we know we are on right path. > > > Avoids > > error: newly created file is older than distributed files! > > > > [YOCTO #13779] > > > > Signed-off-by: Khem Raj > > --- > > v2: Touch configure to match timestamps with system > > Move the touch cmd to configure step itself > > > > meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- > > meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- > > meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py > > index 4bd72dd37e..a2cc8148db 100644 > > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > > @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): > > @OEHasPackage(['autoconf']) > > def test_cpio(self): > > self.project.download_archive() > > - self.project.run_configure() > > + self.project.run_configure('','touch ./configure;') > > self.project.run_make() > > self.project.run_install() > > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py > > index b0beafb38f..e412ee189f 100644 > > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py > > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py > > @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): > > self.assertTrue(os.path.isdir(dirs["source"])) > > os.makedirs(dirs["build"]) > > > > - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) > > + self._run("cd {build} && touch {source}/configure && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) > > self._run("cd {build} && make -j".format(**dirs)) > > self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) > > > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py > > index 809142559a..16acd1154d 100644 > > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py > > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py > > @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): > > "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", > > self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) > > self.project.download_archive() > > - self.assertEqual(self.project.run_configure(), 0, > > + self.assertEqual(self.project.run_configure('','touch configure;'), 0, > > msg="Running configure failed") > > self.assertEqual(self.project.run_make(), 0, > > msg="Running make failed") > > -- > > 2.25.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kanavin at gmail.com Fri Feb 7 19:45:57 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 7 Feb 2020 20:45:57 +0100 Subject: [OE-core] [PATCH 1/3] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Message-ID: <20200207194559.527-1-alex.kanavin@gmail.com> The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW; specifying 'ptests-pkgs' also pulls in additional ptests that are specifically excluded from those lists due to causing issues with ptesting. (particularly bash-ptest is one such item) Signed-off-by: Alexander Kanavin --- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 85b5adbc69..58c257c49f 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc DESCRIPTION += "Also includes ptest packages." -IMAGE_FEATURES += "ptest-pkgs" - PROVIDES += "core-image-sato-ptest" # Also include ptests which may not otherwise be included in a sato image -- 2.25.0 From alex.kanavin at gmail.com Fri Feb 7 19:45:58 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 7 Feb 2020 20:45:58 +0100 Subject: [OE-core] [PATCH 2/3] xserver-xorg: upgrade 1.20.6 -> 1.20.7 In-Reply-To: <20200207194559.527-1-alex.kanavin@gmail.com> References: <20200207194559.527-1-alex.kanavin@gmail.com> Message-ID: <20200207194559.527-2-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...e_display.c-add-missing-mi.h-include.patch | 23 +++++++++++++++++++ ...-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 13 ++++++----- 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} (71%) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch new file mode 100644 index 0000000000..4b8e43f1e4 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch @@ -0,0 +1,23 @@ +From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 7 Feb 2020 20:36:45 +0100 +Subject: [PATCH] drmmode_display.c: add missing mi.h include + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + hw/xfree86/drivers/modesetting/drmmode_display.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c +index e18cc37..3445cce 100644 +--- a/hw/xfree86/drivers/modesetting/drmmode_display.c ++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c +@@ -46,6 +46,7 @@ + #include "xf86Crtc.h" + #include "drmmode_display.h" + #include "present.h" ++#include "mi.h" + + #include + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb similarity index 71% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb index a1cd490394..998b98a76c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb @@ -1,12 +1,13 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ - file://pkgconfig.patch \ - file://0001-test-xtest-Initialize-array-with-braces.patch \ - file://sdksyms-no-build-path.patch \ - " -SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" -SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" + file://pkgconfig.patch \ + file://0001-test-xtest-Initialize-array-with-braces.patch \ + file://sdksyms-no-build-path.patch \ + file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ + " +SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9" +SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1" CFLAGS += "-fcommon" -- 2.25.0 From alex.kanavin at gmail.com Fri Feb 7 19:45:59 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 7 Feb 2020 20:45:59 +0100 Subject: [OE-core] [PATCH 3/3] chkconfig: remove the recipe In-Reply-To: <20200207194559.527-1-alex.kanavin@gmail.com> References: <20200207194559.527-1-alex.kanavin@gmail.com> Message-ID: <20200207194559.527-3-alex.kanavin@gmail.com> chkconfig is one of the options for virtual/update-alternatives, however opkg-utils have been used as the default for a very long time, while chkconfig isn't anymore tested in any way, and is stuck at a very old version due to newer versions requiring selinux. [YOCTO #11264] Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 2 - .../packagegroups/packagegroup-self-hosted.bb | 1 - .../chkconfig-alternatives-native_1.3.59.bb | 44 ------------ .../chkconfig/chkconfig/replace_caddr_t.patch | 33 --------- .../chkconfig/chkconfig_1.3.58.bb | 71 ------------------- 5 files changed, 151 deletions(-) delete mode 100644 meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb delete mode 100644 meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch delete mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index a80e85a2f6..c68e9edf63 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -94,8 +94,6 @@ RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal " RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin " RECIPE_MAINTAINER_pn-ccache = "Robert Yang " RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao " -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao " -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao " RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao " RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton " RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton " diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index ea6d567301..9a70b189a4 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -108,7 +108,6 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ RDEPENDS_packagegroup-self-hosted-extended = "\ bzip2 \ - chkconfig \ chrpath \ cpio \ curl \ diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb deleted file mode 100644 index 87fa8eb605..0000000000 --- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb +++ /dev/null @@ -1,44 +0,0 @@ -require recipes-extended/chkconfig/chkconfig_1.3.58.bb - -SUMMARY = "${SUMMARY_chkconfig-alternatives}" -DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}" -DEPENDS = "" -PROVIDES += "virtual/update-alternatives-native" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -# The sysroot branch is 1.3.59 + some git commits from master + --sysroot -# support for alternatives. -SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" -S = "${WORKDIR}/git" -UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P(\d+(\.\d+)+))" - -SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" -PV = "1.3.59+${SRCPV}" - -inherit native - -# We want our native recipes to build using the target paths rather than paths -# into the sysroot, as we may use them to construct the rootfs. As such, we -# only adjust the paths to match the metadata for the target, not native. -obey_variables () { - sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,' ${S}/alternatives.c -} - -do_compile () { - oe_runmake alternatives -} - -do_install () { - install -d ${D}${sysconfdir}/alternatives \ - ${D}${localstatedir}/lib/alternatives - - install -D -m 0755 alternatives ${D}${bindir}/alternatives - install -D -m 0644 alternatives.8 ${D}${mandir}/man8/alternatives.8 - - ln -s alternatives ${D}${bindir}/update-alternatives - ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8 -} - -do_install_append_linuxstdbase() { - rm -rf ${D}${libdir}/lsb -} diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch deleted file mode 100644 index 96d1938791..0000000000 --- a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch +++ /dev/null @@ -1,33 +0,0 @@ -caddr_t is a legacy BSD type which was rejected by the POSIX standard. -Use void * instead. - -sys/unitstd.h is not needed and moreover its not available on all C library -implementations e.g. musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Index: chkconfig-1.3.58/alternatives.c -=================================================================== ---- chkconfig-1.3.58.orig/alternatives.c -+++ chkconfig-1.3.58/alternatives.c -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - - #define FLAGS_TEST (1 << 0) -Index: chkconfig-1.3.58/leveldb.c -=================================================================== ---- chkconfig-1.3.58.orig/leveldb.c -+++ chkconfig-1.3.58/leveldb.c -@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name - fstat(fd, &sb); - - bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); -- if (bufstart == ((caddr_t) -1)) { -+ if (bufstart == ((void*) -1)) { - close(fd); - return -1; - } diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb deleted file mode 100644 index d21dd69704..0000000000 --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" -DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \ -information for system services. Chkconfig manipulates the numerous \ -symbolic links in /etc/rc.d, to relieve system administrators of some \ -of the drudgery of manually editing the symbolic links." - -RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" - -HOMEPAGE = "https://github.com/fedora-sysv" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" - -DEPENDS = "libnewt popt" -PROVIDES += "virtual/update-alternatives" - -PR = "r7" - -S = "${WORKDIR}/${BPN}-${BPN}-${PV}" - -SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \ - file://replace_caddr_t.patch \ - " - -SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit gettext - -# Makefile uses RPM_OPT_FLAGS to construct CFLAGS -# -EXTRA_OEMAKE = "\ - 'RPM_OPT_FLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ - 'BINDIR=${base_sbindir}' \ - 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' \ - 'ALTDIR=${localstatedir}/lib/alternatives' \ - 'ALTDATADIR=${sysconfdir}/alternatives' \ -" - -do_unpack[postfuncs] += "obey_variables" -do_unpack[vardeps] += "obey_variables" -obey_variables () { - sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ - -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ - -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c -} - -do_install() { - oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' \ - 'BINDIR=${sbindir}' install - install -d ${D}${sysconfdir}/chkconfig.d -} - -PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc" -SUMMARY_${PN}-alternatives = "Maintain symbolic links determining default commands" -DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, maintains and displays \ -information about the symbolic links comprising the alternatives system." -SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - Documentation files" -DESCRIPTION_${PN}-alternatives-doc = "${DESCRIPTION_${PN}-alternatives} \ -This package contains documentation." -RPROVIDES_${PN}-alternatives += "update-alternatives" -RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg update-alternatives-dpkg" -FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternatives \ - ${sysconfdir}/alternatives ${localstatedir}/lib/alternatives" -FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \ - ${mandir}/man8/update-alternatives.8" -- 2.25.0 From mark.hatle at kernel.crashing.org Fri Feb 7 20:20:05 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Fri, 7 Feb 2020 14:20:05 -0600 Subject: [OE-core] [PATCH 0/3] Fix some package issues, and add new features Message-ID: <20200207202008.132026-1-mark.hatle@kernel.crashing.org> While working on baremetal toolchains, I found that the SDKs were potentially very very large. I investigated and found it was due to included debug info, but realize the associated source files were not actually present. Patch 1/3 - Fixes identification of corresponding dwarf debug sources Patch 2/3 - Allow us to skip kernel modules and static libraries Patch 3/3 - Add a -dbg like behavior for static libraries (off by default) Mark Hatle (3): package.bbclass: Fix debug source processing for static libraries package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs package.bbclass: Support stripping and debug copy of static libraries meta/classes/insane.bbclass | 2 +- meta/classes/package.bbclass | 80 ++++++++++++++++++++++++++++++++---- meta/conf/bitbake.conf | 2 +- 3 files changed, 73 insertions(+), 11 deletions(-) -- 2.17.1 From mark.hatle at kernel.crashing.org Fri Feb 7 20:20:06 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Fri, 7 Feb 2020 14:20:06 -0600 Subject: [OE-core] [PATCH 1/3] package.bbclass: Fix debug source processing for static libraries In-Reply-To: <20200207202008.132026-1-mark.hatle@kernel.crashing.org> References: <20200207202008.132026-1-mark.hatle@kernel.crashing.org> Message-ID: <20200207202008.132026-2-mark.hatle@kernel.crashing.org> Format of the sources list is the [ (file, [source, ...]), ... ] before this change, the static libraries were processed but the items were included incorrectly causing no sources for static libraries to be included. Signed-off-by: Mark Hatle --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index ef3de35961..46ec9b6b3a 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1051,7 +1051,7 @@ python split_and_strip_files () { if debugsrcdir and not targetos.startswith("mingw"): for file in staticlibs: - results.extend(source_info(file, d, fatal=False)) + results.append( (file, source_info(file, d, fatal=False)) ) sources = set() for r in results: -- 2.17.1 From mark.hatle at kernel.crashing.org Fri Feb 7 20:20:07 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Fri, 7 Feb 2020 14:20:07 -0600 Subject: [OE-core] [PATCH 2/3] package.bbclass: Allow INHIBIT_PACKAGE_STRIP_FILES to skip .ko and static libs In-Reply-To: <20200207202008.132026-1-mark.hatle@kernel.crashing.org> References: <20200207202008.132026-1-mark.hatle@kernel.crashing.org> Message-ID: <20200207202008.132026-3-mark.hatle@kernel.crashing.org> Change the order of the skip processing to happen before any .ko and static library processing. This will allow these types of files to be individually skipped if necessary. Signed-off-by: Mark Hatle --- meta/classes/package.bbclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 46ec9b6b3a..7080d63287 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -955,12 +955,6 @@ python split_and_strip_files () { for root, dirs, files in cpath.walk(dvar): for f in files: file = os.path.join(root, f) - if file.endswith(".ko") and file.find("/lib/modules/") != -1: - kernmods.append(file) - continue - if oe.package.is_static_lib(file): - staticlibs.append(file) - continue # Skip debug files if debugappend and file.endswith(debugappend): @@ -971,6 +965,13 @@ python split_and_strip_files () { if file in skipfiles: continue + if file.endswith(".ko") and file.find("/lib/modules/") != -1: + kernmods.append(file) + continue + if oe.package.is_static_lib(file): + staticlibs.append(file) + continue + try: ltarget = cpath.realpath(file, dvar, False) s = cpath.lstat(ltarget) -- 2.17.1 From mark.hatle at kernel.crashing.org Fri Feb 7 20:20:08 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Fri, 7 Feb 2020 14:20:08 -0600 Subject: [OE-core] [PATCH 3/3] package.bbclass: Support stripping and debug copy of static libraries In-Reply-To: <20200207202008.132026-1-mark.hatle@kernel.crashing.org> References: <20200207202008.132026-1-mark.hatle@kernel.crashing.org> Message-ID: <20200207202008.132026-4-mark.hatle@kernel.crashing.org> By default, we won't copy and strip static libraries. However, this functionality can be useful in some cases where people are doing development on the target, and don't generally want the larger debug capable static libraries. To enable the new functionality set: PACKAGE_DEBUG_STATIC_SPLIT = '1' Add a new function splitstaticdebuginfo. Thus function will copy the unmodified static library into the specific debug directory location. By keeping an unmodified version, it is possible for a user trying to debug something to use -L /usr/lib/.debug-static and their existing build commands to switch from stripped to full debug versions. The PACKAGE_DEBUG_SPLIT_STYLE will select between two different approaches, /usr/lib/debug-static or /.debug-static. Additionally you can now choose to strip static libraries to conserve space. If either 'PACKAGE_DEBUG_STATIC_SPLIT' or 'PACKAGE_STRIP_STATIC' is set to 1, the static library will be stripped. (This is not on by default, as it could make diagnosing static library usage difficult in some cases.) Add to insane.bbclass a skip to the staticdev warning for the specific -dbg package versions. Signed-off-by: Mark Hatle --- meta/classes/insane.bbclass | 2 +- meta/classes/package.bbclass | 67 ++++++++++++++++++++++++++++++++++-- meta/conf/bitbake.conf | 2 +- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 795c7b9212..7425b8cbd5 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -182,7 +182,7 @@ def package_qa_check_staticdev(path, name, d, elf, messages): libgcc.a, libgcov.a will be skipped in their packages """ - if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a"): + if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a") and not '/usr/lib/debug-static/' in path and not '/.debug-static/' in path: package_qa_add_message(messages, "staticdev", "non -staticdev package contains static .a library: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7080d63287..1efc396ac6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -416,6 +416,49 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, return (file, sources) +def splitstaticdebuginfo(file, dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d): + # Unlike the function above, there is no way to split a static library + # two components. So to get similar results we will copy the unmodified + # static library (containing the debug symbols) into a new directory. + # We will then strip (preserving symbols) the static library in the + # typical location. + # + # return a mapping of files:debugsources + + import stat + import shutil + + src = file[len(dvar):] + dest = debugstaticlibdir + os.path.dirname(src) + debugstaticdir + "/" + os.path.basename(src) + debugstaticappend + debugfile = dvar + dest + sources = [] + + # Copy the file... + bb.utils.mkdirhier(os.path.dirname(debugfile)) + #bb.note("Copy %s -> %s" % (file, debugfile)) + + dvar = d.getVar('PKGD') + + newmode = None + if not os.access(file, os.W_OK) or os.access(file, os.R_OK): + origmode = os.stat(file)[stat.ST_MODE] + newmode = origmode | stat.S_IWRITE | stat.S_IREAD + os.chmod(file, newmode) + + # We need to extract the debug src information here... + if debugsrcdir: + sources = source_info(file, d) + + bb.utils.mkdirhier(os.path.dirname(debugfile)) + + # Copy the unmodified item to the debug directory + shutil.copy2(file, debugfile) + + if newmode: + os.chmod(file, origmode) + + return (file, sources) + def copydebugsources(debugsrcdir, sources, d): # The debug src information written out to sourcefile is further processed # and copied to the destination here. @@ -916,25 +959,37 @@ python split_and_strip_files () { if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-file-directory': # Single debug-file-directory style debug info debugappend = ".debug" + debugstaticappend = "" debugdir = "" + debugstaticdir = "" debuglibdir = "/usr/lib/debug" + debugstaticlibdir = "/usr/lib/debug-static" debugsrcdir = "/usr/src/debug" elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-without-src': # Original OE-core, a.k.a. ".debug", style debug info, but without sources in /usr/src/debug debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "" elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-with-srcpkg': debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" else: # Original OE-core, a.k.a. ".debug", style debug info debugappend = "" + debugstaticappend = "" debugdir = "/.debug" + debugstaticdir = "/.debug-static" debuglibdir = "" + debugstaticlibdir = "" debugsrcdir = "/usr/src/debug" # @@ -1051,8 +1106,11 @@ python split_and_strip_files () { results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d)) if debugsrcdir and not targetos.startswith("mingw"): - for file in staticlibs: - results.append( (file, source_info(file, d, fatal=False)) ) + if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d)) + else: + for file in staticlibs: + results.append( (file,source_info(file, d)) ) sources = set() for r in results: @@ -1121,6 +1179,9 @@ python split_and_strip_files () { sfiles.append((file, elf_file, strip)) for f in kernmods: sfiles.append((f, 16, strip)) + if (d.getVar('PACKAGE_STRIP_STATIC') == '1' or d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): + for f in staticlibs: + sfiles.append((f, 16, strip)) oe.utils.multiprocess_launch(oe.package.runstrip, sfiles, d) @@ -1188,7 +1249,7 @@ python populate_packages () { dir = os.sep for f in (files + dirs): path = "." + os.path.join(dir, f) - if "/.debug/" in path or path.endswith("/.debug"): + if "/.debug/" in path or "/.debug-static/" in path or path.endswith("/.debug"): debug.append(path) for pkg in packages: diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8b4621f9b9..954c06b313 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -325,7 +325,7 @@ FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a" SECTION_${PN}-staticdev = "devel" RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})" -FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug" +FILES_${PN}-dbg = "/usr/lib/debug /usr/lib/debug-static /usr/src/debug" SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -- 2.17.1 From alistair.francis at wdc.com Fri Feb 7 21:10:08 2020 From: alistair.francis at wdc.com (Alistair Francis) Date: Fri, 7 Feb 2020 13:10:08 -0800 Subject: [OE-core] [PATCH] qemu: Upgrade to 4.2.0 Message-ID: <20200207211008.3148-1-alistair.francis@wdc.com> While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- ...u-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...e_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 6 +- ...emu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...test-which-runs-all-unit-test-cases-.patch | 6 +- ...n-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...-connect-socket-to-a-spawned-command.patch | 14 +-- .../0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++- ...dd-pkg-config-handling-for-libgcrypt.patch | 14 +-- ...-libcap-header-issue-on-some-distro.patch} | 0 ...linux-user-remove-host-stime-syscall.patch | 61 ---------- ...messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 ------------------ .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 20 files changed, 53 insertions(+), 228 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb => qemu-system-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch => 0011-fix-libcap-header-issue-on-some-distro.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch rename meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch => 0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5ae16..23f2ce97c3 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43e6b..c04297cad0 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0011-fix-libcap-header-issue-on-some-distro.patch \ + file://0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060997..deca13acae 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,12 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102ae5..66ff996508 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd53cf..7f7da51006 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68030..012d60d8f0 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab40b1..bc30397e8c 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a73681510e..ec303371b0 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a42385530f..0810ae84c0 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2545..89baad9b7f 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25bec..30bb4ddf26 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d9455f..7e273eeced 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7daa42..34df78b7fe 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0011-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0011-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be45d..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e407f..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- 2.25.0 From scott.branden at broadcom.com Fri Feb 7 21:34:40 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Fri, 7 Feb 2020 13:34:40 -0800 Subject: [OE-core] [PATCH] x265: add x265 recipe Message-ID: <20200207213440.10462-1-scott.branden@broadcom.com> Add x265 recipe from latest revision of stable branch. Signed-off-by: Scott Branden --- meta/recipes-multimedia/x265/x265_git.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 meta/recipes-multimedia/x265/x265_git.bb diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb new file mode 100644 index 0000000000..7c230e2b1e --- /dev/null +++ b/meta/recipes-multimedia/x265/x265_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "http://www.videolan.org/developers/x265.html" + +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "nasm-native" +DEPENDS = "gnutls zlib libpcre" + +SRC_URI = "git://github.com/videolan/x265;branch=stable \ + " + +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" + +S = "${WORKDIR}/git/source" + +inherit lib_package pkgconfig cmake + +AS[unexport] = "1" -- 2.17.1 From alex.kanavin at gmail.com Fri Feb 7 22:09:15 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 7 Feb 2020 23:09:15 +0100 Subject: [OE-core] [PATCH] x265: add x265 recipe In-Reply-To: <20200207213440.10462-1-scott.branden@broadcom.com> References: <20200207213440.10462-1-scott.branden@broadcom.com> Message-ID: Can you also enable x265 in ffmpeg and gstreamer plugins recipes, so there would be actual users of the codec in oe-core? Also, x265 git repo does have tagged releases, and so PV/SRCREV in recipe should be set to match a release tag. Alex On Fri, 7 Feb 2020 at 22:35, Scott Branden via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > Add x265 recipe from latest revision of stable branch. > > Signed-off-by: Scott Branden > --- > meta/recipes-multimedia/x265/x265_git.bb | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > create mode 100644 meta/recipes-multimedia/x265/x265_git.bb > > diff --git a/meta/recipes-multimedia/x265/x265_git.bb > b/meta/recipes-multimedia/x265/x265_git.bb > new file mode 100644 > index 0000000000..7c230e2b1e > --- /dev/null > +++ b/meta/recipes-multimedia/x265/x265_git.bb > @@ -0,0 +1,21 @@ > +SUMMARY = "H.265/HEVC video encoder" > +DESCRIPTION = "A free software library and application for encoding video > streams into the H.265/HEVC format." > +HOMEPAGE = "http://www.videolan.org/developers/x265.html" > + > +LICENSE = "GPLv2" > +LICENSE_FLAGS = "commercial" > +LIC_FILES_CHKSUM = > "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" > + > +DEPENDS = "nasm-native" > +DEPENDS = "gnutls zlib libpcre" > + > +SRC_URI = "git://github.com/videolan/x265;branch=stable \ > + " > + > +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" > + > +S = "${WORKDIR}/git/source" > + > +inherit lib_package pkgconfig cmake > + > +AS[unexport] = "1" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From scott.branden at broadcom.com Fri Feb 7 22:26:23 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Fri, 7 Feb 2020 14:26:23 -0800 Subject: [OE-core] [PATCH] x265: add x265 recipe In-Reply-To: References: <20200207213440.10462-1-scott.branden@broadcom.com> Message-ID: <073d103e-a32e-ff07-1223-220f9f97dcec@broadcom.com> HI Alex, On 2020-02-07 2:09 p.m., Alexander Kanavin wrote: > Can you also enable x265 in ffmpeg and gstreamer plugins recipes, so > there would be actual users of the codec in oe-core? I do have a patch for ffmpeg and have tested that works.? I'll add that to the patch series. > > Also, x265 git repo does have tagged releases, and so PV/SRCREV in > recipe should be set to match a release tag. You'll have to help me out a little here on exactly what you want. This is based off the stable tag. I already specified the SRCREV in the recipe. Do you want PV to be: PV = "stable+git${SRCPV}" ? > > Alex > > On Fri, 7 Feb 2020 at 22:35, Scott Branden via Openembedded-core > > wrote: > > Add x265 recipe from latest revision of stable branch. > > Signed-off-by: Scott Branden > > --- > ?meta/recipes-multimedia/x265/x265_git.bb | > 21 +++++++++++++++++++++ > ?1 file changed, 21 insertions(+) > ?create mode 100644 meta/recipes-multimedia/x265/x265_git.bb > > > diff --git a/meta/recipes-multimedia/x265/x265_git.bb > b/meta/recipes-multimedia/x265/x265_git.bb > > new file mode 100644 > index 0000000000..7c230e2b1e > --- /dev/null > +++ b/meta/recipes-multimedia/x265/x265_git.bb > @@ -0,0 +1,21 @@ > +SUMMARY = "H.265/HEVC video encoder" > +DESCRIPTION = "A free software library and application for > encoding video streams into the H.265/HEVC format." > +HOMEPAGE = "http://www.videolan.org/developers/x265.html" > + > +LICENSE = "GPLv2" > +LICENSE_FLAGS = "commercial" > +LIC_FILES_CHKSUM = > "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" > + > +DEPENDS = "nasm-native" > +DEPENDS = "gnutls zlib libpcre" > + > +SRC_URI = "git://github.com/videolan/x265;branch=stable > \ > +? ? ? ? ? " > + > +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" > + > +S = "${WORKDIR}/git/source" > + > +inherit lib_package pkgconfig cmake > + > +AS[unexport] = "1" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From armccurdy at gmail.com Fri Feb 7 23:08:13 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Fri, 7 Feb 2020 15:08:13 -0800 Subject: [OE-core] [PATCH] x265: add x265 recipe In-Reply-To: <20200207213440.10462-1-scott.branden@broadcom.com> References: <20200207213440.10462-1-scott.branden@broadcom.com> Message-ID: On Fri, Feb 7, 2020 at 1:35 PM Scott Branden via Openembedded-core wrote: > > Add x265 recipe from latest revision of stable branch. > > Signed-off-by: Scott Branden > --- > meta/recipes-multimedia/x265/x265_git.bb | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > create mode 100644 meta/recipes-multimedia/x265/x265_git.bb > > diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb > new file mode 100644 > index 0000000000..7c230e2b1e > --- /dev/null > +++ b/meta/recipes-multimedia/x265/x265_git.bb > @@ -0,0 +1,21 @@ > +SUMMARY = "H.265/HEVC video encoder" > +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." > +HOMEPAGE = "http://www.videolan.org/developers/x265.html" > + > +LICENSE = "GPLv2" > +LICENSE_FLAGS = "commercial" > +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" > + > +DEPENDS = "nasm-native" > +DEPENDS = "gnutls zlib libpcre" What's the final value of DEPENDS you are expecting here? > +SRC_URI = "git://github.com/videolan/x265;branch=stable \ > + " > + > +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" > + > +S = "${WORKDIR}/git/source" > + > +inherit lib_package pkgconfig cmake > + > +AS[unexport] = "1" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From scott.branden at broadcom.com Fri Feb 7 23:15:13 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Fri, 7 Feb 2020 15:15:13 -0800 Subject: [OE-core] [PATCH] x265: add x265 recipe In-Reply-To: References: <20200207213440.10462-1-scott.branden@broadcom.com> Message-ID: <42ff44ce-e535-b15c-9c06-c73926ace066@broadcom.com> On 2020-02-07 3:08 p.m., Andre McCurdy wrote: > On Fri, Feb 7, 2020 at 1:35 PM Scott Branden via Openembedded-core > wrote: >> Add x265 recipe from latest revision of stable branch. >> >> Signed-off-by: Scott Branden >> --- >> meta/recipes-multimedia/x265/x265_git.bb | 21 +++++++++++++++++++++ >> 1 file changed, 21 insertions(+) >> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >> >> diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb >> new file mode 100644 >> index 0000000000..7c230e2b1e >> --- /dev/null >> +++ b/meta/recipes-multimedia/x265/x265_git.bb >> @@ -0,0 +1,21 @@ >> +SUMMARY = "H.265/HEVC video encoder" >> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." >> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >> + >> +LICENSE = "GPLv2" >> +LICENSE_FLAGS = "commercial" >> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >> + >> +DEPENDS = "nasm-native" >> +DEPENDS = "gnutls zlib libpcre" > What's the final value of DEPENDS you are expecting here? Started from the x264 recipe - will remove "nasm-native".? Thanks for noticing this. > >> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ >> + " >> + >> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >> + >> +S = "${WORKDIR}/git/source" >> + >> +inherit lib_package pkgconfig cmake >> + >> +AS[unexport] = "1" >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From scott.branden at broadcom.com Fri Feb 7 23:28:21 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Fri, 7 Feb 2020 15:28:21 -0800 Subject: [OE-core] [PATCH] x265: add x265 recipe In-Reply-To: <073d103e-a32e-ff07-1223-220f9f97dcec@broadcom.com> References: <20200207213440.10462-1-scott.branden@broadcom.com> <073d103e-a32e-ff07-1223-220f9f97dcec@broadcom.com> Message-ID: <065b0daf-ec38-b518-c1ab-195b514e5054@broadcom.com> Hi Alex, more comment below about PV. On 2020-02-07 2:26 p.m., Scott Branden wrote: > HI Alex, > > On 2020-02-07 2:09 p.m., Alexander Kanavin wrote: >> Can you also enable x265 in ffmpeg and gstreamer plugins recipes, so >> there would be actual users of the codec in oe-core? > I do have a patch for ffmpeg and have tested that works.? I'll add > that to the patch series. >> >> Also, x265 git repo does have tagged releases, and so PV/SRCREV in >> recipe should be set to match a release tag. > You'll have to help me out a little here on exactly what you want. > > This is based off the stable tag. > I already specified the SRCREV in the recipe. > > Do you want PV to be: > PV = "stable+git${SRCPV}" > > ? I was trying to follow the x264 recipe. Do you want me do something like name the recipe x265_stable.bb instead and not specify PV? >> >> Alex >> >> On Fri, 7 Feb 2020 at 22:35, Scott Branden via Openembedded-core >> > > wrote: >> >> Add x265 recipe from latest revision of stable branch. >> >> Signed-off-by: Scott Branden > > >> --- >> ?meta/recipes-multimedia/x265/x265_git.bb | >> 21 +++++++++++++++++++++ >> ?1 file changed, 21 insertions(+) >> ?create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >> >> >> diff --git a/meta/recipes-multimedia/x265/x265_git.bb >> b/meta/recipes-multimedia/x265/x265_git.bb >> >> new file mode 100644 >> index 0000000000..7c230e2b1e >> --- /dev/null >> +++ b/meta/recipes-multimedia/x265/x265_git.bb >> @@ -0,0 +1,21 @@ >> +SUMMARY = "H.265/HEVC video encoder" >> +DESCRIPTION = "A free software library and application for >> encoding video streams into the H.265/HEVC format." >> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >> + >> +LICENSE = "GPLv2" >> +LICENSE_FLAGS = "commercial" >> +LIC_FILES_CHKSUM = >> "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >> + >> +DEPENDS = "nasm-native" >> +DEPENDS = "gnutls zlib libpcre" >> + >> +SRC_URI = "git://github.com/videolan/x265;branch=stable >> \ >> +? ? ? ? ? " >> + >> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >> + >> +S = "${WORKDIR}/git/source" >> + >> +inherit lib_package pkgconfig cmake >> + >> +AS[unexport] = "1" >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From scott.branden at broadcom.com Sat Feb 8 00:01:09 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Fri, 7 Feb 2020 16:01:09 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe Message-ID: <20200208000110.29065-1-scott.branden@broadcom.com> Add x265 recipe from latest revision of stable branch. Signed-off-by: Scott Branden --- meta/recipes-multimedia/x265/x265_git.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 meta/recipes-multimedia/x265/x265_git.bb diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb new file mode 100644 index 0000000000..796fbbc13a --- /dev/null +++ b/meta/recipes-multimedia/x265/x265_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "http://www.videolan.org/developers/x265.html" + +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "gnutls zlib libpcre" + +SRC_URI = "git://github.com/videolan/x265;branch=stable \ + " + +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" + +S = "${WORKDIR}/git/source" + +inherit lib_package pkgconfig cmake + +AS[unexport] = "1" -- 2.17.1 From scott.branden at broadcom.com Sat Feb 8 00:01:10 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Fri, 7 Feb 2020 16:01:10 -0800 Subject: [OE-core] [PATCH v2 2/2] ffmpeg: add PACKAGECONFIG support for x265 In-Reply-To: <20200208000110.29065-1-scott.branden@broadcom.com> References: <20200208000110.29065-1-scott.branden@broadcom.com> Message-ID: <20200208000110.29065-2-scott.branden@broadcom.com> Add PACKAGECONFIG support for x265 in ffmpeg. Signed-off-by: Scott Branden --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index a3cf0c1a37..0c27663cf6 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -43,7 +43,7 @@ DEPENDS = "nasm-native" inherit autotools pkgconfig PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ - alsa bzlib gpl lzma theora x264 zlib \ + alsa bzlib gpl lzma theora x264 x265 zlib \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" # libraries to build in addition to avutil @@ -74,6 +74,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -- 2.17.1 From raj.khem at gmail.com Sat Feb 8 01:12:22 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 7 Feb 2020 17:12:22 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: <20200208000110.29065-1-scott.branden@broadcom.com> References: <20200208000110.29065-1-scott.branden@broadcom.com> Message-ID: On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > Add x265 recipe from latest revision of stable branch. I wonder if it belongs to core are there deps on it that we need in common metadata > > > Signed-off-by: Scott Branden > --- > meta/recipes-multimedia/x265/x265_git.bb | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > create mode 100644 meta/recipes-multimedia/x265/x265_git.bb > > diff --git a/meta/recipes-multimedia/x265/x265_git.bb > b/meta/recipes-multimedia/x265/x265_git.bb > new file mode 100644 > index 0000000000..796fbbc13a > --- /dev/null > +++ b/meta/recipes-multimedia/x265/x265_git.bb > @@ -0,0 +1,20 @@ > +SUMMARY = "H.265/HEVC video encoder" > +DESCRIPTION = "A free software library and application for encoding video > streams into the H.265/HEVC format." > +HOMEPAGE = "http://www.videolan.org/developers/x265.html" > + > +LICENSE = "GPLv2" > +LICENSE_FLAGS = "commercial" > +LIC_FILES_CHKSUM = > "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" > + > +DEPENDS = "gnutls zlib libpcre" > + > +SRC_URI = "git://github.com/videolan/x265;branch=stable \ > + " > + > +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" > + > +S = "${WORKDIR}/git/source" > + > +inherit lib_package pkgconfig cmake > + > +AS[unexport] = "1" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Sat Feb 8 02:12:36 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 7 Feb 2020 18:12:36 -0800 Subject: [OE-core] [PATCH v3] oeqa: Use --disable-maintainer-mode configure option Message-ID: <20200208021236.1857972-1-raj.khem@gmail.com> since the versions of autotools might differ, and difference in timestamps for configure and system can result in reconfigure lets avoid that by touching the configure script to match system time Avoids error: newly created file is older than distributed files! [YOCTO #13779] Suggested-by: Andre McCurdy Signed-off-by: Khem Raj --- v2: Touch configure to match timestamps with system Move the touch cmd to configure step itself v3: Use --disable-maintainer-mode meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd37e..d0f91668b2 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('--disable-maintainer-mode','') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb38f..902e93f623 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 809142559a..87cc2844a8 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) self.project.download_archive() - self.assertEqual(self.project.run_configure(), 0, + self.assertEqual(self.project.run_configure('--disable-maintainer-mode',''), 0, msg="Running configure failed") self.assertEqual(self.project.run_make(), 0, msg="Running make failed") -- 2.25.0 From patchwork at patchwork.openembedded.org Sat Feb 8 02:32:28 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sat, 08 Feb 2020 02:32:28 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_oeqa=3A_Us?= =?utf-8?q?e_--disable-maintainer-mode_configure_option?= In-Reply-To: <20200208021236.1857972-1-raj.khem@gmail.com> References: <20200208021236.1857972-1-raj.khem@gmail.com> Message-ID: <20200208023228.2273.18415@do> == Series Details == Series: oeqa: Use --disable-maintainer-mode configure option Revision: 1 URL : https://patchwork.openembedded.org/series/22483/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 6f6a6bbac6) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From scott.branden at broadcom.com Sat Feb 8 04:02:41 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Fri, 7 Feb 2020 20:02:41 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: References: <20200208000110.29065-1-scott.branden@broadcom.com> Message-ID: <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> Hi Khem, On 2020-02-07 5:12 p.m., Khem Raj wrote: > > > On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core > > wrote: > > Add x265 recipe from latest revision of stable branch. > > > I wonder if it belongs to core are there deps on it that we need in > common metadata I simply followed where x264 recipe is located and placed x265 beside it. Both are needed when enabled in ffmpeg. I don't know if that answers your question as to where they should be located. > > > > Signed-off-by: Scott Branden > > --- > ?meta/recipes-multimedia/x265/x265_git.bb | > 20 ++++++++++++++++++++ > ?1 file changed, 20 insertions(+) > ?create mode 100644 meta/recipes-multimedia/x265/x265_git.bb > > > diff --git a/meta/recipes-multimedia/x265/x265_git.bb > b/meta/recipes-multimedia/x265/x265_git.bb > > new file mode 100644 > index 0000000000..796fbbc13a > --- /dev/null > +++ b/meta/recipes-multimedia/x265/x265_git.bb > @@ -0,0 +1,20 @@ > +SUMMARY = "H.265/HEVC video encoder" > +DESCRIPTION = "A free software library and application for > encoding video streams into the H.265/HEVC format." > +HOMEPAGE = "http://www.videolan.org/developers/x265.html" > + > +LICENSE = "GPLv2" > +LICENSE_FLAGS = "commercial" > +LIC_FILES_CHKSUM = > "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" > + > +DEPENDS = "gnutls zlib libpcre" > + > +SRC_URI = "git://github.com/videolan/x265;branch=stable > \ > +? ? ? ? ? " > + > +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" > + > +S = "${WORKDIR}/git/source" > + > +inherit lib_package pkgconfig cmake > + > +AS[unexport] = "1" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From jacob.kroon at gmail.com Sat Feb 8 07:09:37 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Sat, 8 Feb 2020 08:09:37 +0100 Subject: [OE-core] [PATCH v3] oeqa: Use --disable-maintainer-mode configure option In-Reply-To: <20200208021236.1857972-1-raj.khem@gmail.com> References: <20200208021236.1857972-1-raj.khem@gmail.com> Message-ID: <6d159cf3-9b32-7ed8-bdce-15cfee22314a@gmail.com> On 2/8/20 3:12 AM, Khem Raj wrote: > since the versions of autotools might differ, and difference in > timestamps for configure and system can result in reconfigure lets avoid > that by touching the configure script to match system time > Maybe align commit message with patch, and mention --disable-maintainer-mode ? Jacob > Avoids > error: newly created file is older than distributed files! > > [YOCTO #13779] > > Suggested-by: Andre McCurdy > Signed-off-by: Khem Raj > --- > v2: Touch configure to match timestamps with system > Move the touch cmd to configure step itself > v3: Use --disable-maintainer-mode > > meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- > meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- > meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py > index 4bd72dd37e..d0f91668b2 100644 > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py > @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): > @OEHasPackage(['autoconf']) > def test_cpio(self): > self.project.download_archive() > - self.project.run_configure() > + self.project.run_configure('--disable-maintainer-mode','') > self.project.run_make() > self.project.run_install() > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py > index b0beafb38f..902e93f623 100644 > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py > @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): > self.assertTrue(os.path.isdir(dirs["source"])) > os.makedirs(dirs["build"]) > > - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) > + self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) > self._run("cd {build} && make -j".format(**dirs)) > self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py > index 809142559a..87cc2844a8 100644 > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py > @@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase): > "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz", > self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) > self.project.download_archive() > - self.assertEqual(self.project.run_configure(), 0, > + self.assertEqual(self.project.run_configure('--disable-maintainer-mode',''), 0, > msg="Running configure failed") > self.assertEqual(self.project.run_make(), 0, > msg="Running make failed") > From richard.purdie at linuxfoundation.org Sat Feb 8 07:45:27 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 08 Feb 2020 07:45:27 +0000 Subject: [OE-core] [PATCH] qemu: Upgrade to 4.2.0 In-Reply-To: <20200204184113.16070-1-alistair.francis@wdc.com> References: <20200204184113.16070-1-alistair.francis@wdc.com> Message-ID: On Tue, 2020-02-04 at 10:41 -0800, Alistair Francis wrote: > While we are upgrading let's refresh patches and remove the outdated > patches. > > Signed-off-by: Alistair Francis I think this stopped qemu running on the autobuilder, we saw many versions of: https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1538 Failed to run qemu: qemu: can't parse 'vga' parameter: Invalid argument Cheers, Richard From richard.purdie at linuxfoundation.org Sat Feb 8 07:46:12 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 08 Feb 2020 07:46:12 +0000 Subject: [OE-core] [PATCH] pciutils: upgrade 3.6.2 -> 3.6.4 In-Reply-To: <1581107275-6540-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581107275-6540-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <91dffeba4f2b203b8fd53a0bfc50f85115644f41.camel@linuxfoundation.org> On Fri, 2020-02-07 at 12:27 -0800, Wang Mingyu wrote: > Signed-off-by: Wang Mingyu > --- > .../pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} (92%) > > diff --git a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb > similarity index 92% > rename from meta/recipes-bsp/pciutils/pciutils_3.6.2.bb > rename to meta/recipes-bsp/pciutils/pciutils_3.6.4.bb > index 413421cd8a..034bb63dc9 100644 > --- a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb > +++ b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb > @@ -11,8 +11,8 @@ DEPENDS = "zlib kmod" > SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ > file://configure.patch" > > -SRC_URI[md5sum] = "77963796d1be4f451b83e6da28ba4f82" > -SRC_URI[sha256sum] = "db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" > +SRC_URI[md5sum] = "4343b37e19f319ce8f3d59c30031790e" > +SRC_URI[sha256sum] = "f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055" > > inherit multilib_header pkgconfig Patches need refreshing: WARNING: pciutils-3.6.4-r0 do_patch: Fuzz detected: WARNING: pciutils-3.6.4-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz] Cheers, Richard From wangmy at cn.fujitsu.com Sat Feb 8 16:14:18 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Sat, 8 Feb 2020 08:14:18 -0800 Subject: [OE-core] [PATCH] ruby: upgrade 2.6.5 -> 2.7.0 Message-ID: <1581178458-23352-1-git-send-email-wangmy@cn.fujitsu.com> 0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch Removed since it is included in 2.7.0. refresh the following patch: 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch add the following patch: 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch format of file COPYING is updated. LEGAL notice information is updated. Signed-off-by: Wang Mingyu --- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...of-libexec-y2racc-and-libexec-racc2y.patch | 36 ++++++ ...Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...ck-finite-isinf-isnan-as-macros-firs.patch | 103 ------------------ .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- 5 files changed, 45 insertions(+), 112 deletions(-) create mode 100644 meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch rename meta/recipes-devtools/ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} (91%) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f012..a38b3fe624 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ + file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000000..fa6f103323 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch @@ -0,0 +1,36 @@ +From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 8 Feb 2020 15:16:14 +0800 +Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. + +change /usr/local/bin/ruby to /usr/bin/env ruby. + +Signed-off-by: Wang Mingyu +--- + libexec/racc2y | 2 +- + libexec/y2racc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexec/racc2y b/libexec/racc2y +index f88d73ed2c..74e49cfa21 100755 +--- a/libexec/racc2y ++++ b/libexec/racc2y +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +diff --git a/libexec/y2racc b/libexec/y2racc +index 7933f94153..36daf864e1 100755 +--- a/libexec/y2racc ++++ b/libexec/y2racc +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +-- +2.17.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8bd73..b31dee1128 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson Upstream-Status: Pending --- - Makefile.in | 2 +- + template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in +diff --git a/template/Makefile.in b/template/Makefile.in index fa1e19ef37..bbd07fa34b 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/template/Makefile.in ++++ b/template/Makefile.in @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3e8c..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 -From: nobu -Date: Fri, 8 Feb 2019 07:22:55 +0000 -Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ruby-core:91487] [Bug #15595] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e - ---- -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] -Signed-off-by: Andr?? Draszik ---- - aclocal.m4 | 1 + - configure.ac | 13 ++++--------- - tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ - 3 files changed, 18 insertions(+), 9 deletions(-) - create mode 100644 tool/m4/ruby_replace_funcs.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index b0fe3eb959..ed7d14ef63 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) - m4_include([tool/m4/ruby_mingw32.m4]) - m4_include([tool/m4/ruby_prepend_option.m4]) - m4_include([tool/m4/ruby_prog_gnu_ld.m4]) -+m4_include([tool/m4/ruby_replace_funcs.m4]) - m4_include([tool/m4/ruby_replace_type.m4]) - m4_include([tool/m4/ruby_rm_recursive.m4]) - m4_include([tool/m4/ruby_setjmp_type.m4]) -diff --git a/configure.ac b/configure.ac -index 2c4d2888d2..2691da6a3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -946,9 +946,6 @@ main() - ac_cv_func_fsync=yes - ac_cv_func_seekdir=yes - ac_cv_func_telldir=yes -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes -- ac_cv_func_finite=yes - ac_cv_func_lchown=yes - ac_cv_func_link=yes - ac_cv_func_readlink=yes -@@ -999,9 +996,6 @@ main() - [netbsd*], [ LIBS="-lm $LIBS" - ], - [dragonfly*], [ LIBS="-lm $LIBS" -- # isinf() and isnan() are macros on DragonFly. -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes - ], - [aix*],[ LIBS="-lm $LIBS" - ac_cv_func_round=no -@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) - AC_REPLACE_FUNCS(erf) - AC_REPLACE_FUNCS(explicit_bzero) - AC_REPLACE_FUNCS(ffs) --AC_REPLACE_FUNCS(finite) - AC_REPLACE_FUNCS(flock) - AC_REPLACE_FUNCS(hypot) --AC_REPLACE_FUNCS(isinf) --AC_REPLACE_FUNCS(isnan) - AC_REPLACE_FUNCS(lgamma_r) - AC_REPLACE_FUNCS(memmove) - AC_REPLACE_FUNCS(nan) -@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) - AC_REPLACE_FUNCS(strstr) - AC_REPLACE_FUNCS(tgamma) - -+RUBY_REPLACE_FUNC([finite], [@%:@include ]) -+RUBY_REPLACE_FUNC([isinf], [@%:@include ]) -+RUBY_REPLACE_FUNC([isnan], [@%:@include ]) -+ - # for missing/setproctitle.c - AS_CASE(["$target_os"], - [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], -diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 -new file mode 100644 -index 0000000000..d0612e29a0 ---- /dev/null -+++ b/tool/m4/ruby_replace_funcs.m4 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+dnl RUBY_REPLACE_FUNC [func] [included] -+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl -+ AC_CHECK_DECL([$1],dnl -+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl -+ [AC_REPLACE_FUNCS($1)],dnl -+ [$2])dnl -+]) -+ -+dnl RUBY_REPLACE_FUNCS [funcs] [included] -+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl -+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl -+]) --- -2.23.0.rc1 - diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb similarity index 91% rename from meta/recipes-devtools/ruby/ruby_2.6.5.bb rename to meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee09f..c796318717 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -1,13 +1,13 @@ require ruby.inc SRC_URI += " \ - file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://remove_has_include_macros.patch \ file://run-ptest \ + file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ " -SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" -SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" +SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" +SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- 2.17.1 From patchwork at patchwork.openembedded.org Sat Feb 8 08:32:32 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sat, 08 Feb 2020 08:32:32 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_ruby=3A_up?= =?utf-8?b?Z3JhZGUgMi42LjUgLT4gMi43LjA=?= In-Reply-To: <1581178458-23352-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581178458-23352-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <20200208083232.2277.73187@do> == Series Details == Series: ruby: upgrade 2.6.5 -> 2.7.0 Revision: 1 URL : https://patchwork.openembedded.org/series/22485/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From wangmy at cn.fujitsu.com Sat Feb 8 17:00:55 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Sat, 8 Feb 2020 09:00:55 -0800 Subject: [OE-core] [PATCH v2] pciutils: upgrade 3.6.2 -> 3.6.4 Message-ID: <1581181255-24126-1-git-send-email-wangmy@cn.fujitsu.com> refresh the following patch: configure.patch Signed-off-by: Wang Mingyu --- meta/recipes-bsp/pciutils/pciutils/configure.patch | 4 ++-- .../pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-bsp/pciutils/{pciutils_3.6.2.bb => pciutils_3.6.4.bb} (92%) diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index a7e445733a..e444c13975 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -24,7 +24,7 @@ Index: pciutils-3.5.6/Makefile - $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ + $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ - %.8 %.7: %.man + %.8 %.7 %.5: %.man M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#" Index: pciutils-3.5.6/lib/configure =================================================================== @@ -70,7 +70,7 @@ Index: pciutils-3.5.6/lib/configure fi [ -n "$RELEASE" ] && rel="${RELEASE}" # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. -@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^ +@@ -44,6 +48,8 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo " $host $rel $cpu $sys" diff --git a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb similarity index 92% rename from meta/recipes-bsp/pciutils/pciutils_3.6.2.bb rename to meta/recipes-bsp/pciutils/pciutils_3.6.4.bb index 413421cd8a..034bb63dc9 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.6.4.bb @@ -11,8 +11,8 @@ DEPENDS = "zlib kmod" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" -SRC_URI[md5sum] = "77963796d1be4f451b83e6da28ba4f82" -SRC_URI[sha256sum] = "db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" +SRC_URI[md5sum] = "4343b37e19f319ce8f3d59c30031790e" +SRC_URI[sha256sum] = "f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055" inherit multilib_header pkgconfig -- 2.17.1 From alex.kiernan at gmail.com Sat Feb 8 09:20:02 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sat, 8 Feb 2020 09:20:02 +0000 Subject: [OE-core] [OE-Core][PATCH] kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE In-Reply-To: <20200131162442.58931-1-alex.kiernan@gmail.com> References: <20200131162442.58931-1-alex.kiernan@gmail.com> Message-ID: On Fri, Jan 31, 2020 at 4:24 PM Alex Kiernan wrote: > > When using EXTERNAL_KERNEL_DEVICETREE, collect DTB overlays too (*.dtbo) > as well as iterating down into sub-directories so using the behaviour > for naming which matches KERNEL_DEVICETREE. > > Signed-off-by: Alex Kiernan > --- > > meta/classes/kernel-fitimage.bbclass | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass > index ec18a3d69921..d1b8cdc1f049 100644 > --- a/meta/classes/kernel-fitimage.bbclass > +++ b/meta/classes/kernel-fitimage.bbclass > @@ -391,11 +391,10 @@ fitimage_assemble() { > > if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then > dtbcount=1 > - for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb; do > - DTB=`basename ${DTBFILE}` > + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do > DTB=$(echo "${DTB}" | tr '/' '_') > DTBS="${DTBS} ${DTB}" > - fitimage_emit_section_dtb ${1} ${DTB} ${DTBFILE} > + fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" > done > fi > Ping? -- Alex Kiernan From alex.kiernan at gmail.com Sat Feb 8 09:20:35 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sat, 8 Feb 2020 09:20:35 +0000 Subject: [OE-core] [OE-Core][RESEND PATCH] rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <20200130045446.44017-1-alex.kiernan@gmail.com> References: <20200130045446.44017-1-alex.kiernan@gmail.com> Message-ID: On Thu, Jan 30, 2020 at 4:54 AM Alex Kiernan wrote: > > With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements > using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the > form: > > bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) > followed by: > LexToken(TOKEN,'write_image_test_data',0,0) > LexToken(COMMA,';',0,0) > LexToken(TOKEN,'set_systemd_default_target',0,0) > LexToken(COMMA,';',0,0) > LexToken(TOKEN,'systemd_create_users',0,0) > > Removing the spaces between the function name and semicolon allows the > list to parse correctly. > > Signed-off-by: Alex Kiernan > --- > > meta/classes/rootfs-postcommands.bbclass | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass > index a7f33fbf9e77..ebf96be7e85f 100644 > --- a/meta/classes/rootfs-postcommands.bbclass > +++ b/meta/classes/rootfs-postcommands.bbclass > @@ -1,6 +1,6 @@ > > # Zap the root password if debug-tweaks feature is not enabled > -ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password ; ",d)}' > +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password; ",d)}' > > # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled > ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password; ", "",d)}' > @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb > ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' > > # Create /etc/timestamp during image construction to give a reasonably sane default time setting > -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " > +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " > > # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled > ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' > @@ -26,11 +26,11 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only > APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' > > # Generates test data file with data store variables expanded in json format > -ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " > +ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " > > # Write manifest > IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" > -ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " > +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest; " > # Set default postinst log file > POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" > # Set default target for systemd images Ping? -- Alex Kiernan From alejandro at enedino.org Sat Feb 8 10:30:04 2020 From: alejandro at enedino.org (Alejandro Hernandez Samaniego) Date: Sat, 8 Feb 2020 02:30:04 -0800 Subject: [OE-core] [PATCH 1/2] testimage: Allow testing on QEMU machines with a single serial port Message-ID: <20200208103004.4910-1-alejandro@enedino.org> commmit 6cde67d0a84 enables the use of qemurunner on machines that only have a single serial port, but still sets the default value as serial_ports=2 if not provided. The testimage class does not call qemurunner with a serial_ports argument, hence always defaulting to two. Pass the serial_ports argument from the testimage class to allow tests to run on QEMU machines with a single serial port. Signed-off-by: Alejandro Hernandez Samaniego --- meta/classes/testimage.bbclass | 1 + meta/lib/oeqa/core/target/qemu.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 844ed87944..0d55c3247e 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -256,6 +256,7 @@ def testimage_main(d): 'kvm' : kvm, 'slirp' : slirp, 'dump_dir' : d.getVar("TESTIMAGE_DUMP_DIR"), + 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), } # TODO: Currently BBPATH is needed for custom loading of targets. diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 758703c0d1..008a9f03ce 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -18,7 +18,7 @@ class OEQemuTarget(OESSHTarget): def __init__(self, logger, server_ip, timeout=300, user='root', port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, dump_dir='', dump_host_cmds='', display='', bootlog='', - tmpdir='', dir_image='', boottime=60, **kwargs): + tmpdir='', dir_image='', boottime=60, serial_ports=2, **kwargs): super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, user, port) @@ -35,7 +35,8 @@ class OEQemuTarget(OESSHTarget): deploy_dir_image=dir_image, display=display, logfile=bootlog, boottime=boottime, use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, - dump_host_cmds=dump_host_cmds, logger=logger) + dump_host_cmds=dump_host_cmds, logger=logger, + serial_ports=serial_ports) def start(self, params=None, extra_bootparams=None, runqemuparams=''): if self.use_slirp and not self.server_ip: -- 2.20.1 From alejandro at enedino.org Sat Feb 8 10:32:02 2020 From: alejandro at enedino.org (Alejandro Hernandez Samaniego) Date: Sat, 8 Feb 2020 02:32:02 -0800 Subject: [OE-core] [PATCH 2/2] testimage: Extend runtime testing infrastructure to allow unconventional booting processes to be tested Message-ID: <20200208103202.4962-1-alejandro@enedino.org> The current runtime infrastructure contains hardcoded values which Ill refer to as patterns, these patterns are either searched through or sent via the serial terminal to communicate between HOST and TARGET. These patterns are required since they allow us to check when a device has finished booting, to log in, and to check whether a command sent from our tests has returned, this way we are able to check both the status of the commands that were sent along with its output. The testing process goes somewhat as follows: 1. Launch QEMU and start booting. 2. Check when the device has booted by looking for the pattern login:. 3. Log in as the root user (default for our images). 4. Check that we were able to log in succesfully. 5. Start running the runtime test cases defined by TEST_SUITES. 6. One of such test cases could send a command to the QEMU target. 7. Check whether that command returned. 8. Check its output and status, return whether the test case passed or failed. This patch allows this set of patterns to be defined instead of being hardcoded, but it also automatically sets the defaults that we have been using in the past if they have not been manually defined, for this reason, the patch is less invasive and should not affect in any way how tests are currently being run. Cases that can be enabled with this patch: - A customized image that does not use the root user (or maybe we want to check what happens if we dont use the root user). - An image where the PS1 env variable has been modified, and the prompt pattern wouldnt match the default. - Baremetal applications, which do not follow the conventional way of booting Linux and would probably not show a prompt for a user to log in, same applies for testing bootloaders. - poky-tiny: Using DISTRO=poky-tiny and an image such as the core-image-tiny from meta-intel, which boots directly to RAM, and does not show a log in prompt since it does not contain a conventional init process. The code itself contains comments that should be self explanatory but here is an example on how these patterns can be defined in a hypothetical case where we want to run test cases as the webserver user instead: TESTIMAGE_BOOT_PATTERNS = "send_login_user search_login_succeeded" TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" TESTIMAGE_BOOT_PATTERNS[search_login_succeeded] = "webserver@[a-zA-Z0-9\-]+:~#" The variable TESTIMAGE_BOOT_PATTERNS defines which patterns to override when used to communicate with the target when booting, anyone familiar with the PACKAGECONFIG syntax should have no trouble setting these. Other patterns would still be set up as default, e.g. search_reached_prompt would still be login: The accepted flags for TESTIMAGE_BOOT_PATTERNS are the following: search_reached_prompt, send_login_user, search_login_succeeded, search_cmd_finished. They are prefixed with either search/send, to differentiate if the pattern is meant to be sent or searched to/from the target terminal. A working example of this code that falls under the baremetal case mentioned above along with a test case is present on the meta-freertos layer, which tests an RTOS image built with OpenEmbedded and automatically runs a test case on it after booting such image: As usual, INHERIT += "testimage" needs to be present on local.conf $ bitbake freertos-demo -c testimage RESULTS: RESULTS - freertos_echo.FreeRTOSTest.test_freertos_echo: PASSED (2.00s) SUMMARY: freertos-demo () - Ran 1 test in 2.006s freertos-demo - OK - All required tests passed (successes=1, skipped=0, failures=0, errors=0) Signed-off-by: Alejandro Hernandez Samaniego Signed-off-by: Alejandro Hernandez Samaniego --- meta/classes/testimage.bbclass | 39 +++++++++++++++++++++++++++++++ meta/lib/oeqa/core/target/qemu.py | 7 ++++-- meta/lib/oeqa/utils/qemurunner.py | 31 ++++++++++++++++++++---- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 0d55c3247e..75f0f2c3e3 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -34,6 +34,17 @@ TESTIMAGE_AUTO ??= "0" # TEST_QEMUPARAMS can be used to pass extra parameters to qemu, e.g. "-m 1024" for setting the amount of ram to 1 GB. # TEST_RUNQEMUPARAMS can be used to pass extra parameters to runqemu, e.g. "gl" to enable OpenGL acceleration. +# TESTIMAGE_BOOT_PATTERNS can be used to override certain patterns used to communicate with the target when booting, +# if a pattern is not specifically present on this variable a default will be used when booting the target. +# TESTIMAGE_BOOT_PATTERNS[] overrides the pattern used for that specific flag, where flag comes from a list of accepted flags +# e.g. normally the system boots and waits for a login prompt (login:), after that it sends the command: "root\n" to log as the root user +# if we wanted to log in as the hypothetical "webserver" user for example we could set the following: +# TESTIMAGE_BOOT_PATTERNS = "send_login_user search_login_succeeded" +# TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" +# TESTIMAGE_BOOT_PATTERNS[search_login_succeeded] = "webserver@[a-zA-Z0-9\-]+:~#" +# The accepted flags are the following: search_reached_prompt, send_login_user, search_login_succeeded, search_cmd_finished. +# They are prefixed with either search/send, to differentiate if the pattern is meant to be sent or searched to/from the target terminal + TEST_LOG_DIR ?= "${WORKDIR}/testimage" TEST_EXPORT_DIR ?= "${TMPDIR}/testimage/${PN}" @@ -68,6 +79,8 @@ TEST_TARGET ?= "qemu" TEST_QEMUPARAMS ?= "" TEST_RUNQEMUPARAMS ?= "" +TESTIMAGE_BOOT_PATTERNS ?= "" + TESTIMAGEDEPENDS = "" TESTIMAGEDEPENDS_append_qemuall = " qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot qemu-helper-native:do_addto_recipe_sysroot" TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'cpio-native:do_populate_sysroot', '', d)}" @@ -150,6 +163,29 @@ def get_testimage_json_result_dir(d): def get_testimage_result_id(configuration): return '%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['MACHINE'], configuration['STARTTIME']) +def get_testimage_boot_patterns(d): + from collections import defaultdict + boot_patterns = defaultdict(str) + # Only accept certain values + accepted_patterns = ['search_reached_prompt', 'send_login_user', 'search_login_succeeded', 'search_cmd_finished'] + # Not all patterns need to be overriden, e.g. perhaps we only want to change the user + boot_patterns_flags = d.getVarFlags('TESTIMAGE_BOOT_PATTERNS') or {} + if boot_patterns_flags: + patterns_set = [p for p in boot_patterns_flags.items() if p[0] in d.getVar('TESTIMAGE_BOOT_PATTERNS').split()] + for flag, flagval in patterns_set: + if flag not in accepted_patterns: + bb.fatal('Testimage: The only accepted boot patterns are: search_reached_prompt,send_login_user, \ + search_login_succeeded,search_cmd_finished\n Make sure your TESTIMAGE_BOOT_PATTERNS=%s \ + contains an accepted flag.' % d.getVar('TESTIMAGE_BOOT_PATTERNS')) + return + # We know boot prompt is searched through in binary format, others might be expressions + if flag == 'search_reached_prompt': + boot_patterns[flag] = flagval.encode() + else: + boot_patterns[flag] = flagval.encode().decode('unicode-escape') + return boot_patterns + + def testimage_main(d): import os import json @@ -259,6 +295,9 @@ def testimage_main(d): 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), } + if d.getVar("TESTIMAGE_BOOT_PATTERNS"): + target_kwargs['boot_patterns'] = get_testimage_boot_patterns(d) + # TODO: Currently BBPATH is needed for custom loading of targets. # It would be better to find these modules using instrospection. target_kwargs['target_modules_path'] = d.getVar('BBPATH') diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 008a9f03ce..059106e915 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -8,6 +8,7 @@ import os import sys import signal import time +from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner @@ -18,7 +19,8 @@ class OEQemuTarget(OESSHTarget): def __init__(self, logger, server_ip, timeout=300, user='root', port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, dump_dir='', dump_host_cmds='', display='', bootlog='', - tmpdir='', dir_image='', boottime=60, serial_ports=2, **kwargs): + tmpdir='', dir_image='', boottime=60, serial_ports=2, + boot_patterns = defaultdict(str), **kwargs): super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, user, port) @@ -30,13 +32,14 @@ class OEQemuTarget(OESSHTarget): self.kernel = kernel self.kvm = kvm self.use_slirp = slirp + self.boot_patterns = boot_patterns self.runner = QemuRunner(machine=machine, rootfs=rootfs, tmpdir=tmpdir, deploy_dir_image=dir_image, display=display, logfile=bootlog, boottime=boottime, use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, dump_host_cmds=dump_host_cmds, logger=logger, - serial_ports=serial_ports) + serial_ports=serial_ports, boot_patterns = boot_patterns) def start(self, params=None, extra_bootparams=None, runqemuparams=''): if self.use_slirp and not self.server_ip: diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 2cada35d48..b09d4240ee 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -21,6 +21,7 @@ import threading import codecs import logging from oeqa.utils.dump import HostDumper +from collections import defaultdict # Get Unicode non printable control chars control_range = list(range(0,32))+list(range(127,160)) @@ -31,7 +32,7 @@ re_control_char = re.compile('[%s]' % re.escape("".join(control_chars))) class QemuRunner: def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, - use_kvm, logger, use_slirp=False, serial_ports=2): + use_kvm, logger, use_slirp=False, serial_ports=2, boot_patterns = defaultdict(str)): # Popen object for runqemu self.runqemu = None @@ -57,6 +58,7 @@ class QemuRunner: self.use_slirp = use_slirp self.serial_ports = serial_ports self.msg = '' + self.boot_patterns = boot_patterns self.runqemutime = 120 self.qemu_pidfile = 'pidfile_'+str(os.getpid()) @@ -65,6 +67,25 @@ class QemuRunner: self.logger = logger + # Enable testing other OS's + # Set commands for target communication, and default to Linux ALWAYS + # Other OS's or baremetal applications need to provide their + # own implementation passing it through QemuRunner's constructor + # or by passing them through TESTIMAGE_BOOT_PATTERNS[flag] + # provided variables, where is one of the mentioned below. + accepted_patterns = ['search_reached_prompt', 'send_login_user', 'search_login_succeeded', 'search_cmd_finished'] + default_boot_patterns = defaultdict(str) + # Default to the usual paterns used to communicate with the target + default_boot_patterns['search_reached_prompt'] = b' login:' + default_boot_patterns['send_login_user'] = 'root\n' + default_boot_patterns['search_login_succeeded'] = r"root@[a-zA-Z0-9\-]+:~#" + default_boot_patterns['search_cmd_finished'] = r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#" + + # Only override patterns that were set e.g. login user TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" + for pattern in accepted_patterns: + if not self.boot_patterns[pattern]: + self.boot_patterns[pattern] = default_boot_patterns[pattern] + def create_socket(self): try: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -321,7 +342,7 @@ class QemuRunner: self.log(data) data = b'' - if b' login:' in bootlog: + if self.boot_patterns['search_reached_prompt'] in bootlog: self.server_socket = qemusock stopread = True reachedlogin = True @@ -353,8 +374,8 @@ class QemuRunner: # If we are not able to login the tests can continue try: - (status, output) = self.run_serial("root\n", raw=True) - if re.search(r"root@[a-zA-Z0-9\-]+:~#", output): + (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True) + if re.search(self.boot_patterns['search_login_succeeded'], output): self.logged = True self.logger.debug("Logged as root in serial console") if netconf: @@ -475,7 +496,7 @@ class QemuRunner: if answer: data += answer.decode('utf-8') # Search the prompt to stop - if re.search(r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#", data): + if re.search(self.boot_patterns['search_cmd_finished'], data): break else: raise Exception("No data on serial console socket") -- 2.20.1 From kexin.hao at windriver.com Sat Feb 8 12:36:42 2020 From: kexin.hao at windriver.com (Kevin Hao) Date: Sat, 8 Feb 2020 20:36:42 +0800 Subject: [OE-core] [PATCH] xserver-nodm-init: Fix the start failure for non-root user Message-ID: <20200208123642.12567-1-kexin.hao@windriver.com> In order to start the xserver, a non-root user should have the cap_sys_admin capability to set the drm master. We try to get the cap_sys_admin capability by setting it in both the thread and file inheritable set. The side effect of this is that we would have to add the "pam" to the distro features if we want use the xserver-nodm-init for a non-root user. [Yocto #11526] Signed-off-by: Kevin Hao --- .../x11-common/xserver-nodm-init/capability.conf | 2 ++ .../x11-common/xserver-nodm-init/xserver-nodm | 8 ++++++++ meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf new file mode 100644 index 000000000000..7ab7460816a8 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf @@ -0,0 +1,2 @@ +cap_sys_admin @USER@ +none * diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm index 6c548551b870..116bb278bc9b 100755 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm @@ -38,6 +38,14 @@ case "$1" in if [ -e /dev/hidraw0 ]; then chmod o+rw /dev/hidraw* fi + # Make sure that the Xorg has the cap_sys_admin capability which is + # needed for setting the drm master + if ! grep -q "^auth.*pam_cap\.so" /etc/pam.d/su; then + echo "auth optional pam_cap.so" >>/etc/pam.d/su + fi + if ! /usr/sbin/getcap $XSERVER | grep -q cap_sys_admin; then + /usr/sbin/setcap cap_sys_admin+eip $XSERVER + fi fi # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index 385fea5e8399..c2995f99ffe1 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb @@ -10,6 +10,7 @@ SRC_URI = "file://xserver-nodm \ file://gplv2-license.patch \ file://xserver-nodm.service.in \ file://xserver-nodm.conf.in \ + file://capability.conf \ " S = "${WORKDIR}" @@ -19,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d systemd features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 ${@oe.utils.conditional('ROOTLESS_X', '1', 'pam', '', d)}" PACKAGECONFIG ??= "blank" # dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG @@ -40,6 +41,8 @@ do_install() { if [ "${ROOTLESS_X}" = "1" ] ; then XUSER_HOME="/home/xuser" XUSER="xuser" + install -D capability.conf ${D}${sysconfdir}/security/capability.conf + sed -i "s:@USER@:${XUSER}:" ${D}${sysconfdir}/security/capability.conf else XUSER_HOME=${ROOT_HOME} XUSER="root" @@ -60,7 +63,7 @@ do_install() { fi } -RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" +RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}" INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." -- 2.21.1 From richard.purdie at linuxfoundation.org Sat Feb 8 13:25:20 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 08 Feb 2020 13:25:20 +0000 Subject: [OE-core] [OE-Core][RESEND PATCH] rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <20200130045446.44017-1-alex.kiernan@gmail.com> References: <20200130045446.44017-1-alex.kiernan@gmail.com> Message-ID: <6403172746ac0772f8c6d0f55838bebe5368e1e8.camel@linuxfoundation.org> On Thu, 2020-01-30 at 04:54 +0000, Alex Kiernan wrote: > With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements > using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the > form: > > bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) > followed by: > LexToken(TOKEN,'write_image_test_data',0,0) > LexToken(COMMA,';',0,0) > LexToken(TOKEN,'set_systemd_default_target',0,0) > LexToken(COMMA,';',0,0) > LexToken(TOKEN,'systemd_create_users',0,0) > > Removing the spaces between the function name and semicolon allows > the list to parse correctly. > > Signed-off-by: Alex Kiernan > --- > > meta/classes/rootfs-postcommands.bbclass | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) This does sound like you're working around a bug in shlex :/ Cheers, Richard From richard.purdie at linuxfoundation.org Sat Feb 8 13:56:00 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 08 Feb 2020 13:56:00 +0000 Subject: [OE-core] Reproducible Build Status (and implications for zeus 3.0.2) In-Reply-To: <836aaccb82a2781c00e26249ab896d7ef0e25a27.camel@linuxfoundation.org> References: <836aaccb82a2781c00e26249ab896d7ef0e25a27.camel@linuxfoundation.org> Message-ID: <6207024170e32fe8ef7262433124efc64d614132.camel@linuxfoundation.org> On Fri, 2020-02-07 at 14:23 +0000, Richard Purdie wrote: > I think we're now down to: > > sudo path issues (Ross is poking) > ncurses-doc issue (assigned to JPEW) > perl host compiler flags issue > sysvinit missing group problem (assigned to Mingli Yu at present) We're now down to: A gstreamer issue with libcap: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13786 and some potential perl host compiler flags leaking in (no bug for that, we've not seen it in the last build and I'm not 100% sure if we fixed it or not yet) I've queued up the recent fixes into zeus-next as I think they're stable material. I'm seriously considering letting 3.0.2 wait a little to include those fixes in an rc2 and abandon rc1. If we do that, we may want to get the bitbake hashequiv+multiconfig fixes in master-next sorted too. Cheers, Richard From alex.kanavin at gmail.com Sat Feb 8 14:47:34 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 8 Feb 2020 15:47:34 +0100 Subject: [OE-core] [PATCH] x265: add x265 recipe In-Reply-To: <065b0daf-ec38-b518-c1ab-195b514e5054@broadcom.com> References: <20200207213440.10462-1-scott.branden@broadcom.com> <073d103e-a32e-ff07-1223-220f9f97dcec@broadcom.com> <065b0daf-ec38-b518-c1ab-195b514e5054@broadcom.com> Message-ID: What I meant is that upstream is actually tagging releases: https://github.com/videolan/x265/releases and therefore we should package the latest release, rather than a random commit. Which means you should name the recipe x265_3.1.2.bb and set SRCREV to match the 3.1.2 tag. Going forward, the recipe should be updated the same way: rename file to the new version, update SRCREV. Another problem is that github is not synced properly with the original x265 repo, and is several months behind. SRC_URI should probably refer to https://bitbucket.org/multicoreware/x265/src/default/ Alternatively, don't use git at all and fetch tarballs: http://ftp.videolan.org/pub/videolan/x265/ Alex On Sat, 8 Feb 2020 at 00:28, Scott Branden wrote: > Hi Alex, > > more comment below about PV. > > On 2020-02-07 2:26 p.m., Scott Branden wrote: > > HI Alex, > > On 2020-02-07 2:09 p.m., Alexander Kanavin wrote: > > Can you also enable x265 in ffmpeg and gstreamer plugins recipes, so there > would be actual users of the codec in oe-core? > > I do have a patch for ffmpeg and have tested that works. I'll add that to > the patch series. > > > Also, x265 git repo does have tagged releases, and so PV/SRCREV in recipe > should be set to match a release tag. > > You'll have to help me out a little here on exactly what you want. > > This is based off the stable tag. > I already specified the SRCREV in the recipe. > > Do you want PV to be: > PV = "stable+git${SRCPV}" > > ? > > I was trying to follow the x264 recipe. > > Do you want me do something like name the recipe x265_stable.bb instead > and not specify PV? > > > Alex > > On Fri, 7 Feb 2020 at 22:35, Scott Branden via Openembedded-core < > openembedded-core at lists.openembedded.org> wrote: > >> Add x265 recipe from latest revision of stable branch. >> >> Signed-off-by: Scott Branden >> --- >> meta/recipes-multimedia/x265/x265_git.bb | 21 +++++++++++++++++++++ >> 1 file changed, 21 insertions(+) >> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >> >> diff --git a/meta/recipes-multimedia/x265/x265_git.bb >> b/meta/recipes-multimedia/x265/x265_git.bb >> new file mode 100644 >> index 0000000000..7c230e2b1e >> --- /dev/null >> +++ b/meta/recipes-multimedia/x265/x265_git.bb >> @@ -0,0 +1,21 @@ >> +SUMMARY = "H.265/HEVC video encoder" >> +DESCRIPTION = "A free software library and application for encoding >> video streams into the H.265/HEVC format." >> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >> + >> +LICENSE = "GPLv2" >> +LICENSE_FLAGS = "commercial" >> +LIC_FILES_CHKSUM = >> "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >> + >> +DEPENDS = "nasm-native" >> +DEPENDS = "gnutls zlib libpcre" >> + >> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ >> + " >> + >> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >> + >> +S = "${WORKDIR}/git/source" >> + >> +inherit lib_package pkgconfig cmake >> + >> +AS[unexport] = "1" >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From akuster808 at gmail.com Sat Feb 8 16:36:27 2020 From: akuster808 at gmail.com (akuster808) Date: Sat, 8 Feb 2020 08:36:27 -0800 Subject: [OE-core] Reproducible Build Status (and implications for zeus 3.0.2) In-Reply-To: <6207024170e32fe8ef7262433124efc64d614132.camel@linuxfoundation.org> References: <836aaccb82a2781c00e26249ab896d7ef0e25a27.camel@linuxfoundation.org> <6207024170e32fe8ef7262433124efc64d614132.camel@linuxfoundation.org> Message-ID: <36734d21-1649-3a14-1355-eb998c0ede12@gmail.com> On 2/8/20 5:56 AM, Richard Purdie wrote: > On Fri, 2020-02-07 at 14:23 +0000, Richard Purdie wrote: >> I think we're now down to: >> >> sudo path issues (Ross is poking) >> ncurses-doc issue (assigned to JPEW) >> perl host compiler flags issue >> sysvinit missing group problem (assigned to Mingli Yu at present) > We're now down to: > > A gstreamer issue with libcap: > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13786 > > and some potential perl host compiler flags leaking in > (no bug for that, we've not seen it in the last build and I'm not 100% > sure if we fixed it or not yet) > > I've queued up the recent fixes into zeus-next as I think they're > stable material. I can not? find your changes so that puts a hold on any zeus work I was planning on doing.? I guess this frees up my weekend.? > > I'm seriously considering letting 3.0.2 wait a little to include those > fixes in an rc2 and abandon rc1. My vote was for rc2 if it counts. > If we do that, we may want to get the > bitbake hashequiv+multiconfig fixes in master-next sorted too. Is we "You" in this case to? - Armin > > Cheers, > > Richard > > > From richard.purdie at linuxfoundation.org Sat Feb 8 16:38:42 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 08 Feb 2020 16:38:42 +0000 Subject: [OE-core] Reproducible Build Status (and implications for zeus 3.0.2) In-Reply-To: <36734d21-1649-3a14-1355-eb998c0ede12@gmail.com> References: <836aaccb82a2781c00e26249ab896d7ef0e25a27.camel@linuxfoundation.org> <6207024170e32fe8ef7262433124efc64d614132.camel@linuxfoundation.org> <36734d21-1649-3a14-1355-eb998c0ede12@gmail.com> Message-ID: <351a57e7950a487d5e6b7ba40d0807fac56582c7.camel@linuxfoundation.org> On Sat, 2020-02-08 at 08:36 -0800, akuster808 wrote: > > On 2/8/20 5:56 AM, Richard Purdie wrote: > > On Fri, 2020-02-07 at 14:23 +0000, Richard Purdie wrote: > > > I think we're now down to: > > > > > > sudo path issues (Ross is poking) > > > ncurses-doc issue (assigned to JPEW) > > > perl host compiler flags issue > > > sysvinit missing group problem (assigned to Mingli Yu at present) > > We're now down to: > > > > A gstreamer issue with libcap: > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13786 > > > > and some potential perl host compiler flags leaking in > > (no bug for that, we've not seen it in the last build and I'm not > > 100% > > sure if we fixed it or not yet) > > > > I've queued up the recent fixes into zeus-next as I think they're > > stable material. > I can not find your changes so that puts a hold on any zeus work I > was planning on doing. I guess this frees up my weekend. Sorry, they're pushed now. My scripts don't seem to update zeus-next for some reason. > > I'm seriously considering letting 3.0.2 wait a little to include > > those > > fixes in an rc2 and abandon rc1. > My vote was for rc2 if it counts. > > If we do that, we may want to get the > > bitbake hashequiv+multiconfig fixes in master-next sorted too. > Is we "You" in this case to? Yes, I merged those to master now. Cheers, Richard From alex.kanavin at gmail.com Sat Feb 8 18:10:27 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 8 Feb 2020 19:10:27 +0100 Subject: [OE-core] [PATCH] qemu: Upgrade to 4.2.0 In-Reply-To: References: <20200204184113.16070-1-alistair.francis@wdc.com> Message-ID: I think this backport should address the problem: https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a88c40f02ace88f09b2a85a64831b277b2ebc88c Alex On Sat, 8 Feb 2020 at 08:45, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > On Tue, 2020-02-04 at 10:41 -0800, Alistair Francis wrote: > > While we are upgrading let's refresh patches and remove the outdated > > patches. > > > > Signed-off-by: Alistair Francis > > I think this stopped qemu running on the autobuilder, we saw many > versions of: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1538 > > Failed to run qemu: qemu: can't parse 'vga' parameter: Invalid argument > > Cheers, > > Richard > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Sat Feb 8 19:01:45 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 8 Feb 2020 11:01:45 -0800 Subject: [OE-core] [PATCH 3/3] chkconfig: remove the recipe In-Reply-To: <20200207194559.527-3-alex.kanavin@gmail.com> References: <20200207194559.527-1-alex.kanavin@gmail.com> <20200207194559.527-3-alex.kanavin@gmail.com> Message-ID: On Fri, Feb 7, 2020 at 11:47 AM Alexander Kanavin wrote: > > chkconfig is one of the options for virtual/update-alternatives, > however opkg-utils have been used as the default for a very long time, > while chkconfig isn't anymore tested in any way, and is stuck > at a very old version due to newer versions requiring selinux. > there are recipes in other layers depending on it. e.g. see 09:40:46 ERROR: Nothing RPROVIDES 'chkconfig' (but /mnt/jenkins/workspace/Yocto-world-clang/sources/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb RDEPENDS on or otherwise requires it) 09:40:48 ERROR: Nothing RPROVIDES 'tigervnc-dev' (but /mnt/jenkins/workspace/Yocto-world-clang/sources/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb RDEPENDS on or otherwise requires it) 09:40:48 No eligible RPROVIDERs exist for 'tigervnc-dev' > [YOCTO #11264] > > Signed-off-by: Alexander Kanavin > --- > meta/conf/distro/include/maintainers.inc | 2 - > .../packagegroups/packagegroup-self-hosted.bb | 1 - > .../chkconfig-alternatives-native_1.3.59.bb | 44 ------------ > .../chkconfig/chkconfig/replace_caddr_t.patch | 33 --------- > .../chkconfig/chkconfig_1.3.58.bb | 71 ------------------- > 5 files changed, 151 deletions(-) > delete mode 100644 meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb > delete mode 100644 meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch > delete mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb > > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc > index a80e85a2f6..c68e9edf63 100644 > --- a/meta/conf/distro/include/maintainers.inc > +++ b/meta/conf/distro/include/maintainers.inc > @@ -94,8 +94,6 @@ RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal " > RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin " > RECIPE_MAINTAINER_pn-ccache = "Robert Yang " > RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao " > -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao " > -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao " > RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao " > RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton " > RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton " > diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > index ea6d567301..9a70b189a4 100644 > --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > @@ -108,7 +108,6 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ > > RDEPENDS_packagegroup-self-hosted-extended = "\ > bzip2 \ > - chkconfig \ > chrpath \ > cpio \ > curl \ > diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb > deleted file mode 100644 > index 87fa8eb605..0000000000 > --- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb > +++ /dev/null > @@ -1,44 +0,0 @@ > -require recipes-extended/chkconfig/chkconfig_1.3.58.bb > - > -SUMMARY = "${SUMMARY_chkconfig-alternatives}" > -DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}" > -DEPENDS = "" > -PROVIDES += "virtual/update-alternatives-native" > -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > - > -# The sysroot branch is 1.3.59 + some git commits from master + --sysroot > -# support for alternatives. > -SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" > -S = "${WORKDIR}/git" > -UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P(\d+(\.\d+)+))" > - > -SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" > -PV = "1.3.59+${SRCPV}" > - > -inherit native > - > -# We want our native recipes to build using the target paths rather than paths > -# into the sysroot, as we may use them to construct the rootfs. As such, we > -# only adjust the paths to match the metadata for the target, not native. > -obey_variables () { > - sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,' ${S}/alternatives.c > -} > - > -do_compile () { > - oe_runmake alternatives > -} > - > -do_install () { > - install -d ${D}${sysconfdir}/alternatives \ > - ${D}${localstatedir}/lib/alternatives > - > - install -D -m 0755 alternatives ${D}${bindir}/alternatives > - install -D -m 0644 alternatives.8 ${D}${mandir}/man8/alternatives.8 > - > - ln -s alternatives ${D}${bindir}/update-alternatives > - ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8 > -} > - > -do_install_append_linuxstdbase() { > - rm -rf ${D}${libdir}/lsb > -} > diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch > deleted file mode 100644 > index 96d1938791..0000000000 > --- a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -caddr_t is a legacy BSD type which was rejected by the POSIX standard. > -Use void * instead. > - > -sys/unitstd.h is not needed and moreover its not available on all C library > -implementations e.g. musl > - > -Upstream-Status: Pending > -Signed-off-by: Khem Raj > -Index: chkconfig-1.3.58/alternatives.c > -=================================================================== > ---- chkconfig-1.3.58.orig/alternatives.c > -+++ chkconfig-1.3.58/alternatives.c > -@@ -22,7 +22,6 @@ > - #include > - #include > - #include > --#include > - #include > - > - #define FLAGS_TEST (1 << 0) > -Index: chkconfig-1.3.58/leveldb.c > -=================================================================== > ---- chkconfig-1.3.58.orig/leveldb.c > -+++ chkconfig-1.3.58/leveldb.c > -@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name > - fstat(fd, &sb); > - > - bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); > -- if (bufstart == ((caddr_t) -1)) { > -+ if (bufstart == ((void*) -1)) { > - close(fd); > - return -1; > - } > diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb > deleted file mode 100644 > index d21dd69704..0000000000 > --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb > +++ /dev/null > @@ -1,71 +0,0 @@ > -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" > -DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \ > -information for system services. Chkconfig manipulates the numerous \ > -symbolic links in /etc/rc.d, to relieve system administrators of some \ > -of the drudgery of manually editing the symbolic links." > - > -RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" > - > -HOMEPAGE = "https://github.com/fedora-sysv" > - > -LICENSE = "GPLv2" > -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" > - > -DEPENDS = "libnewt popt" > -PROVIDES += "virtual/update-alternatives" > - > -PR = "r7" > - > -S = "${WORKDIR}/${BPN}-${BPN}-${PV}" > - > -SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \ > - file://replace_caddr_t.patch \ > - " > - > -SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4" > -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" > - > -S = "${WORKDIR}/git" > - > -inherit gettext > - > -# Makefile uses RPM_OPT_FLAGS to construct CFLAGS > -# > -EXTRA_OEMAKE = "\ > - 'RPM_OPT_FLAGS=${CFLAGS}' \ > - 'LDFLAGS=${LDFLAGS}' \ > - 'BINDIR=${base_sbindir}' \ > - 'SBINDIR=${sbindir}' \ > - 'MANDIR=${mandir}' \ > - 'ALTDIR=${localstatedir}/lib/alternatives' \ > - 'ALTDATADIR=${sysconfdir}/alternatives' \ > -" > - > -do_unpack[postfuncs] += "obey_variables" > -do_unpack[vardeps] += "obey_variables" > -obey_variables () { > - sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h > - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ > - -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ > - -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c > -} > - > -do_install() { > - oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' \ > - 'BINDIR=${sbindir}' install > - install -d ${D}${sysconfdir}/chkconfig.d > -} > - > -PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc" > -SUMMARY_${PN}-alternatives = "Maintain symbolic links determining default commands" > -DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, maintains and displays \ > -information about the symbolic links comprising the alternatives system." > -SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - Documentation files" > -DESCRIPTION_${PN}-alternatives-doc = "${DESCRIPTION_${PN}-alternatives} \ > -This package contains documentation." > -RPROVIDES_${PN}-alternatives += "update-alternatives" > -RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg update-alternatives-dpkg" > -FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternatives \ > - ${sysconfdir}/alternatives ${localstatedir}/lib/alternatives" > -FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \ > - ${mandir}/man8/update-alternatives.8" > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Sat Feb 8 19:18:37 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 8 Feb 2020 11:18:37 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> References: <20200208000110.29065-1-scott.branden@broadcom.com> <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> Message-ID: On Fri, Feb 7, 2020 at 8:02 PM Scott Branden wrote: > > Hi Khem, > > On 2020-02-07 5:12 p.m., Khem Raj wrote: > > > > On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core wrote: >> >> Add x265 recipe from latest revision of stable branch. > > > I wonder if it belongs to core are there deps on it that we need in common metadata > > I simply followed where x264 recipe is located and placed x265 beside it. > Both are needed when enabled in ffmpeg. > > I don't know if that answers your question as to where they should be located. >> idea is to keep small and therefore we should assess the inclusions in core we have many packageconfigs which require packages from other layers so if ffmpeg needs it and is optional then it should be fine to keep it in meta-multimedia and packageconfig in ffmpeg disabled by default. >> >> >> Signed-off-by: Scott Branden >> --- >> meta/recipes-multimedia/x265/x265_git.bb | 20 ++++++++++++++++++++ >> 1 file changed, 20 insertions(+) >> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >> >> diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb >> new file mode 100644 >> index 0000000000..796fbbc13a >> --- /dev/null >> +++ b/meta/recipes-multimedia/x265/x265_git.bb >> @@ -0,0 +1,20 @@ >> +SUMMARY = "H.265/HEVC video encoder" >> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." >> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >> + >> +LICENSE = "GPLv2" >> +LICENSE_FLAGS = "commercial" >> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >> + >> +DEPENDS = "gnutls zlib libpcre" >> + >> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ >> + " >> + >> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >> + >> +S = "${WORKDIR}/git/source" >> + >> +inherit lib_package pkgconfig cmake >> + >> +AS[unexport] = "1" >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > From alex.kiernan at gmail.com Sat Feb 8 19:49:48 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sat, 8 Feb 2020 19:49:48 +0000 Subject: [OE-core] [OE-Core][RESEND PATCH] rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <6403172746ac0772f8c6d0f55838bebe5368e1e8.camel@linuxfoundation.org> References: <20200130045446.44017-1-alex.kiernan@gmail.com> <6403172746ac0772f8c6d0f55838bebe5368e1e8.camel@linuxfoundation.org> Message-ID: On Sat, Feb 8, 2020 at 1:25 PM Richard Purdie wrote: > > On Thu, 2020-01-30 at 04:54 +0000, Alex Kiernan wrote: > > With spaces in ROOTFS_POSTPROCESS_COMMAND attempts to remove elements > > using ROOTFS_POSTPROCESS_COMMAND_remove causes parse failures of the > > form: > > > > bb.pysh.sherrors.ShellSyntaxError: LexToken(COMMA,';',0,0) > > followed by: > > LexToken(TOKEN,'write_image_test_data',0,0) > > LexToken(COMMA,';',0,0) > > LexToken(TOKEN,'set_systemd_default_target',0,0) > > LexToken(COMMA,';',0,0) > > LexToken(TOKEN,'systemd_create_users',0,0) > > > > Removing the spaces between the function name and semicolon allows > > the list to parse correctly. > > > > Signed-off-by: Alex Kiernan > > --- > > > > meta/classes/rootfs-postcommands.bbclass | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > This does sound like you're working around a bug in shlex :/ > Yeah, sorry... I'll see if I can go and have a proper look at the underlying problem! -- Alex Kiernan From akuster808 at gmail.com Sat Feb 8 20:41:32 2020 From: akuster808 at gmail.com (akuster808) Date: Sat, 8 Feb 2020 12:41:32 -0800 Subject: [OE-core] [PATCH 3/3] chkconfig: remove the recipe In-Reply-To: References: <20200207194559.527-1-alex.kanavin@gmail.com> <20200207194559.527-3-alex.kanavin@gmail.com> Message-ID: <5a26efc5-f0a7-1d1b-0cff-d1c6d81d7dd5@gmail.com> On 2/8/20 11:01 AM, Khem Raj wrote: > On Fri, Feb 7, 2020 at 11:47 AM Alexander Kanavin > wrote: >> chkconfig is one of the options for virtual/update-alternatives, >> however opkg-utils have been used as the default for a very long time, >> while chkconfig isn't anymore tested in any way, and is stuck >> at a very old version due to newer versions requiring selinux. >> > there are recipes in other layers depending on it. e.g. see > > 09:40:46 ERROR: Nothing RPROVIDES 'chkconfig' (but > /mnt/jenkins/workspace/Yocto-world-clang/sources/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb > RDEPENDS on or otherwise requires it) > 09:40:48 ERROR: Nothing RPROVIDES 'tigervnc-dev' (but > /mnt/jenkins/workspace/Yocto-world-clang/sources/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb > RDEPENDS on or otherwise requires it) > 09:40:48 No eligible RPROVIDERs exist for 'tigervnc-dev' Should it move to meta-oe then? > > >> [YOCTO #11264] >> >> Signed-off-by: Alexander Kanavin >> --- >> meta/conf/distro/include/maintainers.inc | 2 - >> .../packagegroups/packagegroup-self-hosted.bb | 1 - >> .../chkconfig-alternatives-native_1.3.59.bb | 44 ------------ >> .../chkconfig/chkconfig/replace_caddr_t.patch | 33 --------- >> .../chkconfig/chkconfig_1.3.58.bb | 71 ------------------- >> 5 files changed, 151 deletions(-) >> delete mode 100644 meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb >> delete mode 100644 meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch >> delete mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb >> >> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc >> index a80e85a2f6..c68e9edf63 100644 >> --- a/meta/conf/distro/include/maintainers.inc >> +++ b/meta/conf/distro/include/maintainers.inc >> @@ -94,8 +94,6 @@ RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal " >> RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin " >> RECIPE_MAINTAINER_pn-ccache = "Robert Yang " >> RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao " >> -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao " >> -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao " >> RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao " >> RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton " >> RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton " >> diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb >> index ea6d567301..9a70b189a4 100644 >> --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb >> +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb >> @@ -108,7 +108,6 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ >> >> RDEPENDS_packagegroup-self-hosted-extended = "\ >> bzip2 \ >> - chkconfig \ >> chrpath \ >> cpio \ >> curl \ >> diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb >> deleted file mode 100644 >> index 87fa8eb605..0000000000 >> --- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb >> +++ /dev/null >> @@ -1,44 +0,0 @@ >> -require recipes-extended/chkconfig/chkconfig_1.3.58.bb >> - >> -SUMMARY = "${SUMMARY_chkconfig-alternatives}" >> -DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}" >> -DEPENDS = "" >> -PROVIDES += "virtual/update-alternatives-native" >> -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" >> - >> -# The sysroot branch is 1.3.59 + some git commits from master + --sysroot >> -# support for alternatives. >> -SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" >> -S = "${WORKDIR}/git" >> -UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P(\d+(\.\d+)+))" >> - >> -SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" >> -PV = "1.3.59+${SRCPV}" >> - >> -inherit native >> - >> -# We want our native recipes to build using the target paths rather than paths >> -# into the sysroot, as we may use them to construct the rootfs. As such, we >> -# only adjust the paths to match the metadata for the target, not native. >> -obey_variables () { >> - sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,' ${S}/alternatives.c >> -} >> - >> -do_compile () { >> - oe_runmake alternatives >> -} >> - >> -do_install () { >> - install -d ${D}${sysconfdir}/alternatives \ >> - ${D}${localstatedir}/lib/alternatives >> - >> - install -D -m 0755 alternatives ${D}${bindir}/alternatives >> - install -D -m 0644 alternatives.8 ${D}${mandir}/man8/alternatives.8 >> - >> - ln -s alternatives ${D}${bindir}/update-alternatives >> - ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8 >> -} >> - >> -do_install_append_linuxstdbase() { >> - rm -rf ${D}${libdir}/lsb >> -} >> diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch >> deleted file mode 100644 >> index 96d1938791..0000000000 >> --- a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch >> +++ /dev/null >> @@ -1,33 +0,0 @@ >> -caddr_t is a legacy BSD type which was rejected by the POSIX standard. >> -Use void * instead. >> - >> -sys/unitstd.h is not needed and moreover its not available on all C library >> -implementations e.g. musl >> - >> -Upstream-Status: Pending >> -Signed-off-by: Khem Raj >> -Index: chkconfig-1.3.58/alternatives.c >> -=================================================================== >> ---- chkconfig-1.3.58.orig/alternatives.c >> -+++ chkconfig-1.3.58/alternatives.c >> -@@ -22,7 +22,6 @@ >> - #include >> - #include >> - #include >> --#include >> - #include >> - >> - #define FLAGS_TEST (1 << 0) >> -Index: chkconfig-1.3.58/leveldb.c >> -=================================================================== >> ---- chkconfig-1.3.58.orig/leveldb.c >> -+++ chkconfig-1.3.58/leveldb.c >> -@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name >> - fstat(fd, &sb); >> - >> - bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); >> -- if (bufstart == ((caddr_t) -1)) { >> -+ if (bufstart == ((void*) -1)) { >> - close(fd); >> - return -1; >> - } >> diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb >> deleted file mode 100644 >> index d21dd69704..0000000000 >> --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb >> +++ /dev/null >> @@ -1,71 +0,0 @@ >> -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" >> -DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \ >> -information for system services. Chkconfig manipulates the numerous \ >> -symbolic links in /etc/rc.d, to relieve system administrators of some \ >> -of the drudgery of manually editing the symbolic links." >> - >> -RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" >> - >> -HOMEPAGE = "https://github.com/fedora-sysv" >> - >> -LICENSE = "GPLv2" >> -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" >> - >> -DEPENDS = "libnewt popt" >> -PROVIDES += "virtual/update-alternatives" >> - >> -PR = "r7" >> - >> -S = "${WORKDIR}/${BPN}-${BPN}-${PV}" >> - >> -SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \ >> - file://replace_caddr_t.patch \ >> - " >> - >> -SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4" >> -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" >> - >> -S = "${WORKDIR}/git" >> - >> -inherit gettext >> - >> -# Makefile uses RPM_OPT_FLAGS to construct CFLAGS >> -# >> -EXTRA_OEMAKE = "\ >> - 'RPM_OPT_FLAGS=${CFLAGS}' \ >> - 'LDFLAGS=${LDFLAGS}' \ >> - 'BINDIR=${base_sbindir}' \ >> - 'SBINDIR=${sbindir}' \ >> - 'MANDIR=${mandir}' \ >> - 'ALTDIR=${localstatedir}/lib/alternatives' \ >> - 'ALTDATADIR=${sysconfdir}/alternatives' \ >> -" >> - >> -do_unpack[postfuncs] += "obey_variables" >> -do_unpack[vardeps] += "obey_variables" >> -obey_variables () { >> - sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h >> - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ >> - -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ >> - -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c >> -} >> - >> -do_install() { >> - oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' \ >> - 'BINDIR=${sbindir}' install >> - install -d ${D}${sysconfdir}/chkconfig.d >> -} >> - >> -PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc" >> -SUMMARY_${PN}-alternatives = "Maintain symbolic links determining default commands" >> -DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, maintains and displays \ >> -information about the symbolic links comprising the alternatives system." >> -SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - Documentation files" >> -DESCRIPTION_${PN}-alternatives-doc = "${DESCRIPTION_${PN}-alternatives} \ >> -This package contains documentation." >> -RPROVIDES_${PN}-alternatives += "update-alternatives" >> -RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg update-alternatives-dpkg" >> -FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternatives \ >> - ${sysconfdir}/alternatives ${localstatedir}/lib/alternatives" >> -FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \ >> - ${mandir}/man8/update-alternatives.8" >> -- >> 2.25.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Sat Feb 8 21:56:27 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 08 Feb 2020 21:56:27 +0000 Subject: [OE-core] [PATCH v3] oeqa: Use --disable-maintainer-mode configure option In-Reply-To: <20200208021236.1857972-1-raj.khem@gmail.com> References: <20200208021236.1857972-1-raj.khem@gmail.com> Message-ID: <85beea5aef24489b87c53295b3dbcb0501b2a01d.camel@linuxfoundation.org> On Fri, 2020-02-07 at 18:12 -0800, Khem Raj wrote: > since the versions of autotools might differ, and difference in > timestamps for configure and system can result in reconfigure lets > avoid > that by touching the configure script to match system time > > Avoids > error: newly created file is older than distributed files! > > [YOCTO #13779] > > Suggested-by: Andre McCurdy > Signed-off-by: Khem Raj > --- > v2: Touch configure to match timestamps with system > Move the touch cmd to configure step itself > v3: Use --disable-maintainer-mode I tweaked the commit message but it failed during testing: https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/1545 https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/1541 (and on other arches too) Cheers, Richard From raj.khem at gmail.com Sat Feb 8 23:00:56 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 8 Feb 2020 15:00:56 -0800 Subject: [OE-core] [PATCH 3/3] chkconfig: remove the recipe In-Reply-To: <5a26efc5-f0a7-1d1b-0cff-d1c6d81d7dd5@gmail.com> References: <20200207194559.527-1-alex.kanavin@gmail.com> <20200207194559.527-3-alex.kanavin@gmail.com> <5a26efc5-f0a7-1d1b-0cff-d1c6d81d7dd5@gmail.com> Message-ID: On Sat, Feb 8, 2020 at 12:41 PM akuster808 wrote: > > > On 2/8/20 11:01 AM, Khem Raj wrote: > > On Fri, Feb 7, 2020 at 11:47 AM Alexander Kanavin > > wrote: > >> chkconfig is one of the options for virtual/update-alternatives, > >> however opkg-utils have been used as the default for a very long time, > >> while chkconfig isn't anymore tested in any way, and is stuck > >> at a very old version due to newer versions requiring selinux. > >> > > there are recipes in other layers depending on it. e.g. see > > > > 09:40:46 ERROR: Nothing RPROVIDES 'chkconfig' (but > > > /mnt/jenkins/workspace/Yocto-world-clang/sources/meta-openembedded/meta-oe/recipes-graphics/tigervnc/ > tigervnc_1.10.1.bb > > RDEPENDS on or otherwise requires it) > > 09:40:48 ERROR: Nothing RPROVIDES 'tigervnc-dev' (but > > > /mnt/jenkins/workspace/Yocto-world-clang/sources/meta-openembedded/meta-oe/recipes-graphics/tigervnc/ > tigervnc_1.10.1.bb > > RDEPENDS on or otherwise requires it) > > 09:40:48 No eligible RPROVIDERs exist for 'tigervnc-dev' > > Should it move to meta-oe then? I would prefer to remove the dep instead > > > > > > >> [YOCTO #11264] > >> > >> Signed-off-by: Alexander Kanavin > >> --- > >> meta/conf/distro/include/maintainers.inc | 2 - > >> .../packagegroups/packagegroup-self-hosted.bb | 1 - > >> .../chkconfig-alternatives-native_1.3.59.bb | 44 ------------ > >> .../chkconfig/chkconfig/replace_caddr_t.patch | 33 --------- > >> .../chkconfig/chkconfig_1.3.58.bb | 71 ------------------- > >> 5 files changed, 151 deletions(-) > >> delete mode 100644 meta/recipes-extended/chkconfig/ > chkconfig-alternatives-native_1.3.59.bb > >> delete mode 100644 > meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch > >> delete mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb > >> > >> diff --git a/meta/conf/distro/include/maintainers.inc > b/meta/conf/distro/include/maintainers.inc > >> index a80e85a2f6..c68e9edf63 100644 > >> --- a/meta/conf/distro/include/maintainers.inc > >> +++ b/meta/conf/distro/include/maintainers.inc > >> @@ -94,8 +94,6 @@ RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal < > anuj.mittal at intel.com>" > >> RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin < > alex.kanavin at gmail.com>" > >> RECIPE_MAINTAINER_pn-ccache = "Robert Yang >" > >> RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao >" > >> -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao " > >> -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao < > yi.zhao at windriver.com>" > >> RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao " > >> RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton >" > >> RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton < > ross.burton at intel.com>" > >> diff --git a/meta/recipes-core/packagegroups/ > packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/ > packagegroup-self-hosted.bb > >> index ea6d567301..9a70b189a4 100644 > >> --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > >> +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > >> @@ -108,7 +108,6 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ > >> > >> RDEPENDS_packagegroup-self-hosted-extended = "\ > >> bzip2 \ > >> - chkconfig \ > >> chrpath \ > >> cpio \ > >> curl \ > >> diff --git a/meta/recipes-extended/chkconfig/ > chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/ > chkconfig-alternatives-native_1.3.59.bb > >> deleted file mode 100644 > >> index 87fa8eb605..0000000000 > >> --- a/meta/recipes-extended/chkconfig/ > chkconfig-alternatives-native_1.3.59.bb > >> +++ /dev/null > >> @@ -1,44 +0,0 @@ > >> -require recipes-extended/chkconfig/chkconfig_1.3.58.bb > >> - > >> -SUMMARY = "${SUMMARY_chkconfig-alternatives}" > >> -DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}" > >> -DEPENDS = "" > >> -PROVIDES += "virtual/update-alternatives-native" > >> -LIC_FILES_CHKSUM = > "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > >> - > >> -# The sysroot branch is 1.3.59 + some git commits from master + > --sysroot > >> -# support for alternatives. > >> -SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" > >> -S = "${WORKDIR}/git" > >> -UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P(\d+(\.\d+)+))" > >> - > >> -SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" > >> -PV = "1.3.59+${SRCPV}" > >> - > >> -inherit native > >> - > >> -# We want our native recipes to build using the target paths rather > than paths > >> -# into the sysroot, as we may use them to construct the rootfs. As > such, we > >> -# only adjust the paths to match the metadata for the target, not > native. > >> -obey_variables () { > >> - sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,' > ${S}/alternatives.c > >> -} > >> - > >> -do_compile () { > >> - oe_runmake alternatives > >> -} > >> - > >> -do_install () { > >> - install -d ${D}${sysconfdir}/alternatives \ > >> - ${D}${localstatedir}/lib/alternatives > >> - > >> - install -D -m 0755 alternatives ${D}${bindir}/alternatives > >> - install -D -m 0644 alternatives.8 > ${D}${mandir}/man8/alternatives.8 > >> - > >> - ln -s alternatives ${D}${bindir}/update-alternatives > >> - ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8 > >> -} > >> - > >> -do_install_append_linuxstdbase() { > >> - rm -rf ${D}${libdir}/lsb > >> -} > >> diff --git > a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch > b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch > >> deleted file mode 100644 > >> index 96d1938791..0000000000 > >> --- a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch > >> +++ /dev/null > >> @@ -1,33 +0,0 @@ > >> -caddr_t is a legacy BSD type which was rejected by the POSIX standard. > >> -Use void * instead. > >> - > >> -sys/unitstd.h is not needed and moreover its not available on all C > library > >> -implementations e.g. musl > >> - > >> -Upstream-Status: Pending > >> -Signed-off-by: Khem Raj > >> -Index: chkconfig-1.3.58/alternatives.c > >> -=================================================================== > >> ---- chkconfig-1.3.58.orig/alternatives.c > >> -+++ chkconfig-1.3.58/alternatives.c > >> -@@ -22,7 +22,6 @@ > >> - #include > >> - #include > >> - #include > >> --#include > >> - #include > >> - > >> - #define FLAGS_TEST (1 << 0) > >> -Index: chkconfig-1.3.58/leveldb.c > >> -=================================================================== > >> ---- chkconfig-1.3.58.orig/leveldb.c > >> -+++ chkconfig-1.3.58/leveldb.c > >> -@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name > >> - fstat(fd, &sb); > >> - > >> - bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); > >> -- if (bufstart == ((caddr_t) -1)) { > >> -+ if (bufstart == ((void*) -1)) { > >> - close(fd); > >> - return -1; > >> - } > >> diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb > b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb > >> deleted file mode 100644 > >> index d21dd69704..0000000000 > >> --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb > >> +++ /dev/null > >> @@ -1,71 +0,0 @@ > >> -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" > >> -DESCRIPTION = "Chkconfig is a basic system utility. It updates and > queries runlevel \ > >> -information for system services. Chkconfig manipulates the numerous \ > >> -symbolic links in /etc/rc.d, to relieve system administrators of some \ > >> -of the drudgery of manually editing the symbolic links." > >> - > >> -RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" > >> - > >> -HOMEPAGE = "https://github.com/fedora-sysv" > >> - > >> -LICENSE = "GPLv2" > >> -LIC_FILES_CHKSUM = > "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" > >> - > >> -DEPENDS = "libnewt popt" > >> -PROVIDES += "virtual/update-alternatives" > >> - > >> -PR = "r7" > >> - > >> -S = "${WORKDIR}/${BPN}-${BPN}-${PV}" > >> - > >> -SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \ > >> - file://replace_caddr_t.patch \ > >> - " > >> - > >> -SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4" > >> -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" > >> - > >> -S = "${WORKDIR}/git" > >> - > >> -inherit gettext > >> - > >> -# Makefile uses RPM_OPT_FLAGS to construct CFLAGS > >> -# > >> -EXTRA_OEMAKE = "\ > >> - 'RPM_OPT_FLAGS=${CFLAGS}' \ > >> - 'LDFLAGS=${LDFLAGS}' \ > >> - 'BINDIR=${base_sbindir}' \ > >> - 'SBINDIR=${sbindir}' \ > >> - 'MANDIR=${mandir}' \ > >> - 'ALTDIR=${localstatedir}/lib/alternatives' \ > >> - 'ALTDATADIR=${sysconfdir}/alternatives' \ > >> -" > >> - > >> -do_unpack[postfuncs] += "obey_variables" > >> -do_unpack[vardeps] += "obey_variables" > >> -obey_variables () { > >> - sed -i -e 's,/etc,${sysconfdir},; > s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h > >> - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ > >> - -e > 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ > >> - -e 's,/usr/share/locale,${datadir}/locale,' > ${S}/alternatives.c > >> -} > >> - > >> -do_install() { > >> - oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' > \ > >> - 'BINDIR=${sbindir}' install > >> - install -d ${D}${sysconfdir}/chkconfig.d > >> -} > >> - > >> -PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc" > >> -SUMMARY_${PN}-alternatives = "Maintain symbolic links determining > default commands" > >> -DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, > maintains and displays \ > >> -information about the symbolic links comprising the alternatives > system." > >> -SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - > Documentation files" > >> -DESCRIPTION_${PN}-alternatives-doc = > "${DESCRIPTION_${PN}-alternatives} \ > >> -This package contains documentation." > >> -RPROVIDES_${PN}-alternatives += "update-alternatives" > >> -RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg > update-alternatives-dpkg" > >> -FILES_${PN}-alternatives = "${sbindir}/alternatives > ${sbindir}/update-alternatives \ > >> - ${sysconfdir}/alternatives > ${localstatedir}/lib/alternatives" > >> -FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \ > >> - ${mandir}/man8/update-alternatives.8" > >> -- > >> 2.25.0 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From chris.laplante at agilent.com Sun Feb 9 00:23:40 2020 From: chris.laplante at agilent.com (chris.laplante at agilent.com) Date: Sun, 9 Feb 2020 00:23:40 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> Message-ID: Hi Richard, > > > Anecdotally, we are running Zeus for nightly builds with three > > > multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: > > > fixup" patches and haven't seen any of the BB_UNIHASH errors since. > > > Granted it's only been a week. But before that, hash equiv + > > > multiconfig was unusable due to the BB_UNIHASH errors. > > > > That is a really helpful data point, thanks. I should probably clean up > > those bitbake patches and get them merged then, I couldn't decide if > > they were right or not... > > > > I just picked all your pending changes out of master-next into our > local patch queue - will let you know how it looks when it's finished > cooking! There are two small issues I have observed. One is occasionally I get a lot of undeterministic metadata errors when BB_CACHE_POLICY = "cache", multiconfig, and hash equiv are enabled. The errors are all on recipes for which SRCREV = "${AUTOREV}". It doesn't always happen. But it did just now when I rebased our "zeus-modified" branch onto the upstream "zeus" branch, to get the changes starting with 7dc72fde6edeb5d6ac6b3832530998afeea67cbc. Two is that, sometimes "Initializing tasks" stage appears stuck at 44% for a couple minutes. I traced it down to this code in runqueue.py (line 1168 on zeus): # Iterate over the task list and call into the siggen code dealtwith = set() todeal = set(self.runtaskentries) while len(todeal) > 0: for tid in todeal.copy(): if len(self.runtaskentries[tid].depends - dealtwith) == 0: dealtwith.add(tid) todeal.remove(tid) self.prepare_task_hash(tid) When I instrument the loop to print out the size of "todeal", I see it decrease very slowly, sometimes only a couple at a time. I'm guessing this is because prepare_task_hash is contacting the hash equiv server, in a serial manner here. I'm over my work VPN which makes things extra slow. Is there an opportunity for batching here? Thanks, Chris From tom.hochstein at nxp.com Sun Feb 9 03:00:07 2020 From: tom.hochstein at nxp.com (Tom Hochstein) Date: Sat, 8 Feb 2020 21:00:07 -0600 Subject: [OE-core] [PATCH 1/2] bitbake.conf: Add wayland to DISTRO_FEATURES_FILTER_NATIVESDK Message-ID: <20200209030008.4719-1-tom.hochstein@nxp.com> nativesdk-wayland was not being added to the SDK. This fixes that. Signed-off-by: Tom Hochstein --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2da7c5849a..a93099bf0c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -826,7 +826,7 @@ DISTRO_FEATURES_NATIVESDK ?= "x11" # Normally target distro features will not be applied to native builds: # Native distro features on this list will use the target feature value DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation" -DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation" +DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation wayland" DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig" MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" -- 2.17.1 From tom.hochstein at nxp.com Sun Feb 9 03:00:08 2020 From: tom.hochstein at nxp.com (Tom Hochstein) Date: Sat, 8 Feb 2020 21:00:08 -0600 Subject: [OE-core] [PATCH 2/2] wayland: Fix wayland-scanner missing from SDK In-Reply-To: <20200209030008.4719-1-tom.hochstein@nxp.com> References: <20200209030008.4719-1-tom.hochstein@nxp.com> Message-ID: <20200209030008.4719-2-tom.hochstein@nxp.com> The FILES variable is customized to package wayland-scanner in the target -dev package. However, this is not correct for the nativesdk packages and causes wayland-scanner to be missing from the SDK. Fix the nativesdk packaging by properly limiting the wayland-scanner target packaging. Signed-off-by: Tom Hochstein --- meta/recipes-graphics/wayland/wayland_1.17.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland_1.17.0.bb b/meta/recipes-graphics/wayland/wayland_1.17.0.bb index 12916a0c40..cb4ff2c20b 100644 --- a/meta/recipes-graphics/wayland/wayland_1.17.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.17.0.bb @@ -43,7 +43,7 @@ sysroot_stage_all_append_class-target () { cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ } -FILES_${PN} = "${libdir}/*${SOLIBS}" -FILES_${PN}-dev += "${bindir} ${datadir}/wayland" +FILES_${PN}_class-target = "${libdir}/*${SOLIBS}" +FILES_${PN}-dev_append_class-target = " ${bindir} ${datadir}/wayland" BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From peter.kjellerstedt at axis.com Sun Feb 9 06:05:18 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Sun, 9 Feb 2020 06:05:18 +0000 Subject: [OE-core] [OE-Core][PATCH] rootfs: Make BUILDNAME a weak default in reproducible_build_simple In-Reply-To: References: <20200118054107.101203-1-alex.kiernan@gmail.com> <9242b01969234918b10a8d1c2f494590@XBOX03.axis.com> Message-ID: <9fa587c116f94151a80e97e14c678e1e@XBOX03.axis.com> > -----Original Message----- > From: Alex Kiernan > Sent: den 7 februari 2020 18:04 > To: Peter Kjellerstedt > Cc: openembedded-core at lists.openembedded.org > Subject: Re: [OE-core] [OE-Core][PATCH] rootfs: Make BUILDNAME a weak > default in reproducible_build_simple > > On Fri, Feb 7, 2020 at 4:27 PM Peter Kjellerstedt > wrote: > > > > > -----Original Message----- > > > From: openembedded-core-bounces at lists.openembedded.org core- > > > bounces at lists.openembedded.org> On Behalf Of Alex Kiernan > > > Sent: den 18 januari 2020 06:41 > > > To: openembedded-core at lists.openembedded.org > > > Subject: [OE-core] [OE-Core][PATCH] rootfs: Make BUILDNAME a weak > default > > > in reproducible_build_simple > > > > > > 11e45082ad00 ("rootfs-postcommands.bbclass: improve binary > > > reproducibility") fixed binary reproducibility of /etc/version, but > with > > > the move to reproducibilty in all builds, setting /etc/version to > > > anything other than the default fixed timestamp is tricky because > > > rootfs_reproducible() runs very late. > > > > > > rootfs.py uses BUILDNAME if set for /etc/version, so introduce a weak > > > default for BUILDNAME of "REPRODUCIBLE_TIMESTAMP_ROOTFS", when > enabling > > > reproducible builds hence allowing BUILDNAME to be overridden > elsewhere. > > > > > > Signed-off-by: Alex Kiernan > > > --- > > > > > > meta/classes/reproducible_build_simple.bbclass | 1 + > > > meta/classes/rootfs-postcommands.bbclass | 5 ----- > > > 2 files changed, 1 insertion(+), 5 deletions(-) > > > > > > diff --git a/meta/classes/reproducible_build_simple.bbclass > b/meta/classes/reproducible_build_simple.bbclass > > > index d0842f0f902a..153a07607219 100644 > > > --- a/meta/classes/reproducible_build_simple.bbclass > > > +++ b/meta/classes/reproducible_build_simple.bbclass > > > @@ -7,5 +7,6 @@ export PERL_HASH_SEED = "0" > > > export SOURCE_DATE_EPOCH ??= "1520598896" > > > > > > REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" > > > +BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" > > > > Can we please revert this change? This breaks (all?) other usages > > of ${BUILDNAME}. E.g., the information in tmp/buildstats is totally > > useless now since all builds end up in the same directory > > "tmp/buildstats/1520598896", overwriting each other... > > > > +1; I'd agree that seems rather more broken than the problem I was > trying to fix here. > > -- > Alex Kiernan I guess you can achieve what you originally wanted by introducing some new variable, but I will send a patch to revert the above change for now. //Peter From pkj at axis.com Sun Feb 9 06:06:58 2020 From: pkj at axis.com (Peter Kjellerstedt) Date: Sun, 9 Feb 2020 07:06:58 +0100 Subject: [OE-core] [PATCH] Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" Message-ID: <20200209060658.800-1-pkj@axis.com> This reverts commit 8380df6566db49ef184b837432558750f77f592f. Giving BUILDNAME a static default in reproducible_build_simple.bbclass to have /etc/version be generated with that name lead to other users of BUILDNAME no longer working as expected. E.g., buildstats.bcclass would now write its information in a single directory, overwriting the statistics for each build. Signed-off-by: Peter Kjellerstedt --- meta/classes/reproducible_build_simple.bbclass | 1 - meta/classes/rootfs-postcommands.bbclass | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/reproducible_build_simple.bbclass b/meta/classes/reproducible_build_simple.bbclass index 3e5fd82432..393372993d 100644 --- a/meta/classes/reproducible_build_simple.bbclass +++ b/meta/classes/reproducible_build_simple.bbclass @@ -7,4 +7,3 @@ export PERL_HASH_SEED = "0" export SOURCE_DATE_EPOCH ??= "1520598896" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" -BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e40097444d..2f171836fa 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -356,6 +356,11 @@ python rootfs_log_check_recommends() { # Perform any additional adjustments needed to make rootf binary reproducible rootfs_reproducible () { if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" != "" ]; then + # Convert UTC into %4Y%2m%2d%2H%2M%2S + sformatted=`date -u -d @${REPRODUCIBLE_TIMESTAMP_ROOTFS} +%4Y%2m%2d%2H%2M%2S` + echo $sformatted > ${IMAGE_ROOTFS}/etc/version + bbnote "rootfs_reproducible: set /etc/version to $sformatted" + if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name '%gconf.xml' -print0 | xargs -0r \ sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g' -- 2.21.1 From jupiter.hce at gmail.com Sun Feb 9 06:23:34 2020 From: jupiter.hce at gmail.com (JH) Date: Sun, 9 Feb 2020 17:23:34 +1100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: Hi Gabriele, Thanks for the help. On 2/8/20, Gabriele Zampieri wrote: > If you just want to run the menuconfig run > make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- menuconfig > and > make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- savedefconfig > In any environment. It does not seem the OE / Yocto build issue, rather than the u-boot build issue. I can build OE / Yocto to load my mx6ull_14x14_evk_nand_defconfig to replace the original source git/configs/mx6ull_14x14_evk_nand_defconfig. The git/scripts/kconfig was able to run defconfig mode that git/scripts/kconfig/conf.c and git/scripts/kconfig/confdata.c was able to enable CONFIG_CMD_UBI and to write to the .config based on my mx6ull_14x14_evk_nand_defconfig, but git/scripts/kconfig/conf.c and git/scripts/kconfig/confdata.c were not able to generate CONFIG_CMD_MTDPARTS (I could not find CONFIG_CMD_MTDPARTS when I made menuconig from menu config either). The git/cmd/Makefile requires CONFIG_CMD_MTDPARTS set up to run mtdparts.c, without CONFIG_CMD_MTDPARTS, mtdparts.c was not compiled, and other cmd source files were not compiled, thus missing all dependencies for ubi (undefined reference). Is it buggy in u-boot source downloaded from https://source.codeaurora.org/external/imx/uboot-imx.git (commit "8be98e9322040c655b9e5c9fb2c494e002e3fad9"), or is just my silly stupidity to miss things? Could anyone in u-boot source development help to comment our if https://source.codeaurora.org/external/imx/uboot-imx.git (commit "8be98e9322040c655b9e5c9fb2c494e002e3fad9") works for ubi or not? Or what I could be missing? Apologize to cc source contributors. Thank you. Kind regards, - jh From alex.kiernan at gmail.com Sun Feb 9 07:27:23 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sun, 9 Feb 2020 07:27:23 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> Message-ID: On Sun, Feb 9, 2020 at 12:23 AM chris.laplante at agilent.com wrote: > > Hi Richard, > > > > > Anecdotally, we are running Zeus for nightly builds with three > > > > multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: > > > > fixup" patches and haven't seen any of the BB_UNIHASH errors since. > > > > Granted it's only been a week. But before that, hash equiv + > > > > multiconfig was unusable due to the BB_UNIHASH errors. > > > > > > That is a really helpful data point, thanks. I should probably clean up > > > those bitbake patches and get them merged then, I couldn't decide if > > > they were right or not... > > > > > > > I just picked all your pending changes out of master-next into our > > local patch queue - will let you know how it looks when it's finished > > cooking! > > There are two small issues I have observed. > > One is occasionally I get a lot of undeterministic metadata errors when BB_CACHE_POLICY = "cache", multiconfig, and hash equiv are enabled. The errors are all on recipes for which SRCREV = "${AUTOREV}". It doesn't always happen. But it did just now when I rebased our "zeus-modified" branch onto the upstream "zeus" branch, to get the changes starting with 7dc72fde6edeb5d6ac6b3832530998afeea67cbc. > > Two is that, sometimes "Initializing tasks" stage appears stuck at 44% for a couple minutes. I traced it down to this code in runqueue.py (line 1168 on zeus): > > # Iterate over the task list and call into the siggen code > dealtwith = set() > todeal = set(self.runtaskentries) > while len(todeal) > 0: > for tid in todeal.copy(): > if len(self.runtaskentries[tid].depends - dealtwith) == 0: > dealtwith.add(tid) > todeal.remove(tid) > self.prepare_task_hash(tid) > > When I instrument the loop to print out the size of "todeal", I see it decrease very slowly, sometimes only a couple at a time. I'm guessing this is because prepare_task_hash is contacting the hash equiv server, in a serial manner here. I'm over my work VPN which makes things extra slow. Is there an opportunity for batching here? > I've a new failure: 00:20:59.829 Traceback (most recent call last): 00:20:59.829 File "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/server/process.py", line 278, in ProcessServer.idle_commands(delay=0.1, fds=[, , ]): 00:20:59.829 try: 00:20:59.829 > retval = function(self, data, False) 00:20:59.829 if retval is False: 00:20:59.829 File "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/cooker.py", line 1434, in buildTargetsIdle(server=, rq=, abort=False): 00:20:59.829 try: 00:20:59.829 > retval = rq.execute_runqueue() 00:20:59.829 except runqueue.TaskFailure as exc: 00:20:59.829 File "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", line 1522, in RunQueue.execute_runqueue(): 00:20:59.829 try: 00:20:59.829 > return self._execute_runqueue() 00:20:59.829 except bb.runqueue.TaskFailure: 00:20:59.829 File "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", line 1488, in RunQueue._execute_runqueue(): 00:20:59.829 if self.state is runQueueRunning: 00:20:59.829 > retval = self.rqexe.execute() 00:20:59.829 00:20:59.829 File "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", line 1997, in RunQueueExecute.execute(): 00:20:59.829 else: 00:20:59.829 > self.sqdata.outrightfail.remove(nexttask) 00:20:59.829 if nexttask in self.sqdata.outrightfail: Just testing locally with: diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 71108eeed752..a94a9bb27ae2 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1994,7 +1994,7 @@ class RunQueueExecute: self.sq_task_failoutright(nexttask) return True else: - self.sqdata.outrightfail.remove(nexttask) + self.sqdata.outrightfail.discard(nexttask) if nexttask in self.sqdata.outrightfail: logger.debug(2, 'No package found, so skipping setscene task %s', nexttask) self.sq_task_failoutright(nexttask) -- Alex Kiernan From jupiter.hce at gmail.com Sun Feb 9 09:01:15 2020 From: jupiter.hce at gmail.com (JH) Date: Sun, 9 Feb 2020 20:01:15 +1100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: Changed to https://source.codeaurora.org/external/imx/uboot-imx.git branch imx_v2018.03_4.14.98_2.0.0_ga, it can now support CONFIG_CMD_MTDPARTS ind defconfg, all MTDPARTS error gone, but then 2018.03-r0/git/cmd/ubi.c missed dependencies of del_mtd_partitions, add_mtd_partitions, mtd_get_device_size all in mtdpart.c which can only be enabled by CONFIG_MTD_PARTITIONS: obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o But that CONFIG_MTD_PARTITIONS is not supported in defconfig. Could anyone advise which branch works for UBI? Thank you. Kind regards, - jh From jupiter.hce at gmail.com Sun Feb 9 11:13:14 2020 From: jupiter.hce at gmail.com (JH) Date: Sun, 9 Feb 2020 22:13:14 +1100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: Anyway, hacked the Makefile and mtdpart.c, finally got it compiled to support UBI. I think some latest branch might fix the problems I haven't tested, if not, I am happy to make patches. Thank you all. Kind regards, - jh On 2/9/20, JH wrote: > Changed to https://source.codeaurora.org/external/imx/uboot-imx.git > branch imx_v2018.03_4.14.98_2.0.0_ga, it can now support > CONFIG_CMD_MTDPARTS ind defconfg, all MTDPARTS error gone, but then > 2018.03-r0/git/cmd/ubi.c missed dependencies of del_mtd_partitions, > add_mtd_partitions, mtd_get_device_size all in mtdpart.c which can > only be enabled by CONFIG_MTD_PARTITIONS: > > obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o > > But that CONFIG_MTD_PARTITIONS is not supported in defconfig. > > Could anyone advise which branch works for UBI? > > Thank you. > > Kind regards, > > - jh > From akuster808 at gmail.com Sun Feb 9 16:09:28 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:28 -0800 Subject: [OE-core] [zeus 00/29] Patch review Message-ID: These are the additional changes to help address reproducibility issues and additional fixes we would like to be included in 3.0.2 Please have comments back by Tuesday The following changes since commit 9b1bf083129be2b849db52d4f0eda9eb6077c97e: python2: add ntpath (2020-02-02 18:19:50 -0800) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib stable/zeus-nut http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/zeus-nut Alejandro del Castillo (1): opkg-utils: upgrade to version 0.4.2 Alexander Kanavin (1): perl: do not install files that contain build host specific data Anuj Mittal (3): Revert "bzip2: Fix CVE-2019-12900" curl: fix CVE-2019-15601 cpio: fix CVE-2019-14866 Joshua Watt (2): classes/reproducible_build: Read SDE file later mc: Fix build reproducibility Lee Chee Yang (1): rsync: whitelist CVE-2017-16548 Richard Purdie (17): opkg-utils: Fix reproducibility issues in opkg-build oeqa/reproducible: Improve test output and ensure deb+ipk compared sudo: Set vardir deterministically libxshmfence: Set shm directory deterministically mc: Set zipinfo presence determinstically mc: Fix manpage date indeterminism tar: Fix build determinism, disable rsh patch: Extend to native/nativesdk and depend upon libidn2: Fix reproducibility issue perl: Fix various reproducibile build issues openssl: Fix reproducibility issue iputils: Fix build determinism libinput: Fix determinism issue libgcrypt: Fix determinism issue sysvinit: Fix Reproducibility issue libevdev: Fix determinism issue ncurses: Fix reproducibility issue Ross Burton (2): gtk+3: sort resources for reproducible binaries sudo: specify where target tools are Taras Kondratiuk via Openembedded-core (1): gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' Tom Hochstein (1): devtool/standard.py: Allow recipe to disable menuconfig logic meta/classes/patch.bbclass | 7 + meta/classes/reproducible_build.bbclass | 40 ++- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +- .../openssl/openssl/reproducible.patch | 32 ++ .../openssl/openssl_1.1.1d.bb | 1 + meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-core/ncurses/ncurses.inc | 1 + .../recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 + meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...02-aarch64-ICE-on-Linux-kernel-with-.patch | 95 ++++++ ...Switch-all-scripts-to-use-Python-3.x.patch | 113 ------- ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 44 --- .../opkg-utils/fix-reproducibility.patch | 32 ++ .../opkg-utils/opkg-utils/pipefail.patch | 31 -- ...pkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} | 13 +- meta/recipes-devtools/patch/patch_2.7.6.bb | 3 + .../perl/files/determinism.patch | 81 +++++ meta/recipes-devtools/perl/perl-ptest.inc | 3 + meta/recipes-devtools/perl/perl_5.30.0.bb | 4 + meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 -- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + .../iputils/iputils_s20190709.bb | 3 +- meta/recipes-extended/libidn/libidn2_2.2.0.bb | 3 +- ...Add-option-to-control-configure-args.patch | 99 ++++++ .../recipes-extended/mc/files/nomandate.patch | 21 ++ meta/recipes-extended/mc/mc_4.8.23.bb | 7 +- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.27.bb | 10 +- meta/recipes-extended/tar/tar_1.32.bb | 2 + .../gtk+/gtk+3/sort-resources.patch | 19 ++ meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb | 1 + .../wayland/libinput/determinism.patch | 21 ++ .../wayland/libinput_1.14.1.bb | 4 +- .../xorg-lib/libxshmfence_1.3.bb | 2 + .../curl/curl/CVE-2019-15601.patch | 46 +++ meta/recipes-support/curl/curl_7.66.0.bb | 1 + .../libevdev/libevdev/determinism.patch | 34 ++ .../libevdev/libevdev_1.8.0.bb | 3 +- .../libgcrypt/files/determinism.patch | 32 ++ .../libgcrypt/libgcrypt_1.8.4.bb | 1 + scripts/lib/devtool/standard.py | 6 +- 43 files changed, 933 insertions(+), 252 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} (83%) create mode 100644 meta/recipes-devtools/perl/files/determinism.patch delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch create mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch create mode 100644 meta/recipes-extended/mc/files/nomandate.patch create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2019-15601.patch create mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:29 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:29 -0800 Subject: [OE-core] [zeus 01/29] Revert "bzip2: Fix CVE-2019-12900" In-Reply-To: References: Message-ID: From: Anuj Mittal This reverts commit 175e6cb75ce328d51a9d4ad18c7e09d9fb92c2e1. This change is already in bzip2 1.0.7. The change fixing a regression caused by this change is in 1.0.8 which is the current version in zeus. This isn't resulting in failures because the patch file isn't included in SRC_URI. Signed-off-by: Anuj Mittal --- .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch deleted file mode 100644 index 9859d9d1a2..0000000000 --- a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 28 May 2019 19:35:18 +0200 -Subject: [PATCH] Make sure nSelectors is not out of range - -nSelectors is used in a loop from 0 to nSelectors to access selectorMtf -which is -UChar selectorMtf[BZ_MAX_SELECTORS]; -so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid memory -access -Fixes out of bounds access discovered while fuzzying karchive - -Link: https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc.patch - -Upstream-Status: Backport -CVE: CVE-2019-12900.patch -Signed-off-by: Saloni Jain ---- - decompress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/decompress.c b/decompress.c -index ab6a624..f3db91d 100644 ---- a/decompress.c -+++ b/decompress.c -@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s ) - GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); -- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); -+ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { --- -2.22.0 -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:30 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:30 -0800 Subject: [OE-core] [zeus 02/29] rsync: whitelist CVE-2017-16548 In-Reply-To: References: Message-ID: <842bd7ca21efc6378ba24a8d0bf065c4d0f54f1d.1581264380.git.akuster808@gmail.com> From: Lee Chee Yang patch for this CVE applies to v3.1.3pre1 not for v3.1.3. patch already in v3.1.3. see https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce (From OE-Core rev: 1e2739c821312527010fb0afbde5a20cd3f03d24) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb index ffb1d061c0..152ff02a25 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb @@ -20,6 +20,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +# -16548 required for v3.1.3pre1. Already in v3.1.3. +CVE_CHECK_WHITELIST += " CVE-2017-16548 " + inherit autotools PACKAGECONFIG ??= "acl attr \ -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:31 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:31 -0800 Subject: [OE-core] [zeus 03/29] curl: fix CVE-2019-15601 In-Reply-To: References: Message-ID: From: Anuj Mittal Signed-off-by: Anuj Mittal --- .../curl/curl/CVE-2019-15601.patch | 46 +++++++++++++++++++ meta/recipes-support/curl/curl_7.66.0.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2019-15601.patch diff --git a/meta/recipes-support/curl/curl/CVE-2019-15601.patch b/meta/recipes-support/curl/curl/CVE-2019-15601.patch new file mode 100644 index 0000000000..7bfaae7b21 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2019-15601.patch @@ -0,0 +1,46 @@ +Upstream-Status: Backport [https://github.com/curl/curl/commit/1b71bc532bde8621fd3260843f8197182a467ff2] +CVE: CVE-2019-15601 +Signed-off-by: Anuj Mittal + +From 1b71bc532bde8621fd3260843f8197182a467ff2 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 7 Nov 2019 10:13:01 +0100 +Subject: [PATCH] file: on Windows, refuse paths that start with \\ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +... as that might cause an unexpected SMB connection to a given host +name. + +Reported-by: Fernando Mu?oz +CVE-2019-15601 +Bug: https://curl.haxx.se/docs/CVE-2019-15601.html +--- + lib/file.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/file.c b/lib/file.c +index d349cd9241..166931d7f1 100644 +--- a/lib/file.c ++++ b/lib/file.c +@@ -136,7 +136,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done) + struct Curl_easy *data = conn->data; + char *real_path; + struct FILEPROTO *file = data->req.protop; +- int fd; ++ int fd = -1; + #ifdef DOS_FILESYSTEM + size_t i; + char *actual_path; +@@ -181,7 +181,9 @@ static CURLcode file_connect(struct connectdata *conn, bool *done) + return CURLE_URL_MALFORMAT; + } + +- fd = open_readonly(actual_path, O_RDONLY|O_BINARY); ++ if(strncmp("\\\\", actual_path, 2)) ++ /* refuse to open path that starts with two backslashes */ ++ fd = open_readonly(actual_path, O_RDONLY|O_BINARY); + file->path = actual_path; + #else + if(memchr(real_path, 0, real_path_len)) { diff --git a/meta/recipes-support/curl/curl_7.66.0.bb b/meta/recipes-support/curl/curl_7.66.0.bb index d1975f2460..a54e0536e9 100644 --- a/meta/recipes-support/curl/curl_7.66.0.bb +++ b/meta/recipes-support/curl/curl_7.66.0.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=be5d9e1419c4363f4b32037a2d3b7ffa" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ + file://CVE-2019-15601.patch \ " SRC_URI[md5sum] = "c238aa394e3aa47ca4fcb0491774149f" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:32 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:32 -0800 Subject: [OE-core] [zeus 04/29] cpio: fix CVE-2019-14866 In-Reply-To: References: Message-ID: <3a9872c664cdc5c5a6ac712142ce1d28d6fcd6d1.1581264380.git.akuster808@gmail.com> From: Anuj Mittal Signed-off-by: Anuj Mittal --- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + 2 files changed, 317 insertions(+) create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch diff --git a/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch new file mode 100644 index 0000000000..5d587fc832 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch @@ -0,0 +1,316 @@ +CVE: CVE-2019-14866 +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=7554e3e42cd72f6f8304410c47fe6f8918e9bfd7] +Signed-off-by: Anuj Mittal + +From a052401293e45a13cded5959b258204dae6d0af5 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sun, 3 Nov 2019 23:59:39 +0200 +Subject: [PATCH] Fix CVE-2019-14866 + +* src/copyout.c (to_ascii): Additional argument nul controls whether +to add the terminating nul character. +(field_width_error): Improve diagnostics: print the actual and the +maximum allowed field value. +* src/extern.h (to_ascii, field_width_error): New prototypes. +* src/tar.c (to_oct): Remove. +(to_oct_or_error): New function. +(TO_OCT): New macro. +(write_out_tar_header): Use TO_OCT and to_ascii. Return 0 on +success, 1 on error. +--- + src/copyout.c | 49 ++++++++++++++++++++++-------------- + src/extern.h | 15 +++++++++-- + src/tar.c | 69 ++++++++++++++++++++++++--------------------------- + 3 files changed, 75 insertions(+), 58 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 1f0987a..1ae5477 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -269,26 +269,32 @@ writeout_final_defers (int out_des) + so it should be moved to paxutils too. + Allowed values for logbase are: 1 (binary), 2, 3 (octal), 4 (hex) */ + int +-to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase) ++to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, bool nul) + { + static char codetab[] = "0123456789ABCDEF"; +- int i = digits; +- +- do ++ ++ if (nul) ++ where[--digits] = 0; ++ while (digits > 0) + { +- where[--i] = codetab[(v & ((1 << logbase) - 1))]; ++ where[--digits] = codetab[(v & ((1 << logbase) - 1))]; + v >>= logbase; + } +- while (i); + + return v != 0; + } + +-static void +-field_width_error (const char *filename, const char *fieldname) ++void ++field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul) + { +- error (0, 0, _("%s: field width not sufficient for storing %s"), +- filename, fieldname); ++ char valbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%s"), ++ filename, fieldname, ++ STRINGIFY_BIGINT (value, valbuf), ++ STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8), ++ maxbuf)); + } + + static void +@@ -303,7 +309,7 @@ to_ascii_or_warn (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + field_width_warning (filename, fieldname); + } + +@@ -312,9 +318,9 @@ to_ascii_or_error (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + { +- field_width_error (filename, fieldname); ++ field_width_error (filename, fieldname, n, digits, false); + return 1; + } + return 0; +@@ -371,7 +377,7 @@ write_out_new_ascii_header (const char *magic_string, + _("name size"))) + return 1; + p += 8; +- to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16); ++ to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16, false); + + tape_buffered_write (ascii_header, out_des, sizeof ascii_header); + +@@ -388,7 +394,7 @@ write_out_old_ascii_header (dev_t dev, dev_t rdev, + char ascii_header[76]; + char *p = ascii_header; + +- to_ascii (p, file_hdr->c_magic, 6, LG_8); ++ to_ascii (p, file_hdr->c_magic, 6, LG_8, false); + p += 6; + to_ascii_or_warn (p, dev, 6, LG_8, file_hdr->c_name, _("device number")); + p += 6; +@@ -492,7 +498,10 @@ write_out_binary_header (dev_t rdev, + short_hdr.c_namesize = file_hdr->c_namesize & 0xFFFF; + if (short_hdr.c_namesize != file_hdr->c_namesize) + { +- field_width_error (file_hdr->c_name, _("name size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%u"), ++ file_hdr->c_name, _("name size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFu); + return 1; + } + +@@ -502,7 +511,10 @@ write_out_binary_header (dev_t rdev, + if (((off_t)short_hdr.c_filesizes[0] << 16) + short_hdr.c_filesizes[1] + != file_hdr->c_filesize) + { +- field_width_error (file_hdr->c_name, _("file size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%lu"), ++ file_hdr->c_name, _("file size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFFFFFlu); + return 1; + } + +@@ -552,8 +564,7 @@ write_out_header (struct cpio_file_stat *file_hdr, int out_des) + error (0, 0, _("%s: file name too long"), file_hdr->c_name); + return 1; + } +- write_out_tar_header (file_hdr, out_des); /* FIXME: No error checking */ +- return 0; ++ return write_out_tar_header (file_hdr, out_des); + + case arf_binary: + return write_out_binary_header (makedev (file_hdr->c_rdev_maj, +diff --git a/src/extern.h b/src/extern.h +index e27d662..f9ef56a 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -117,6 +117,10 @@ void print_name_with_quoting (char *p); + /* copyout.c */ + int write_out_header (struct cpio_file_stat *file_hdr, int out_des); + void process_copy_out (void); ++int to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, ++ bool nul); ++void field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul); + + /* copypass.c */ + void process_copy_pass (void); +@@ -145,7 +149,7 @@ int make_path (char *argpath, uid_t owner, gid_t group, + const char *verbose_fmt_string); + + /* tar.c */ +-void write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); ++int write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); + int null_block (long *block, int size); + void read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des); + int otoa (char *s, unsigned long *n); +@@ -204,9 +208,16 @@ void cpio_safer_name_suffix (char *name, bool link_target, + int cpio_create_dir (struct cpio_file_stat *file_hdr, int existing_dir); + void change_dir (void); + +-/* FIXME: These two defines should be defined in paxutils */ ++/* FIXME: The following three should be defined in paxutils */ + #define LG_8 3 + #define LG_16 4 ++/* The maximum uintmax_t value that can be represented with DIGITS digits, ++ assuming that each digit is BITS_PER_DIGIT wide. */ ++#define MAX_VAL_WITH_DIGITS(digits, bits_per_digit) \ ++ ((digits) * (bits_per_digit) < sizeof (uintmax_t) * CHAR_BIT \ ++ ? ((uintmax_t) 1 << ((digits) * (bits_per_digit))) - 1 \ ++ : (uintmax_t) -1) ++ + + uintmax_t from_ascii (char const *where, size_t digs, unsigned logbase); + +diff --git a/src/tar.c b/src/tar.c +index a2ce171..ef58027 100644 +--- a/src/tar.c ++++ b/src/tar.c +@@ -79,36 +79,17 @@ stash_tar_filename (char *prefix, char *filename) + return hold_tar_filename; + } + +-/* Convert a number into a string of octal digits. +- Convert long VALUE into a DIGITS-digit field at WHERE, +- including a trailing space and room for a NUL. DIGITS==3 means +- 1 digit, a space, and room for a NUL. +- +- We assume the trailing NUL is already there and don't fill it in. +- This fact is used by start_header and finish_header, so don't change it! +- +- This is be equivalent to: +- sprintf (where, "%*lo ", digits - 2, value); +- except that sprintf fills in the trailing NUL and we don't. */ +- +-static void +-to_oct (register long value, register int digits, register char *where) ++static int ++to_oct_or_error (uintmax_t value, size_t digits, char *where, char const *field, ++ char const *file) + { +- --digits; /* Leave the trailing NUL slot alone. */ +- +- /* Produce the digits -- at least one. */ +- do ++ if (to_ascii (where, value, digits, LG_8, true)) + { +- where[--digits] = '0' + (char) (value & 7); /* One octal digit. */ +- value >>= 3; ++ field_width_error (file, field, value, digits, true); ++ return 1; + } +- while (digits > 0 && value != 0); +- +- /* Add leading zeroes, if necessary. */ +- while (digits > 0) +- where[--digits] = '0'; ++ return 0; + } +- + + + /* Compute and return a checksum for TAR_HDR, +@@ -134,10 +115,22 @@ tar_checksum (struct tar_header *tar_hdr) + return sum; + } + ++#define TO_OCT(file_hdr, c_fld, digits, tar_hdr, tar_field) \ ++ do \ ++ { \ ++ if (to_oct_or_error (file_hdr -> c_fld, \ ++ digits, \ ++ tar_hdr -> tar_field, \ ++ #tar_field, \ ++ file_hdr->c_name)) \ ++ return 1; \ ++ } \ ++ while (0) ++ + /* Write out header FILE_HDR, including the file name, to file + descriptor OUT_DES. */ + +-void ++int + write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + { + int name_len; +@@ -166,11 +159,11 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + + /* Ustar standard (POSIX.1-1988) requires the mode to contain only 3 octal + digits */ +- to_oct (file_hdr->c_mode & MODE_ALL, 8, tar_hdr->mode); +- to_oct (file_hdr->c_uid, 8, tar_hdr->uid); +- to_oct (file_hdr->c_gid, 8, tar_hdr->gid); +- to_oct (file_hdr->c_filesize, 12, tar_hdr->size); +- to_oct (file_hdr->c_mtime, 12, tar_hdr->mtime); ++ TO_OCT (file_hdr, c_mode & MODE_ALL, 8, tar_hdr, mode); ++ TO_OCT (file_hdr, c_uid, 8, tar_hdr, uid); ++ TO_OCT (file_hdr, c_gid, 8, tar_hdr, gid); ++ TO_OCT (file_hdr, c_filesize, 12, tar_hdr, size); ++ TO_OCT (file_hdr, c_mtime, 12, tar_hdr, mtime); + + switch (file_hdr->c_mode & CP_IFMT) + { +@@ -182,7 +175,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); + tar_hdr->typeflag = LNKTYPE; +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + } + else + tar_hdr->typeflag = REGTYPE; +@@ -208,7 +201,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + than TARLINKNAMESIZE. */ + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + break; + #endif /* CP_IFLNK */ + } +@@ -227,13 +220,15 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + if (name) + strcpy (tar_hdr->gname, name); + +- to_oct (file_hdr->c_rdev_maj, 8, tar_hdr->devmajor); +- to_oct (file_hdr->c_rdev_min, 8, tar_hdr->devminor); ++ TO_OCT (file_hdr, c_rdev_maj, 8, tar_hdr, devmajor); ++ TO_OCT (file_hdr, c_rdev_min, 8, tar_hdr, devminor); + } + +- to_oct (tar_checksum (tar_hdr), 8, tar_hdr->chksum); ++ to_ascii (tar_hdr->chksum, tar_checksum (tar_hdr), 8, LG_8, true); + + tape_buffered_write ((char *) &tar_rec, out_des, TARRECORDSIZE); ++ ++ return 0; + } + + /* Return nonzero iff all the bytes in BLOCK are NUL. +-- +2.24.1 + diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb index 3713bf0b1f..5abe494ebc 100644 --- a/meta/recipes-extended/cpio/cpio_2.12.bb +++ b/meta/recipes-extended/cpio/cpio_2.12.bb @@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Fix-CVE-2015-1197.patch \ file://0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch \ file://0001-Fix-segfault-with-append.patch \ + file://CVE-2019-14866.patch \ " SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:33 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:33 -0800 Subject: [OE-core] [zeus 05/29] devtool/standard.py: Allow recipe to disable menuconfig logic In-Reply-To: References: Message-ID: <2c2b187ec108d0157f6cc30fd9eb8862d8a35214.1581264380.git.akuster808@gmail.com> From: Tom Hochstein u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie Signed-off-by: Peter Kjellerstedt Signed-off-by: Anuj Mittal --- scripts/lib/devtool/standard.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 60c9a046f9..b43c725cf8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -940,8 +940,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' - ' cp ${B}/.config ${S}/.config.baseline\n' - ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' + ' cp ${B}/.config ${S}/.config.baseline\n' + ' ln -sfT ${B}/.config ${S}/.config.new\n' + ' fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:34 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:34 -0800 Subject: [OE-core] [zeus 06/29] gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' In-Reply-To: References: Message-ID: From: Taras Kondratiuk via Openembedded-core Linux kernel compilation for aarch64 triggers ICE if CONFIG_CC_OPTIMIZE_FOR_SIZE=y. The rootcause is GCC bug #91102 'aarch64 ICE on Linux kernel with -Os'. Apply the fix to 9.2. (From OE-Core rev: 14f34d32bfdaa752f5043e62750d2e7b92c4b419) Signed-off-by: Taras Kondratiuk Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...02-aarch64-ICE-on-Linux-kernel-with-.patch | 95 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index c6395998d5..4f068231f3 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -68,6 +68,7 @@ SRC_URI = "\ file://CVE-2019-15847_1.patch \ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ + file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch new file mode 100644 index 0000000000..c37e0bb9dd --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch @@ -0,0 +1,95 @@ +From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 +From: Vladimir Makarov +Date: Wed, 10 Jul 2019 16:07:10 +0000 +Subject: [PATCH] re PR target/91102 (aarch64 ICE on Linux kernel with -Os + starting with r270266) + +2019-07-10 Vladimir Makarov + + PR target/91102 + * lra-constraints.c (process_alt_operands): Don't match user + defined regs only if they are early clobbers. + +2019-07-10 Vladimir Makarov + + PR target/91102 + * gcc.target/aarch64/pr91102.c: New test. + +From-SVN: r273357 +Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/613caed2feb9cfc8158308670b59df3d031ec629] +[takondra: dropped conflicting ChangeLog changes] +Signed-off-by: Taras Kondratiuk +--- + gcc/lra-constraints.c | 17 ++++++++++---- + gcc/testsuite/gcc.target/aarch64/pr91102.c | 26 ++++++++++++++++++++++ + 2 files changed, 39 insertions(+), 4 deletions(-) + create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c + +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c +index cf33da8013e4..6382dbf852b6 100644 +--- a/gcc/lra-constraints.c ++++ b/gcc/lra-constraints.c +@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) + else + { + /* Operands don't match. If the operands are +- different user defined explicit hard registers, +- then we cannot make them match. */ ++ different user defined explicit hard ++ registers, then we cannot make them match ++ when one is early clobber operand. */ + if ((REG_P (*curr_id->operand_loc[nop]) + || SUBREG_P (*curr_id->operand_loc[nop])) + && (REG_P (*curr_id->operand_loc[m]) +@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative) + && REG_P (m_reg) + && HARD_REGISTER_P (m_reg) + && REG_USERVAR_P (m_reg)) +- break; ++ { ++ int i; ++ ++ for (i = 0; i < early_clobbered_regs_num; i++) ++ if (m == early_clobbered_nops[i]) ++ break; ++ if (i < early_clobbered_regs_num ++ || early_clobber_p) ++ break; ++ } + } +- + /* Both operands must allow a reload register, + otherwise we cannot make them match. */ + if (curr_alt[m] == NO_REGS) +diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c +new file mode 100644 +index 000000000000..70b99045a48e +--- /dev/null ++++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c +@@ -0,0 +1,26 @@ ++/* PR target/91102 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++ ++int ++foo (long d, long l) ++{ ++ register long e asm ("x1") = d; ++ register long f asm("x2") = l; ++ asm ("" : : "r" (e), "r" (f)); ++ return 3; ++} ++ ++struct T { int i; int j; }; ++union S { long h; struct T t; }; ++ ++void ++bar (union S b) ++{ ++ while (1) ++ { ++ union S c = b; ++ c.t.j++; ++ b.h = foo (b.h, c.h); ++ } ++} -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:35 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:35 -0800 Subject: [OE-core] [zeus 07/29] opkg-utils: upgrade to version 0.4.2 In-Reply-To: References: Message-ID: From: Alejandro del Castillo - Drop 00001-Switch-all-scripts-to-use-Python-3.x.patch - Drop 00001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch - Drop pipefail.patch (From OE-Core rev: bf51a4a1312562cc9b5944b7dfccba0b3d11dc3c) (From OE-Core rev: 1b71c28e1ca4fddc0f3c340ea4bcd76854ef620c) Signed-off-by: Alejandro del Castillo Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- ...Switch-all-scripts-to-use-Python-3.x.patch | 113 ------------------ ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 44 ------- .../opkg-utils/opkg-utils/pipefail.patch | 31 ----- ...pkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} | 12 +- 4 files changed, 4 insertions(+), 196 deletions(-) delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} (83%) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch deleted file mode 100644 index 691ed50c2b..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch +++ /dev/null @@ -1,113 +0,0 @@ -From d42b23f4fb5d6bd58e92e995fe5befc76efbae0c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 27 Apr 2017 15:47:58 +0300 -Subject: [PATCH] Switch all scripts to use Python 3.x - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - makePackage | 2 +- - opkg-compare-indexes | 2 +- - opkg-graph-deps | 2 +- - opkg-list-fields | 2 +- - opkg-make-index | 2 +- - opkg-show-deps | 2 +- - opkg-unbuild | 2 +- - opkg-update-index | 2 +- - opkg.py | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/makePackage b/makePackage -index 4bdfc56..02124dd 100755 ---- a/makePackage -+++ b/makePackage -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - - # The general algorithm this program follows goes like this: - # Run tar to extract control from control.tar.gz from the package. -diff --git a/opkg-compare-indexes b/opkg-compare-indexes -index b60d20a..80c1263 100755 ---- a/opkg-compare-indexes -+++ b/opkg-compare-indexes -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-graph-deps b/opkg-graph-deps -index 6653fd5..f1e376a 100755 ---- a/opkg-graph-deps -+++ b/opkg-graph-deps -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-list-fields b/opkg-list-fields -index c14a90f..24f7955 100755 ---- a/opkg-list-fields -+++ b/opkg-list-fields -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-make-index b/opkg-make-index -index 3f757f6..2988f9f 100755 ---- a/opkg-make-index -+++ b/opkg-make-index -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ - Utility to create opkg compatible indexes - """ - -diff --git a/opkg-show-deps b/opkg-show-deps -index 153f21e..4e18b4f 100755 ---- a/opkg-show-deps -+++ b/opkg-show-deps -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-unbuild b/opkg-unbuild -index 4f36bec..57642c9 100755 ---- a/opkg-unbuild -+++ b/opkg-unbuild -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - from __future__ import print_function - -diff --git a/opkg-update-index b/opkg-update-index -index 341c1c2..7bff8a1 100755 ---- a/opkg-update-index -+++ b/opkg-update-index -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import - - import sys, os -diff --git a/opkg.py b/opkg.py -index 2ecac8a..7e64de4 100644 ---- a/opkg.py -+++ b/opkg.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Copyright (C) 2001 Alexander S. Guy - # Andern Research Labs - # --- -2.11.0 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index a181169d47..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 59da5577bf8df441c6ca958e50fcb83228702764 Mon Sep 17 00:00:00 2001 -From: Alejandro del Castillo -Date: Thu, 12 Sep 2019 10:24:58 -0500 -Subject: [PATCH] opkg-build: clamp mtimes to SOURCE_DATE_EPOCH - -For reproducible builds, clamp mtimes bigger than SOURCE_DATE_EPOCH to -SOURCE_DATE_EPOCH (build generated files, usually). - -Fixes bugzilla 13450 - -Signed-off-by: Alejandro del Castillo -Signed-off-by: Ross Burton ---- - opkg-build | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/opkg-build b/opkg-build -index dcd2d68..2517a2b 100755 ---- a/opkg-build -+++ b/opkg-build -@@ -297,9 +297,16 @@ mkdir $tmp_dir - - build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}" - -+mtime_args="" -+# --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28. -+# this setting will make sure files generated at build time have consistent mtimes, for reproducible builds. -+if [ ! -z "$SOURCE_DATE_EPOCH" ]; then -+ mtime_args="--mtime=@$build_date --clamp-mtime" -+fi -+ - ( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) - ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -print > $tmp_dir/file_list ) --( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) -+( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) - ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) - rm $tmp_dir/file_list - rm $tmp_dir/control_list --- -2.20.1 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch deleted file mode 100644 index 55ddcc1fd2..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch +++ /dev/null @@ -1,31 +0,0 @@ -We need opkg-build to fail if for example the tar command is passed invalid -options. Without this, we see silently created empty packaged where data.tar -is zero bytes in size. This creates hard to debug problems. - -An example is when reproducible builds are enabled and run on old hosts like -centos7 which has tar < 1.28: - -Subprocess output:tar: unrecognized option '--clamp-mtime' -Try `tar --help' or `tar --usage' for more information. - -Upstream-Status: Pending -Signed-off-by: Richard Purdie - -Index: opkg-utils-0.4.1/opkg-build -=================================================================== ---- opkg-utils-0.4.1.orig/opkg-build -+++ opkg-utils-0.4.1/opkg-build -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - : <<=cut - =head1 NAME -@@ -12,6 +12,7 @@ opkg-build - construct an .opk from a di - # Updated to work on Familiar Pre0.7rc1, with busybox tar. - # Note it Requires: binutils-ar (since the busybox ar can't create) - set -e -+set -o pipefail - - version=1.0 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb similarity index 83% rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index eb6c7a3a6a..6495726500 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -4,19 +4,15 @@ SECTION = "base" HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://opkg.py;beginline=2;endline=18;md5=63ce9e6bcc445181cd9e4baf4b4ccc35" + file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" -SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ - file://0001-Switch-all-scripts-to-use-Python-3.x.patch \ - file://0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch \ - file://pipefail.patch \ +SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" - -SRC_URI[md5sum] = "8c140f835b694a0c27cfb23d2426a02b" -SRC_URI[sha256sum] = "9ea9efdd9fe13661ad251e3a2860c1c93045adcfaa6659c3e86d9748ecda3b6e" +SRC_URI[md5sum] = "cc210650644fcb9bba06ad5ec95a63ec" +SRC_URI[sha256sum] = "5929ad87d541789e0b82d626db01a1201ac48df6f49f2262fcfb86cf815e5d6c" TARGET_CC_ARCH += "${LDFLAGS}" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:36 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:36 -0800 Subject: [OE-core] [zeus 08/29] opkg-utils: Fix reproducibility issues in opkg-build In-Reply-To: References: Message-ID: <7a222381df431a46dd0898c2b90a1d2dda2e0a43.1581264380.git.akuster808@gmail.com> From: Richard Purdie There is a sorting problem with opkg-build where the ipk generated is depending upon the order of files on disk. The reason is the --sort option to tar only influences the orders of files tar reads, not those passed by the -T option. Add in a sort call to resolve this issue. To ensure consistent sorting we also need to force to a specific locale (C) else the results are still not deterministic. (From OE-Core rev: a9b8287984c63420e10329a69f7ac5125f1687f8) (From OE-Core rev: b577a6d923042cfc04e67d470e0987488ea61412) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../opkg-utils/fix-reproducibility.patch | 32 +++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.2.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 0000000000..945979bc8a --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,32 @@ +Fix reproducibility issues in opkg-build + +There is a sorting problem with opkg-build where the ipk generated is depending +upon the order of files on disk. The reason is the --sort option to tar only +influences the orders of files tar reads, not those passed by the -T option. + +Add in a sort call to resolve this issue. To ensure consistent sorting we +also need to force to a specific locale (C) else the results are still not +deterministic. + +RP 2020/2/5 + +Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] +Signed-off-by: Richard Purdie + +Index: opkg-utils-0.4.2/opkg-build +=================================================================== +--- opkg-utils-0.4.2.orig/opkg-build ++++ opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 6495726500..042eec7e0e 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:37 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:37 -0800 Subject: [OE-core] [zeus 09/29] oeqa/reproducible: Improve test output and ensure deb+ipk compared In-Reply-To: References: Message-ID: From: Richard Purdie Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. (From OE-Core rev: 6e2e0480852177db75a6108d77c99c92c4e9950f) (From OE-Core rev: 4d470f48f7fb5e05fba1ca3a59fb4f85d910026e) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index a9110565a9..1b0b5bae70 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -174,6 +174,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -197,6 +199,9 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: - self.fail("The following %s packages are missing or different: %s" % - (c, ' '.join(r.test for r in (result.missing + result.different)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:38 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:38 -0800 Subject: [OE-core] [zeus 10/29] classes/reproducible_build: Read SDE file later In-Reply-To: References: Message-ID: <9e8ee3be00fde21585dd0f593782a89f55ebad7b.1581264380.git.akuster808@gmail.com> From: Joshua Watt Defers the resolution of the SOURCE_DATE_EPOCH until the variable needs to be actually realized with a value. The previous method of loading the value in anonymous python had issues because it could occur before other anonymous python functions that affect the location of the epoch file, such as when a recipe uses AUTOINC/AUTOREV or allarch.bbclass. Also adds more logging to help diagnose issues in the future. [YOCTO #13763] (From OE-Core rev: b3313a10a3eb93f0a3710a35de0404fb49cd6202) (From OE-Core rev: 10515e5f7e38edbc4430e2599062a9ce6fdb42a8) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/classes/reproducible_build.bbclass | 40 +++++++++++++++++++------ 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 39b6e40cac..750eb950f2 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -44,10 +44,12 @@ SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch" SSTATETASKS += "do_deploy_source_date_epoch" do_deploy_source_date_epoch () { - echo "Deploying SDE to ${SDE_DIR}." mkdir -p ${SDE_DEPLOYDIR} if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" fi } @@ -56,7 +58,11 @@ python do_deploy_source_date_epoch_setscene () { bb.utils.mkdirhier(d.getVar('SDE_DIR')) sde_file = os.path.join(d.getVar('SDE_DEPLOYDIR'), '__source_date_epoch.txt') if os.path.exists(sde_file): - os.rename(sde_file, d.getVar('SDE_FILE')) + target = d.getVar('SDE_FILE') + bb.debug(1, "Moving setscene SDE file %s -> %s" % (sde_file, target)) + os.rename(sde_file, target) + else: + bb.debug(1, "%s not found!" % sde_file) } do_deploy_source_date_epoch[dirs] = "${SDE_DEPLOYDIR}" @@ -164,16 +170,32 @@ python do_create_source_date_epoch_stamp() { f.write(str(source_date_epoch)) } +def get_source_date_epoch_value(d): + cached = d.getVar('__CACHED_SOURCE_DATE_EPOCH') + if cached: + return cached + + epochfile = d.getVar('SDE_FILE') + source_date_epoch = 0 + if os.path.isfile(epochfile): + with open(epochfile, 'r') as f: + s = f.read() + try: + source_date_epoch = int(s) + except ValueError: + bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s) + source_date_epoch = 0 + bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) + else: + bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) + + d.setVar('__CACHED_SOURCE_DATE_EPOCH', str(source_date_epoch)) + return str(source_date_epoch) + +export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") - epochfile = d.getVar('SDE_FILE') - source_date_epoch = "0" - if os.path.isfile(epochfile): - with open(epochfile, 'r') as f: - source_date_epoch = f.read() - bb.debug(1, "SOURCE_DATE_EPOCH: %s" % source_date_epoch) - d.setVar('SOURCE_DATE_EPOCH', source_date_epoch) } -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:39 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:39 -0800 Subject: [OE-core] [zeus 11/29] sudo: Set vardir deterministically In-Reply-To: References: Message-ID: From: Richard Purdie Without setting this it will vary depending on which directories are present on the host. [YOCTO #13775] (From OE-Core rev: 39fe849b56d70689846262c31ab7c182c8443923) (From OE-Core rev: 51274c9b195ad00dd6362f352ad9bbf7e9a3e098) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/sudo/sudo_1.8.27.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/sudo/sudo_1.8.27.bb b/meta/recipes-extended/sudo/sudo_1.8.27.bb index 0a11a1b28f..ee3be95644 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.27.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb @@ -19,6 +19,7 @@ EXTRA_OECONF += " \ ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ + --with-vardir=/var/lib/sudo \ " do_install_append () { -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:40 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:40 -0800 Subject: [OE-core] [zeus 12/29] libxshmfence: Set shm directory deterministically In-Reply-To: References: Message-ID: From: Richard Purdie Without setting this it will vary depending on which directories are present on the host. [YOCTO #13778] (From OE-Core rev: 6217c3a7201b34888aa2fbae8b6e490bea545574) (From OE-Core rev: 10357b0bf3f6b34b54c0329e7e392ecf2c7043cd) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index 85a48e4c58..cc45696530 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" +EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" + BBCLASSEXTEND = "native nativesdk" SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:41 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:41 -0800 Subject: [OE-core] [zeus 13/29] mc: Fix build reproducibility In-Reply-To: References: Message-ID: <0b225d2513272072f90b2e5f5a7ff36fddb4d6e3.1581264380.git.akuster808@gmail.com> From: Joshua Watt Fixes some issues with reproducible builds. Adds a patch to allow the configure arguments to be omitted from the build and also explicitly setting some autoconf paths that were picking up hosttools. (From OE-Core rev: f54d60ee8f15229aa515e168b9c7d248663b48fe) (From OE-Core rev: 164d72b7a6ab20940f9a124beaf485be9ddc07ba) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- ...Add-option-to-control-configure-args.patch | 99 +++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 5 +- 2 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch diff --git a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch new file mode 100644 index 0000000000..e76aac8161 --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch @@ -0,0 +1,99 @@ +From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001 +From: Joshua Watt +Date: Sat, 9 Nov 2019 20:01:48 -0600 +Subject: [PATCH] Add option to control configure args + +Embedding the configure time options into the executable can lead to +non-reproducible builds, since configure options often have embedded +paths. Add a configure time option to control if the configure args are +embedded so this can be disabled. + +Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031] +Signed-off-by: Joshua Watt +--- + configure.ac | 6 ++++++ + src/args.c | 6 ++++++ + src/textconf.c | 2 ++ + 3 files changed, 14 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 19d1a76be..a1948f6b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule + AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ + test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) + ++AC_ARG_ENABLE([configure-args], ++ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) ++if test "x$enable_configure_args" != xno; then ++ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) ++fi ++ + AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) + + AC_CONFIG_FILES( +diff --git a/src/args.c b/src/args.c +index baef1a1c8..f8dc24020 100644 +--- a/src/args.c ++++ b/src/args.c +@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE; + #endif /* ENABLE_SUBSHELL */ + static gboolean mc_args__show_datadirs = FALSE; + static gboolean mc_args__show_datadirs_extended = FALSE; ++#ifdef ENABLE_CONFIGURE_ARGS + static gboolean mc_args__show_configure_opts = FALSE; ++#endif + + static GOptionGroup *main_group; + +@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = { + NULL + }, + ++#ifdef ENABLE_CONFIGURE_ARGS + /* show configure options */ + { + "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, +@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = { + N_("Print configure options"), + NULL + }, ++#endif + + { + "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, +@@ -758,11 +762,13 @@ mc_args_show_info (void) + return FALSE; + } + ++#ifdef ENABLE_CONFIGURE_ARGS + if (mc_args__show_configure_opts) + { + show_configure_options (); + return FALSE; + } ++#endif + + return TRUE; + } +diff --git a/src/textconf.c b/src/textconf.c +index 1e0613e58..f39b9e028 100644 +--- a/src/textconf.c ++++ b/src/textconf.c +@@ -232,10 +232,12 @@ show_datadirs_extended (void) + + /* --------------------------------------------------------------------------------------------- */ + ++#ifdef ENABLE_CONFIGURE_ARGS + void + show_configure_options (void) + { + (void) printf ("%s\n", MC_CONFIGURE_ARGS); + } ++#endif + + /* --------------------------------------------------------------------------------------------- */ +-- +2.23.0 + diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 83de8dbb2c..71f61b4848 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -8,6 +8,7 @@ RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ + file://0001-Add-option-to-control-configure-args.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" @@ -21,9 +22,11 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba," PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," -EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" +EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" +CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" +CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:42 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:42 -0800 Subject: [OE-core] [zeus 14/29] mc: Set zipinfo presence determinstically In-Reply-To: References: Message-ID: From: Richard Purdie This value was floating causing differences in generated files. Set it determinstically. (From OE-Core rev: 11d7a9e37c1d3fc21396a98fefc9d34c0b9e784b) (From OE-Core rev: 8f77075425e2ef9c3b5adbf8e5b29e7cfd7b9b7a) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 71f61b4848..5667038a18 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -27,6 +27,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:43 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:43 -0800 Subject: [OE-core] [zeus 15/29] mc: Fix manpage date indeterminism In-Reply-To: References: Message-ID: From: Richard Purdie The man page date can vary depending upon the host perl, e.g. in Russian some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. Rather than depend upon perl-native to fix this, just remove the date from the manpages. (From OE-Core rev: 5553c20f9fa4f35bf711b6b9d5717dcf4bfefafa) (From OE-Core rev: 3653fd41fbc28f70259a00bb0098ec8731526449) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../recipes-extended/mc/files/nomandate.patch | 21 +++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-extended/mc/files/nomandate.patch diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 0000000000..48bd73b110 --- /dev/null +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -0,0 +1,21 @@ +The man page date can vary depending upon the host perl, e.g. in Russian +some versions print '????', others '????' or Polish 'czerwca' or 'czerwiec'. +Rather than depend upon perl-native to fix this, just remove the date from +the manpages. + +RP 2020/2/4 + +Upstream-Status: Inappropriate [OE specficic reproducibility workaround] +Signed-off-by: Richard Purdie + +Index: mc-4.8.23/doc/man/date-of-man-include.am +=================================================================== +--- mc-4.8.23.orig/doc/man/date-of-man-include.am ++++ mc-4.8.23/doc/man/date-of-man-include.am +@@ -1,5 +1,5 @@ + SED_PARAMETERS = \ +- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ ++ -e "s/%DATE_OF_MAN_PAGE%//g" \ + -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s{%prefix%{@prefix@{g" \ + -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 5667038a18..de76591d9b 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -9,6 +9,7 @@ RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://0001-Add-option-to-control-configure-args.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:44 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:44 -0800 Subject: [OE-core] [zeus 16/29] tar: Fix build determinism, disable rsh In-Reply-To: References: Message-ID: <8cd9176a541f682393e76a8792269e9457a82e29.1581264380.git.akuster808@gmail.com> From: Richard Purdie rsh is insecure and obsolete but tar will enable support if the binary is on the host system. Some systems point it at ssh. Lets explictly disable it for now unless someone actually needs/uses this at which point it could become a packageconfig. (From OE-Core rev: d14a4b0db92a9a7d1ff72a2e0faca7f1a23a0b68) (From OE-Core rev: 6bdc5f787af46e9c849947cad06ad40aa401b767) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/tar/tar_1.32.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb index 18f09b5711..ebe6cb0dbd 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.32.bb @@ -22,6 +22,8 @@ PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" +CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" + # Let aclocal use the relative path for the m4 file rather than the # absolute since tar has a lot of m4 files, otherwise there might # be an "Argument list too long" error when it is built in a long/deep -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:45 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:45 -0800 Subject: [OE-core] [zeus 17/29] patch: Extend to native/nativesdk and depend upon In-Reply-To: References: Message-ID: From: Richard Purdie There is a bug in patch 2.7.3 and earlier where index lines in patches can change file modes when they shouldn't: http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 This leaks into debug sources in particular (e.g. tcp-wrappers where source files are read-only). Add the dependency to target recipes to avoid this problem until we can rely on 2.7.4 or later. We could try and remove all index lines from patch files but it will be a losing battle. We could try and identify all the recipes which change modes on files in patches but again, its a losing battle. Instead, compromise and have patch-native as a dependency for target recipes. We use patch-replacement-native since patch-native is in ASSUME_PROVIDED. Also add nativesdk-patch to buildtools-tarball. [YOCTO #13777] (From OE-Core rev: 5ed0840c93804488cd1c1aba6cb382b2434714a5) (From OE-Core rev: fd3bd61a6fe5190c575dc968f3a0be9c1cbf21ed) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/classes/patch.bbclass | 7 +++++++ meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 +++ 3 files changed, 11 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index cd241f1c84..25ec089ae1 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,6 +5,13 @@ QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" +# There is a bug in patch 2.7.3 and earlier where index lines +# in patches can change file modes when they shouldn't: +# http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 +# This leaks into debug sources in particular. Add the dependency +# to target recipes to avoid this problem until we can rely on 2.7.4 or later. +PATCHDEPENDENCY_append_class-target = " patch-replacement-native:do_populate_sysroot" + PATCH_GIT_USER_NAME ?= "OpenEmbedded" PATCH_GIT_USER_EMAIL ?= "oe.patch at oe" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 91df6f1ae9..66201514d7 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-texinfo \ nativesdk-libnss-nis \ nativesdk-rpcsvc-proto \ + nativesdk-patch \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 5d7f55f8dc..b5897b357a 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -22,3 +22,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PROVIDES_append_class-native = " patch-replacement-native" + +BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:46 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:46 -0800 Subject: [OE-core] [zeus 18/29] libidn2: Fix reproducibility issue In-Reply-To: References: Message-ID: <184fd10f91d3f77c7f0726a4672c66678250762a.1581264380.git.akuster808@gmail.com> From: Richard Purdie The previous tweak for reproducibility didn't handle the duplicate whitepace left behind, fix this. [YOCTO #13771] (From OE-Core rev: 0392fcbdc85180581ce7392212808ebb822cc2e8) (From OE-Core rev: ca213de432d8d9d715ef09e17cea2aa1e6666e91) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/libidn/libidn2_2.2.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/libidn/libidn2_2.2.0.bb b/meta/recipes-extended/libidn/libidn2_2.2.0.bb index bcbfdd85b9..71314149e1 100644 --- a/meta/recipes-extended/libidn/libidn2_2.2.0.bb +++ b/meta/recipes-extended/libidn/libidn2_2.2.0.bb @@ -22,7 +22,8 @@ EXTRA_OECONF += "--disable-rpath \ " do_install_append() { - sed -i -e 's|-L${STAGING_LIBDIR}||' ${D}${libdir}/pkgconfig/libidn2.pc + # Need to remove any duplicate whitespace too for reproducibility + sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:47 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:47 -0800 Subject: [OE-core] [zeus 19/29] gtk+3: sort resources for reproducible binaries In-Reply-To: References: Message-ID: <79ea42840c82f3c14d4c735b6c6f5827195d1612.1581264380.git.akuster808@gmail.com> From: Ross Burton The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. (From OE-Core rev: f3675be6be29426688187a135221431a0941d007) (From OE-Core rev: a2a6d9fa4df66a1f52c1c1fec45eedb4199e8162) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../gtk+/gtk+3/sort-resources.patch | 19 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 0000000000..7f87372c52 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb index d79b18bee0..596dee6264 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb @@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ + file://sort-resources.patch \ " SRC_URI[md5sum] = "eeedde01856238114dcf4df3ebc942a5" SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:48 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:48 -0800 Subject: [OE-core] [zeus 20/29] perl: do not install files that contain build host specific data In-Reply-To: References: Message-ID: From: Alexander Kanavin This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] (From OE-Core rev: 2e0f30c4680221c693495e3a0327378d502a518b) (From OE-Core rev: 208efc88fa3c57244b272bf7e7f7f8163f14630c) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.0.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057762..98e3361fcc 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index ba2a8437d4..c567d4e7a2 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -135,6 +135,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:49 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:49 -0800 Subject: [OE-core] [zeus 21/29] perl: Fix various reproducibile build issues In-Reply-To: References: Message-ID: <502af15e2639526687edc038c7e56ecd3feaed86.1581264380.git.akuster808@gmail.com> From: Richard Purdie Add a patch which handles the following issues: a) Remove the \n from configure_attr.sh since it gets quoted differently depending on whether the shell is bash or dash which can cause the test result to be incorrect. Reported upstream: https://github.com/arsv/perl-cross/issues/87 b) Sort the order of the module lists from configure_mods.sh since otherwise the result isn't the same leading to makefile differences. Reported upstream: https://github.com/arsv/perl-cross/issues/88 c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst there for good measure) This needs to go to upstream perl (not done) d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash and "" with dash Reported upstream: https://github.com/arsv/perl-cross/issues/87 (From OE-Core rev: 482fd0d99f989b5a72a25bdf402fb2f219420b5d) (From OE-Core rev: def3a9d748564883d71c506726554df622701b00) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../perl/files/determinism.patch | 81 +++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.0.bb | 1 + 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/determinism.patch diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch new file mode 100644 index 0000000000..ed4d06f5ec --- /dev/null +++ b/meta/recipes-devtools/perl/files/determinism.patch @@ -0,0 +1,81 @@ +Fixes to make the perl build reproducible: + +a) Remove the \n from configure_attr.sh since it gets quoted differently depending on + whether the shell is bash or dash which can cause the test result to be incorrect. + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +b) Sort the order of the module lists from configure_mods.sh since otherwise + the result isn't the same leading to makefile differences. + Reported upstream: https://github.com/arsv/perl-cross/issues/88 + +c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst + there for good measure) + This needs to go to upstream perl (not done) + +d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash + and "" with dash + Reported upstream: https://github.com/arsv/perl-cross/issues/87 + +RP 2020/2/7 + +Upstream-Status: Pending [75% submitted] +Signed-off-by: Richard Purdie ' + try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)' +- try_add 'int main(void) { foo("%i\n", 1234); return 0; }' ++ try_add 'int main(void) { foo("%i", 1234); return 0; }' + try_compile + resdef d_c99_variadic_macros 'supported' 'missing' + fi +Index: perl-5.30.1/cnf/configure_mods.sh +=================================================================== +--- perl-5.30.1.orig/cnf/configure_mods.sh ++++ perl-5.30.1/cnf/configure_mods.sh +@@ -82,7 +82,7 @@ extonlyif() { + } + + definetrimspaces() { +- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'` ++ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs` + define $1 "$v" + } + +Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL ++++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL +@@ -171,7 +171,7 @@ sub postamble + my $lengthsofar = length($str); + my $continuator = ''; + $str .= "$table.c : $enc2xs Makefile.PL"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + $str .= $continuator.' '.$self->catfile($dir,$file); + if ( length($str)-$lengthsofar > 128*$numlines ) +@@ -189,7 +189,7 @@ sub postamble + qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; + open (FILELIST, ">$table.fnm") + || die "Could not open $table.fnm: $!"; +- foreach my $file (@{$tables{$table}}) ++ foreach my $file (sort (@{$tables{$table}})) + { + print FILELIST $self->catfile($dir,$file) . "\n"; + } +Index: perl-5.30.1/cnf/configure +=================================================================== +--- perl-5.30.1.orig/cnf/configure ++++ perl-5.30.1/cnf/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + base=${0%/*}; test -z "$base" && base=. + diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index c567d4e7a2..838e52c67b 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://fix-setgroup.patch \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ + file://determinism.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:50 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:50 -0800 Subject: [OE-core] [zeus 22/29] openssl: Fix reproducibility issue In-Reply-To: References: Message-ID: <499694d329221008111fa86dca0a0957f549b880.1581264380.git.akuster808@gmail.com> From: Richard Purdie There was a build architecture leaking into the target ptest which could vary depending upon host. Remove it as its cosmetic. [YOCTO #13770] (From OE-Core rev: 37db519eedb7eb5cd4f14d05f30f5d580aa7458d) (From OE-Core rev: c31c676319812e6fc036741db2ab8e16eccff723) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../openssl/openssl/reproducible.patch | 32 +++++++++++++++++++ .../openssl/openssl_1.1.1d.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch new file mode 100644 index 0000000000..a24260c95d --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch @@ -0,0 +1,32 @@ +The value for perl_archname can vary depending on the host, e.g. +x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which +makes the ptest package non-reproducible. Its unused other than +these references so drop it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: openssl-1.1.1d/Configure +=================================================================== +--- openssl-1.1.1d.orig/Configure ++++ openssl-1.1.1d/Configure +@@ -286,7 +286,7 @@ if (defined env($local_config_envname)) + # Save away perl command information + $config{perl_cmd} = $^X; + $config{perl_version} = $Config{version}; +-$config{perl_archname} = $Config{archname}; ++#$config{perl_archname} = $Config{archname}; + + $config{prefix}=""; + $config{openssldir}=""; +@@ -2517,7 +2517,7 @@ _____ + @{$config{perlargv}}), "\n"; + print "\nPerl information:\n\n"; + print ' ',$config{perl_cmd},"\n"; +- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n"; ++ print ' ',$config{perl_version},"\n"; + } + if ($dump || $options) { + my $longest = 0; diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 458ae7daf4..169824a8be 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.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-1551.patch \ + file://reproducible.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:51 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:51 -0800 Subject: [OE-core] [zeus 23/29] iputils: Fix build determinism In-Reply-To: References: Message-ID: <1384b8121dc8bbf58454a0952744119b896f2fc1.1581264380.git.akuster808@gmail.com> From: Richard Purdie The suid/setcap code depends on whether setcap is on the host system or not with suid as a fallback. Disable this functionality to be deterministic. (From OE-Core rev: 8b00ec484fb851c301f13145e17707c0167feab1) (From OE-Core rev: 3997c47dea49d583fd48cb03f83c007f61d2cb35) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index 3f9e9917f0..42260f531e 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -32,7 +32,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN inherit meson update-alternatives -EXTRA_OEMESON += "--prefix=${root_prefix}/" +# Have to disable setcap/suid as its not deterministic +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" ALTERNATIVE_PRIORITY = "100" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:52 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:52 -0800 Subject: [OE-core] [zeus 24/29] libinput: Fix determinism issue In-Reply-To: References: Message-ID: From: Richard Purdie The build was injection git information from the wrong git tree, stop this to allow reproducible builds. (From OE-Core rev: c3f6a6113f562ecdb13386c3ff52adb7973980a4) (From OE-Core rev: 22dc9a3314eef5925241a9a961bd79815d3172b6) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../wayland/libinput/determinism.patch | 21 +++++++++++++++++++ .../wayland/libinput_1.14.1.bb | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch new file mode 100644 index 0000000000..cb554030cf --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta/recipes-graphics/wayland/libinput_1.14.1.bb b/meta/recipes-graphics/wayland/libinput_1.14.1.bb index 38bc8d2c33..2c5733f33a 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.1.bb +++ b/meta/recipes-graphics/wayland/libinput_1.14.1.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" DEPENDS = "libevdev udev mtdev" -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://determinism.patch \ +" SRC_URI[md5sum] = "da29a704dc6f7ea2d5aac754db046340" SRC_URI[sha256sum] = "e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:53 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:53 -0800 Subject: [OE-core] [zeus 25/29] libgcrypt: Fix determinism issue In-Reply-To: References: Message-ID: From: Richard Purdie The build was injection git information from the wrong git tree, stop this to allow reproducible builds. (From OE-Core rev: 506b36b6d86b3454fcc3cb85f6229cbe8d14f5b5) (From OE-Core rev: 2b68ffc6d7c45541958f1b0c0b9ca9e39064e096) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libgcrypt/files/determinism.patch | 32 +++++++++++++++++++ .../libgcrypt/libgcrypt_1.8.4.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 0000000000..ad0b8c7950 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb index 1bd355133e..92eb2d257a 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb @@ -26,6 +26,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ file://0001-ecc-Add-mitigation-against-timing-attack.patch \ file://0001-dsa-ecdsa-Fix-use-of-nonce-use-larger-one.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573" SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:54 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:54 -0800 Subject: [OE-core] [zeus 26/29] sudo: specify where target tools are In-Reply-To: References: Message-ID: <2944f0d6e80a4f4c3a4be884cf3e3f6784afd007.1581264380.git.akuster808@gmail.com> From: Ross Burton sudo uses AC_PATH_PROG to find target paths, which means at best potential host-contamination (and reproducible issues) and at worst it thinks sh is at /your/build/path/hosttools/sh. Solve this by explicitly passing the correct paths to configure. (From OE-Core rev: 61650dd8498a093f3bfa93202c9cd2e9a7fb7834) (From OE-Core rev: 6e809474ab686fba6924d8b46fd0b9eab5c66c06) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.27.bb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 15075bcefd..4edfabe510 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sudo/sudo_1.8.27.bb b/meta/recipes-extended/sudo/sudo_1.8.27.bb index ee3be95644..6d470d0373 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.27.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb @@ -15,8 +15,15 @@ SRC_URI[sha256sum] = "7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd3 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:55 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:55 -0800 Subject: [OE-core] [zeus 27/29] sysvinit: Fix Reproducibility issue In-Reply-To: References: Message-ID: <116ac91d4acd1c90d02184c4deb3ab6fbc84d1c4.1581264380.git.akuster808@gmail.com> From: Richard Purdie With a sequence like: bitbake sysvinit bitbake sysvinit -c clean bitbake sysvinit -c package_write_ipk -f then the resulting package has two files with group "root/70" rather than "root/shutdown". The issue is that of do_package is a setscene task, base-passwd isn't present. This patch fixes that dependency but there may be other cases of this problem around. [YOCTO #13776] (From OE-Core rev: 0227e929021263c51d2e7db36224000fecb01f1c) (From OE-Core rev: cbcba43c18d67aea0ba41f019b357fbec6570ee1) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index bfc1283f73..39f612be1f 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb @@ -31,6 +31,7 @@ B = "${S}/src" inherit update-alternatives distro_features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" REQUIRED_DISTRO_FEATURES = "sysvinit" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:56 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:56 -0800 Subject: [OE-core] [zeus 28/29] libevdev: Fix determinism issue In-Reply-To: References: Message-ID: From: Richard Purdie We need to sort python dict output to be deterministic and generate consistent header files. (From OE-Core rev: 75e4cedb986379db2e8a897df52ee1363f9a9a80) (From OE-Core rev: fc6e8e527698a82bf8047d02e0e792c4a1a64449) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../libevdev/libevdev/determinism.patch | 34 +++++++++++++++++++ .../libevdev/libevdev_1.8.0.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 0000000000..33a6076b78 --- /dev/null +++ b/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 84274987d7..46ed5d786a 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" -- 2.17.1 From akuster808 at gmail.com Sun Feb 9 16:09:57 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 9 Feb 2020 08:09:57 -0800 Subject: [OE-core] [zeus 29/29] ncurses: Fix reproducibility issue In-Reply-To: References: Message-ID: From: Richard Purdie The build was deciding whether to rename manpages based upon the presence of /etc/debian_version. Be explicit about the configuration instead and ensure determinism. [YOCTO #13781] (From OE-Core rev: 09c8a28893e7ca94a44232d802e1cb02a8f34b87) (From OE-Core rev: 3d114c08c32578426646f5d97769d2c66fea06cb) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-core/ncurses/ncurses.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc35823..b7bf4c0d81 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. -- 2.17.1 From alex.kiernan at gmail.com Sun Feb 9 16:25:11 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sun, 9 Feb 2020 16:25:11 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> Message-ID: On Sun, Feb 9, 2020 at 7:27 AM Alex Kiernan wrote: > > On Sun, Feb 9, 2020 at 12:23 AM chris.laplante at agilent.com > wrote: > > > > Hi Richard, > > > > > > > Anecdotally, we are running Zeus for nightly builds with three > > > > > multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: > > > > > fixup" patches and haven't seen any of the BB_UNIHASH errors since. > > > > > Granted it's only been a week. But before that, hash equiv + > > > > > multiconfig was unusable due to the BB_UNIHASH errors. > > > > > > > > That is a really helpful data point, thanks. I should probably clean up > > > > those bitbake patches and get them merged then, I couldn't decide if > > > > they were right or not... > > > > > > > > > > I just picked all your pending changes out of master-next into our > > > local patch queue - will let you know how it looks when it's finished > > > cooking! > > > > There are two small issues I have observed. > > > > One is occasionally I get a lot of undeterministic metadata errors when BB_CACHE_POLICY = "cache", multiconfig, and hash equiv are enabled. The errors are all on recipes for which SRCREV = "${AUTOREV}". It doesn't always happen. But it did just now when I rebased our "zeus-modified" branch onto the upstream "zeus" branch, to get the changes starting with 7dc72fde6edeb5d6ac6b3832530998afeea67cbc. > > > > Two is that, sometimes "Initializing tasks" stage appears stuck at 44% for a couple minutes. I traced it down to this code in runqueue.py (line 1168 on zeus): > > > > # Iterate over the task list and call into the siggen code > > dealtwith = set() > > todeal = set(self.runtaskentries) > > while len(todeal) > 0: > > for tid in todeal.copy(): > > if len(self.runtaskentries[tid].depends - dealtwith) == 0: > > dealtwith.add(tid) > > todeal.remove(tid) > > self.prepare_task_hash(tid) > > > > When I instrument the loop to print out the size of "todeal", I see it decrease very slowly, sometimes only a couple at a time. I'm guessing this is because prepare_task_hash is contacting the hash equiv server, in a serial manner here. I'm over my work VPN which makes things extra slow. Is there an opportunity for batching here? > > > > I've a new failure: > > 00:20:59.829 Traceback (most recent call last): > 00:20:59.829 File > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/server/process.py", > line 278, in ProcessServer.idle_commands(delay=0.1, > fds=[ type=SocketKind.SOCK_STREAM, proto=0, laddr=bitbake.sock>, > type=SocketKind.SOCK_STREAM, proto=0, laddr=bitbake.sock>, > ]): > 00:20:59.829 try: > 00:20:59.829 > retval = function(self, data, False) > 00:20:59.829 if retval is False: > 00:20:59.829 File > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/cooker.py", > line 1434, in buildTargetsIdle(server= started)>, rq=, > abort=False): > 00:20:59.829 try: > 00:20:59.829 > retval = rq.execute_runqueue() > 00:20:59.829 except runqueue.TaskFailure as exc: > 00:20:59.829 File > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", > line 1522, in RunQueue.execute_runqueue(): > 00:20:59.829 try: > 00:20:59.829 > return self._execute_runqueue() > 00:20:59.829 except bb.runqueue.TaskFailure: > 00:20:59.829 File > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", > line 1488, in RunQueue._execute_runqueue(): > 00:20:59.829 if self.state is runQueueRunning: > 00:20:59.829 > retval = self.rqexe.execute() > 00:20:59.829 > 00:20:59.829 File > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", > line 1997, in RunQueueExecute.execute(): > 00:20:59.829 else: > 00:20:59.829 > > self.sqdata.outrightfail.remove(nexttask) > 00:20:59.829 if nexttask in self.sqdata.outrightfail: > > Just testing locally with: > > diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py > index 71108eeed752..a94a9bb27ae2 100644 > --- a/bitbake/lib/bb/runqueue.py > +++ b/bitbake/lib/bb/runqueue.py > @@ -1994,7 +1994,7 @@ class RunQueueExecute: > self.sq_task_failoutright(nexttask) > return True > else: > - self.sqdata.outrightfail.remove(nexttask) > + self.sqdata.outrightfail.discard(nexttask) > if nexttask in self.sqdata.outrightfail: > logger.debug(2, 'No package found, so > skipping setscene task %s', nexttask) > self.sq_task_failoutright(nexttask) > That change has got me a clean build to complete end to end, which a rebuild is then successfully using the sstate-cache. But something is upsetting sstate I'm serving back from the jenkins box to a local build, as I'm getting different hashes for the same sstate: akiernan at akiernan-virtual-machine:~/nanohub/build$ find sstate-cache -name '*quilt-native*populate_sysroot*' -ls 2240468 40 -rw-rw-r-- 1 akiernan akiernan 39406 Feb 9 13:53 sstate-cache/universal/ff/29/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:ff29b95eb35bba9a4c2e0857372991e6f08c0e9fcb72f76bc2dfbad5d12cade1_populate_sysroot.tgz.siginfo 2241106 56 -rw-rw-r-- 1 akiernan akiernan 53302 Feb 9 13:53 sstate-cache/universal/ff/29/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:ff29b95eb35bba9a4c2e0857372991e6f08c0e9fcb72f76bc2dfbad5d12cade1_populate_sysroot.tgz 2634859 40 -rw-rw-r-- 1 akiernan akiernan 39387 Feb 9 16:16 sstate-cache/universal/83/30/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:83309dcd3c0c7e2ab03ed24b2a5b8d6bf9e35e7b4c8c27373fd68513c8c2b29e_populate_sysroot.tgz.siginfo 2634858 52 -rw-rw-r-- 1 akiernan akiernan 52543 Feb 9 16:16 sstate-cache/universal/83/30/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:83309dcd3c0c7e2ab03ed24b2a5b8d6bf9e35e7b4c8c27373fd68513c8c2b29e_populate_sysroot.tgz akiernan at akiernan-virtual-machine:~/nanohub/build$ bitbake-diffsigs sstate-cache/universal/ff/29/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:ff29b95eb35bba9a4c2e0857372991e6f08c0e9fcb72f76bc2dfbad5d12cade1_populate_sysroot.tgz.siginfo sstate-cache/universal/83/30/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:83309dcd3c0c7e2ab03ed24b2a5b8d6bf9e35e7b4c8c27373fd68513c8c2b29e_populate_sysroot.tgz.siginfo NOTE: Starting bitbake server... akiernan at akiernan-virtual-machine:~/nanohub/build$ Running dumpsig and diffing them manually I'm none the wiser - other than variables being a in a different order in the two sstate files, they're identical. -- Alex Kiernan From jpewhacker at gmail.com Sun Feb 9 16:37:10 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Sun, 9 Feb 2020 10:37:10 -0600 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> Message-ID: On Sat, Feb 8, 2020, 6:24 PM chris.laplante--- via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > Hi Richard, > > > > > Anecdotally, we are running Zeus for nightly builds with three > > > > multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: > > > > fixup" patches and haven't seen any of the BB_UNIHASH errors since. > > > > Granted it's only been a week. But before that, hash equiv + > > > > multiconfig was unusable due to the BB_UNIHASH errors. > > > > > > That is a really helpful data point, thanks. I should probably clean up > > > those bitbake patches and get them merged then, I couldn't decide if > > > they were right or not... > > > > > > > I just picked all your pending changes out of master-next into our > > local patch queue - will let you know how it looks when it's finished > > cooking! > > There are two small issues I have observed. > > One is occasionally I get a lot of undeterministic metadata errors when > BB_CACHE_POLICY = "cache", multiconfig, and hash equiv are enabled. The > errors are all on recipes for which SRCREV = "${AUTOREV}". It doesn't > always happen. But it did just now when I rebased our "zeus-modified" > branch onto the upstream "zeus" branch, to get the changes starting with > 7dc72fde6edeb5d6ac6b3832530998afeea67cbc. > > Two is that, sometimes "Initializing tasks" stage appears stuck at 44% for > a couple minutes. I traced it down to this code in runqueue.py (line 1168 > on zeus): > > # Iterate over the task list and call into the siggen code > dealtwith = set() > todeal = set(self.runtaskentries) > while len(todeal) > 0: > for tid in todeal.copy(): > if len(self.runtaskentries[tid].depends - dealtwith) == 0: > dealtwith.add(tid) > todeal.remove(tid) > self.prepare_task_hash(tid) > > When I instrument the loop to print out the size of "todeal", I see it > decrease very slowly, sometimes only a couple at a time. I'm guessing this > is because prepare_task_hash is contacting the hash equiv server, in a > serial manner here. I'm over my work VPN which makes things extra slow. Is > there an opportunity for batching here? > Batching is hard because the hashes you request might depend on hashes previous received from the server. It might be possible to figure out these dependencies and submit multiple batch requests, but this would require some work in the code. Another option would be to have some multi-level caching scheme where you can have a local database that mirrors your centralized server. If you have any ideas on how to make it faster, we would love to hear your opinion :) > Thanks, > Chris > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From scott.branden at broadcom.com Sun Feb 9 19:16:57 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Sun, 9 Feb 2020 11:16:57 -0800 Subject: [OE-core] [PATCH] x265: add x265 recipe In-Reply-To: References: <20200207213440.10462-1-scott.branden@broadcom.com> <073d103e-a32e-ff07-1223-220f9f97dcec@broadcom.com> <065b0daf-ec38-b518-c1ab-195b514e5054@broadcom.com> Message-ID: Hi Alex, Thanks for the pointers. Yes, too bad - the github mirror is out of date, it would be nice to have commit history. I will setup x265_3.2.1.bb recipe use tarballs to fetch. On 2020-02-08 6:47 a.m., Alexander Kanavin wrote: > What I meant is that upstream is actually tagging releases: > https://github.com/videolan/x265/releases > and therefore we should package the latest release, rather than a > random commit. > > Which means you should name the recipe x265_3.1.2.bb > and set SRCREV to match the 3.1.2 tag. Going > forward, the recipe should be updated the same way: rename file to the > new version, update SRCREV. > > Another problem is that github is not synced properly with the > original x265 repo, and is several months behind. SRC_URI should > probably refer to https://bitbucket.org/multicoreware/x265/src/default/ > Alternatively, don't use git at all and fetch tarballs: > http://ftp.videolan.org/pub/videolan/x265/ > > Alex > > On Sat, 8 Feb 2020 at 00:28, Scott Branden > wrote: > > Hi Alex, > > more comment below about PV. > > On 2020-02-07 2:26 p.m., Scott Branden wrote: >> HI Alex, >> >> On 2020-02-07 2:09 p.m., Alexander Kanavin wrote: >>> Can you also enable x265 in ffmpeg and gstreamer plugins >>> recipes, so there would be actual users of the codec in oe-core? >> I do have a patch for ffmpeg and have tested that works. I'll add >> that to the patch series. >>> >>> Also, x265 git repo does have tagged releases, and so PV/SRCREV >>> in recipe should be set to match a release tag. >> You'll have to help me out a little here on exactly what you want. >> >> This is based off the stable tag. >> I already specified the SRCREV in the recipe. >> >> Do you want PV to be: >> PV = "stable+git${SRCPV}" >> >> ? > I was trying to follow the x264 recipe. > > Do you want me do something like name the recipe x265_stable.bb > instead and not specify PV? >>> >>> Alex >>> >>> On Fri, 7 Feb 2020 at 22:35, Scott Branden via Openembedded-core >>> >> > wrote: >>> >>> Add x265 recipe from latest revision of stable branch. >>> >>> Signed-off-by: Scott Branden >> > >>> --- >>> ?meta/recipes-multimedia/x265/x265_git.bb >>> | 21 +++++++++++++++++++++ >>> ?1 file changed, 21 insertions(+) >>> ?create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >>> >>> >>> diff --git a/meta/recipes-multimedia/x265/x265_git.bb >>> >>> b/meta/recipes-multimedia/x265/x265_git.bb >>> new file mode 100644 >>> index 0000000000..7c230e2b1e >>> --- /dev/null >>> +++ b/meta/recipes-multimedia/x265/x265_git.bb >>> >>> @@ -0,0 +1,21 @@ >>> +SUMMARY = "H.265/HEVC video encoder" >>> +DESCRIPTION = "A free software library and application for >>> encoding video streams into the H.265/HEVC format." >>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >>> + >>> +LICENSE = "GPLv2" >>> +LICENSE_FLAGS = "commercial" >>> +LIC_FILES_CHKSUM = >>> "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >>> + >>> +DEPENDS = "nasm-native" >>> +DEPENDS = "gnutls zlib libpcre" >>> + >>> +SRC_URI = "git://github.com/videolan/x265;branch=stable >>> \ >>> +? ? ? ? ? " >>> + >>> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >>> + >>> +S = "${WORKDIR}/git/source" >>> + >>> +inherit lib_package pkgconfig cmake >>> + >>> +AS[unexport] = "1" >>> -- >>> 2.17.1 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From scott.branden at broadcom.com Sun Feb 9 19:27:46 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Sun, 9 Feb 2020 11:27:46 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: References: <20200208000110.29065-1-scott.branden@broadcom.com> <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> Message-ID: <2159565f-eaca-697d-0711-e39aeccb1ba2@broadcom.com> On 2020-02-08 11:18 a.m., Khem Raj wrote: > On Fri, Feb 7, 2020 at 8:02 PM Scott Branden wrote: >> Hi Khem, >> >> On 2020-02-07 5:12 p.m., Khem Raj wrote: >> >> >> >> On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core wrote: >>> Add x265 recipe from latest revision of stable branch. >> >> I wonder if it belongs to core are there deps on it that we need in common metadata >> >> I simply followed where x264 recipe is located and placed x265 beside it. >> Both are needed when enabled in ffmpeg. >> >> I don't know if that answers your question as to where they should be located. > idea is to keep small and therefore we should assess the inclusions in core > we have many packageconfigs which require packages from other layers > so if ffmpeg needs it and is optional then it should be fine to keep > it in meta-multimedia and packageconfig in ffmpeg disabled by default. I don't see why x264 would be in core and x265 in meta-multimedia. Both should be moved to meta-multimedia then? I think you would also require a bbappend to fffmpeg recipe to add x264 and x265 to ffmpeg packageconfig. if that is the case, why not move ffmpeg to meta-multimedia as well? > >>> >>> Signed-off-by: Scott Branden >>> --- >>> meta/recipes-multimedia/x265/x265_git.bb | 20 ++++++++++++++++++++ >>> 1 file changed, 20 insertions(+) >>> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >>> >>> diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb >>> new file mode 100644 >>> index 0000000000..796fbbc13a >>> --- /dev/null >>> +++ b/meta/recipes-multimedia/x265/x265_git.bb >>> @@ -0,0 +1,20 @@ >>> +SUMMARY = "H.265/HEVC video encoder" >>> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." >>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >>> + >>> +LICENSE = "GPLv2" >>> +LICENSE_FLAGS = "commercial" >>> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >>> + >>> +DEPENDS = "gnutls zlib libpcre" >>> + >>> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ >>> + " >>> + >>> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >>> + >>> +S = "${WORKDIR}/git/source" >>> + >>> +inherit lib_package pkgconfig cmake >>> + >>> +AS[unexport] = "1" >>> -- >>> 2.17.1 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> From scott.branden at broadcom.com Sun Feb 9 19:33:18 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Sun, 9 Feb 2020 11:33:18 -0800 Subject: [OE-core] [PATCH v3 1/2] x265: add x265 recipe Message-ID: <20200209193319.4378-1-scott.branden@broadcom.com> Add x265 recipe for latest tag of Release_3.2 branch (3.2.1). Signed-off-by: Scott Branden --- meta/recipes-multimedia/x265/x265_3.2.1.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 meta/recipes-multimedia/x265/x265_3.2.1.bb diff --git a/meta/recipes-multimedia/x265/x265_3.2.1.bb b/meta/recipes-multimedia/x265/x265_3.2.1.bb new file mode 100644 index 0000000000..3a41475be7 --- /dev/null +++ b/meta/recipes-multimedia/x265/x265_3.2.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "http://www.videolan.org/developers/x265.html" + +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "nasm-native gnutls zlib libpcre" + +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz" + +S = "${WORKDIR}/x265_${PV}/source" + +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca" +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc" + +inherit lib_package pkgconfig cmake + +AS[unexport] = "1" -- 2.17.1 From scott.branden at broadcom.com Sun Feb 9 19:33:19 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Sun, 9 Feb 2020 11:33:19 -0800 Subject: [OE-core] [PATCH v3 2/2] ffmpeg: add PACKAGECONFIG support for x265 In-Reply-To: <20200209193319.4378-1-scott.branden@broadcom.com> References: <20200209193319.4378-1-scott.branden@broadcom.com> Message-ID: <20200209193319.4378-2-scott.branden@broadcom.com> Add PACKAGECONFIG support for x265 in ffmpeg. Signed-off-by: Scott Branden --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index a3cf0c1a37..0c27663cf6 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -43,7 +43,7 @@ DEPENDS = "nasm-native" inherit autotools pkgconfig PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ - alsa bzlib gpl lzma theora x264 zlib \ + alsa bzlib gpl lzma theora x264 x265 zlib \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" # libraries to build in addition to avutil @@ -74,6 +74,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -- 2.17.1 From scott.branden at broadcom.com Sun Feb 9 20:26:00 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Sun, 9 Feb 2020 12:26:00 -0800 Subject: [OE-core] [PATCH] iproute2: add devlink support to iproute2 Message-ID: <20200209202600.2918-1-scott.branden@broadcom.com> Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden --- meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b8444e..6ef9201258 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl \ + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" do_configure_append () { @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ ${PN}-rtacct \ ${PN}-nstat \ ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- 2.17.1 From raj.khem at gmail.com Sun Feb 9 23:35:01 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 9 Feb 2020 15:35:01 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: <2159565f-eaca-697d-0711-e39aeccb1ba2@broadcom.com> References: <20200208000110.29065-1-scott.branden@broadcom.com> <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> <2159565f-eaca-697d-0711-e39aeccb1ba2@broadcom.com> Message-ID: On Sun, Feb 9, 2020 at 11:27 AM Scott Branden wrote: > > > > On 2020-02-08 11:18 a.m., Khem Raj wrote: > > On Fri, Feb 7, 2020 at 8:02 PM Scott Branden wrote: > >> Hi Khem, > >> > >> On 2020-02-07 5:12 p.m., Khem Raj wrote: > >> > >> > >> > >> On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core wrote: > >>> Add x265 recipe from latest revision of stable branch. > >> > >> I wonder if it belongs to core are there deps on it that we need in common metadata > >> > >> I simply followed where x264 recipe is located and placed x265 beside it. > >> Both are needed when enabled in ffmpeg. > >> > >> I don't know if that answers your question as to where they should be located. > > idea is to keep small and therefore we should assess the inclusions in core > > we have many packageconfigs which require packages from other layers > > so if ffmpeg needs it and is optional then it should be fine to keep > > it in meta-multimedia and packageconfig in ffmpeg disabled by default. > I don't see why x264 would be in core and x265 in meta-multimedia. > Both should be moved to meta-multimedia then? > I followed the thread a bit and I see there are followups where usecase for other recipes in core is now established, where this seemed a leaf package being added to oe-core, So perhaps it should be added to validation loops as well like x264. > I think you would also require a bbappend to fffmpeg recipe to add x264 > and x265 to ffmpeg packageconfig. > if that is the case, why not move ffmpeg to meta-multimedia as well? > You would not go down that line of thought since these packages are in the dependency chain for validating reference images in core along with they being used by other packages from other layers. > > > >>> > >>> Signed-off-by: Scott Branden > >>> --- > >>> meta/recipes-multimedia/x265/x265_git.bb | 20 ++++++++++++++++++++ > >>> 1 file changed, 20 insertions(+) > >>> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb > >>> > >>> diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb > >>> new file mode 100644 > >>> index 0000000000..796fbbc13a > >>> --- /dev/null > >>> +++ b/meta/recipes-multimedia/x265/x265_git.bb > >>> @@ -0,0 +1,20 @@ > >>> +SUMMARY = "H.265/HEVC video encoder" > >>> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." > >>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" > >>> + > >>> +LICENSE = "GPLv2" > >>> +LICENSE_FLAGS = "commercial" > >>> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" > >>> + > >>> +DEPENDS = "gnutls zlib libpcre" > >>> + > >>> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ > >>> + " > >>> + > >>> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" > >>> + > >>> +S = "${WORKDIR}/git/source" > >>> + > >>> +inherit lib_package pkgconfig cmake > >>> + > >>> +AS[unexport] = "1" > >>> -- > >>> 2.17.1 > >>> > >>> -- > >>> _______________________________________________ > >>> Openembedded-core mailing list > >>> Openembedded-core at lists.openembedded.org > >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > >> > From raj.khem at gmail.com Mon Feb 10 00:27:30 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 9 Feb 2020 16:27:30 -0800 Subject: [OE-core] [PATCH] qemuarm: Disable highmem when QB_MACHINE is virt Message-ID: <20200210002730.851991-1-raj.khem@gmail.com> running ptests on qemuarm returns fails since it finds errors in kernel logs like below *********************** Central error: [ 4.338465] pci-host-generic 4010000000.pcie: ECAM ioremap failed *********************** Since its a 32bit kernel 4010000000 address is truncated to 10000000 and ends up in conflicts with VIRT_PCIE_MMIO, which ranges from 0x10000000 to 0x3efeffff This is happening because the linux-yocto kernel is not compiled with LPAE support, however, virt machine for qemuarm assumes that by default Should LPAE be enabled by default in kernel config is a separate question Signed-off-by: Khem Raj --- meta/conf/machine/qemuarm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 26f40b1419..367fcef019 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -11,7 +11,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" -QB_MACHINE = "-machine virt" +QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" -- 2.25.0 From raj.khem at gmail.com Mon Feb 10 03:30:07 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 9 Feb 2020 19:30:07 -0800 Subject: [OE-core] [PATCH v4] oeqa: Use --disable-maintainer-mode configure option Message-ID: <20200210033007.2324804-1-raj.khem@gmail.com> since the versions of autotools might differ on target and build host, plus difference in timestamps for configure and system can result in reconfigure lets avoid that by disabling maintainer mode Avoids error: newly created file is older than distributed files! [YOCTO #13779] Suggested-by: Andre McCurdy Signed-off-by: Khem Raj --- v2: Touch configure to match timestamps with system Move the touch cmd to configure step itself v3: Use --disable-maintainer-mode v4: Remove --disable-maintainer-mode for meta-ide selftest, its not needed meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd37e..d0f91668b2 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('--disable-maintainer-mode','') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb38f..902e93f623 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) -- 2.25.0 From scott.branden at broadcom.com Mon Feb 10 06:15:36 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Sun, 9 Feb 2020 22:15:36 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: References: <20200208000110.29065-1-scott.branden@broadcom.com> <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> <2159565f-eaca-697d-0711-e39aeccb1ba2@broadcom.com> Message-ID: <6cf5b86f-5055-0573-61ab-ad4717af5c2d@broadcom.com> On 2020-02-09 3:35 p.m., Khem Raj wrote: > On Sun, Feb 9, 2020 at 11:27 AM Scott Branden > wrote: >> >> >> On 2020-02-08 11:18 a.m., Khem Raj wrote: >>> On Fri, Feb 7, 2020 at 8:02 PM Scott Branden wrote: >>>> Hi Khem, >>>> >>>> On 2020-02-07 5:12 p.m., Khem Raj wrote: >>>> >>>> >>>> >>>> On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core wrote: >>>>> Add x265 recipe from latest revision of stable branch. >>>> I wonder if it belongs to core are there deps on it that we need in common metadata >>>> >>>> I simply followed where x264 recipe is located and placed x265 beside it. >>>> Both are needed when enabled in ffmpeg. >>>> >>>> I don't know if that answers your question as to where they should be located. >>> idea is to keep small and therefore we should assess the inclusions in core >>> we have many packageconfigs which require packages from other layers >>> so if ffmpeg needs it and is optional then it should be fine to keep >>> it in meta-multimedia and packageconfig in ffmpeg disabled by default. >> I don't see why x264 would be in core and x265 in meta-multimedia. >> Both should be moved to meta-multimedia then? >> > I followed the thread a bit and I see there are followups where > usecase for other recipes in core is now > established, where this seemed a leaf package being added to oe-core, > So perhaps it should be added > to validation loops as well like x264. I leave it to the powers that be to decide where to place this recipe. > >> I think you would also require a bbappend to fffmpeg recipe to add x264 >> and x265 to ffmpeg packageconfig. >> if that is the case, why not move ffmpeg to meta-multimedia as well? >> > You would not go down that line of thought since these packages are in > the dependency chain for validating reference > images in core along with they being used by other packages from other layers. > >>>>> Signed-off-by: Scott Branden >>>>> --- >>>>> meta/recipes-multimedia/x265/x265_git.bb | 20 ++++++++++++++++++++ >>>>> 1 file changed, 20 insertions(+) >>>>> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >>>>> >>>>> diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb >>>>> new file mode 100644 >>>>> index 0000000000..796fbbc13a >>>>> --- /dev/null >>>>> +++ b/meta/recipes-multimedia/x265/x265_git.bb >>>>> @@ -0,0 +1,20 @@ >>>>> +SUMMARY = "H.265/HEVC video encoder" >>>>> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." >>>>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >>>>> + >>>>> +LICENSE = "GPLv2" >>>>> +LICENSE_FLAGS = "commercial" >>>>> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >>>>> + >>>>> +DEPENDS = "gnutls zlib libpcre" >>>>> + >>>>> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ >>>>> + " >>>>> + >>>>> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >>>>> + >>>>> +S = "${WORKDIR}/git/source" >>>>> + >>>>> +inherit lib_package pkgconfig cmake >>>>> + >>>>> +AS[unexport] = "1" >>>>> -- >>>>> 2.17.1 >>>>> >>>>> -- >>>>> _______________________________________________ >>>>> Openembedded-core mailing list >>>>> Openembedded-core at lists.openembedded.org >>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core From pbarker at konsulko.com Mon Feb 10 08:14:16 2020 From: pbarker at konsulko.com (Paul Barker) Date: Mon, 10 Feb 2020 08:14:16 +0000 Subject: [OE-core] Reminder: Yocto Project Technical Team Meeting @ Monthly from 8am on the first Tuesday (PDT) In-Reply-To: <077f01d5dab8$a17a92a0$e46fb7e0$@gmail.com> References: <077f01d5dab8$a17a92a0$e46fb7e0$@gmail.com> Message-ID: Hi Stephen, The link in your email points to the 2019 minutes, I think the current link is https://docs.google.com/document/d/1ly8nyhO14kDNnFcW2QskANXW3ZT7QwKC5wWVDg9dDH4/edit. Thanks, Paul On Mon, 3 Feb 2020 at 17:37, wrote: > > All, > > > > Just a reminder we will hold the monthly Yocto Project Technical Meeting at 8am PST tomorrow. (2/4) > > > > Yocto Project Technical Team Meeting: We encourage people attending the meeting to logon and announce themselves on the Yocto Project IRC chancel during the meeting (optional): > > Yocto IRC: http://webchat.freenode.net/?channels=#yocto > > > > Wiki: https://www.yoctoproject.org/public-virtual-meetings/ > > > > When Monthly from 8am to 8:30am on the first Tuesday Pacific Time > > Where Zoom Meeting: https://zoom.us/j/990892712 > > > > I am tracking the minutes at: https://docs.google.com/document/d/1Y5IIuE-z0Ykdl-DwuzUJh52flOZuhN_TSAfw2tdU9pg/edit?ts=5c06b22d Please request access if you want to assist in editing them. The world should have view access. > > > > Thanks, > > > > Stephen K. Jolley > > Yocto Project Program Manager > > ( Cell: (208) 244-4460 > > * Email: sjolley.yp.pm at gmail.com > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From frieder.schrempf at kontron.de Mon Feb 10 08:07:25 2020 From: frieder.schrempf at kontron.de (Schrempf Frieder) Date: Mon, 10 Feb 2020 08:07:25 +0000 Subject: [OE-core] [zeus 00/29] Patch review In-Reply-To: References: Message-ID: Hi Armin, On 09.02.20 17:09, Armin Kuster wrote: > These are the additional changes to help address reproducibility issues and additional fixes > we would like to be included in 3.0.2 > > Please have comments back by Tuesday I have two questions/comments: 1. When I look at the zeus-next branch, why do I see only patches 7 to 29 from this series applied and what about patches 1 to 6? Am I missing something? 2. Patch 5 (devtool/standard.py: Allow recipe to disable menuconfig logic) goes hand in hand with a change to the u-boot recipe, that is also in master (c634b8db1a8b). This patch seems to be missing here. Regards, Frieder > > The following changes since commit 9b1bf083129be2b849db52d4f0eda9eb6077c97e: > > python2: add ntpath (2020-02-02 18:19:50 -0800) > > are available in the Git repository at: > > git://git.openembedded.org/openembedded-core-contrib stable/zeus-nut > http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/zeus-nut > > Alejandro del Castillo (1): > opkg-utils: upgrade to version 0.4.2 > > Alexander Kanavin (1): > perl: do not install files that contain build host specific data > > Anuj Mittal (3): > Revert "bzip2: Fix CVE-2019-12900" > curl: fix CVE-2019-15601 > cpio: fix CVE-2019-14866 > > Joshua Watt (2): > classes/reproducible_build: Read SDE file later > mc: Fix build reproducibility > > Lee Chee Yang (1): > rsync: whitelist CVE-2017-16548 > > Richard Purdie (17): > opkg-utils: Fix reproducibility issues in opkg-build > oeqa/reproducible: Improve test output and ensure deb+ipk compared > sudo: Set vardir deterministically > libxshmfence: Set shm directory deterministically > mc: Set zipinfo presence determinstically > mc: Fix manpage date indeterminism > tar: Fix build determinism, disable rsh > patch: Extend to native/nativesdk and depend upon > libidn2: Fix reproducibility issue > perl: Fix various reproducibile build issues > openssl: Fix reproducibility issue > iputils: Fix build determinism > libinput: Fix determinism issue > libgcrypt: Fix determinism issue > sysvinit: Fix Reproducibility issue > libevdev: Fix determinism issue > ncurses: Fix reproducibility issue > > Ross Burton (2): > gtk+3: sort resources for reproducible binaries > sudo: specify where target tools are > > Taras Kondratiuk via Openembedded-core (1): > gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' > > Tom Hochstein (1): > devtool/standard.py: Allow recipe to disable menuconfig logic > > meta/classes/patch.bbclass | 7 + > meta/classes/reproducible_build.bbclass | 40 ++- > meta/lib/oeqa/selftest/cases/reproducible.py | 9 +- > .../openssl/openssl/reproducible.patch | 32 ++ > .../openssl/openssl_1.1.1d.bb | 1 + > meta/recipes-core/meta/buildtools-tarball.bb | 1 + > meta/recipes-core/ncurses/ncurses.inc | 1 + > .../recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 + > meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + > ...02-aarch64-ICE-on-Linux-kernel-with-.patch | 95 ++++++ > ...Switch-all-scripts-to-use-Python-3.x.patch | 113 ------- > ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 44 --- > .../opkg-utils/fix-reproducibility.patch | 32 ++ > .../opkg-utils/opkg-utils/pipefail.patch | 31 -- > ...pkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} | 13 +- > meta/recipes-devtools/patch/patch_2.7.6.bb | 3 + > .../perl/files/determinism.patch | 81 +++++ > meta/recipes-devtools/perl/perl-ptest.inc | 3 + > meta/recipes-devtools/perl/perl_5.30.0.bb | 4 + > meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + > .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 -- > .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ > meta/recipes-extended/cpio/cpio_2.12.bb | 1 + > .../iputils/iputils_s20190709.bb | 3 +- > meta/recipes-extended/libidn/libidn2_2.2.0.bb | 3 +- > ...Add-option-to-control-configure-args.patch | 99 ++++++ > .../recipes-extended/mc/files/nomandate.patch | 21 ++ > meta/recipes-extended/mc/mc_4.8.23.bb | 7 +- > meta/recipes-extended/sudo/sudo.inc | 2 +- > meta/recipes-extended/sudo/sudo_1.8.27.bb | 10 +- > meta/recipes-extended/tar/tar_1.32.bb | 2 + > .../gtk+/gtk+3/sort-resources.patch | 19 ++ > meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb | 1 + > .../wayland/libinput/determinism.patch | 21 ++ > .../wayland/libinput_1.14.1.bb | 4 +- > .../xorg-lib/libxshmfence_1.3.bb | 2 + > .../curl/curl/CVE-2019-15601.patch | 46 +++ > meta/recipes-support/curl/curl_7.66.0.bb | 1 + > .../libevdev/libevdev/determinism.patch | 34 ++ > .../libevdev/libevdev_1.8.0.bb | 3 +- > .../libgcrypt/files/determinism.patch | 32 ++ > .../libgcrypt/libgcrypt_1.8.4.bb | 1 + > scripts/lib/devtool/standard.py | 6 +- > 43 files changed, 933 insertions(+), 252 deletions(-) > create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch > create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch > delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch > delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch > create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch > delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch > rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} (83%) > create mode 100644 meta/recipes-devtools/perl/files/determinism.patch > delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch > create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch > create mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch > create mode 100644 meta/recipes-extended/mc/files/nomandate.patch > create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch > create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch > create mode 100644 meta/recipes-support/curl/curl/CVE-2019-15601.patch > create mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch > create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch > From pbarker at konsulko.com Mon Feb 10 08:23:52 2020 From: pbarker at konsulko.com (Paul Barker) Date: Mon, 10 Feb 2020 08:23:52 +0000 Subject: [OE-core] [PATCH 1/1] runit: Add runit and related recipes In-Reply-To: <24a8b4f8d4bdcf67fcae933539008f9f109c9fae.1580403003.git.raj.khem@gmail.com> References: <24a8b4f8d4bdcf67fcae933539008f9f109c9fae.1580403003.git.raj.khem@gmail.com> Message-ID: On Fri, 31 Jan 2020 at 09:32, Khem Raj wrote: > > * Another init system, very small in size with application life > cycle management > * Add runit-services recipe for additional runit services from void linux > * socklog is a system/kernel logger > * Add socklog-services to provide additional logging services > > * disable the chkshsgr tests in socklog > > Running the chkhsgr test during cross compile fails > > ./chkshsgr || ( cat warn-shsgr; exit 1 ) > Oops. Your getgroups() returned 0, and setgroups() failed; this means > that I can't reliably do my shsgr test. Please either ``make'' as root > or ``make'' while you're in one or more supplementary groups. > > All OE based targets have working getgroups()/setgroups() > implementation, so its a safe assumption and therefore make the test > to be a dummy > > Signed-off-by: Khem Raj I do like the idea of having another init system supported as both systemd and sysvinit have their issues in some use cases. However, this may be better off in a meta-runit layer so we don't spread our resources too thinly in oe-core. > --- > meta/conf/distro/include/maintainers.inc | 2 + > meta/conf/layer.conf | 1 + > meta/recipes-core/runit/runit-serialgetty.bb | 43 ++++++++ > .../runit/runit-serialgetty/finish | 2 + > meta/recipes-core/runit/runit-serialgetty/run | 2 + > meta/recipes-core/runit/runit-services.bb | 50 +++++++++ > ...y-for-services-on-Debian-is-etc-servi.diff | 87 +++++++++++++++ > ...t-nosync-file-to-make-sync-on-shutdow.diff | 95 ++++++++++++++++ > ...03-utmpset.c-mixes-int32_t-and-time_t.diff | 57 ++++++++++ > ...-t-use-static-to-link-runit-runit-ini.diff | 30 ++++++ > .../0005-patch-etc-runit-2-for-FHS.patch | 17 +++ > ...0006-make-buildsystem-respect-CFLAGS.patch | 21 ++++ > .../runit/0007-move-communication-files.patch | 102 ++++++++++++++++++ > .../runit/0008-emulate-sysv-runlevel-5.patch | 20 ++++ > .../runit/0009-fix-error-in-manpage.patch | 23 ++++ > meta/recipes-core/runit/runit/clearmem.patch | 22 ++++ > meta/recipes-core/runit/runit/cross.patch | 50 +++++++++ > ...h-disable-chkshgrp-test-that-fails-i.patch | 19 ++++ > ...h-fix-spin-lock-on-systems-with-poor.patch | 20 ++++ > ...h-make-build-system-print-compilatio.patch | 15 +++ > meta/recipes-core/runit/runit/svlogd.patch | 19 ++++ > meta/recipes-core/runit/runit_2.1.2.bb | 68 ++++++++++++ > meta/recipes-core/runit/socklog-services.bb | 23 ++++ > ...-options-to-cp-to-ensure-proper-mods.patch | 33 ++++++ > meta/recipes-core/runit/socklog/cross.patch | 58 ++++++++++ > meta/recipes-core/runit/socklog_2.1.0.bb | 32 ++++++ > 26 files changed, 911 insertions(+) > create mode 100644 meta/recipes-core/runit/runit-serialgetty.bb > create mode 100644 meta/recipes-core/runit/runit-serialgetty/finish > create mode 100644 meta/recipes-core/runit/runit-serialgetty/run > create mode 100644 meta/recipes-core/runit/runit-services.bb > create mode 100644 meta/recipes-core/runit/runit/0001-default-directory-for-services-on-Debian-is-etc-servi.diff > create mode 100644 meta/recipes-core/runit/runit/0002-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff > create mode 100644 meta/recipes-core/runit/runit/0003-utmpset.c-mixes-int32_t-and-time_t.diff > create mode 100644 meta/recipes-core/runit/runit/0004-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff > create mode 100644 meta/recipes-core/runit/runit/0005-patch-etc-runit-2-for-FHS.patch > create mode 100644 meta/recipes-core/runit/runit/0006-make-buildsystem-respect-CFLAGS.patch > create mode 100644 meta/recipes-core/runit/runit/0007-move-communication-files.patch > create mode 100644 meta/recipes-core/runit/runit/0008-emulate-sysv-runlevel-5.patch > create mode 100644 meta/recipes-core/runit/runit/0009-fix-error-in-manpage.patch > create mode 100644 meta/recipes-core/runit/runit/clearmem.patch > create mode 100644 meta/recipes-core/runit/runit/cross.patch > create mode 100644 meta/recipes-core/runit/runit/patch-disable-chkshgrp-test-that-fails-i.patch > create mode 100644 meta/recipes-core/runit/runit/patch-fix-spin-lock-on-systems-with-poor.patch > create mode 100644 meta/recipes-core/runit/runit/patch-make-build-system-print-compilatio.patch > create mode 100644 meta/recipes-core/runit/runit/svlogd.patch > create mode 100644 meta/recipes-core/runit/runit_2.1.2.bb > create mode 100644 meta/recipes-core/runit/socklog-services.bb > create mode 100644 meta/recipes-core/runit/socklog-services/0001-Use-options-to-cp-to-ensure-proper-mods.patch > create mode 100644 meta/recipes-core/runit/socklog/cross.patch > create mode 100644 meta/recipes-core/runit/socklog_2.1.0.bb > > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc > index a80e85a2f6..5e79dc3892 100644 > --- a/meta/conf/distro/include/maintainers.inc > +++ b/meta/conf/distro/include/maintainers.inc > @@ -616,6 +616,8 @@ RECIPE_MAINTAINER_pn-rsync = "Yi Zhao " > RECIPE_MAINTAINER_pn-rt-tests = "Alexander Kanavin " > RECIPE_MAINTAINER_pn-ruby = "Ross Burton " > RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton " > +RECIPE_MAINTAINER_pn-runit = "Khem Raj " > +RECIPE_MAINTAINER_pn-runit-serialgetty = "Khem Raj " > RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster " > RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton " > RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen " > diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf > index fcdf9ae5a3..07d9a9e32d 100644 > --- a/meta/conf/layer.conf > +++ b/meta/conf/layer.conf > @@ -35,6 +35,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ > keymaps \ > udev-extraconf \ > packagegroup-x11-xserver \ > + runit-serialgetty \ > systemd-serialgetty \ > initscripts \ > shadow \ > diff --git a/meta/recipes-core/runit/runit-serialgetty.bb b/meta/recipes-core/runit/runit-serialgetty.bb > new file mode 100644 > index 0000000000..780a74bafa > --- /dev/null > +++ b/meta/recipes-core/runit/runit-serialgetty.bb > @@ -0,0 +1,43 @@ > +# Copyright (C) 2017 Khem Raj > +# Released under the MIT license (see COPYING.MIT for the terms) > + > +DESCRIPTION = "Serial terminal support for runit" > + > +SECTION = "base utils" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > + > +INHIBIT_DEFAULT_DEPS = "1" > + > +SRC_URI = "\ > + file://run \ > + file://finish \ > +" > + > +S = "${WORKDIR}" > + > +SERIAL_CONSOLES ??= "115200;ttyS0" > + > +do_install() { > + install -d ${D}${sysconfdir}/service ${D}${sysconfdir}/runit/runsvdir/default > + tmp="${SERIAL_CONSOLES}" > + for i in $tmp > + do > + baudrate=`echo $i | sed 's/\;.*//'` > + ttydev=`echo $i | sed -e 's/^[0-9]*\;//' -e 's/\;.*//'` > + install -d ${D}${sysconfdir}/sv/getty-${ttydev} > + install -m 755 ${WORKDIR}/run ${D}${sysconfdir}/sv/getty-${ttydev} > + install -m 755 ${WORKDIR}/finish ${D}${sysconfdir}/sv/getty-${ttydev} > + sed -i -e s/\@BAUDRATE\@/$baudrate/g ${D}${sysconfdir}/sv/getty-${ttydev}/run > + sed -i -e s/\@BAUDRATE\@/$baudrate/g ${D}${sysconfdir}/sv/getty-${ttydev}/finish > + sed -i -e s/\@TTY\@/$ttydev/g ${D}${sysconfdir}/sv/getty-${ttydev}/run > + sed -i -e s/\@TTY\@/$ttydev/g ${D}${sysconfdir}/sv/getty-${ttydev}/finish > + ln -s ${localstatedir}/run/sv.getty-${ttydev} ${D}${sysconfdir}/sv/getty-${ttydev}/supervise > + ln -s ${sysconfdir}/sv/getty-${ttydev} ${D}${sysconfdir}/service/getty-${ttydev} > + ln -s ${sysconfdir}/sv/getty-${ttydev} ${D}${sysconfdir}/runit/runsvdir/default/getty-${ttydev} > + done > +} > +# Since SERIAL_CONSOLES is likely to be set from the machine configuration > +PACKAGE_ARCH = "${MACHINE_ARCH}" > + > +FILES_${PN} = "${sysconfdir}" > diff --git a/meta/recipes-core/runit/runit-serialgetty/finish b/meta/recipes-core/runit/runit-serialgetty/finish > new file mode 100644 > index 0000000000..860c07d64d > --- /dev/null > +++ b/meta/recipes-core/runit/runit-serialgetty/finish > @@ -0,0 +1,2 @@ > +#!/bin/sh > +exec utmpset -w @TTY@ > diff --git a/meta/recipes-core/runit/runit-serialgetty/run b/meta/recipes-core/runit/runit-serialgetty/run > new file mode 100644 > index 0000000000..2070fbd711 > --- /dev/null > +++ b/meta/recipes-core/runit/runit-serialgetty/run > @@ -0,0 +1,2 @@ > +#!/bin/sh > +exec /sbin/getty @BAUDRATE@ @TTY@ vt102 > diff --git a/meta/recipes-core/runit/runit-services.bb b/meta/recipes-core/runit/runit-services.bb > new file mode 100644 > index 0000000000..d24ed592dc > --- /dev/null > +++ b/meta/recipes-core/runit/runit-services.bb > @@ -0,0 +1,50 @@ > +# Copyright (C) 2017 Khem Raj > +# Released under the MIT license (see COPYING.MIT for the terms) > + > +DESCRIPTION = "Additional runit scripts for OE based systems" > +HOMEPAGE = "https://github.com/YoeDistro/oe-runit" > +LICENSE = "PD" > +LIC_FILES_CHKSUM = "file://README.md;beginline=41;endline=48;md5=f2f8535b84b11359cc7757b009cfd646" > +SECTION = "base" > + > +PV = "20180623+git${SRCPV}" > + > +SRCREV = "8d5db5c26670e49524f33800aaf0337466495c84" > +SRC_URI = "git://github.com/YoeDistro/oe-runit;branch=oe/master \ > +" > + > +S = "${WORKDIR}/git" > + > +EXTRA_OEMAKE = "PREFIX=${exec_prefix}" > + > +do_install() { > + oe_runmake DESTDIR=${D} install > + install -d ${D}${base_bindir} ${D}${sysconfdir}/runit/runsvdir > + for f in shutdown halt reboot poweroff > + do > + ln -sf ${bindir}/$f ${D}${base_bindir}/$f > + done > +} > + > +pkg_postinst_ontarget_${PN} () { > + # Enable default services: > + # - agetty-tty[1-4] (default) > + # - udevd (default) > + # - sulogin (single) > + mkdir -p $D/etc/runit/runsvdir/single > + ln -sf /etc/sv/sulogin $D/etc/runit/runsvdir/single > + > + mkdir -p $D/etc/runit/runsvdir/default > + if [ ! -e $D/etc/runit/runsvdir/current ]; then > + ln -sf default $D/etc/runit/runsvdir/current > + fi > + if [ -e $D/etc/sv/udevd/run ]; then > + ln -sf /etc/sv/udevd $D/etc/runit/runsvdir/default > + fi > +} > + > +RDEPENDS_${PN} = "runit findutils util-linux-fsck coreutils" > + > +PACKAGES =+ "${PN}-dracut" > + > +FILES_${PN}-dracut = "${nonarch_libdir}/dracut" > diff --git a/meta/recipes-core/runit/runit/0001-default-directory-for-services-on-Debian-is-etc-servi.diff b/meta/recipes-core/runit/runit/0001-default-directory-for-services-on-Debian-is-etc-servi.diff > new file mode 100644 > index 0000000000..afc1bc5564 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0001-default-directory-for-services-on-Debian-is-etc-servi.diff > @@ -0,0 +1,87 @@ > +From d99515f6c8427e5f1c8f252532df8858bdef1007 Mon Sep 17 00:00:00 2001 > +From: Gerrit Pape > +Date: Wed, 7 May 2008 23:51:16 +0000 > +Subject: [PATCH] default directory for services on Debian is /etc/service/, > + not /service/ > + > +--- > + runit-2.1.2/man/runsv.8 | 4 ++-- > + runit-2.1.2/man/runsvchdir.8 | 4 ++-- > + runit-2.1.2/man/sv.8 | 4 ++-- > + runit-2.1.2/src/sv.c | 2 +- > + 4 files changed, 7 insertions(+), 7 deletions(-) > + > +diff --git a/runit-2.1.2/man/runsv.8 b/runit-2.1.2/man/runsv.8 > +index 7c5abfc..75bc73a 100644 > +--- a/runit-2.1.2/man/runsv.8 > ++++ b/runit-2.1.2/man/runsv.8 > +@@ -157,9 +157,9 @@ This command is ignored if it is given to > + .IR service /log/supervise/control. > + .P > + Example: to send a TERM signal to the socklog-unix service, either do > +- # sv term /service/socklog-unix > ++ # sv term /etc/service/socklog-unix > + or > +- # printf t >/service/socklog-unix/supervise/control > ++ # printf t >/etc/service/socklog-unix/supervise/control > + .P > + .BR printf (1) > + usually blocks if no > +diff --git a/runit-2.1.2/man/runsvchdir.8 b/runit-2.1.2/man/runsvchdir.8 > +index f7f94dc..a5fc180 100644 > +--- a/runit-2.1.2/man/runsvchdir.8 > ++++ b/runit-2.1.2/man/runsvchdir.8 > +@@ -27,13 +27,13 @@ with a symlink pointing to > + .IR dir . > + .P > + Normally > +-.I /service > ++.I /etc/service > + is a symlink to > + .IR current , > + and > + .BR runsvdir (8) > + is running > +-.IR /service/ . > ++.IR /etc/service/ . > + .SH EXIT CODES > + .B runsvchdir > + prints an error message and exits 111 on error. > +diff --git a/runit-2.1.2/man/sv.8 b/runit-2.1.2/man/sv.8 > +index 7ed9852..fa56443 100644 > +--- a/runit-2.1.2/man/sv.8 > ++++ b/runit-2.1.2/man/sv.8 > +@@ -30,7 +30,7 @@ If > + .I service > + doesn't start with a dot or slash and doesn't end with a slash, it is > + searched in the default services directory > +-.IR /service/ , > ++.IR /etc/service/ , > + otherwise relative to the current directory. > + .P > + .I command > +@@ -232,7 +232,7 @@ This option implies > + .TP > + .B SVDIR > + The environment variable $SVDIR overrides the default services directory > +-.IR /service/ . > ++.IR /etc/service/ . > + .TP > + .B SVWAIT > + The environment variable $SVWAIT overrides the default 7 seconds to wait > +diff --git a/runit-2.1.2/src/sv.c b/runit-2.1.2/src/sv.c > +index 0125795..887e9d1 100644 > +--- a/runit-2.1.2/src/sv.c > ++++ b/runit-2.1.2/src/sv.c > +@@ -32,7 +32,7 @@ > + char *progname; > + char *action; > + char *acts; > +-char *varservice ="/service/"; > ++char *varservice ="/etc/service/"; > + char **service; > + char **servicex; > + unsigned int services; > +-- > +2.0.1 > + > diff --git a/meta/recipes-core/runit/runit/0002-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff b/meta/recipes-core/runit/runit/0002-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff > new file mode 100644 > index 0000000000..91f9e947e1 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0002-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff > @@ -0,0 +1,95 @@ > +From aed8774b9aa813cbb3e8b732f6f7ae132f86c82b Mon Sep 17 00:00:00 2001 > +From: Andras Korn > +Date: Thu, 6 Dec 2012 16:57:06 +0100 > +Subject: [PATCH] support /etc/runit/nosync file to make sync on > + shutdown/reboot optional > + > +https://bugs.debian.org/695281 > +--- > + runit-2.1.2/doc/runit.8.html | 2 ++ > + runit-2.1.2/man/runit.8 | 5 +++++ > + runit-2.1.2/src/runit.c | 15 ++++++++++----- > + runit-2.1.2/src/runit.h | 1 + > + 4 files changed, 18 insertions(+), 5 deletions(-) > + > +--- a/runit-2.1.2/doc/runit.8.html > ++++ b/runit-2.1.2/doc/runit.8.html > +@@ -34,6 +34,8 @@ stage 2 if it is running, and runs /e > + and possibly halt or reboot the system are done here. If stage 3 returns, > + runit checks if the file /etc/runit/reboot exists and has the execute by > + owner permission set. If so, the system is rebooted, it’s halted otherwise. > ++If /etc/runit/nosync exists, runit doesn’t invoke > ++sync(). This is useful in vservers. > + > +

Ctrl-alt-del

> + If runit receives the ctrl-alt-del keyboard request and the file > +--- a/runit-2.1.2/man/runit.8 > ++++ b/runit-2.1.2/man/runit.8 > +@@ -48,6 +48,11 @@ checks if the file > + .I /etc/runit/reboot > + exists and has the execute by owner permission set. > + If so, the system is rebooted, it's halted otherwise. > ++If > ++.I /etc/runit/nosync > ++exists, > ++.B runit > ++doesn't invoke sync(). This is useful in vservers. > + .SH CTRL-ALT-DEL > + If > + .B runit > +--- a/runit-2.1.2/src/runit.c > ++++ b/runit-2.1.2/src/runit.c > +@@ -41,6 +41,11 @@ void sig_int_handler (void) { > + } > + void sig_child_handler (void) { write(selfpipe[1], "", 1); } > + > ++void sync_if_needed() { > ++ struct stat s; > ++ if (stat(NOSYNC, &s) == -1) sync(); > ++} > ++ > + int main (int argc, const char * const *argv, char * const *envp) { > + const char * prog[2]; > + int pid, pid2; > +@@ -305,28 +310,28 @@ int main (int argc, const char * const * > + case -1: > + if ((stat(REBOOT, &s) != -1) && (s.st_mode & S_IXUSR)) { > + strerr_warn2(INFO, "system reboot.", 0); > +- sync(); > ++ sync_if_needed(); > + reboot_system(RB_AUTOBOOT); > + } > + else { > + #ifdef RB_POWER_OFF > + strerr_warn2(INFO, "power off...", 0); > +- sync(); > ++ sync_if_needed(); > + reboot_system(RB_POWER_OFF); > + sleep(2); > + #endif > + #ifdef RB_HALT_SYSTEM > + strerr_warn2(INFO, "system halt.", 0); > +- sync(); > ++ sync_if_needed(); > + reboot_system(RB_HALT_SYSTEM); > + #else > + #ifdef RB_HALT > + strerr_warn2(INFO, "system halt.", 0); > +- sync(); > ++ sync_if_needed(); > + reboot_system(RB_HALT); > + #else > + strerr_warn2(INFO, "system reboot.", 0); > +- sync(); > ++ sync_if_needed(); > + reboot_system(RB_AUTOBOOT); > + #endif > + #endif > +--- a/runit-2.1.2/src/runit.h > ++++ b/runit-2.1.2/src/runit.h > +@@ -1,4 +1,5 @@ > + #define RUNIT "/sbin/runit" > + #define STOPIT "/etc/runit/stopit" > + #define REBOOT "/etc/runit/reboot" > ++#define NOSYNC "/run/runit.nosync" > + #define CTRLALTDEL "/etc/runit/ctrlaltdel" > diff --git a/meta/recipes-core/runit/runit/0003-utmpset.c-mixes-int32_t-and-time_t.diff b/meta/recipes-core/runit/runit/0003-utmpset.c-mixes-int32_t-and-time_t.diff > new file mode 100644 > index 0000000000..6b21bbb40e > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0003-utmpset.c-mixes-int32_t-and-time_t.diff > @@ -0,0 +1,57 @@ > +From 20a0afcd367666efc17c59cf121a0d991ff1bd09 Mon Sep 17 00:00:00 2001 > +From: Gerrit Pape > +Date: Thu, 31 Jul 2014 12:25:49 +0000 > +Subject: [PATCH] utmpset.c: mixes "int32_t *" and "time_t *" > + > +Don't pass int32_t to time(), thx Lorenzo Beretta, > +https://bugs.debian.org/754849 > +--- > + runit-2.1.2/src/utmpset.c | 8 ++++++-- > + 1 file changed, 6 insertions(+), 2 deletions(-) > + > +diff --git a/runit-2.1.2/src/utmpset.c b/runit-2.1.2/src/utmpset.c > +index eea41a5..2e8a525 100644 > +--- a/runit-2.1.2/src/utmpset.c > ++++ b/runit-2.1.2/src/utmpset.c > +@@ -24,6 +24,7 @@ void usage(void) { strerr_die4x(1, "usage: ", progname, USAGE, "\n"); } > + int utmp_logout(const char *line) { > + int fd; > + uw_tmp ut; > ++ time_t t; > + int ok =-1; > + > + if ((fd =open(UW_TMP_UFILE, O_RDWR, 0)) < 0) > +@@ -35,7 +36,8 @@ int utmp_logout(const char *line) { > + if (!ut.ut_name[0] || (str_diff(ut.ut_line, line) != 0)) continue; > + memset(ut.ut_name, 0, sizeof ut.ut_name); > + memset(ut.ut_host, 0, sizeof ut.ut_host); > +- if (time(&ut.ut_time) == -1) break; > ++ if (time(&t) == -1) break; > ++ ut.ut_time = t; > + #ifdef DEAD_PROCESS > + ut.ut_type =DEAD_PROCESS; > + #endif > +@@ -52,6 +54,7 @@ int wtmp_logout(const char *line) { > + int len; > + struct stat st; > + uw_tmp ut; > ++ time_t t; > + > + if ((fd = open_append(UW_TMP_WFILE)) == -1) > + strerr_die4sys(111, FATAL, "unable to open ", UW_TMP_WFILE, ": "); > +@@ -65,10 +68,11 @@ int wtmp_logout(const char *line) { > + memset(&ut, 0, sizeof(uw_tmp)); > + if ((len =str_len(line)) > sizeof ut.ut_line) len =sizeof ut.ut_line -2; > + byte_copy(ut.ut_line, len, line); > +- if (time(&ut.ut_time) == -1) { > ++ if (time(&t) == -1) { > + close(fd); > + return(-1); > + } > ++ ut.ut_time = t; > + #ifdef DEAD_PROCESS > + ut.ut_type =DEAD_PROCESS; > + #endif > +-- > +2.0.1 > + > diff --git a/meta/recipes-core/runit/runit/0004-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff b/meta/recipes-core/runit/runit/0004-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff > new file mode 100644 > index 0000000000..c2cdfc8881 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0004-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff > @@ -0,0 +1,30 @@ > +From 77d0f60701a401ea0de0925d9422c78fb560b4f6 Mon Sep 17 00:00:00 2001 > +From: Gerrit Pape > +Date: Thu, 31 Jul 2014 12:54:32 +0000 > +Subject: [PATCH] src/Makefile: don't use -static to link runit, runit-init on > + Debian > + > +--- > + runit-2.1.2/src/Makefile | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/runit-2.1.2/src/Makefile b/runit-2.1.2/src/Makefile > +index d9624de..507a419 100644 > +--- a/runit-2.1.2/src/Makefile > ++++ b/runit-2.1.2/src/Makefile > +@@ -6,10 +6,10 @@ check: $(IT) > + ./check-local $(IT) > + > + runit: load runit.o unix.a byte.a > +- ./load runit unix.a byte.a -static > ++ ./load runit unix.a byte.a > + > + runit-init: load runit-init.o unix.a byte.a > +- ./load runit-init unix.a byte.a -static > ++ ./load runit-init unix.a byte.a > + > + runsv: load runsv.o unix.a byte.a time.a > + ./load runsv unix.a byte.a time.a > +-- > +2.0.1 > + > diff --git a/meta/recipes-core/runit/runit/0005-patch-etc-runit-2-for-FHS.patch b/meta/recipes-core/runit/runit/0005-patch-etc-runit-2-for-FHS.patch > new file mode 100644 > index 0000000000..8bcfe8801c > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0005-patch-etc-runit-2-for-FHS.patch > @@ -0,0 +1,17 @@ > +Description: Make /etc/runit/2 respect FHS > + On Debian system services directory is /etc/service, not /service. > +Author: Dmitry Bogatov > +Last-Update: 2016-05-31 > +--- > +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ > +--- a/runit-2.1.2/etc/2 > ++++ b/runit-2.1.2/etc/2 > +@@ -1,6 +1,6 @@ > + #!/bin/sh > + > +-PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin > ++PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin > + > + exec env - PATH=$PATH \ > +-runsvdir -P /service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................' > ++runsvdir -P /etc/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................' > diff --git a/meta/recipes-core/runit/runit/0006-make-buildsystem-respect-CFLAGS.patch b/meta/recipes-core/runit/runit/0006-make-buildsystem-respect-CFLAGS.patch > new file mode 100644 > index 0000000000..269d79a49b > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0006-make-buildsystem-respect-CFLAGS.patch > @@ -0,0 +1,21 @@ > +Description: Make buildsystem respect dpkg-buildflags > +Author: Dmitry Bogatov > +Last-Update: 2016-06-01 > +--- > +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ > +--- a/runit-2.1.2/src/print-cc.sh > ++++ b/runit-2.1.2/src/print-cc.sh > +@@ -2,4 +2,4 @@ cc="`head -n1 conf-cc`" > + systype="`cat systype`" > + > + cat warn-auto.sh > +-echo exec "$cc" '-c ${1+"$@"}' > ++echo exec "$cc" "$CPPFLAGS" "$CFLAGS" '-c ${1+"$@"}' > +--- a/runit-2.1.2/src/print-ld.sh > ++++ b/runit-2.1.2/src/print-ld.sh > +@@ -3,4 +3,4 @@ systype="`cat systype`" > + > + cat warn-auto.sh > + echo 'main="$1"; shift' > +-echo exec "$ld" '-o "$main" "$main".o ${1+"$@"}' > ++echo exec "$ld" "$LDFLAGS" '-o "$main" "$main".o ${1+"$@"}' > diff --git a/meta/recipes-core/runit/runit/0007-move-communication-files.patch b/meta/recipes-core/runit/runit/0007-move-communication-files.patch > new file mode 100644 > index 0000000000..bfcbac8015 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0007-move-communication-files.patch > @@ -0,0 +1,102 @@ > +Description: Move communication files under /run > + Runit by default uses files /etc/runit/stop and /etc/runit/reboot. > + This configuration will not work when /etc is mounted read-only, > + as such this patch renames this files into /run/runit.stop and > + /run/runit.reboot > +Author: Dmitry Bogatov > +Last-Update: 2016-06-02 > +--- > +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ > +--- a/runit-2.1.2/etc/debian/1 > ++++ b/runit-2.1.2/etc/debian/1 > +@@ -6,5 +6,5 @@ PATH=/command:/sbin:/bin:/usr/sbin:/usr/ > + /etc/init.d/rcS > + /etc/init.d/rmnologin > + > +-touch /etc/runit/stopit > +-chmod 0 /etc/runit/stopit > ++touch /run/runit.stopit > ++chmod 0 /run/runit.stopit > +--- a/runit-2.1.2/etc/debian/3 > ++++ b/runit-2.1.2/etc/debian/3 > +@@ -4,7 +4,7 @@ exec 2>&1 > + PATH=/command:/sbin:/bin:/usr/sbin:/usr/bin > + > + LAST=0 > +-test -x /etc/runit/reboot && LAST=6 > ++test -x /run/runit.reboot && LAST=6 > + > + echo 'Waiting for services to stop...' > + sv -w196 force-stop /service/* > +--- a/runit-2.1.2/etc/debian/ctrlaltdel > ++++ b/runit-2.1.2/etc/debian/ctrlaltdel > +@@ -4,6 +4,6 @@ PATH=/bin:/usr/bin > + MSG="System is going down in 14 seconds..." > + > + # echo 'disabled.' ; exit > +-touch /etc/runit/stopit > +-chmod 100 /etc/runit/stopit && echo "$MSG" | wall > ++touch /etc/runit.stopit > ++chmod 100 /etc/runit.stopit && echo "$MSG" | wall > + /bin/sleep 14 > +--- a/runit-2.1.2/man/runit-init.8 > ++++ b/runit-2.1.2/man/runit-init.8 > +@@ -26,9 +26,9 @@ To signal > + the system halt request, > + .B runit-init > + removes all permissions of the file > +-.I /etc/runit/reboot > ++.I /run/runit.reboot > + (chmod 0), and sets the execute by owner permission of the file > +-.I /etc/runit/stopit > ++.I /run/runit.stopit > + (chmod 100). > + Then a CONT signal is sent to > + .BR runit (8). > +@@ -40,9 +40,9 @@ To signal > + the system reboot request, > + .B runit-init > + sets the execute by owner permission of the files > +-.I /etc/runit/reboot > ++.I /run/runit.reboot > + and > +-.I /etc/runit/stopit > ++.I /run/runit.stopit > + (chmod 100). Then a CONT signal is sent to > + .BR runit (8). > + .SH EXIT CODES > +--- a/runit-2.1.2/man/runit.8 > ++++ b/runit-2.1.2/man/runit.8 > +@@ -45,11 +45,11 @@ done here. > + If stage 3 returns, > + .B runit > + checks if the file > +-.I /etc/runit/reboot > ++.I /run/runit.reboot > + exists and has the execute by owner permission set. > + If so, the system is rebooted, it's halted otherwise. > + If > +-.I /etc/runit/nosync > ++.I /run/runit.nosync > + exists, > + .B runit > + doesn't invoke sync(). This is useful in vservers. > +@@ -70,7 +70,7 @@ only accepts signals in stage 2. > + If > + .B runit > + receives a CONT signal and the file > +-.I /etc/runit/stopit > ++.I /run/runit.stopit > + exists and has the execute by owner permission set, > + .B runit > + is told to shutdown the system. > +--- a/runit-2.1.2/src/runit.h > ++++ b/runit-2.1.2/src/runit.h > +@@ -1,5 +1,5 @@ > + #define RUNIT "/sbin/runit" > +-#define STOPIT "/etc/runit/stopit" > +-#define REBOOT "/etc/runit/reboot" > ++#define STOPIT "/run/runit.stopit" > ++#define REBOOT "/run/runit.reboot" > + #define NOSYNC "/run/runit.nosync" > + #define CTRLALTDEL "/etc/runit/ctrlaltdel" > diff --git a/meta/recipes-core/runit/runit/0008-emulate-sysv-runlevel-5.patch b/meta/recipes-core/runit/runit/0008-emulate-sysv-runlevel-5.patch > new file mode 100644 > index 0000000000..0d370c8fe7 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0008-emulate-sysv-runlevel-5.patch > @@ -0,0 +1,20 @@ > +Description: Emulalate sysv runlevel 5 by default > + Currently, not many daemons in Debian provides proper runscripts, so > + if user switches to runit, she will on next reboot, that none of daemons, > + including essential, like cron, are started. > + . > + This patch starts them in sysv-init style -- unmanaged, in background. > + It is sub-par solution, but allows one-by-one transition. > +Author: Dmitry Bogatov > +Forwarded: not-needed > +Last-Update: 2016-06-09 > +--- > +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ > +--- a/runit-2.1.2/etc/debian/1 > ++++ b/runit-2.1.2/etc/debian/1 > +@@ -8,3 +8,5 @@ PATH=/command:/sbin:/bin:/usr/sbin:/usr/ > + > + touch /run/runit.stopit > + chmod 0 /run/runit.stopit > ++ > ++[ -e /etc/runit/no-emulate-sysv ] || /etc/init.d/rc 5 > diff --git a/meta/recipes-core/runit/runit/0009-fix-error-in-manpage.patch b/meta/recipes-core/runit/runit/0009-fix-error-in-manpage.patch > new file mode 100644 > index 0000000000..5803b0a387 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/0009-fix-error-in-manpage.patch > @@ -0,0 +1,23 @@ > +Description: Fix factual error in manpage. > + Log ./finish script is not actually invoked. It is not clear, whether this > + limitation is worth lifting. > +Author: Dmitry Bogatov > +Forwarded: no > +Last-Update: 2016-08-31 > +--- > +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ > +--- a/runit-2.1.2/man/runsv.8 > ++++ b/runit-2.1.2/man/runsv.8 > +@@ -54,10 +54,8 @@ and > + .IR service /finish's > + standard output to the pipe, switches to the directory > + .IR service /log > +-and starts ./run (and ./finish) exactly as described above for the > +-.I service > +-directory. > +-The standard input of the log service is redirected to read from the pipe. > ++and starts ./run script. The standard input of the log service > ++is redirected to read from the pipe. > + .P > + .B runsv > + maintains status information in a binary format (compatible to the > diff --git a/meta/recipes-core/runit/runit/clearmem.patch b/meta/recipes-core/runit/runit/clearmem.patch > new file mode 100644 > index 0000000000..3fa28a7006 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/clearmem.patch > @@ -0,0 +1,22 @@ > +fix segfault in svlogd discovered on armv7hf-musl. > + > +Code in svlogd.c allocates some memory at startup which is > +not zeroed, and other code was using those garbage values. > +I have no idea why this has never caused a problem before, but > +for me, svlogd consistently segfaults on armv7hf-musl when > +it is called by socklog. > + > +Upstream-Status: Pending > +Author: Christopher Brannon > + > +diff -Naur runit-2.1.2/src/svlogd.c runit-2.1.2/src/svlogd.c > +--- runit-2.1.2/src/svlogd.c 2014-08-10 11:22:34.000000000 -0700 > ++++ runit-2.1.2/src/svlogd.c 2018-03-03 03:28:08.243085845 -0800 > +@@ -705,6 +705,7 @@ > + coe(fdwdir); > + dir =(struct logdir*)alloc(dirn *sizeof(struct logdir)); > + if (! dir) die_nomem(); > ++ memset(dir, 0, dirn * sizeof(struct logdir)); > + for (i =0; i < dirn; ++i) { > + dir[i].fddir =-1; dir[i].fdcur =-1; > + dir[i].btmp =(char*)alloc(buflen *sizeof(char)); > diff --git a/meta/recipes-core/runit/runit/cross.patch b/meta/recipes-core/runit/runit/cross.patch > new file mode 100644 > index 0000000000..3a9dcd8afe > --- /dev/null > +++ b/meta/recipes-core/runit/runit/cross.patch > @@ -0,0 +1,50 @@ > +chskshsgr must be built for the host. > + > +Index: runit-2.1.2/src/Makefile > +=================================================================== > +--- runit-2.1.2.orig/src/Makefile > ++++ runit-2.1.2/src/Makefile > +@@ -170,11 +170,11 @@ byte_diff.o: byte.h byte_diff.c compile > + byte_rchr.o: byte.h byte_rchr.c compile > + ./compile byte_rchr.c > + > +-chkshsgr: chkshsgr.o load > +- ./load chkshsgr > ++chkshsgr: chkshsgr.o loadhost > ++ ./loadhost chkshsgr > + > +-chkshsgr.o: chkshsgr.c compile > +- ./compile chkshsgr.c > ++chkshsgr.o: chkshsgr.c compilehost > ++ ./compilehost chkshsgr.c > + > + choose: choose.sh warn-auto.sh > + rm -f choose > +@@ -185,6 +185,11 @@ choose: choose.sh warn-auto.sh > + coe.o: coe.c coe.h compile > + ./compile coe.c > + > ++compilehost: > ++ cat warn-auto.sh > compilehost > ++ @echo 'exec ${BUILD_CC} ${BUILD_CFLAGS} -c $${1+"$$@"}' >> compilehost > ++ chmod 555 compilehost > ++ > + compile: conf-cc print-cc.sh systype warn-auto.sh > + rm -f compile > + sh print-cc.sh > compile > +@@ -246,6 +251,15 @@ iopause.h: choose compile iopause.h1 iop > + iopause.o: compile iopause.c iopause.h select.h tai.h taia.h uint64.h > + ./compile iopause.c > + > ++loadhost: > ++ rm -f loadhost > ++ @echo > loadhost > ++ @echo 'systype="`cat systype`"' >> loadhost > ++ @echo 'cat warn-auto.sh' >> loadhost > ++ @echo 'main="$$1"; shift' >> loadhost > ++ @echo 'exec ${BUILD_CC} ${BUILD_LDFLAGS} -o "$$main" "$$main".o $${1+"$$@"}' >> loadhost > ++ chmod 555 loadhost > ++ > + load: conf-ld print-ld.sh systype warn-auto.sh > + rm -f load > + sh print-ld.sh > load > diff --git a/meta/recipes-core/runit/runit/patch-disable-chkshgrp-test-that-fails-i.patch b/meta/recipes-core/runit/runit/patch-disable-chkshgrp-test-that-fails-i.patch > new file mode 100644 > index 0000000000..6753dff4ef > --- /dev/null > +++ b/meta/recipes-core/runit/runit/patch-disable-chkshgrp-test-that-fails-i.patch > @@ -0,0 +1,19 @@ > +From: Dmitry Bogatov > +Date: Sun, 13 May 2018 10:38:20 +0300 > +X-Dgit-Generated: 2.1.2-14 2c8a08023e964bf54344e7030573ef7ad6881880 > +Subject: [PATCH] Disable chkshgrp test, that fails in whalebuilder > + > +Upstream-Status: Pending > + > +--- > + > +--- runit-2.1.2.orig/runit-2.1.2/src/Makefile > ++++ runit-2.1.2/runit-2.1.2/src/Makefile > +@@ -234,7 +234,6 @@ hassgprm.h: choose compile hassgprm.h1 h > + > + hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ > + tryshsgr.c warn-shsgr > +- ./chkshsgr || ( cat warn-shsgr; exit 1 ) > + ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h > + > + haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c > diff --git a/meta/recipes-core/runit/runit/patch-fix-spin-lock-on-systems-with-poor.patch b/meta/recipes-core/runit/runit/patch-fix-spin-lock-on-systems-with-poor.patch > new file mode 100644 > index 0000000000..6f15e92779 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/patch-fix-spin-lock-on-systems-with-poor.patch > @@ -0,0 +1,20 @@ > +From: Dmitry Bogatov > +Date: Mon, 28 May 2018 21:46:39 +0300 > +X-Dgit-Generated: 2.1.2-15 7791b76917a00ca44e3a5c297675214a40f7f215 > +Subject: [PATCH] Fix spin lock on systems with poor clock > + > +Upstream-Status: Pending > + > +--- > + > +--- runit-2.1.2.orig/runit-2.1.2/src/svlogd.c > ++++ runit-2.1.2/runit-2.1.2/src/svlogd.c > +@@ -234,7 +234,7 @@ void rmoldest(struct logdir *ld) { > + if (unlink(f->d_name) == -1) > + warn2("unable to unlink processor leftover", f->d_name); > + } > +- else { > ++ else if (f->d_name[26] != 'u') { > + ++n; > + if (str_diff(f->d_name, oldest) < 0) byte_copy(oldest, 27, f->d_name); > + } > diff --git a/meta/recipes-core/runit/runit/patch-make-build-system-print-compilatio.patch b/meta/recipes-core/runit/runit/patch-make-build-system-print-compilatio.patch > new file mode 100644 > index 0000000000..f62dfa36d3 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/patch-make-build-system-print-compilatio.patch > @@ -0,0 +1,15 @@ > +From: Dmitry Bogatov > +Date: Tue, 10 Apr 2018 20:08:14 +0300 > +X-Dgit-Generated: 2.1.2-10 9187ce34534181446afc87277ec0d460e5575f9c > +Subject: [PATCH] Make build system print compilation commands > + > +Upstream-Status: Pending > + > +--- > + > +--- runit-2.1.2.orig/runit-2.1.2/src/warn-auto.sh > ++++ runit-2.1.2/runit-2.1.2/src/warn-auto.sh > +@@ -1,2 +1,2 @@ > +-#!/bin/sh > ++#!/bin/sh -x > + # WARNING: This file was auto-generated. Do not edit! > diff --git a/meta/recipes-core/runit/runit/svlogd.patch b/meta/recipes-core/runit/runit/svlogd.patch > new file mode 100644 > index 0000000000..468fdb2ae4 > --- /dev/null > +++ b/meta/recipes-core/runit/runit/svlogd.patch > @@ -0,0 +1,19 @@ > +Initialize all fields of sockaddr_in. > +http://skarnet.org/cgi-bin/archive.cgi?2:mss:1163:201602:gpiglpbjdemlioaeabbn > + > +set all fields of sockaddr_in in svlogd. > + > +Upstream-Status: Submitted > + > +Author: Leah Neukirchen > + > +--- runit-2.1.2/src/svlogd.c 2014-08-10 15:22:34.000000000 -0300 > ++++ runit-2.1.2/src/svlogd.c 2016-02-04 22:53:52.910965361 -0300 > +@@ -430,6 +430,7 @@ > + ld->name =(char*)fn; > + ld->ppid =0; > + ld->match ='+'; > ++ ld->udpaddr.sin_family =AF_INET; > + ld->udpaddr.sin_port =0; > + ld->udponly =0; > + while (! stralloc_copys(&ld->prefix, "")) pause_nomem(); > diff --git a/meta/recipes-core/runit/runit_2.1.2.bb b/meta/recipes-core/runit/runit_2.1.2.bb > new file mode 100644 > index 0000000000..affb309be1 > --- /dev/null > +++ b/meta/recipes-core/runit/runit_2.1.2.bb > @@ -0,0 +1,68 @@ > +# Copyright (C) 2017 Khem Raj > +# Released under the MIT license (see COPYING.MIT for the terms) > + > +DESCRIPTION = "A UNIX init scheme with service supervision" > +HOMEPAGE = "http://smarden.org/runit/" > +LICENSE = "BSD-3-Clause" > +SECTION = "base" > + > +LIC_FILES_CHKSUM = "file://package/COPYING;md5=c9e8a560732fc8b860b6a91341cc603b" > + > +inherit update-alternatives > + > +SRC_URI = "http://smarden.org/${BPN}/${BP}.tar.gz \ > + file://0001-default-directory-for-services-on-Debian-is-etc-servi.diff;striplevel=2 \ > + file://0002-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff;striplevel=2 \ > + file://0003-utmpset.c-mixes-int32_t-and-time_t.diff;striplevel=2 \ > + file://0004-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff;striplevel=2 \ > + file://0005-patch-etc-runit-2-for-FHS.patch;striplevel=2 \ > + file://0006-make-buildsystem-respect-CFLAGS.patch;striplevel=2 \ > + file://0007-move-communication-files.patch;striplevel=2 \ > + file://0008-emulate-sysv-runlevel-5.patch;striplevel=2 \ > + file://0009-fix-error-in-manpage.patch;striplevel=2 \ > + file://patch-make-build-system-print-compilatio.patch;striplevel=2 \ > + file://patch-disable-chkshgrp-test-that-fails-i.patch;striplevel=2 \ > + file://patch-fix-spin-lock-on-systems-with-poor.patch;striplevel=2 \ > + file://cross.patch \ > + file://clearmem.patch \ > + file://svlogd.patch \ > +" > + > +SRC_URI[md5sum] = "6c985fbfe3a34608eb3c53dc719172c4" > +SRC_URI[sha256sum] = "6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18" > + > +S = "${WORKDIR}/admin/${BPN}-${PV}" > + > +do_compile() { > + cd ${S}/src > + sed -e 's,sbin/runit,usr/bin/runit,g' -i ${S}/src/runit.h > + echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc > + echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld > + # change type short to gid_t for getgroups(2) and setgroups(2) > + sed -i -e 's:short x\[4\];$:gid_t x[4];:' ${S}/src/chkshsgr.c > + oe_runmake > + > +} > + > +do_install() { > + cd ${S}/src > + install -d ${D}${bindir} > + for f in chpst runit runit-init runsv runsvchdir runsvdir \ > + sv svlogd utmpset; do > + install -m 0755 $f ${D}${bindir} > + done > + install -d ${D}${sysconfdir}/runit > + for f in 1 2 3 ctrlaltdel; do > + install -m 0755 ${S}/etc/debian/$f ${D}${sysconfdir}/runit/$f > + done > + sed -e 's,rmnologin,rmnologin.sh,g' -i ${D}${sysconfdir}/runit/1 > + ln -s ${localstatedir}/run/runit.stopit ${D}${sysconfdir}/runit/stopit > + rm -rf ${D}${sysconfdir}/runit/{1,2,3,stopit,ctrlaltdel} > +} > + > +RDEPENDS_${PN} += "runit-serialgetty socklog socklog-services" > + > +ALTERNATIVE_${PN} = "init" > +ALTERNATIVE_TARGET[init] = "${bindir}/runit-init" > +ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" > +ALTERNATIVE_PRIORITY[init] ?= "300" > diff --git a/meta/recipes-core/runit/socklog-services.bb b/meta/recipes-core/runit/socklog-services.bb > new file mode 100644 > index 0000000000..795bf8f390 > --- /dev/null > +++ b/meta/recipes-core/runit/socklog-services.bb > @@ -0,0 +1,23 @@ > +# Copyright (C) 2017 Khem Raj > +# Released under the MIT license (see COPYING.MIT for the terms) > + > +DESCRIPTION = "Additional socklog configurations from Void Distro" > +HOMEPAGE = "https://github.com/void-linux/void-socklog" > +LICENSE = "PD" > +LIC_FILES_CHKSUM = "file://nanoklogd.c;beginline=3;endline=6;md5=8c10698c7abd64f01ac4245e2b11ab64" > +SECTION = "base" > + > +PV = "20150726+git${SRCPV}" > + > +SRCREV = "e6b8b91dcd38ebcfbb0d41753d814edf78b06989" > +SRC_URI = "git://github.com/void-linux/socklog-void \ > + file://0001-Use-options-to-cp-to-ensure-proper-mods.patch \ > +" > + > +S = "${WORKDIR}/git" > + > +EXTRA_OEMAKE = "PREFIX=${exec_prefix}" > + > +do_install() { > + oe_runmake DESTDIR=${D} install > +} > diff --git a/meta/recipes-core/runit/socklog-services/0001-Use-options-to-cp-to-ensure-proper-mods.patch b/meta/recipes-core/runit/socklog-services/0001-Use-options-to-cp-to-ensure-proper-mods.patch > new file mode 100644 > index 0000000000..edd5bae2ef > --- /dev/null > +++ b/meta/recipes-core/runit/socklog-services/0001-Use-options-to-cp-to-ensure-proper-mods.patch > @@ -0,0 +1,33 @@ > +From b1f46a4d7273ba9b446527dc3f50aa4c318acdd3 Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Fri, 4 Jan 2019 18:15:18 -0800 > +Subject: [PATCH] Use options to cp to ensure proper mods > + > +This ensures that permissions are in line when using staged installed in > +OE e.g. > + > +Upstream-Status: Pending > + > +Signed-off-by: Khem Raj > +--- > + Makefile | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/Makefile b/Makefile > +index 4f96b6e..4889229 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -5,8 +5,8 @@ install: all > + install -Dm755 svlogtail ${DESTDIR}/usr/bin/svlogtail > + install -Dm755 syslog-stripdate ${DESTDIR}/usr/bin/syslog-stripdate > + mkdir -p ${DESTDIR}/etc ${DESTDIR}/var/log > +- cp -a sv ${DESTDIR}/etc > +- cp -a socklog ${DESTDIR}/var/log > ++ cp -R --no-dereference --preserve=mode,links sv ${DESTDIR}/etc > ++ cp -R --no-dereference --preserve=mode,links socklog ${DESTDIR}/var/log > + > + clean: > + rm -f nanoklogd > +-- > +2.20.1 > + > diff --git a/meta/recipes-core/runit/socklog/cross.patch b/meta/recipes-core/runit/socklog/cross.patch > new file mode 100644 > index 0000000000..bc0385f54e > --- /dev/null > +++ b/meta/recipes-core/runit/socklog/cross.patch > @@ -0,0 +1,58 @@ > +chskshsgr must be built for the host. > + > +Original at: https://github.com/void-linux/void-packages/blob/master/srcpkgs/socklog/patches/cross.patch > + > +Upstream-Status: Inappropriate [Cross-compile Specific] > +Signed-off-by: Khem Raj > + > +--- a/src/Makefile > ++++ b/src/Makefile > +@@ -117,11 +117,11 @@ byte_rchr.o: byte.h byte_rchr.c compile > + byte_zero.o: byte.h byte_zero.c compile > + ./compile byte_zero.c > + > +-chkshsgr: chkshsgr.o load > +- ./load chkshsgr > ++chkshsgr: chkshsgr.o loadhost > ++ ./loadhost chkshsgr > + > +-chkshsgr.o: chkshsgr.c compile > +- ./compile chkshsgr.c > ++chkshsgr.o: chkshsgr.c compilehost > ++ ./compilehost chkshsgr.c > + > + choose: choose.sh warn-auto.sh > + rm -f choose > +@@ -137,6 +137,11 @@ compile: conf-cc print-cc.sh systype war > + sh print-cc.sh > compile > + chmod 555 compile > + > ++compilehost: > ++ cat warn-auto.sh > compilehost > ++ @echo 'gcc -c $${1+"$$@"}' >> compilehost > ++ chmod 555 compilehost > ++ > + direntry.h: choose compile direntry.h1 direntry.h2 trydrent.c > + ./choose c trydrent direntry.h1 direntry.h2 > direntry.h > + > +@@ -198,6 +203,15 @@ load: conf-ld print-ld.sh systype warn-a > + sh print-ld.sh > load > + chmod 555 load > + > ++loadhost: > ++ rm -f loadhost > ++ @echo > loadhost > ++ @echo 'systype="`cat systype`"' >> loadhost > ++ @echo 'cat warn-auto.sh' >> loadhost > ++ @echo 'main="$$1"; shift' >> loadhost > ++ @echo 'gcc -o "$$main" "$$main".o $${1+"$$@"}' >> loadhost > ++ chmod 555 loadhost > ++ > + lock_ex.o: compile hasflock.h lock.h lock_ex.c > + ./compile lock_ex.c > + > +@@ -410,4 +424,3 @@ wait_nohang.o: compile haswaitp.h wait_n > + > + wait_pid.o: compile error.h haswaitp.h wait_pid.c > + ./compile wait_pid.c > +- > diff --git a/meta/recipes-core/runit/socklog_2.1.0.bb b/meta/recipes-core/runit/socklog_2.1.0.bb > new file mode 100644 > index 0000000000..fc3fbd9826 > --- /dev/null > +++ b/meta/recipes-core/runit/socklog_2.1.0.bb > @@ -0,0 +1,32 @@ > +# Copyright (C) 2018 Khem Raj > +# Released under the MIT license (see COPYING.MIT for the terms) > + > +SUMMARY = "Small and secure syslogd replacement for use with runit" > +HOMEPAGE = "http://smarden.org/socklog/" > +LICENSE = "BSD-3-Clause" > +SECTION = "base" > + > +LIC_FILES_CHKSUM = "file://package/COPYING;md5=c7a77593c4b489904800014396f3f742" > +SRC_URI = "http://smarden.org/${BPN}/${BP}.tar.gz \ > + file://cross.patch \ > +" > +SRC_URI[md5sum] = "5d0e8e28c9329ad3af982c5241df9ff1" > +SRC_URI[sha256sum] = "aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455" > + > +S = "${WORKDIR}/admin/${BPN}-${PV}" > + > +do_compile() { > + cd ${S}/src > + echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc > + echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld > + echo "int main() { return 0; }" >${S}/src/chkshsgr.c > + oe_runmake > +} > + > +do_install() { > + cd ${S}/src > + install -d ${D}${bindir} > + for f in socklog socklog-conf socklog-check uncat tryto; do > + install -m 0755 $f ${D}${bindir} > + done > +} > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From wangmy at cn.fujitsu.com Mon Feb 10 17:38:00 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Mon, 10 Feb 2020 09:38:00 -0800 Subject: [OE-core] [PATCH] sudo: upgrade 1.8.30 -> 1.8.31 Message-ID: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> -License-Update: Copyright year updated from 1998-2019 to 1998-2020. Signed-off-by: Wang Mingyu --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-extended/sudo/{sudo_1.8.30.bb => sudo_1.8.31.bb} (92%) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 3b314dd4a9..5d27d46928 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=4d1b44b1576eea036d78b8cc961aa93d \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.31.bb similarity index 92% rename from meta/recipes-extended/sudo/sudo_1.8.30.bb rename to meta/recipes-extended/sudo/sudo_1.8.31.bb index 9d014d294b..39d8817c32 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.31.bb @@ -7,8 +7,8 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "d56cd5835b1cc9852bd76ddaaa572475" -SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31c579e7" +SRC_URI[md5sum] = "ce17ff6e72a70f8d5dabba8abf3cd2de" +SRC_URI[sha256sum] = "7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -- 2.17.1 From wangmy at cn.fujitsu.com Mon Feb 10 17:38:01 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Mon, 10 Feb 2020 09:38:01 -0800 Subject: [OE-core] [PATCH] xkeyboard-config: upgrade 2.28 -> 2.29 In-Reply-To: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581356285-65315-2-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} (87%) diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb similarity index 87% rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb index 7a3d694bd6..c8fa98e8d8 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb @@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "5a968ab77846ff85a04242410b2a61de" -SRC_URI[sha256sum] = "69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce" +SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d" +SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native" -- 2.17.1 From wangmy at cn.fujitsu.com Mon Feb 10 17:38:02 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Mon, 10 Feb 2020 09:38:02 -0800 Subject: [OE-core] [PATCH] libtasn1: upgrade 4.15.0 -> 4.16.0 In-Reply-To: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581356285-65315-3-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/gnutls/{libtasn1_4.15.0.bb => libtasn1_4.16.0.bb} (83%) diff --git a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb similarity index 83% rename from meta/recipes-support/gnutls/libtasn1_4.15.0.bb rename to meta/recipes-support/gnutls/libtasn1_4.16.0.bb index 115c98ae57..8337b70241 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.15.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -14,8 +14,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ DEPENDS = "bison-native" -SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" -SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" inherit autotools texinfo lib_package gtk-doc -- 2.17.1 From wangmy at cn.fujitsu.com Mon Feb 10 17:38:03 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Mon, 10 Feb 2020 09:38:03 -0800 Subject: [OE-core] [PATCH] libxcrypt: upgrade 4.4.10 -> 4.4.12 In-Reply-To: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581356285-65315-4-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.10.bb => libxcrypt-compat_4.4.12.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.10.bb => libxcrypt_4.4.12.bb} (100%) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index accbdd6361..59744c0cf8 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "dcf7d7509a26a2fe83f115f5ee731c59749ae17e" +SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb -- 2.17.1 From wangmy at cn.fujitsu.com Mon Feb 10 17:38:04 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Mon, 10 Feb 2020 09:38:04 -0800 Subject: [OE-core] [PATCH] libcheck: upgrade 0.13.0 -> 0.14.0 In-Reply-To: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581356285-65315-5-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libcheck/{libcheck_0.13.0.bb => libcheck_0.14.0.bb} (83%) diff --git a/meta/recipes-support/libcheck/libcheck_0.13.0.bb b/meta/recipes-support/libcheck/libcheck_0.14.0.bb similarity index 83% rename from meta/recipes-support/libcheck/libcheck_0.13.0.bb rename to meta/recipes-support/libcheck/libcheck_0.14.0.bb index 226417f991..a88f009cdb 100644 --- a/meta/recipes-support/libcheck/libcheck_0.13.0.bb +++ b/meta/recipes-support/libcheck/libcheck_0.14.0.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "2c730c40b08482eaeb10132517970593" -SRC_URI[sha256sum] = "c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909" +SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" +SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" -- 2.17.1 From wangmy at cn.fujitsu.com Mon Feb 10 17:38:05 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Mon, 10 Feb 2020 09:38:05 -0800 Subject: [OE-core] [PATCH] librepo: upgrade 1.11.1 -> 1.11.2 In-Reply-To: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581356285-65315-6-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/librepo/{librepo_1.11.1.bb => librepo_1.11.2.bb} (93%) diff --git a/meta/recipes-devtools/librepo/librepo_1.11.1.bb b/meta/recipes-devtools/librepo/librepo_1.11.2.bb similarity index 93% rename from meta/recipes-devtools/librepo/librepo_1.11.1.bb rename to meta/recipes-devtools/librepo/librepo_1.11.2.bb index dbf1016456..6a0a59f865 100644 --- a/meta/recipes-devtools/librepo/librepo_1.11.1.bb +++ b/meta/recipes-devtools/librepo/librepo_1.11.2.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "5ade10012d40fad27a7aa1085091c2c5fdd099ff" +SRCREV = "67c2d1f83f1bf87be3f26ba730fce7fbdf0c9fba" S = "${WORKDIR}/git" -- 2.17.1 From peter.kjellerstedt at axis.com Mon Feb 10 09:55:34 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Mon, 10 Feb 2020 09:55:34 +0000 Subject: [OE-core] [zeus 00/29] Patch review In-Reply-To: References: Message-ID: <2cd46664933442f788e7d5ef62b184eb@XBOX03.axis.com> > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Schrempf Frieder > Sent: den 10 februari 2020 09:07 > To: Armin Kuster ; openembedded- > core at openembedded.org > Subject: Re: [OE-core] [zeus 00/29] Patch review > > Hi Armin, > > On 09.02.20 17:09, Armin Kuster wrote: > > These are the additional changes to help address reproducibility issues > > and additional fixes we would like to be included in 3.0.2 > > > > Please have comments back by Tuesday > > I have two questions/comments: > > 1. When I look at the zeus-next branch, why do I see only patches 7 to > 29 from this series applied and what about patches 1 to 6? Am I missing > something? That is a really good question, and one I too would like an answer to. > 2. Patch 5 (devtool/standard.py: Allow recipe to disable menuconfig > logic) goes hand in hand with a change to the u-boot recipe, that is > also in master (c634b8db1a8b). This patch seems to be missing here. That one is probably my fault. We have a local recipe that defines a menuconfig task and thus I needed the correction for devtool and sent a request for it to be backported. However, since we do not use u-boot, I did not think of that part, which obviously should be backported too. > Regards, > Frieder //Peter From richard.purdie at linuxfoundation.org Mon Feb 10 11:21:45 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 10 Feb 2020 11:21:45 +0000 Subject: [OE-core] [zeus 00/29] Patch review In-Reply-To: <2cd46664933442f788e7d5ef62b184eb@XBOX03.axis.com> References: <2cd46664933442f788e7d5ef62b184eb@XBOX03.axis.com> Message-ID: <7acbab1fb3fb8eb0cfa69beb54b1214345e5ba30.camel@linuxfoundation.org> On Mon, 2020-02-10 at 09:55 +0000, Peter Kjellerstedt wrote: > > -----Original Message----- > > From: openembedded-core-bounces at lists.openembedded.org > > > bounces at lists.openembedded.org> On Behalf Of Schrempf Frieder > > Sent: den 10 februari 2020 09:07 > > To: Armin Kuster ; openembedded- > > core at openembedded.org > > Subject: Re: [OE-core] [zeus 00/29] Patch review > > > > Hi Armin, > > > > On 09.02.20 17:09, Armin Kuster wrote: > > > These are the additional changes to help address reproducibility > > > issues > > > and additional fixes we would like to be included in 3.0.2 > > > > > > Please have comments back by Tuesday > > > > I have two questions/comments: > > > > 1. When I look at the zeus-next branch, why do I see only patches 7 > > to > > 29 from this series applied and what about patches 1 to 6? Am I > > missing > > something? > > That is a really good question, and one I too would like an answer > to. I tried to help Armin by staging a few patches related to reproducibility and it was easiest for me to do that via the -next branch. It seems I mainly caused confusion, sorry :( Cheers, Richard From alex.kanavin at gmail.com Mon Feb 10 11:42:41 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 10 Feb 2020 12:42:41 +0100 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: <6cf5b86f-5055-0573-61ab-ad4717af5c2d@broadcom.com> References: <20200208000110.29065-1-scott.branden@broadcom.com> <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> <2159565f-eaca-697d-0711-e39aeccb1ba2@broadcom.com> <6cf5b86f-5055-0573-61ab-ad4717af5c2d@broadcom.com> Message-ID: As long as we're consistent, I'm ok with either option. I think it's ultimately up to RP to make the call. Alex On Mon, 10 Feb 2020 at 07:16, Scott Branden via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > > > On 2020-02-09 3:35 p.m., Khem Raj wrote: > > On Sun, Feb 9, 2020 at 11:27 AM Scott Branden > > wrote: > >> > >> > >> On 2020-02-08 11:18 a.m., Khem Raj wrote: > >>> On Fri, Feb 7, 2020 at 8:02 PM Scott Branden < > scott.branden at broadcom.com> wrote: > >>>> Hi Khem, > >>>> > >>>> On 2020-02-07 5:12 p.m., Khem Raj wrote: > >>>> > >>>> > >>>> > >>>> On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core < > openembedded-core at lists.openembedded.org> wrote: > >>>>> Add x265 recipe from latest revision of stable branch. > >>>> I wonder if it belongs to core are there deps on it that we need in > common metadata > >>>> > >>>> I simply followed where x264 recipe is located and placed x265 beside > it. > >>>> Both are needed when enabled in ffmpeg. > >>>> > >>>> I don't know if that answers your question as to where they should be > located. > >>> idea is to keep small and therefore we should assess the inclusions in > core > >>> we have many packageconfigs which require packages from other layers > >>> so if ffmpeg needs it and is optional then it should be fine to keep > >>> it in meta-multimedia and packageconfig in ffmpeg disabled by default. > >> I don't see why x264 would be in core and x265 in meta-multimedia. > >> Both should be moved to meta-multimedia then? > >> > > I followed the thread a bit and I see there are followups where > > usecase for other recipes in core is now > > established, where this seemed a leaf package being added to oe-core, > > So perhaps it should be added > > to validation loops as well like x264. > I leave it to the powers that be to decide where to place this recipe. > > > >> I think you would also require a bbappend to fffmpeg recipe to add x264 > >> and x265 to ffmpeg packageconfig. > >> if that is the case, why not move ffmpeg to meta-multimedia as well? > >> > > You would not go down that line of thought since these packages are in > > the dependency chain for validating reference > > images in core along with they being used by other packages from other > layers. > > > >>>>> Signed-off-by: Scott Branden > >>>>> --- > >>>>> meta/recipes-multimedia/x265/x265_git.bb | 20 > ++++++++++++++++++++ > >>>>> 1 file changed, 20 insertions(+) > >>>>> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb > >>>>> > >>>>> diff --git a/meta/recipes-multimedia/x265/x265_git.bb > b/meta/recipes-multimedia/x265/x265_git.bb > >>>>> new file mode 100644 > >>>>> index 0000000000..796fbbc13a > >>>>> --- /dev/null > >>>>> +++ b/meta/recipes-multimedia/x265/x265_git.bb > >>>>> @@ -0,0 +1,20 @@ > >>>>> +SUMMARY = "H.265/HEVC video encoder" > >>>>> +DESCRIPTION = "A free software library and application for encoding > video streams into the H.265/HEVC format." > >>>>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" > >>>>> + > >>>>> +LICENSE = "GPLv2" > >>>>> +LICENSE_FLAGS = "commercial" > >>>>> +LIC_FILES_CHKSUM = > "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" > >>>>> + > >>>>> +DEPENDS = "gnutls zlib libpcre" > >>>>> + > >>>>> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ > >>>>> + " > >>>>> + > >>>>> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" > >>>>> + > >>>>> +S = "${WORKDIR}/git/source" > >>>>> + > >>>>> +inherit lib_package pkgconfig cmake > >>>>> + > >>>>> +AS[unexport] = "1" > >>>>> -- > >>>>> 2.17.1 > >>>>> > >>>>> -- > >>>>> _______________________________________________ > >>>>> Openembedded-core mailing list > >>>>> Openembedded-core at lists.openembedded.org > >>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From zhe.he at windriver.com Mon Feb 10 13:11:28 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Mon, 10 Feb 2020 21:11:28 +0800 Subject: [OE-core] [PATCH] cryptodev-module: Fix build failure with kernel v5.5 Message-ID: <20200210131128.28390-1-zhe.he@windriver.com> From: He Zhe Backport from upstream to fix the following build failure. cryptlib.c:162:37: error: 'crypto_ablkcipher_type' undeclared (first use in this function); did you mean 'crypto_skcipher_tfm'? 162 | if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) | ^~~~~~~~~~~~~~~~~~~~~~ | crypto_skcipher_tfm cryptlib.c:169:25: error: 'struct crypto_alg' has no member named 'cra_ablkcipher' 169 | alg = &tfm->__crt_alg->cra_ablkcipher; | ^~ cryptlib.c:170:21: error: dereferencing pointer to incomplete type 'struct ablkcipher_alg' 170 | min_keysize = alg->min_keysize; | ^~ Signed-off-by: He Zhe --- .../cryptodev/cryptodev-module_1.10.bb | 1 + ...-cryptlib.c-fix-build-on-kernel-v5.5.patch | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb index 552eb6abaa..89b52d8d95 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb @@ -9,6 +9,7 @@ DEPENDS += "cryptodev-linux" SRC_URI += " \ file://0001-Disable-installing-header-file-provided-by-another-p.patch \ +file://0001-cryptlib.c-fix-build-on-kernel-v5.5.patch \ " EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' diff --git a/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch b/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch new file mode 100644 index 0000000000..1af9aed8d8 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch @@ -0,0 +1,49 @@ +From 98b163a23f6b9fbdc18c3644cf94a75cdcd0cc80 Mon Sep 17 00:00:00 2001 +From: Andrei Botila +Date: Wed, 27 Nov 2019 09:53:37 +0200 +Subject: [PATCH] cryptlib.c: fix build on kernel v5.5+ + +Starting with kernel v5.5-rc1 ablkcipher and blkcipher are removed and +symmetric key operations will rely solely on skcipher: +commit d63007eb954 ("crypto: ablkcipher - remove deprecated and unused ablkcipher support"). + +When cryptodev will use higher kernel versions > 5.4 will need to use the +skcipher interface instead. + +Signed-off-by: Andrei Botila + +Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/ +commit/98b163a23f6b9fbdc18c3644cf94a75cdcd0cc80] + +Signed-off-by: He Zhe + +--- + cryptlib.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/cryptlib.c b/cryptlib.c +index 4a87037..e2a4198 100644 +--- a/cryptlib.c ++++ b/cryptlib.c +@@ -159,6 +159,7 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) + tfm = crypto_skcipher_tfm(out->async.s); ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 4, 0)) + if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) + || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) +@@ -169,7 +170,9 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, + alg = &tfm->__crt_alg->cra_ablkcipher; + min_keysize = alg->min_keysize; + max_keysize = alg->max_keysize; +- } else { ++ } else ++#endif ++ { + struct skcipher_alg *alg; + + alg = crypto_skcipher_alg(out->async.s); +-- +2.7.4 + -- 2.24.1 From kai.kang at windriver.com Mon Feb 10 13:20:26 2020 From: kai.kang at windriver.com (kai.kang at windriver.com) Date: Mon, 10 Feb 2020 21:20:26 +0800 Subject: [OE-core] [PATCH] imagefeatures.py: update no busybox cases Message-ID: <20200210132026.10962-1-kai.kang@windriver.com> From: Kai Kang Duplicate case test_no_busybox_base_utils with test_no_busybox_base_utils_systemd in imagefeatures.py. Append IMAGE_FEATURES "ptest-pkgs" and run task 'testimage' of core-image-sato in original case test_no_busybox_base_utils. It takes too much time to run case test_no_busybox_base_utils, so not update the case to run task 'testimage' in test_no_busybox_base_utils_systemd. $ time oe-selftest -r imagefeatures.ImageFeatures.test_no_busybox_base_utils real 394m54.424s user 0m17.764s sys 0m4.276s [Yocto #13736] Signed-off-by: Kai Kang --- meta/lib/oeqa/selftest/cases/imagefeatures.py | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py index 5c519ac3d6..200dfe58db 100644 --- a/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py @@ -239,8 +239,33 @@ USERADD_GID_TABLES += "files/static-group" def test_no_busybox_base_utils(self): config = """ +INHERIT += "testimage" + +# Enable x11 +DISTRO_FEATURES_append = " x11" + +# Involve ptest packages +IMAGE_FEATURES_append = " ptest-pkgs" + +# Replace busybox +PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils" +VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils" +VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock" +VIRTUAL-RUNTIME_base-utils-syslog = "sysklogd" +VIRTUAL-RUNTIME_login_manager = "shadow-base" + +# Blacklist busybox +PNBLACKLIST[busybox] = "Don't build this" +""" + self.write_config(config) + + bitbake("core-image-sato") + bitbake("-c testimage core-image-sato") + + def test_no_busybox_base_utils_systemd(self): + config = """ # Enable x11 -DISTRO_FEATURES_append += "x11" +DISTRO_FEATURES_append = " x11" # Switch to systemd DISTRO_FEATURES += "systemd" -- 2.17.1 From alex.kiernan at gmail.com Mon Feb 10 14:22:15 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Mon, 10 Feb 2020 14:22:15 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> Message-ID: On Sun, Feb 9, 2020 at 4:25 PM Alex Kiernan wrote: > > On Sun, Feb 9, 2020 at 7:27 AM Alex Kiernan wrote: > > > > On Sun, Feb 9, 2020 at 12:23 AM chris.laplante at agilent.com > > wrote: > > > > > > Hi Richard, > > > > > > > > > Anecdotally, we are running Zeus for nightly builds with three > > > > > > multiconfigs. I cherry-picked your "bitbake: fix2" and "bitbake: > > > > > > fixup" patches and haven't seen any of the BB_UNIHASH errors since. > > > > > > Granted it's only been a week. But before that, hash equiv + > > > > > > multiconfig was unusable due to the BB_UNIHASH errors. > > > > > > > > > > That is a really helpful data point, thanks. I should probably clean up > > > > > those bitbake patches and get them merged then, I couldn't decide if > > > > > they were right or not... > > > > > > > > > > > > > I just picked all your pending changes out of master-next into our > > > > local patch queue - will let you know how it looks when it's finished > > > > cooking! > > > > > > There are two small issues I have observed. > > > > > > One is occasionally I get a lot of undeterministic metadata errors when BB_CACHE_POLICY = "cache", multiconfig, and hash equiv are enabled. The errors are all on recipes for which SRCREV = "${AUTOREV}". It doesn't always happen. But it did just now when I rebased our "zeus-modified" branch onto the upstream "zeus" branch, to get the changes starting with 7dc72fde6edeb5d6ac6b3832530998afeea67cbc. > > > > > > Two is that, sometimes "Initializing tasks" stage appears stuck at 44% for a couple minutes. I traced it down to this code in runqueue.py (line 1168 on zeus): > > > > > > # Iterate over the task list and call into the siggen code > > > dealtwith = set() > > > todeal = set(self.runtaskentries) > > > while len(todeal) > 0: > > > for tid in todeal.copy(): > > > if len(self.runtaskentries[tid].depends - dealtwith) == 0: > > > dealtwith.add(tid) > > > todeal.remove(tid) > > > self.prepare_task_hash(tid) > > > > > > When I instrument the loop to print out the size of "todeal", I see it decrease very slowly, sometimes only a couple at a time. I'm guessing this is because prepare_task_hash is contacting the hash equiv server, in a serial manner here. I'm over my work VPN which makes things extra slow. Is there an opportunity for batching here? > > > > > > > I've a new failure: > > > > 00:20:59.829 Traceback (most recent call last): > > 00:20:59.829 File > > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/server/process.py", > > line 278, in ProcessServer.idle_commands(delay=0.1, > > fds=[ > type=SocketKind.SOCK_STREAM, proto=0, laddr=bitbake.sock>, > > > type=SocketKind.SOCK_STREAM, proto=0, laddr=bitbake.sock>, > > ]): > > 00:20:59.829 try: > > 00:20:59.829 > retval = function(self, data, False) > > 00:20:59.829 if retval is False: > > 00:20:59.829 File > > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/cooker.py", > > line 1434, in buildTargetsIdle(server= > started)>, rq=, > > abort=False): > > 00:20:59.829 try: > > 00:20:59.829 > retval = rq.execute_runqueue() > > 00:20:59.829 except runqueue.TaskFailure as exc: > > 00:20:59.829 File > > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", > > line 1522, in RunQueue.execute_runqueue(): > > 00:20:59.829 try: > > 00:20:59.829 > return self._execute_runqueue() > > 00:20:59.829 except bb.runqueue.TaskFailure: > > 00:20:59.829 File > > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", > > line 1488, in RunQueue._execute_runqueue(): > > 00:20:59.829 if self.state is runQueueRunning: > > 00:20:59.829 > retval = self.rqexe.execute() > > 00:20:59.829 > > 00:20:59.829 File > > "/var/lib/jenkins/workspace/nanohub_master/poky/bitbake/lib/bb/runqueue.py", > > line 1997, in RunQueueExecute.execute(): > > 00:20:59.829 else: > > 00:20:59.829 > > > self.sqdata.outrightfail.remove(nexttask) > > 00:20:59.829 if nexttask in self.sqdata.outrightfail: > > > > Just testing locally with: > > > > diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py > > index 71108eeed752..a94a9bb27ae2 100644 > > --- a/bitbake/lib/bb/runqueue.py > > +++ b/bitbake/lib/bb/runqueue.py > > @@ -1994,7 +1994,7 @@ class RunQueueExecute: > > self.sq_task_failoutright(nexttask) > > return True > > else: > > - self.sqdata.outrightfail.remove(nexttask) > > + self.sqdata.outrightfail.discard(nexttask) > > if nexttask in self.sqdata.outrightfail: > > logger.debug(2, 'No package found, so > > skipping setscene task %s', nexttask) > > self.sq_task_failoutright(nexttask) > > > > That change has got me a clean build to complete end to end, which a > rebuild is then successfully using the sstate-cache. > With this change on top of master I've 7 green builds one after another, which is better than we've managed in a week. > But something is upsetting sstate I'm serving back from the jenkins > box to a local build, as I'm getting different hashes for the same > sstate: > > akiernan at akiernan-virtual-machine:~/nanohub/build$ find sstate-cache > -name '*quilt-native*populate_sysroot*' -ls > 2240468 40 -rw-rw-r-- 1 akiernan akiernan 39406 Feb 9 > 13:53 sstate-cache/universal/ff/29/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:ff29b95eb35bba9a4c2e0857372991e6f08c0e9fcb72f76bc2dfbad5d12cade1_populate_sysroot.tgz.siginfo > 2241106 56 -rw-rw-r-- 1 akiernan akiernan 53302 Feb 9 > 13:53 sstate-cache/universal/ff/29/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:ff29b95eb35bba9a4c2e0857372991e6f08c0e9fcb72f76bc2dfbad5d12cade1_populate_sysroot.tgz > 2634859 40 -rw-rw-r-- 1 akiernan akiernan 39387 Feb 9 > 16:16 sstate-cache/universal/83/30/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:83309dcd3c0c7e2ab03ed24b2a5b8d6bf9e35e7b4c8c27373fd68513c8c2b29e_populate_sysroot.tgz.siginfo > 2634858 52 -rw-rw-r-- 1 akiernan akiernan 52543 Feb 9 > 16:16 sstate-cache/universal/83/30/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:83309dcd3c0c7e2ab03ed24b2a5b8d6bf9e35e7b4c8c27373fd68513c8c2b29e_populate_sysroot.tgz > akiernan at akiernan-virtual-machine:~/nanohub/build$ bitbake-diffsigs > sstate-cache/universal/ff/29/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:ff29b95eb35bba9a4c2e0857372991e6f08c0e9fcb72f76bc2dfbad5d12cade1_populate_sysroot.tgz.siginfo > sstate-cache/universal/83/30/sstate:quilt-native:x86_64-linux:0.66:r0:x86_64:3:83309dcd3c0c7e2ab03ed24b2a5b8d6bf9e35e7b4c8c27373fd68513c8c2b29e_populate_sysroot.tgz.siginfo > NOTE: Starting bitbake server... > akiernan at akiernan-virtual-machine:~/nanohub/build$ > > Running dumpsig and diffing them manually I'm none the wiser - other > than variables being a in a different order in the two sstate files, > they're identical. > Whatever my problem is here, it's now vanished again :| -- Alex Kiernan From oleksandr.s.popovych at globallogic.com Mon Feb 10 14:51:32 2020 From: oleksandr.s.popovych at globallogic.com (Oleksandr Popovych) Date: Mon, 10 Feb 2020 16:51:32 +0200 Subject: [OE-core] [PATCH] expat: Add ptest Message-ID: >From f7b0599dcd3e12f0042bb06ea8b80645da997982 Mon Sep 17 00:00:00 2001 From: Oleksandr Popovych Date: Mon, 10 Feb 2020 15:57:25 +0200 Subject: [OE-core][PATCH] expat: Add ptest For ptest support for this package several additional patches and run-ptest script were added and recipe was changed. Signed-off-by: Oleksandr Popovych --- ...d-Makefile-targets-for-ptest-support.patch | 38 ++++++++++++++ ...ort-for-ptests-in-form-of-new-target.patch | 31 ++++++++++++ ...ed-suitable-format-of-tests-in-ptest.patch | 50 +++++++++++++++++++ meta/recipes-core/expat/expat/run-ptest | 3 ++ meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- 5 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch create mode 100644 meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch create mode 100644 meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch create mode 100644 meta/recipes-core/expat/expat/run-ptest diff --git a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch new file mode 100644 index 0000000000..32488060ee --- /dev/null +++ b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch @@ -0,0 +1,38 @@ +From ce803ec3d7b095cb55686f9cd5d3f01d34a31a5e Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:41:45 +0200 +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support + +install-ptest, runtests and check tagrets are added. + +Signed-off-by: Oleksandr Popovych +--- + Makefile.am | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 5e1d37d..c63b44a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -152,3 +152,18 @@ qa: + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh ++ ++.PHONY: install-ptest ++install-ptest: ++ echo $(S) ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ ++ install runtests runtestspp $(DESTDIR)) ++ cp Makefile $(DESTDIR) ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile ++ ++.PHONY: runtests ++runtests: ++ @echo "C variant of tests:" ++ @$(CHECKER) ./runtests$(EXEEXT) -q ++ @echo "C++ variant of tests:" ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch new file mode 100644 index 0000000000..cf8a2495e9 --- /dev/null +++ b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch @@ -0,0 +1,31 @@ +From 2b209a025f62fb1be7b32599aa80703ce8ecd76a Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:43:57 +0200 +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target + +configure.am file changed, according to this advice: +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite + +Signed-off-by: Oleksandr Popovych +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d58ac03..8e6b41e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) + AC_CONFIG_AUX_DIR([conftools]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST +-AM_INIT_AUTOMAKE +- ++AM_INIT_AUTOMAKE([serial-tests]) ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) + + dnl + dnl Increment LIBREVISION if source code has changed at all +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch new file mode 100644 index 0000000000..5d1daefc92 --- /dev/null +++ b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch @@ -0,0 +1,50 @@ +From b2e236e238f8bab42651313ea198b27355945d97 Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:44:56 +0200 +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest + +Some changes in testcases code were applied for testcase engine. +This was just adding of message outputs in "RESULT: TESTNAME" form... + +Signed-off-by: Oleksandr Popovych +--- + tests/minicheck.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/minicheck.c b/tests/minicheck.c +index a5a1efb..b39cda9 100644 +--- a/tests/minicheck.c ++++ b/tests/minicheck.c +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + if (tc->setup != NULL) { + /* setup */ + if (setjmp(env)) { ++ printf("SKIP: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + } + /* test */ + if (setjmp(env)) { ++ printf("FAIL: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { + /* teardown */ + if (tc->teardown != NULL) { + if (setjmp(env)) { ++ printf("PASS: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } + tc->teardown(); + } ++ printf("PASS: %s\n", _check_current_function); + } + tc = tc->next_tcase; + } +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..df994c0838 --- /dev/null +++ b/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,3 @@ +#!/bin/bash + +make -k runtests diff --git a/meta/recipes-core/expat/expat_2.2.9.bb b/meta/recipes-core/expat/expat_2.2.9.bb index 8f3db41352..420ffddc80 100644 --- a/meta/recipes-core/expat/expat_2.2.9.bb +++ b/meta/recipes-core/expat/expat_2.2.9.bb @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ + file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" -inherit autotools lib_package +inherit autotools ptest lib_package + +RDEPENDS_${PN}-ptest += "make bash" do_configure_prepend () { rm -f ${S}/conftools/libtool.m4 } +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From patchwork at patchwork.openembedded.org Mon Feb 10 15:02:39 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 10 Feb 2020 15:02:39 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_expat=3A_A?= =?utf-8?q?dd_ptest?= In-Reply-To: References: Message-ID: <20200210150239.2273.81903@do> == Series Details == Series: expat: Add ptest Revision: 1 URL : https://patchwork.openembedded.org/series/22530/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] Suggested fix Create the series again using git-format-patch and ensure it can be applied using git am Diff line "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 44a4ac2294) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From akuster808 at gmail.com Mon Feb 10 16:01:01 2020 From: akuster808 at gmail.com (akuster808) Date: Mon, 10 Feb 2020 08:01:01 -0800 Subject: [OE-core] [zeus 00/29] Patch review In-Reply-To: <2cd46664933442f788e7d5ef62b184eb@XBOX03.axis.com> References: <2cd46664933442f788e7d5ef62b184eb@XBOX03.axis.com> Message-ID: <3e9e9b41-a82b-b77f-4ce7-746ae65c8fb0@gmail.com> On 2/10/20 1:55 AM, Peter Kjellerstedt wrote: >> -----Original Message----- >> From: openembedded-core-bounces at lists.openembedded.org > bounces at lists.openembedded.org> On Behalf Of Schrempf Frieder >> Sent: den 10 februari 2020 09:07 >> To: Armin Kuster ; openembedded- >> core at openembedded.org >> Subject: Re: [OE-core] [zeus 00/29] Patch review >> >> Hi Armin, >> >> On 09.02.20 17:09, Armin Kuster wrote: >>> These are the additional changes to help address reproducibility issues >>> and additional fixes we would like to be included in 3.0.2 >>> >>> Please have comments back by Tuesday >> I have two questions/comments: >> >> 1. When I look at the zeus-next branch, why do I see only patches 7 to >> 29 from this series applied and what about patches 1 to 6? Am I missing >> something? > That is a really good question, and one I too would like an answer to. > >> 2. Patch 5 (devtool/standard.py: Allow recipe to disable menuconfig >> logic) goes hand in hand with a change to the u-boot recipe, that is >> also in master (c634b8db1a8b). This patch seems to be missing here. > That one is probably my fault. We have a local recipe that defines a > menuconfig task and thus I needed the correction for devtool and sent > a request for it to be backported. However, since we do not use u-boot, > I did not think of that part, which obviously should be backported too. will find that one. thanks, Armin > >> Regards, >> Frieder > //Peter > From raj.khem at gmail.com Mon Feb 10 16:01:03 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 10 Feb 2020 08:01:03 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: References: <20200208000110.29065-1-scott.branden@broadcom.com> <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> <2159565f-eaca-697d-0711-e39aeccb1ba2@broadcom.com> <6cf5b86f-5055-0573-61ab-ad4717af5c2d@broadcom.com> Message-ID: On Mon, Feb 10, 2020 at 3:42 AM Alexander Kanavin wrote: > > As long as we're consistent, I'm ok with either option. I think it's ultimately up to RP to make the call. > > The usecase is fine, as long as we add x265 support to gst plugins and ffmeg and it gets tested via reference images, I see no issues adding it. > Alex > > On Mon, 10 Feb 2020 at 07:16, Scott Branden via Openembedded-core wrote: >> >> >> >> On 2020-02-09 3:35 p.m., Khem Raj wrote: >> > On Sun, Feb 9, 2020 at 11:27 AM Scott Branden >> > wrote: >> >> >> >> >> >> On 2020-02-08 11:18 a.m., Khem Raj wrote: >> >>> On Fri, Feb 7, 2020 at 8:02 PM Scott Branden wrote: >> >>>> Hi Khem, >> >>>> >> >>>> On 2020-02-07 5:12 p.m., Khem Raj wrote: >> >>>> >> >>>> >> >>>> >> >>>> On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core wrote: >> >>>>> Add x265 recipe from latest revision of stable branch. >> >>>> I wonder if it belongs to core are there deps on it that we need in common metadata >> >>>> >> >>>> I simply followed where x264 recipe is located and placed x265 beside it. >> >>>> Both are needed when enabled in ffmpeg. >> >>>> >> >>>> I don't know if that answers your question as to where they should be located. >> >>> idea is to keep small and therefore we should assess the inclusions in core >> >>> we have many packageconfigs which require packages from other layers >> >>> so if ffmpeg needs it and is optional then it should be fine to keep >> >>> it in meta-multimedia and packageconfig in ffmpeg disabled by default. >> >> I don't see why x264 would be in core and x265 in meta-multimedia. >> >> Both should be moved to meta-multimedia then? >> >> >> > I followed the thread a bit and I see there are followups where >> > usecase for other recipes in core is now >> > established, where this seemed a leaf package being added to oe-core, >> > So perhaps it should be added >> > to validation loops as well like x264. >> I leave it to the powers that be to decide where to place this recipe. >> > >> >> I think you would also require a bbappend to fffmpeg recipe to add x264 >> >> and x265 to ffmpeg packageconfig. >> >> if that is the case, why not move ffmpeg to meta-multimedia as well? >> >> >> > You would not go down that line of thought since these packages are in >> > the dependency chain for validating reference >> > images in core along with they being used by other packages from other layers. >> > >> >>>>> Signed-off-by: Scott Branden >> >>>>> --- >> >>>>> meta/recipes-multimedia/x265/x265_git.bb | 20 ++++++++++++++++++++ >> >>>>> 1 file changed, 20 insertions(+) >> >>>>> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >> >>>>> >> >>>>> diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb >> >>>>> new file mode 100644 >> >>>>> index 0000000000..796fbbc13a >> >>>>> --- /dev/null >> >>>>> +++ b/meta/recipes-multimedia/x265/x265_git.bb >> >>>>> @@ -0,0 +1,20 @@ >> >>>>> +SUMMARY = "H.265/HEVC video encoder" >> >>>>> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." >> >>>>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >> >>>>> + >> >>>>> +LICENSE = "GPLv2" >> >>>>> +LICENSE_FLAGS = "commercial" >> >>>>> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >> >>>>> + >> >>>>> +DEPENDS = "gnutls zlib libpcre" >> >>>>> + >> >>>>> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ >> >>>>> + " >> >>>>> + >> >>>>> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >> >>>>> + >> >>>>> +S = "${WORKDIR}/git/source" >> >>>>> + >> >>>>> +inherit lib_package pkgconfig cmake >> >>>>> + >> >>>>> +AS[unexport] = "1" >> >>>>> -- >> >>>>> 2.17.1 >> >>>>> >> >>>>> -- >> >>>>> _______________________________________________ >> >>>>> Openembedded-core mailing list >> >>>>> Openembedded-core at lists.openembedded.org >> >>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Mon Feb 10 16:02:24 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 10 Feb 2020 16:02:24 +0000 Subject: [OE-core] [PATCH] pkgconf: Remove pointless DEFAULT_PREFERENCE Message-ID: <20200210160224.21246-1-richard.purdie@linuxfoundation.org> There is no other version of pkgconfig to have a preference against, remove the unneeded variable. Signed-off-by: Richard Purdie --- meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb index 94bc112b9fd..732ca2a0348 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb @@ -8,7 +8,6 @@ BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" RPROVIDES_${PN} += "pkgconfig" -DEFAULT_PREFERENCE = "-1" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name. -- 2.20.1 From oleksandr.s.popovych at globallogic.com Mon Feb 10 16:40:36 2020 From: oleksandr.s.popovych at globallogic.com (Oleksandr Popovych) Date: Mon, 10 Feb 2020 18:40:36 +0200 Subject: [OE-core] [PATCH V2] Message-ID: >From dcf5a9b6199c3b1f4a6aad00334e69281bde3c34 Mon Sep 17 00:00:00 2001 From: Oleksandr Popovych Date: Thu, 6 Feb 2020 18:14:28 +0200 Subject: [OE-core][PATCH] expat: Added ptest For ptest support for this package several additional patches and run-ptest script were added and recipe was changed. Signed-off-by: Oleksandr Popovych --- ...d-Makefile-targets-for-ptest-support.patch | 38 ++++++++++++++ ...ort-for-ptests-in-form-of-new-target.patch | 31 ++++++++++++ ...ed-suitable-format-of-tests-in-ptest.patch | 50 +++++++++++++++++++ meta/recipes-core/expat/expat/run-ptest | 3 ++ meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- 5 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch create mode 100644 meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch create mode 100644 meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch create mode 100644 meta/recipes-core/expat/expat/run-ptest diff --git a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch new file mode 100644 index 0000000000..32488060ee --- /dev/null +++ b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch @@ -0,0 +1,38 @@ +From ce803ec3d7b095cb55686f9cd5d3f01d34a31a5e Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:41:45 +0200 +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support + +install-ptest, runtests and check tagrets are added. + +Signed-off-by: Oleksandr Popovych +--- + Makefile.am | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 5e1d37d..c63b44a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -152,3 +152,18 @@ qa: + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh ++ ++.PHONY: install-ptest ++install-ptest: ++ echo $(S) ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ ++ install runtests runtestspp $(DESTDIR)) ++ cp Makefile $(DESTDIR) ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile ++ ++.PHONY: runtests ++runtests: ++ @echo "C variant of tests:" ++ @$(CHECKER) ./runtests$(EXEEXT) -q ++ @echo "C++ variant of tests:" ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch new file mode 100644 index 0000000000..cf8a2495e9 --- /dev/null +++ b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch @@ -0,0 +1,31 @@ +From 2b209a025f62fb1be7b32599aa80703ce8ecd76a Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:43:57 +0200 +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target + +configure.am file changed, according to this advice: +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite + +Signed-off-by: Oleksandr Popovych +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d58ac03..8e6b41e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) + AC_CONFIG_AUX_DIR([conftools]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST +-AM_INIT_AUTOMAKE +- ++AM_INIT_AUTOMAKE([serial-tests]) ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) + + dnl + dnl Increment LIBREVISION if source code has changed at all +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch new file mode 100644 index 0000000000..5d1daefc92 --- /dev/null +++ b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch @@ -0,0 +1,50 @@ +From b2e236e238f8bab42651313ea198b27355945d97 Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:44:56 +0200 +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest + +Some changes in testcases code were applied for testcase engine. +This was just adding of message outputs in "RESULT: TESTNAME" form... + +Signed-off-by: Oleksandr Popovych +--- + tests/minicheck.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/minicheck.c b/tests/minicheck.c +index a5a1efb..b39cda9 100644 +--- a/tests/minicheck.c ++++ b/tests/minicheck.c +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + if (tc->setup != NULL) { + /* setup */ + if (setjmp(env)) { ++ printf("SKIP: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + } + /* test */ + if (setjmp(env)) { ++ printf("FAIL: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { + /* teardown */ + if (tc->teardown != NULL) { + if (setjmp(env)) { ++ printf("PASS: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } + tc->teardown(); + } ++ printf("PASS: %s\n", _check_current_function); + } + tc = tc->next_tcase; + } +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..df994c0838 --- /dev/null +++ b/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,3 @@ +#!/bin/bash + +make -k runtests diff --git a/meta/recipes-core/expat/expat_2.2.9.bb b/meta/recipes-core/expat/expat_2.2.9.bb index 8f3db41352..420ffddc80 100644 --- a/meta/recipes-core/expat/expat_2.2.9.bb +++ b/meta/recipes-core/expat/expat_2.2.9.bb @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ + file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" -inherit autotools lib_package +inherit autotools ptest lib_package + +RDEPENDS_${PN}-ptest += "make bash" do_configure_prepend () { rm -f ${S}/conftools/libtool.m4 } +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From oleksandr.s.popovych at globallogic.com Mon Feb 10 16:50:22 2020 From: oleksandr.s.popovych at globallogic.com (Oleksandr Popovych) Date: Mon, 10 Feb 2020 18:50:22 +0200 Subject: [OE-core] [PATCH v3] expat: add ptest Message-ID: >From dcf5a9b6199c3b1f4a6aad00334e69281bde3c34 Mon Sep 17 00:00:00 2001 From: Oleksandr Popovych Date: Thu, 6 Feb 2020 18:14:28 +0200 Subject: [OE-core][PATCH] expat: Added ptest For ptest support for this package several additional patches and run-ptest script were added and recipe was changed. Signed-off-by: Oleksandr Popovych --- ...d-Makefile-targets-for-ptest-support.patch | 38 ++++++++++++++ ...ort-for-ptests-in-form-of-new-target.patch | 31 ++++++++++++ ...ed-suitable-format-of-tests-in-ptest.patch | 50 +++++++++++++++++++ meta/recipes-core/expat/expat/run-ptest | 3 ++ meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- 5 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch create mode 100644 meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch create mode 100644 meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch create mode 100644 meta/recipes-core/expat/expat/run-ptest diff --git a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch new file mode 100644 index 0000000000..32488060ee --- /dev/null +++ b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch @@ -0,0 +1,38 @@ +From ce803ec3d7b095cb55686f9cd5d3f01d34a31a5e Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:41:45 +0200 +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support + +install-ptest, runtests and check tagrets are added. + +Signed-off-by: Oleksandr Popovych +--- + Makefile.am | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 5e1d37d..c63b44a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -152,3 +152,18 @@ qa: + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh ++ ++.PHONY: install-ptest ++install-ptest: ++ echo $(S) ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ ++ install runtests runtestspp $(DESTDIR)) ++ cp Makefile $(DESTDIR) ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile ++ ++.PHONY: runtests ++runtests: ++ @echo "C variant of tests:" ++ @$(CHECKER) ./runtests$(EXEEXT) -q ++ @echo "C++ variant of tests:" ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch new file mode 100644 index 0000000000..cf8a2495e9 --- /dev/null +++ b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch @@ -0,0 +1,31 @@ +From 2b209a025f62fb1be7b32599aa80703ce8ecd76a Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:43:57 +0200 +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target + +configure.am file changed, according to this advice: +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite + +Signed-off-by: Oleksandr Popovych +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d58ac03..8e6b41e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) + AC_CONFIG_AUX_DIR([conftools]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST +-AM_INIT_AUTOMAKE +- ++AM_INIT_AUTOMAKE([serial-tests]) ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) + + dnl + dnl Increment LIBREVISION if source code has changed at all +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch new file mode 100644 index 0000000000..5d1daefc92 --- /dev/null +++ b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch @@ -0,0 +1,50 @@ +From b2e236e238f8bab42651313ea198b27355945d97 Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:44:56 +0200 +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest + +Some changes in testcases code were applied for testcase engine. +This was just adding of message outputs in "RESULT: TESTNAME" form... + +Signed-off-by: Oleksandr Popovych +--- + tests/minicheck.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/minicheck.c b/tests/minicheck.c +index a5a1efb..b39cda9 100644 +--- a/tests/minicheck.c ++++ b/tests/minicheck.c +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + if (tc->setup != NULL) { + /* setup */ + if (setjmp(env)) { ++ printf("SKIP: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + } + /* test */ + if (setjmp(env)) { ++ printf("FAIL: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { + /* teardown */ + if (tc->teardown != NULL) { + if (setjmp(env)) { ++ printf("PASS: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } + tc->teardown(); + } ++ printf("PASS: %s\n", _check_current_function); + } + tc = tc->next_tcase; + } +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..df994c0838 --- /dev/null +++ b/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,3 @@ +#!/bin/bash + +make -k runtests diff --git a/meta/recipes-core/expat/expat_2.2.9.bb b/meta/recipes-core/expat/expat_2.2.9.bb index 8f3db41352..420ffddc80 100644 --- a/meta/recipes-core/expat/expat_2.2.9.bb +++ b/meta/recipes-core/expat/expat_2.2.9.bb @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ + file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" -inherit autotools lib_package +inherit autotools ptest lib_package + +RDEPENDS_${PN}-ptest += "make bash" do_configure_prepend () { rm -f ${S}/conftools/libtool.m4 } +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From patchwork at patchwork.openembedded.org Mon Feb 10 17:02:39 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 10 Feb 2020 17:02:39 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_expat=3A_A?= =?utf-8?q?dd_ptest_=28rev2=29?= In-Reply-To: References: Message-ID: <20200210170239.2273.6687@do> == Series Details == Series: expat: Add ptest (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22530/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] Suggested fix Create the series again using git-format-patch and ensure it can be applied using git am Diff line "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 44a4ac2294) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From patchwork at patchwork.openembedded.org Mon Feb 10 17:02:40 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 10 Feb 2020 17:02:40 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_=5BV2=5D?= In-Reply-To: References: Message-ID: <20200210170240.2273.98845@do> == Series Details == Series: [V2] Revision: 1 URL : https://patchwork.openembedded.org/series/22533/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] Suggested fix Create the series again using git-format-patch and ensure it can be applied using git am Diff line "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 44a4ac2294) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From sjolley.yp.pm at gmail.com Mon Feb 10 17:09:35 2020 From: sjolley.yp.pm at gmail.com (sjolley.yp.pm at gmail.com) Date: Mon, 10 Feb 2020 09:09:35 -0800 Subject: [OE-core] Yocto Project Newcomer & Unassigned Bugs - Help Needed Message-ID: <059e01d5e034$df16eb00$9d44c100$@gmail.com> All, The triage team is starting to try and collect up and classify bugs which a newcomer to the project would be able to work on in a way which means people can find them. They're being listed on the triage page under the appropriate heading: https://wiki.yoctoproject.org/wiki/Bug_Triage#Newcomer_Bugs The idea is these bugs should be straight forward for a person to help work on who doesn't have deep experience with the project. If anyone can help, please take ownership of the bug and send patches! If anyone needs help/advice there are people on irc who can likely do so, or some of the more experienced contributors will likely be happy to help too. Also, the triage team meets weekly and does its best to handle the bugs reported into the Bugzilla. The number of people attending that meeting has fallen, as have the number of people available to help fix bugs. One of the things we hear users report is they don't know how to help. We (the triage team) are therefore going to start reporting out the currently 294 unassigned or newcomer bugs. We're hoping people may be able to spare some time now and again to help out with these. Bugs are split into two types, "true bugs" where things don't work as they should and "enhancements" which are features we'd want to add to the system. There are also roughly four different "priority" classes right now, "3.1", "3.2, "3.99" and "Future", the more pressing/urgent issues being in "3.1" and then "3.2". Please review this link and if a bug is something you would be able to help with either take ownership of the bug, or send me (sjolley.yp.pm at gmail.com ) an e-mail with the bug number you would like and I will assign it to you (please make sure you have a Bugzilla account). The list is at: https://wiki.yoctoproject.org/wiki/Bug_Triage_Archive#Unassigned_or_Newcomer _Bugs Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From persaur at gmail.com Mon Feb 10 17:10:52 2020 From: persaur at gmail.com (Rich Persaud) Date: Mon, 10 Feb 2020 12:10:52 -0500 Subject: [OE-core] [Openembedded-architecture] Incorporating deploy artefacts from one multiconfig in another multiconfig Message-ID: <30A4CC9D-603A-458A-8ACD-EEC71389434A@gmail.com> On Feb 21, 2019, at 18:51, Richard Purdie wrote: > > ?Multiconfig is meant to support this workflow. Unfortunately there are > open bugs and people haven't the time to work on it so its stalled. > That said, the key pieces are already there. > > A picture is worth a thousand words. I thought a demo might interest > people and "prove" this can work. > > To make it work you need four patches: > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/t222&id=b896b2238c100d486e7c43992b49001150749d04 > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/t222&id=e5ef6b008e85f42b5e4ffd72fae7036dd68b2ea5 > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/t222&id=5d2bd43d14315ef3212e0d09a16446bd74305a2f > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/t222&id=abdb83576b699448b76293294809aaa04b8e853b > > The first two are fixes from Alejandro which haven't merged as they're > not right. The third patch was me hitting the fixes and bitbake to make > the demo work. That proves they're not right and hints at where we have > some problems in bitbake too. We can get those issues sorted fairly > easily and I'm going to block 2.7 M3 on them. > > The final patch is the interesting one. > > It adds a layer, meta-multiconfig-example layer with a README about how > to configure it. Basically you create two multiconfig configurations, > "musl" and "tiny". > > The demo is to run "bitbake core-image-full-cmdline". > > The result is a core-image-full-cmdline image with a tiny qemux86 image > and a musl based qemux86-64 image installed into /var/lib/machines/ > > The way it does this is creative, having a recipe called image-packer > which creates virtclass variants of itself which depend on the > appropriate multiconfig. It pulls in the images and creates a package > containing them which the bbappend to core-image-full-cmdline can then > install. It'd be very easy to turn this into a list driven piece of > code rather than the two values currently listed. > > Its late here, some of the above code is horrible. I have rushed this > but hopefully it shows this is possible! :) > > I've love to turn this into an oe-selftest, that is my ultimate > intention for this code. > > As things stand today you can't query one multiconfig from another. As > this demo shows, that doesn't need to stop you making interesting > things though. We will do something with such querying eventually to > make things easier but until then, much is still possible. For search engines: the multiconfig demo from this thread is now is an oe-selftest: https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/lib/oeqa/selftest/cases/multiconfig.py Are there other public examples of combining artifacts from different machines into a single image via multiconfig? We can include them in a doc update for Dunfell. A list of use cases could motivate more people to try multiconfig. For developer workflows, multiconfig can accelerate multi-image builds (more parallelism) but slow single-package builds (more recipe parsing). As a workaround, BBMULTICONFIG="" restores the speed of building a target for a single MACHINE+DISTRO config. Is there a better way to disable multiconfig for a single bitbake invocation? Bitbake currently requires a MACHINE to be specified for multiconfig builds. It also accepts non-multiconfig target names, even when BBMULTICONFIG is defined. From a usability point of view, this CLI syntax could distinguish the two workflows: standard build: MACHINE=foo bitbake singleconfig-image multiconfig build: bitbake mc::multiconfig-image Rich -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Mon Feb 10 17:14:00 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 10 Feb 2020 18:14:00 +0100 Subject: [OE-core] [PATCH v3] expat: add ptest In-Reply-To: References: Message-ID: You need to send your patch using 'git send-email', that will guarantee the correct format. Alex On Mon, 10 Feb 2020 at 17:50, Oleksandr Popovych via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > From dcf5a9b6199c3b1f4a6aad00334e69281bde3c34 Mon Sep 17 00:00:00 2001 > From: Oleksandr Popovych > Date: Thu, 6 Feb 2020 18:14:28 +0200 > Subject: [OE-core][PATCH] expat: Added ptest > > For ptest support for this package several additional patches and > run-ptest script were added and recipe was changed. > > Signed-off-by: Oleksandr Popovych > --- > ...d-Makefile-targets-for-ptest-support.patch | 38 ++++++++++++++ > ...ort-for-ptests-in-form-of-new-target.patch | 31 ++++++++++++ > ...ed-suitable-format-of-tests-in-ptest.patch | 50 +++++++++++++++++++ > meta/recipes-core/expat/expat/run-ptest | 3 ++ > meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- > 5 files changed, 133 insertions(+), 1 deletion(-) > create mode 100644 > > meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > create mode 100644 > > meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > create mode 100644 > > meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > create mode 100644 meta/recipes-core/expat/expat/run-ptest > > diff --git > a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > > b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > new file mode 100644 > index 0000000000..32488060ee > --- /dev/null > +++ > b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > @@ -0,0 +1,38 @@ > +From ce803ec3d7b095cb55686f9cd5d3f01d34a31a5e Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:41:45 +0200 > +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support > + > +install-ptest, runtests and check tagrets are added. > + > +Signed-off-by: Oleksandr Popovych > +--- > + Makefile.am | 15 +++++++++++++++ > + 1 file changed, 15 insertions(+) > + > +diff --git a/Makefile.am b/Makefile.am > +index 5e1d37d..c63b44a 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -152,3 +152,18 @@ qa: > + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh > + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh > + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh > ++ > ++.PHONY: install-ptest > ++install-ptest: > ++ echo $(S) > ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ > ++ install runtests runtestspp $(DESTDIR)) > ++ cp Makefile $(DESTDIR) > ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile > ++ > ++.PHONY: runtests > ++runtests: > ++ @echo "C variant of tests:" > ++ @$(CHECKER) ./runtests$(EXEEXT) -q > ++ @echo "C++ variant of tests:" > ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q > +-- > +2.17.1 > + > diff --git > a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > > b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > new file mode 100644 > index 0000000000..cf8a2495e9 > --- /dev/null > +++ > b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > @@ -0,0 +1,31 @@ > +From 2b209a025f62fb1be7b32599aa80703ce8ecd76a Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:43:57 +0200 > +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target > + > +configure.am file changed, according to this advice: > +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite > + > +Signed-off-by: Oleksandr Popovych > +--- > + configure.ac | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index d58ac03..8e6b41e 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) > + AC_CONFIG_AUX_DIR([conftools]) > + AC_CONFIG_MACRO_DIR([m4]) > + AC_CANONICAL_HOST > +-AM_INIT_AUTOMAKE > +- > ++AM_INIT_AUTOMAKE([serial-tests]) > ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) > + > + dnl > + dnl Increment LIBREVISION if source code has changed at all > +-- > +2.17.1 > + > diff --git > a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > > b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > new file mode 100644 > index 0000000000..5d1daefc92 > --- /dev/null > +++ > b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > @@ -0,0 +1,50 @@ > +From b2e236e238f8bab42651313ea198b27355945d97 Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:44:56 +0200 > +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest > + > +Some changes in testcases code were applied for testcase engine. > +This was just adding of message outputs in "RESULT: TESTNAME" form... > + > +Signed-off-by: Oleksandr Popovych > +--- > + tests/minicheck.c | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/tests/minicheck.c b/tests/minicheck.c > +index a5a1efb..b39cda9 100644 > +--- a/tests/minicheck.c > ++++ b/tests/minicheck.c > +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { > + if (tc->setup != NULL) { > + /* setup */ > + if (setjmp(env)) { > ++ printf("SKIP: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { > + } > + /* test */ > + if (setjmp(env)) { > ++ printf("FAIL: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { > + /* teardown */ > + if (tc->teardown != NULL) { > + if (setjmp(env)) { > ++ printf("PASS: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > + tc->teardown(); > + } > ++ printf("PASS: %s\n", _check_current_function); > + } > + tc = tc->next_tcase; > + } > +-- > +2.17.1 > + > diff --git a/meta/recipes-core/expat/expat/run-ptest > b/meta/recipes-core/expat/expat/run-ptest > new file mode 100644 > index 0000000000..df994c0838 > --- /dev/null > +++ b/meta/recipes-core/expat/expat/run-ptest > @@ -0,0 +1,3 @@ > +#!/bin/bash > + > +make -k runtests > diff --git a/meta/recipes-core/expat/expat_2.2.9.bb > b/meta/recipes-core/expat/expat_2.2.9.bb > index 8f3db41352..420ffddc80 100644 > --- a/meta/recipes-core/expat/expat_2.2.9.bb > +++ b/meta/recipes-core/expat/expat_2.2.9.bb > @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" > > SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ > file://libtool-tag.patch \ > + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ > + > file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ > + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \ > + file://run-ptest \ > " > > SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" > SRC_URI[sha256sum] = > "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" > > -inherit autotools lib_package > +inherit autotools ptest lib_package > + > +RDEPENDS_${PN}-ptest += "make bash" > > > do_configure_prepend () { > rm -f ${S}/conftools/libtool.m4 > } > > +do_compile_ptest() { > + oe_runmake buildtest-TESTS > +} > + > BBCLASSEXTEND = "native nativesdk" > -- > 2.17.1 > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From rahulchauhankitps at gmail.com Mon Feb 10 18:16:59 2020 From: rahulchauhankitps at gmail.com (Rahul Chauhan) Date: Mon, 10 Feb 2020 23:46:59 +0530 Subject: [OE-core] [PATCH] ruby: fix CVE-2019-16254 Message-ID: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> Signed-off-by: Rahul Chauhan --- .../ruby/ruby/fix-CVE-2019-16254.patch | 106 +++++++++++++++++++++ meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + 2 files changed, 107 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch new file mode 100644 index 0000000..704c850 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch @@ -0,0 +1,106 @@ +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001 +From: Yusuke Endoh +Date: Tue, 1 Oct 2019 12:29:18 +0900 +Subject: [PATCH] WEBrick: prevent response splitting and header injection + +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16. +The commit prevented CRLR, but did not address an isolated CR or an +isolated LF. + +Upstream-Status: Backport https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc +CVE: CVE-2019-16254 + +Co-Authored-By: NARUSE, Yui +Signed-off-by: Rahul Chauhan +--- + lib/webrick/httpresponse.rb | 3 ++- + test/webrick/test_httpresponse.rb | 46 +++++++++++++++++++++++++++++++++++++-- + 2 files changed, 46 insertions(+), 3 deletions(-) + +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb +index 6d77692..d26324c 100644 +--- a/lib/webrick/httpresponse.rb ++++ b/lib/webrick/httpresponse.rb +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false) + private + + def check_header(header_value) +- if header_value =~ /\r\n/ ++ header_value = header_value.to_s ++ if /[\r\n]/ =~ header_value + raise InvalidHeader + else + header_value +diff --git a/test/webrick/test_httpresponse.rb b/test/webrick/test_httpresponse.rb +index 6263e0a..24a6968 100644 +--- a/test/webrick/test_httpresponse.rb ++++ b/test/webrick/test_httpresponse.rb +@@ -29,7 +29,7 @@ def setup + @res.keep_alive = true + end + +- def test_prevent_response_splitting_headers ++ def test_prevent_response_splitting_headers_crlf + res['X-header'] = "malicious\r\nCookie: hack" + io = StringIO.new + res.send_response io +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers + refute_match 'hack', io.string + end + +- def test_prevent_response_splitting_cookie_headers ++ def test_prevent_response_splitting_cookie_headers_crlf + user_input = "malicious\r\nCookie: hack" + res.cookies << WEBrick::Cookie.new('author', user_input) + io = StringIO.new +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers + refute_match 'hack', io.string + end + ++ def test_prevent_response_splitting_headers_cr ++ res['X-header'] = "malicious\rCookie: hack" ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_cookie_headers_cr ++ user_input = "malicious\rCookie: hack" ++ res.cookies << WEBrick::Cookie.new('author', user_input) ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_headers_lf ++ res['X-header'] = "malicious\nCookie: hack" ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_cookie_headers_lf ++ user_input = "malicious\nCookie: hack" ++ res.cookies << WEBrick::Cookie.new('author', user_input) ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ + def test_304_does_not_log_warning + res.status = 304 + res.setup_header +-- +2.7.4 diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb b/meta/recipes-devtools/ruby/ruby_2.5.5.bb index 223b037..58bb97f 100644 --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb @@ -3,6 +3,7 @@ require ruby.inc SRC_URI += " \ file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://run-ptest \ + file://fix-CVE-2019-16254.patch \ " SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" -- 2.7.4 From patchwork at patchwork.openembedded.org Mon Feb 10 18:32:42 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 10 Feb 2020 18:32:42 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_ruby=3A_fi?= =?utf-8?q?x_CVE-2019-16254?= In-Reply-To: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> References: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> Message-ID: <20200210183242.2277.62736@do> == Series Details == Series: ruby: fix CVE-2019-16254 Revision: 1 URL : https://patchwork.openembedded.org/series/22538/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 44a4ac2294) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From rahulchauhankitps at gmail.com Mon Feb 10 18:49:21 2020 From: rahulchauhankitps at gmail.com (Rahul Chauhan) Date: Tue, 11 Feb 2020 00:19:21 +0530 Subject: [OE-core] [warrior][PATCH] libxml2: Fix CVE-2019-19956 Message-ID: <1581360561-30532-1-git-send-email-rahulk@mvista.com> Signed-off-by: Rahul Chauhan --- .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch new file mode 100644 index 0000000..43c3589 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch @@ -0,0 +1,38 @@ +From 3cd2b25ddb04740be2880cfd78d60038452228b1 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Wed, 7 Aug 2019 17:39:17 +0800 +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover + +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to +NULL and free newDoc will cause a memory leak. + +Found with libFuzzer. + +Closes #82. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549] +CVE: CVE-2019-19956 + +Signed-off-by: Rahul Chauhan +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index b7ecd65..491f5c9 100644 +--- a/parser.c ++++ b/parser.c +@@ -13899,7 +13899,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, + xmlFreeParserCtxt(ctxt); + newDoc->intSubset = NULL; + newDoc->extSubset = NULL; +- newDoc->oldNs = NULL; ++ if(doc != NULL) ++ newDoc->oldNs = NULL; + xmlFreeDoc(newDoc); + + return(ret); +-- +2.7.4 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 62643bc..67c2d4f 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb @@ -23,6 +23,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-CVE-2017-8872.patch \ file://fix-CVE-2018-14404.patch \ file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ + file://fix-CVE-2019-19956.patch \ " SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" -- 2.7.4 From alistair23 at gmail.com Mon Feb 10 19:49:13 2020 From: alistair23 at gmail.com (Alistair Francis) Date: Mon, 10 Feb 2020 11:49:13 -0800 Subject: [OE-core] [PATCH] qemu: Upgrade to 4.2.0 In-Reply-To: References: <20200204184113.16070-1-alistair.francis@wdc.com> Message-ID: On Sat, Feb 8, 2020 at 10:10 AM Alexander Kanavin wrote: > > I think this backport should address the problem: > https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a88c40f02ace88f09b2a85a64831b277b2ebc88c Thanks for that! I have sent a v2 with this patch included. Alistair > > Alex > > On Sat, 8 Feb 2020 at 08:45, Richard Purdie wrote: >> >> On Tue, 2020-02-04 at 10:41 -0800, Alistair Francis wrote: >> > While we are upgrading let's refresh patches and remove the outdated >> > patches. >> > >> > Signed-off-by: Alistair Francis >> >> I think this stopped qemu running on the autobuilder, we saw many >> versions of: >> >> https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1538 >> >> Failed to run qemu: qemu: can't parse 'vga' parameter: Invalid argument >> >> Cheers, >> >> Richard >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From alistair.francis at wdc.com Mon Feb 10 19:48:42 2020 From: alistair.francis at wdc.com (Alistair Francis) Date: Mon, 10 Feb 2020 11:48:42 -0800 Subject: [OE-core] [PATCH v2] qemu: Upgrade to 4.2.0 Message-ID: <20200210194842.18877-1-alistair.francis@wdc.com> While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- ...u-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...e_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 7 +- ...emu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...test-which-runs-all-unit-test-cases-.patch | 6 +- ...n-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...-connect-socket-to-a-spawned-command.patch | 14 +-- .../0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++- ...dd-pkg-config-handling-for-libgcrypt.patch | 14 +-- ...egression-in-parsing-vga-cmdline-par.patch | 53 +++++++++ ...linux-user-remove-host-stime-syscall.patch | 61 ---------- ...-libcap-header-issue-on-some-distro.patch} | 0 ...messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 ------------------ .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 21 files changed, 107 insertions(+), 228 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb => qemu-system-native_4.2.0.bb} (100%) create mode 100644 meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch rename meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch => 0012-fix-libcap-header-issue-on-some-distro.patch} (100%) rename meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch => 0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5ae16..23f2ce97c3 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43e6b..28cfd2cca3 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0012-fix-libcap-header-issue-on-some-distro.patch \ + file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060997..a557e74e97 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ + file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102ae5..66ff996508 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd53cf..7f7da51006 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68030..012d60d8f0 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab40b1..bc30397e8c 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a73681510e..ec303371b0 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a42385530f..0810ae84c0 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2545..89baad9b7f 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25bec..30bb4ddf26 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d9455f..7e273eeced 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7daa42..34df78b7fe 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch new file mode 100644 index 0000000000..1433e13d68 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch @@ -0,0 +1,53 @@ +From a88c40f02ace88f09b2a85a64831b277b2ebc88c Mon Sep 17 00:00:00 2001 +From: Peter Wu +Date: Sat, 21 Dec 2019 17:21:24 +0100 +Subject: [PATCH] hw/i386/pc: fix regression in parsing vga cmdline parameter + +When the 'vga=' parameter is succeeded by another parameter, QEMU 4.2.0 +would refuse to start with a rather cryptic message: + + $ qemu-system-x86_64 -kernel /boot/vmlinuz-linux -append 'vga=792 quiet' + qemu: can't parse 'vga' parameter: Invalid argument + +It was not clear whether this applied to the '-vga std' parameter or the +'-append' one. Fix the parsing regression and clarify the error. + +Fixes: 133ef074bd ("hw/i386/pc: replace use of strtol with qemu_strtoui in x86_load_linux()") +Cc: Sergio Lopez +Signed-off-by: Peter Wu +Message-Id: <20191221162124.1159291-1-peter at lekensteyn.nl> +Cc: qemu-stable at nongnu.org +Signed-off-by: Paolo Bonzini +--- + hw/i386/x86.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/i386/x86.c b/hw/i386/x86.c +index d8bb5c2a96..9b9a4d5837 100644 +--- a/hw/i386/x86.c ++++ b/hw/i386/x86.c +@@ -612,6 +612,7 @@ void x86_load_linux(X86MachineState *x86ms, + vmode = strstr(kernel_cmdline, "vga="); + if (vmode) { + unsigned int video_mode; ++ const char *end; + int ret; + /* skip "vga=" */ + vmode += 4; +@@ -622,10 +623,9 @@ void x86_load_linux(X86MachineState *x86ms, + } else if (!strncmp(vmode, "ask", 3)) { + video_mode = 0xfffd; + } else { +- ret = qemu_strtoui(vmode, NULL, 0, &video_mode); +- if (ret != 0) { +- fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n", +- strerror(-ret)); ++ ret = qemu_strtoui(vmode, &end, 0, &video_mode); ++ if (ret != 0 || (*end && *end != ' ')) { ++ fprintf(stderr, "qemu: invalid 'vga=' kernel parameter.\n"); + exit(1); + } + } +-- +2.25.0 + diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be45d..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e407f..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- 2.25.0 From patchwork at patchwork.openembedded.org Mon Feb 10 20:32:27 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 10 Feb 2020 20:32:27 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_qemu=3A_Up?= =?utf-8?b?Z3JhZGUgdG8gNC4yLjAgKHJldjMp?= In-Reply-To: <20200210194842.18877-1-alistair.francis@wdc.com> References: <20200210194842.18877-1-alistair.francis@wdc.com> Message-ID: <20200210203227.2275.36278@do> == Series Details == Series: qemu: Upgrade to 4.2.0 (rev3) Revision: 3 URL : https://patchwork.openembedded.org/series/22420/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From scott.branden at broadcom.com Mon Feb 10 21:17:08 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Mon, 10 Feb 2020 13:17:08 -0800 Subject: [OE-core] [PATCH v2 1/2] x265: add x265 recipe In-Reply-To: References: <20200208000110.29065-1-scott.branden@broadcom.com> <55bb9c66-a419-c43d-111b-e5442db8df91@broadcom.com> <2159565f-eaca-697d-0711-e39aeccb1ba2@broadcom.com> <6cf5b86f-5055-0573-61ab-ad4717af5c2d@broadcom.com> Message-ID: <871ad7a3-93ba-8f45-7b9b-2ae458782118@broadcom.com> On 2020-02-10 8:01 a.m., Khem Raj wrote: > On Mon, Feb 10, 2020 at 3:42 AM Alexander Kanavin > wrote: >> As long as we're consistent, I'm ok with either option. I think it's ultimately up to RP to make the call. >> >> > The usecase is fine, as long as we add x265 support to gst plugins and > ffmeg and it gets tested via reference > images, I see no issues adding it. I'm changing my opinion now and leaning toward meta-multimedia as Khem originally suggested. For the simple reason that I think x265 only builds (easily) for x86 based platforms. That being the case: we only add the packageconfig option to ffmpeg but don't enable by default in the PACKAGECONFIG default in the ffmpeg recipe. PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" And add the x265 recipe to meta-multimedia and limit to x86 at this time. Is this what I would set in the x265 recipe? COMPATIBLE_MACHINE_x86 = "(.*)" COMPATIBLE_MACHINE_x86-64 = "(.*)" >> Alex >> >> On Mon, 10 Feb 2020 at 07:16, Scott Branden via Openembedded-core wrote: >>> >>> >>> On 2020-02-09 3:35 p.m., Khem Raj wrote: >>>> On Sun, Feb 9, 2020 at 11:27 AM Scott Branden >>>> wrote: >>>>> >>>>> On 2020-02-08 11:18 a.m., Khem Raj wrote: >>>>>> On Fri, Feb 7, 2020 at 8:02 PM Scott Branden wrote: >>>>>>> Hi Khem, >>>>>>> >>>>>>> On 2020-02-07 5:12 p.m., Khem Raj wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>> On Fri, Feb 7, 2020 at 4:01 PM Scott Branden via Openembedded-core wrote: >>>>>>>> Add x265 recipe from latest revision of stable branch. >>>>>>> I wonder if it belongs to core are there deps on it that we need in common metadata >>>>>>> >>>>>>> I simply followed where x264 recipe is located and placed x265 beside it. >>>>>>> Both are needed when enabled in ffmpeg. >>>>>>> >>>>>>> I don't know if that answers your question as to where they should be located. >>>>>> idea is to keep small and therefore we should assess the inclusions in core >>>>>> we have many packageconfigs which require packages from other layers >>>>>> so if ffmpeg needs it and is optional then it should be fine to keep >>>>>> it in meta-multimedia and packageconfig in ffmpeg disabled by default. >>>>> I don't see why x264 would be in core and x265 in meta-multimedia. >>>>> Both should be moved to meta-multimedia then? >>>>> >>>> I followed the thread a bit and I see there are followups where >>>> usecase for other recipes in core is now >>>> established, where this seemed a leaf package being added to oe-core, >>>> So perhaps it should be added >>>> to validation loops as well like x264. >>> I leave it to the powers that be to decide where to place this recipe. >>>>> I think you would also require a bbappend to fffmpeg recipe to add x264 >>>>> and x265 to ffmpeg packageconfig. >>>>> if that is the case, why not move ffmpeg to meta-multimedia as well? >>>>> >>>> You would not go down that line of thought since these packages are in >>>> the dependency chain for validating reference >>>> images in core along with they being used by other packages from other layers. >>>> >>>>>>>> Signed-off-by: Scott Branden >>>>>>>> --- >>>>>>>> meta/recipes-multimedia/x265/x265_git.bb | 20 ++++++++++++++++++++ >>>>>>>> 1 file changed, 20 insertions(+) >>>>>>>> create mode 100644 meta/recipes-multimedia/x265/x265_git.bb >>>>>>>> >>>>>>>> diff --git a/meta/recipes-multimedia/x265/x265_git.bb b/meta/recipes-multimedia/x265/x265_git.bb >>>>>>>> new file mode 100644 >>>>>>>> index 0000000000..796fbbc13a >>>>>>>> --- /dev/null >>>>>>>> +++ b/meta/recipes-multimedia/x265/x265_git.bb >>>>>>>> @@ -0,0 +1,20 @@ >>>>>>>> +SUMMARY = "H.265/HEVC video encoder" >>>>>>>> +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." >>>>>>>> +HOMEPAGE = "http://www.videolan.org/developers/x265.html" >>>>>>>> + >>>>>>>> +LICENSE = "GPLv2" >>>>>>>> +LICENSE_FLAGS = "commercial" >>>>>>>> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" >>>>>>>> + >>>>>>>> +DEPENDS = "gnutls zlib libpcre" >>>>>>>> + >>>>>>>> +SRC_URI = "git://github.com/videolan/x265;branch=stable \ >>>>>>>> + " >>>>>>>> + >>>>>>>> +SRCREV = "4ef6b67fd46e1584e52a11a264812edcaef02526" >>>>>>>> + >>>>>>>> +S = "${WORKDIR}/git/source" >>>>>>>> + >>>>>>>> +inherit lib_package pkgconfig cmake >>>>>>>> + >>>>>>>> +AS[unexport] = "1" >>>>>>>> -- >>>>>>>> 2.17.1 >>>>>>>> >>>>>>>> -- >>>>>>>> _______________________________________________ >>>>>>>> Openembedded-core mailing list >>>>>>>> Openembedded-core at lists.openembedded.org >>>>>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core From jpuhlman at mvista.com Mon Feb 10 21:29:26 2020 From: jpuhlman at mvista.com (Jeremy Puhlman) Date: Mon, 10 Feb 2020 13:29:26 -0800 Subject: [OE-core] [PATCH] binutils: additional patch should be added with space. Message-ID: <20200210212926.24770-1-jpuhlman@mvista.com> If an append adds a patch or file with SRC_URI += , the spaceless append causes the file listings to concatinate and cause failures in the nativesdk-binutils parse/build. Signed-off-by: Jeremy Puhlman --- meta/recipes-devtools/binutils/binutils_2.33.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.33.bb index ecdab96658..8bd2bf778c 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.33.bb @@ -51,7 +51,7 @@ do_install_class-native () { PACKAGE_BEFORE_PN += "libbfd" FILES_libbfd = "${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = "file://nativesdk-relocation.patch" +SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- 2.20.1 From pjtexier at koncepto.io Mon Feb 10 21:25:59 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Mon, 10 Feb 2020 22:25:59 +0100 Subject: [OE-core] [PATCH] mtdev: upgrade 1.1.5 -> 1.1.6 Message-ID: <1581369959-17175-1-git-send-email-pjtexier@koncepto.io> Also remove patch which have been merged upstream Signed-off-by: Pierre-Jean Texier --- ...-for-64bit-time_t-for-32bit-architectures.patch | 77 ---------------------- .../wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} | 8 +-- 2 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch rename meta/recipes-graphics/wayland/{mtdev_1.1.5.bb => mtdev_1.1.6.bb} (65%) diff --git a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch deleted file mode 100644 index a0cebe5..0000000 --- a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch +++ /dev/null @@ -1,77 +0,0 @@ -From af75e8ee3d12a493b758421b2feed0351fdcbbf0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 23 Nov 2019 13:44:32 -0800 -Subject: [PATCH] adjust for 64bit time_t for 32bit architectures - -libc that has support for 32 bit applications to use 64 bit -time_t supplies __USE_TIME_BITS64 define [1] - -[1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/core.c | 8 +++++++- - test/mtdev-test.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/src/core.c b/src/core.c -index 87ef420..0d91c0b 100644 ---- a/src/core.c -+++ b/src/core.c -@@ -31,6 +31,11 @@ - #include "evbuf.h" - #include "match.h" - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - static inline int istouch(const struct mtdev_slot *data, - const struct mtdev *dev) - { -@@ -251,7 +256,8 @@ static void push_slot_changes(struct mtdev_state *state, - count++; - if (!count) - return; -- ev.time = syn->time; -+ ev.input_event_sec = syn->input_event_sec; -+ ev.input_event_usec = syn->input_event_usec; - ev.type = EV_ABS; - ev.code = ABS_MT_SLOT; - ev.value = slot; -diff --git a/test/mtdev-test.c b/test/mtdev-test.c -index 1b3e4f2..773f86a 100644 ---- a/test/mtdev-test.c -+++ b/test/mtdev-test.c -@@ -30,9 +30,15 @@ - #include - #include - #include -+#include -+ -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif - - /* year-proof millisecond event time */ --typedef __u64 mstime_t; -+typedef uint64_t mstime_t; - - static int use_event(const struct input_event *ev) - { -@@ -47,7 +53,7 @@ static void print_event(const struct input_event *ev) - { - static const mstime_t ms = 1000; - static int slot; -- mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; -+ mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms; - if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) - slot = ev->value; - fprintf(stderr, "%012llx %02d %01d %04x %d\n", --- -2.24.0 - diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb similarity index 65% rename from meta/recipes-graphics/wayland/mtdev_1.1.5.bb rename to meta/recipes-graphics/wayland/mtdev_1.1.6.bb index aa8bb69..7c1cb5e 100644 --- a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb +++ b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb @@ -11,10 +11,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2 \ - file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ -" -SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1" -SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" +SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" +SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" +SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" inherit autotools pkgconfig -- 2.7.4 From alistair.francis at wdc.com Mon Feb 10 21:25:15 2020 From: alistair.francis at wdc.com (Alistair Francis) Date: Mon, 10 Feb 2020 13:25:15 -0800 Subject: [OE-core] [PATCH v3] qemu: Upgrade to 4.2.0 Message-ID: <20200210212515.21381-1-alistair.francis@wdc.com> While we are upgrading let's refresh patches and remove the outdated patches. Signed-off-by: Alistair Francis --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/qemu/qemu-native.inc | 4 +- ...u-native_4.1.0.bb => qemu-native_4.2.0.bb} | 0 ...e_4.1.0.bb => qemu-system-native_4.2.0.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 7 +- ...emu-Add-missing-wacom-HID-descriptor.patch | 4 +- ...test-which-runs-all-unit-test-cases-.patch | 6 +- ...n-environment-space-to-boot-loader-q.patch | 16 +-- .../qemu/0004-qemu-disable-Valgrind.patch | 6 +- ...ld.bfd-fix-cflags-and-set-some-envir.patch | 6 +- ...-connect-socket-to-a-spawned-command.patch | 14 +-- .../0007-apic-fixup-fallthrough-to-PIC.patch | 4 +- ...webkitgtk-hangs-on-32-bit-x86-target.patch | 12 +- .../qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 ++- ...dd-pkg-config-handling-for-libgcrypt.patch | 14 +-- ...egression-in-parsing-vga-cmdline-par.patch | 54 +++++++++ ...linux-user-remove-host-stime-syscall.patch | 61 ---------- ...-libcap-header-issue-on-some-distro.patch} | 0 ...messages-when-qemi_cpu_kick_thread-.patch} | 0 .../qemu/qemu/CVE-2019-12068.patch | 108 ------------------ .../qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} | 0 21 files changed, 108 insertions(+), 228 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_4.1.0.bb => qemu-native_4.2.0.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_4.1.0.bb => qemu-system-native_4.2.0.bb} (100%) create mode 100644 meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch rename meta/recipes-devtools/qemu/qemu/{0010-fix-libcap-header-issue-on-some-distro.patch => 0012-fix-libcap-header-issue-on-some-distro.patch} (100%) rename meta/recipes-devtools/qemu/qemu/{0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch => 0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch rename meta/recipes-devtools/qemu/{qemu_4.1.0.bb => qemu_4.2.0.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5ae16..23f2ce97c3 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.33%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.1%" +QEMUVERSION ?= "4.2%" GOVERSION ?= "1.13%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 69c2c43e6b..28cfd2cca3 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc @@ -3,8 +3,8 @@ inherit native require qemu.inc SRC_URI_append = " \ - file://0010-fix-libcap-header-issue-on-some-distro.patch \ - file://0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ + file://0012-fix-libcap-header-issue-on-some-distro.patch \ + file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ " EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" diff --git a/meta/recipes-devtools/qemu/qemu-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb9f060997..a557e74e97 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,14 +27,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ - file://0011-linux-user-remove-host-stime-syscall.patch \ + file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - file://CVE-2019-12068.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" -SRC_URI[sha256sum] = "656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6" +SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" +SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch index 9478102ae5..66ff996508 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-missing-wacom-HID-descriptor.patch @@ -1,4 +1,4 @@ -From 4655dc18074e0be9d239f51dac32b61435da8549 Mon Sep 17 00:00:00 2001 +From 526cb7e26f6dd96c9ee2ffa05ce0a358d3bfbfb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Nov 2014 14:04:29 +0000 Subject: [PATCH] qemu: Add missing wacom HID descriptor @@ -19,7 +19,7 @@ Upstream-Status: Submitted 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c -index 8c43db93..3ff8ca28 100644 +index 8ed57b3b..1502928b 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -74,6 +74,89 @@ static const USBDescStrings desc_strings = { diff --git a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch index 2ccddd53cf..7f7da51006 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch @@ -1,4 +1,4 @@ -From 67751f3a23e3db3012f391b3b3b73a4484488ce9 Mon Sep 17 00:00:00 2001 +From 8ee6281516bd9210e75e91d705da8916bab3bf51 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 31 Aug 2017 11:06:56 -0700 Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for @@ -15,10 +15,10 @@ Signed-off-by: Juro Bystricky 1 file changed, 8 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include -index fd7fdb86..83b7f409 100644 +index 8566f5f1..52d0320b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -1183,4 +1183,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) +@@ -1210,4 +1210,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) -include $(wildcard tests/*.d) -include $(wildcard tests/libqos/*.d) diff --git a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 5c42d68030..012d60d8f0 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 235b94f1188597873c8776b019fed49947983392 Mon Sep 17 00:00:00 2001 +From ce1eceab2350d27960ec254650717085f6a11c9a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -19,15 +19,15 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c -index 20e019bf..d150b01c 100644 +index 92e9ca5b..3a7f3954 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ - #define ENVP_ADDR 0x80002000l - #define ENVP_NB_ENTRIES 16 --#define ENVP_ENTRY_SIZE 256 -+#define ENVP_ENTRY_SIZE 1024 + #define ENVP_ADDR 0x80002000l + #define ENVP_NB_ENTRIES 16 +-#define ENVP_ENTRY_SIZE 256 ++#define ENVP_ENTRY_SIZE 1024 /* Hardware addresses */ - #define FLASH_ADDRESS 0x1e000000ULL + #define FLASH_ADDRESS 0x1e000000ULL diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch index 0ac4ab40b1..bc30397e8c 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-disable-Valgrind.patch @@ -1,4 +1,4 @@ -From 3ad7a375015d47fdf5016e03e11fa93440d6d8bd Mon Sep 17 00:00:00 2001 +From 4127296bb1046cdf73994ba69dc913d8c02fd74f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 22:19:08 +0100 Subject: [PATCH] qemu: disable Valgrind @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 9 deletions(-) diff --git a/configure b/configure -index 714e7fb6..dad4fc59 100755 +index 6099be1d..a766017b 100755 --- a/configure +++ b/configure -@@ -5335,15 +5335,6 @@ fi +@@ -5390,15 +5390,6 @@ fi # check if we have valgrind/valgrind.h valgrind_h=no diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch index a73681510e..ec303371b0 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch @@ -1,4 +1,4 @@ -From 80e6070bcdfe636b103a13598e6c38ad0d0e7624 Mon Sep 17 00:00:00 2001 +From 6cdf82af2eba312b9b8da86dda28b98d3d51f4d4 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Sun, 12 Jun 2016 18:09:56 -0700 Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 4 deletions(-) diff --git a/configure b/configure -index dad4fc59..685bbe5e 100755 +index a766017b..72f11aca 100755 --- a/configure +++ b/configure -@@ -5971,10 +5971,6 @@ write_c_skeleton +@@ -6085,10 +6085,6 @@ write_c_skeleton if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index a42385530f..0810ae84c0 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch @@ -1,4 +1,4 @@ -From ad853601e75f6d0dd09672bcca05fbe4fac766a4 Mon Sep 17 00:00:00 2001 +From bcc63f775e265df69963a4ad7805b8678ace68f0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 21 Dec 2017 11:35:16 -0800 Subject: [PATCH] chardev: connect socket to a spawned command @@ -52,10 +52,10 @@ Signed-off-by: Patrick Ohly 3 files changed, 109 insertions(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c -index 7ca5d97a..207fae4a 100644 +index 185fe38d..54fa4234 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c -@@ -1278,6 +1278,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, +@@ -1288,6 +1288,67 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return true; } @@ -123,7 +123,7 @@ index 7ca5d97a..207fae4a 100644 static void qmp_chardev_open_socket(Chardev *chr, ChardevBackend *backend, -@@ -1286,6 +1347,9 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1296,6 +1357,9 @@ static void qmp_chardev_open_socket(Chardev *chr, { SocketChardev *s = SOCKET_CHARDEV(chr); ChardevSocket *sock = backend->u.socket.data; @@ -133,7 +133,7 @@ index 7ca5d97a..207fae4a 100644 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1351,6 +1415,14 @@ static void qmp_chardev_open_socket(Chardev *chr, +@@ -1361,6 +1425,14 @@ static void qmp_chardev_open_socket(Chardev *chr, update_disconnected_filename(s); @@ -148,7 +148,7 @@ index 7ca5d97a..207fae4a 100644 if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1370,9 +1442,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1380,9 +1452,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -175,7 +175,7 @@ index 7ca5d97a..207fae4a 100644 if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1415,12 +1504,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, +@@ -1425,12 +1514,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch index b50e8c2545..89baad9b7f 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From f51e49e7d7d87b7254242b7360f99c2df94a5a2d Mon Sep 17 00:00:00 2001 +From a59a98d100123030a4145e7efe3b8a001920a9f1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -30,7 +30,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index bce89911..df4b582e 100644 +index 2a74f7b4..4d5da365 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -603,7 +603,7 @@ int apic_accept_pic_intr(DeviceState *dev) diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch index e562f25bec..30bb4ddf26 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch @@ -1,4 +1,4 @@ -From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 +From cf8c9aac5243f506a1a3e8e284414f311cde04f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 17 Jan 2018 10:51:49 -0800 Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target @@ -19,15 +19,15 @@ Signed-off-by: Alistair Francis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c -index 8ffc5251..4067e739 100644 +index 6ff7851e..ebff0485 100644 --- a/linux-user/main.c +++ b/linux-user/main.c -@@ -77,7 +77,7 @@ int have_guest_base; +@@ -78,7 +78,7 @@ int have_guest_base; (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) /* There are a number of places where we assign reserved_va to a variable of type abi_ulong and expect it to fit. Avoid the last page. */ --# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) -+# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) +-# define MAX_RESERVED_VA(CPU) (0xfffffffful & TARGET_PAGE_MASK) ++# define MAX_RESERVED_VA(CPU) (0x7ffffffful & TARGET_PAGE_MASK) # else - # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) + # define MAX_RESERVED_VA(CPU) (1ul << TARGET_VIRT_ADDR_SPACE_BITS) # endif diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d9455f..7e273eeced 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch @@ -1,4 +1,4 @@ -From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 +From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Fix webkitgtk builds @@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending Signed-off-by: Alistair Francis + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 5 ++++- @@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index 536ea58f81..4c63a6a2e4 100644 +index e96781a4..a369f81a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -162,12 +162,8 @@ extern unsigned long guest_base; @@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 9151fdb042..cb2b8f329f 100644 +index fd499f7e..30575f60 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; @@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 46a6e3a761..7735465462 100644 +index 46a6e3a7..77354654 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) @@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8b41a03901..bc5d85de02 100644 +index 171c0cae..fc18f244 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 mmap_lock(); -@@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); @@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 if (page_check_range(h2g(min), max - min, flags) == -1) { continue; } --- -2.22.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch index a8ab7daa42..34df78b7fe 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From 5214dd4461f2090ef0965b4d2518f49927d61cbc Mon Sep 17 00:00:00 2001 +From c207607cdf3996ad9783c3bffbcd3d65e74c0158 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [Qemu-devel] [PATCH] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -9,12 +9,13 @@ handling for libgcrypt. Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] Signed-off-by: He Zhe + --- configure | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index e44e454..0f362a7 100755 +index 72f11aca..cac271ce 100755 --- a/configure +++ b/configure @@ -2875,6 +2875,30 @@ has_libgcrypt() { @@ -48,7 +49,7 @@ index e44e454..0f362a7 100755 if test "$nettle" != "no"; then pass="no" -@@ -2902,7 +2926,14 @@ fi +@@ -2915,7 +2939,14 @@ fi if test "$gcrypt" != "no"; then pass="no" @@ -64,7 +65,7 @@ index e44e454..0f362a7 100755 gcrypt_cflags=$(libgcrypt-config --cflags) gcrypt_libs=$(libgcrypt-config --libs) # Debian has removed -lgpg-error from libgcrypt-config -@@ -2912,15 +2943,16 @@ if test "$gcrypt" != "no"; then +@@ -2925,15 +2956,16 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi @@ -88,6 +89,3 @@ index e44e454..0f362a7 100755 if test "$pass" = "yes"; then gcrypt="yes" cat > $TMPC << EOF --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch new file mode 100644 index 0000000000..2fe0850a33 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch @@ -0,0 +1,54 @@ +From a88c40f02ace88f09b2a85a64831b277b2ebc88c Mon Sep 17 00:00:00 2001 +From: Peter Wu +Date: Sat, 21 Dec 2019 17:21:24 +0100 +Subject: [PATCH] hw/i386/pc: fix regression in parsing vga cmdline parameter + +When the 'vga=' parameter is succeeded by another parameter, QEMU 4.2.0 +would refuse to start with a rather cryptic message: + + $ qemu-system-x86_64 -kernel /boot/vmlinuz-linux -append 'vga=792 quiet' + qemu: can't parse 'vga' parameter: Invalid argument + +It was not clear whether this applied to the '-vga std' parameter or the +'-append' one. Fix the parsing regression and clarify the error. + +Fixes: 133ef074bd ("hw/i386/pc: replace use of strtol with qemu_strtoui in x86_load_linux()") +Cc: Sergio Lopez +Signed-off-by: Peter Wu +Message-Id: <20191221162124.1159291-1-peter at lekensteyn.nl> +Cc: qemu-stable at nongnu.org +Signed-off-by: Paolo Bonzini +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a88c40f02ace88f09b2a85a64831b277b2ebc88c] +--- + hw/i386/x86.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/i386/x86.c b/hw/i386/x86.c +index d8bb5c2a96..9b9a4d5837 100644 +--- a/hw/i386/x86.c ++++ b/hw/i386/x86.c +@@ -612,6 +612,7 @@ void x86_load_linux(X86MachineState *x86ms, + vmode = strstr(kernel_cmdline, "vga="); + if (vmode) { + unsigned int video_mode; ++ const char *end; + int ret; + /* skip "vga=" */ + vmode += 4; +@@ -622,10 +623,9 @@ void x86_load_linux(X86MachineState *x86ms, + } else if (!strncmp(vmode, "ask", 3)) { + video_mode = 0xfffd; + } else { +- ret = qemu_strtoui(vmode, NULL, 0, &video_mode); +- if (ret != 0) { +- fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n", +- strerror(-ret)); ++ ret = qemu_strtoui(vmode, &end, 0, &video_mode); ++ if (ret != 0 || (*end && *end != ' ')) { ++ fprintf(stderr, "qemu: invalid 'vga=' kernel parameter.\n"); + exit(1); + } + } +-- +2.25.0 + diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 659e6be45d..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include - #include - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson -Signed-off-by: Laurent Vivier -Reviewed-by: Peter Maydell -Message-Id: <20191112142556.6335-1-laurent at vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ diff --git a/meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0010-fix-libcap-header-issue-on-some-distro.patch rename to meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch diff --git a/meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch b/meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch similarity index 100% rename from meta/recipes-devtools/qemu/qemu/0011-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch rename to meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch deleted file mode 100644 index f1655e407f..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2019-12068.patch +++ /dev/null @@ -1,108 +0,0 @@ -From de594e47659029316bbf9391efb79da0a1a08e08 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Wed, 14 Aug 2019 17:35:21 +0530 -Subject: [PATCH] scsi: lsi: exit infinite loop while executing script - (CVE-2019-12068) - -When executing script in lsi_execute_script(), the LSI scsi adapter -emulator advances 's->dsp' index to read next opcode. This can lead -to an infinite loop if the next opcode is empty. Move the existing -loop exit after 10k iterations so that it covers no-op opcodes as -well. - -Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=de594e47659029316bbf9391efb79da0a1a08e08] -CVE: CVE-2019-12068 - -Reported-by: Bugs SysSec -Signed-off-by: Paolo Bonzini -Signed-off-by: Prasad J Pandit -Signed-off-by: Paolo Bonzini - -Signed-off-by: Changqing Li ---- - hw/scsi/lsi53c895a.c | 41 +++++++++++++++++++++++++++-------------- - 1 file changed, 27 insertions(+), 14 deletions(-) - -diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c -index 222a286..ec53b14 100644 ---- a/hw/scsi/lsi53c895a.c -+++ b/hw/scsi/lsi53c895a.c -@@ -186,6 +186,9 @@ static const char *names[] = { - /* Flag set if this is a tagged command. */ - #define LSI_TAG_VALID (1 << 16) - -+/* Maximum instructions to process. */ -+#define LSI_MAX_INSN 10000 -+ - typedef struct lsi_request { - SCSIRequest *req; - uint32_t tag; -@@ -1133,7 +1136,21 @@ static void lsi_execute_script(LSIState *s) - - s->istat1 |= LSI_ISTAT1_SRUN; - again: -- insn_processed++; -+ if (++insn_processed > LSI_MAX_INSN) { -+ /* Some windows drivers make the device spin waiting for a memory -+ location to change. If we have been executed a lot of code then -+ assume this is the case and force an unexpected device disconnect. -+ This is apparently sufficient to beat the drivers into submission. -+ */ -+ if (!(s->sien0 & LSI_SIST0_UDC)) { -+ qemu_log_mask(LOG_GUEST_ERROR, -+ "lsi_scsi: inf. loop with UDC masked"); -+ } -+ lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -+ lsi_disconnect(s); -+ trace_lsi_execute_script_stop(); -+ return; -+ } - insn = read_dword(s, s->dsp); - if (!insn) { - /* If we receive an empty opcode increment the DSP by 4 bytes -@@ -1570,19 +1587,7 @@ again: - } - } - } -- if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { -- /* Some windows drivers make the device spin waiting for a memory -- location to change. If we have been executed a lot of code then -- assume this is the case and force an unexpected device disconnect. -- This is apparently sufficient to beat the drivers into submission. -- */ -- if (!(s->sien0 & LSI_SIST0_UDC)) { -- qemu_log_mask(LOG_GUEST_ERROR, -- "lsi_scsi: inf. loop with UDC masked"); -- } -- lsi_script_scsi_interrupt(s, LSI_SIST0_UDC, 0); -- lsi_disconnect(s); -- } else if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { -+ if (s->istat1 & LSI_ISTAT1_SRUN && s->waiting == LSI_NOWAIT) { - if (s->dcntl & LSI_DCNTL_SSM) { - lsi_script_dma_interrupt(s, LSI_DSTAT_SSI); - } else { -@@ -1970,6 +1975,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - case 0x2f: /* DSP[24:31] */ - s->dsp &= 0x00ffffff; - s->dsp |= val << 24; -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((s->dmode & LSI_DMODE_MAN) == 0 - && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); -@@ -1988,6 +1997,10 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) - break; - case 0x3b: /* DCNTL */ - s->dcntl = val & ~(LSI_DCNTL_PFF | LSI_DCNTL_STD); -+ /* -+ * FIXME: if s->waiting != LSI_NOWAIT, this will only execute one -+ * instruction. Is this correct? -+ */ - if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTAT1_SRUN) == 0) - lsi_execute_script(s); - break; --- -2.7.4 - diff --git a/meta/recipes-devtools/qemu/qemu_4.1.0.bb b/meta/recipes-devtools/qemu/qemu_4.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_4.1.0.bb rename to meta/recipes-devtools/qemu/qemu_4.2.0.bb -- 2.25.0 From maxime.roussinbelanger at gmail.com Mon Feb 10 21:42:11 2020 From: maxime.roussinbelanger at gmail.com (=?UTF-8?q?Maxime=20Roussin-B=C3=A9langer?=) Date: Mon, 10 Feb 2020 16:42:11 -0500 Subject: [OE-core] [PATCH] wpa-supplicant: add virtual supplicant Message-ID: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> There is a second supplicant raising, iwd. User should be able to switch between wpa-supplicant and iwd. Let's provide a virtual package. ConnMan, systemd-networkd and NetworkManager supports iwd. Signed-off-by: Maxime Roussin-B?langer --- meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb | 3 +++ meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb index 2db09ad2c6..270e14eeb3 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb @@ -15,6 +15,9 @@ PACKAGECONFIG[openssl] = ",,openssl" inherit pkgconfig systemd +PROVIDES = "virtual/supplicant" +RPROVIDES_${PN} += "virtual/supplicant" + SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211 at .service wpa_supplicant-wired at .service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 1f802da09b..911877cf0a 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -270,7 +270,7 @@ SUMMARY_packagegroup-base-wifi = "WiFi support" RDEPENDS_packagegroup-base-wifi = "\ iw \ wireless-regdb-static \ - wpa-supplicant" + virtual/supplicant" RRECOMMENDS_packagegroup-base-wifi = "\ ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ -- 2.20.1 From trevor.gamblin at windriver.com Mon Feb 10 23:46:03 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Mon, 10 Feb 2020 18:46:03 -0500 Subject: [OE-core] [PATCH v2] bitbake-buildall: automate build testing for qemu MACHINEs Message-ID: <20200210234603.1718190-1-trevor.gamblin@windriver.com> bitbake-buildall simplifies the process of build testing an upgraded or patched recipe by cycling through the build steps for each available qemu target, with desired LIBC specified by the user as an option (defaulting to both glibc and musl if no option is provided). While building, a log file with the name "-buildall.log" is written, containing a PASS or FAIL line upon completion of the build for each architecture. For now, qemu targets are not selectable (i.e. the recipe is built for all qemu targets found in meta/conf/machine), but this functionality can be added in the future along with other useful options. The log file created by bitbake-buildall also includes some basic system info (e.g. build start time, hostname, host OS, host kernel). Since it is not guaranteed that tools such as lsb_release will be available on the host (it isn't by default on my Fedora machine), this information is collected manually. Additionally, the previous run's log is retained for comparison by renaming it in the format -buildall.log.old once a new set of builds is triggered for the same recipe. Finally, in v2, the line "set -o pipefail" has been removed to be fully POSIX-compatible. Sample log output: BITBAKE-BUILDALL LOG FOR aspell START TIME: 2020-02-05_15:57:41 HOSTNAME: yow-tgamblin-fedora2 HOST OS: Fedora 31 (Server Edition) HOST KERNEL: 5.4.10-200.fc31.x86_64 =============== BUILD RESULTS: [glibc] PASS: qemuarmv5 PASS: qemux86 PASS: qemuppc PASS: qemumips64 FAIL: qemux86-64 FAIL: qemumips FAIL: qemuarm FAIL: qemuarm64 FAIL: qemuriscv64 [musl] PASS: qemuarmv5 PASS: qemux86 PASS: qemuppc PASS: qemumips64 PASS: qemux86-64 PASS: qemumips PASS: qemuarm PASS: qemuarm64 PASS: qemuriscv64 =============== PASSED: 13 FAILED: 5 Signed-off-by: Trevor Gamblin --- scripts/bitbake-buildall | 120 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100755 scripts/bitbake-buildall diff --git a/scripts/bitbake-buildall b/scripts/bitbake-buildall new file mode 100755 index 0000000000..74a5994f2f --- /dev/null +++ b/scripts/bitbake-buildall @@ -0,0 +1,120 @@ +#!/bin/sh +# Copyright (c) 2020 Wind River Systems, Inc. +# +# SPDX-License-Identifier: GPL-2.0-only +# +# bitbake-buildall: a tool for automating build testing of recipes +# TODO: Add support for selecting which qemu architectures to build +# TODO: Add support for queueing up multiple recipe builds +# TODO: Add more logging options (e.g. local.conf info, bitbake env info) + +usage () +{ + base=$(basename "$0") + echo "Usage: $base [options] [recipename/target]" + echo "Executes a build of a given target for selected LIBCs. With no options, default to both libc and musl." + echo "Options:" + echo "-l, --libc Specify one of \"libc\" or \"musl\"" +} + + +buildall () +{ + # Get path to oe-core directory. Since oe-init-build-env prepends $PATH with + # the path to the scripts directory, get it from there + SCRIPTS_PATH="$(echo "$PATH" | cut -d ":" -f 1)" + OE_CORE_PATH=$(echo "$SCRIPTS_PATH" | sed 's|\(.*\)/.*|\1|') + + # Get target list and host machine information + TARGET_LIST=$(find "$OE_CORE_PATH"/meta/conf/machine -maxdepth 1 -type f | grep qemu | sed 's|.*/||' | sed -e 's/\.conf//') + + # Set LIBC value to use for the builds based on options provided by the user + if [ -n "$2" ] + then + LIBC_LIST="$2" + echo "$LIBC_LIST" + else + LIBC_LIST="glibc musl" + echo "$LIBC_LIST" + fi + + START_TIME=$(date "+%Y-%m-%d_%H:%M:%S") + LOG_FILE="$1-buildall.log" + OS_INFO=$(grep "PRETTY_NAME=" /etc/os-release | awk -F "=" '{print $2}' | sed -e 's/^"//' -e 's/"$//') + + # Append an existing log file for this build with .old if one exists + if [ -f "${LOG_FILE}" ] + then + mv "${LOG_FILE}" "${LOG_FILE}.old" + else + touch "${LOG_FILE}" + fi + + # Fill the log file with build and host info + echo "BITBAKE-BUILDALL LOG FOR $1" >> "${LOG_FILE}" + echo "START TIME: ${START_TIME}" >> "${LOG_FILE}" + echo "HOSTNAME: $(uname -n)" >> "${LOG_FILE}" + echo "HOST OS: ${OS_INFO}" >> "${LOG_FILE}" + echo "HOST KERNEL: $(uname -r)" >> "${LOG_FILE}" + echo "===============" >> "${LOG_FILE}" + echo "BUILD RESULTS:" >> "${LOG_FILE}" + + # start the builds for each MACHINE and TCLIBC + for j in ${LIBC_LIST} + do + echo "[$j]" >> "${LOG_FILE}" + for i in ${TARGET_LIST} + do + echo "$i" "$j"; \ + TCLIBC=$j MACHINE=$i bitbake "$1" && echo "PASS: $i" >> "${LOG_FILE}" || echo "FAIL: $i" >> "${LOG_FILE}" + done + done + + # Get pass/fail totals and add them to the end of the log + PASSED=$(grep "PASS:" "${LOG_FILE}" | wc -l) + FAILED=$(grep "FAIL:" "${LOG_FILE}" | wc -l) + + echo "===============" >> "${LOG_FILE}" + echo "PASSED: ${PASSED}" >> "${LOG_FILE}" + echo "FAILED: ${FAILED}" >> "${LOG_FILE}" +} + + +# fail entire script if any command fails +set -e + +# print usage and exit if not enough args given +[ $# -eq 0 ] && usage && exit 1 + +# handle arguments +RECIPE= +while [ $# -gt 0 ] +do + arg=$1 + case $arg in + -l|--libc) + if [ "$2" = "glibc" ] || [ "$2" = "musl" ] + then + LIBC_LIST="$2" + else + echo "Unrecognized libc option." + usage && exit 1 + fi + shift + shift + ;; + *) + RECIPE="$1" + shift + ;; + esac +done + +set -- "$RECIPE" + +# run buildall for the given recipe and LIBC +if [ -n "$1" ] +then + buildall "$1" "$LIBC_LIST" +fi + -- 2.24.1 From raj.khem at gmail.com Tue Feb 11 00:28:20 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 10 Feb 2020 16:28:20 -0800 Subject: [OE-core] [PATCH v2] bitbake-buildall: automate build testing for qemu MACHINEs In-Reply-To: <20200210234603.1718190-1-trevor.gamblin@windriver.com> References: <20200210234603.1718190-1-trevor.gamblin@windriver.com> Message-ID: On Mon, Feb 10, 2020 at 3:47 PM Trevor Gamblin wrote: > > bitbake-buildall simplifies the process of build testing an upgraded or > patched recipe by cycling through the build steps for each available qemu > target, with desired LIBC specified by the user as an option (defaulting > to both glibc and musl if no option is provided). While building, a log > file with the name "-buildall.log" is written, containing a PASS > or FAIL line upon completion of the build for each architecture. For now, > qemu targets are not selectable (i.e. the recipe is built for all qemu > targets found in meta/conf/machine), but this functionality can be added > in the future along with other useful options. > > The log file created by bitbake-buildall also includes some basic system > info (e.g. build start time, hostname, host OS, host kernel). Since it is > not guaranteed that tools such as lsb_release will be available on the > host (it isn't by default on my Fedora machine), this information is > collected manually. Additionally, the previous run's log is retained for > comparison by renaming it in the format -buildall.log.old once a > new set of builds is triggered for the same recipe. > > Finally, in v2, the line "set -o pipefail" has been removed to be fully > POSIX-compatible. > > Sample log output: > > BITBAKE-BUILDALL LOG FOR aspell > START TIME: 2020-02-05_15:57:41 > HOSTNAME: yow-tgamblin-fedora2 > HOST OS: Fedora 31 (Server Edition) > HOST KERNEL: 5.4.10-200.fc31.x86_64 > =============== > BUILD RESULTS: > [glibc] > PASS: qemuarmv5 > PASS: qemux86 > PASS: qemuppc > PASS: qemumips64 > FAIL: qemux86-64 > FAIL: qemumips > FAIL: qemuarm > FAIL: qemuarm64 > FAIL: qemuriscv64 > [musl] > PASS: qemuarmv5 > PASS: qemux86 > PASS: qemuppc > PASS: qemumips64 > PASS: qemux86-64 > PASS: qemumips > PASS: qemuarm > PASS: qemuarm64 > PASS: qemuriscv64 > =============== > PASSED: 13 > FAILED: 5 > > Signed-off-by: Trevor Gamblin > --- > scripts/bitbake-buildall | 120 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 120 insertions(+) > create mode 100755 scripts/bitbake-buildall if its building qemu machines only, then naming it build-qemuall.sh or some such would be better, I would avoid usine bitbake- prefix. That can confuse with bitbake tools > > diff --git a/scripts/bitbake-buildall b/scripts/bitbake-buildall > new file mode 100755 > index 0000000000..74a5994f2f > --- /dev/null > +++ b/scripts/bitbake-buildall > @@ -0,0 +1,120 @@ > +#!/bin/sh > +# Copyright (c) 2020 Wind River Systems, Inc. > +# > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# bitbake-buildall: a tool for automating build testing of recipes > +# TODO: Add support for selecting which qemu architectures to build > +# TODO: Add support for queueing up multiple recipe builds > +# TODO: Add more logging options (e.g. local.conf info, bitbake env info) > + > +usage () > +{ > + base=$(basename "$0") > + echo "Usage: $base [options] [recipename/target]" > + echo "Executes a build of a given target for selected LIBCs. With no options, default to both libc and musl." > + echo "Options:" > + echo "-l, --libc Specify one of \"libc\" or \"musl\"" > +} > + > + > +buildall () > +{ > + # Get path to oe-core directory. Since oe-init-build-env prepends $PATH with > + # the path to the scripts directory, get it from there > + SCRIPTS_PATH="$(echo "$PATH" | cut -d ":" -f 1)" > + OE_CORE_PATH=$(echo "$SCRIPTS_PATH" | sed 's|\(.*\)/.*|\1|') > + > + # Get target list and host machine information > + TARGET_LIST=$(find "$OE_CORE_PATH"/meta/conf/machine -maxdepth 1 -type f | grep qemu | sed 's|.*/||' | sed -e 's/\.conf//') > + > + # Set LIBC value to use for the builds based on options provided by the user > + if [ -n "$2" ] > + then > + LIBC_LIST="$2" > + echo "$LIBC_LIST" > + else > + LIBC_LIST="glibc musl" > + echo "$LIBC_LIST" > + fi > + > + START_TIME=$(date "+%Y-%m-%d_%H:%M:%S") > + LOG_FILE="$1-buildall.log" > + OS_INFO=$(grep "PRETTY_NAME=" /etc/os-release | awk -F "=" '{print $2}' | sed -e 's/^"//' -e 's/"$//') > + > + # Append an existing log file for this build with .old if one exists > + if [ -f "${LOG_FILE}" ] > + then > + mv "${LOG_FILE}" "${LOG_FILE}.old" > + else > + touch "${LOG_FILE}" > + fi > + > + # Fill the log file with build and host info > + echo "BITBAKE-BUILDALL LOG FOR $1" >> "${LOG_FILE}" > + echo "START TIME: ${START_TIME}" >> "${LOG_FILE}" > + echo "HOSTNAME: $(uname -n)" >> "${LOG_FILE}" > + echo "HOST OS: ${OS_INFO}" >> "${LOG_FILE}" > + echo "HOST KERNEL: $(uname -r)" >> "${LOG_FILE}" > + echo "===============" >> "${LOG_FILE}" > + echo "BUILD RESULTS:" >> "${LOG_FILE}" > + > + # start the builds for each MACHINE and TCLIBC > + for j in ${LIBC_LIST} > + do > + echo "[$j]" >> "${LOG_FILE}" > + for i in ${TARGET_LIST} > + do > + echo "$i" "$j"; \ > + TCLIBC=$j MACHINE=$i bitbake "$1" && echo "PASS: $i" >> "${LOG_FILE}" || echo "FAIL: $i" >> "${LOG_FILE}" > + done > + done > + > + # Get pass/fail totals and add them to the end of the log > + PASSED=$(grep "PASS:" "${LOG_FILE}" | wc -l) > + FAILED=$(grep "FAIL:" "${LOG_FILE}" | wc -l) > + > + echo "===============" >> "${LOG_FILE}" > + echo "PASSED: ${PASSED}" >> "${LOG_FILE}" > + echo "FAILED: ${FAILED}" >> "${LOG_FILE}" > +} > + > + > +# fail entire script if any command fails > +set -e > + > +# print usage and exit if not enough args given > +[ $# -eq 0 ] && usage && exit 1 > + > +# handle arguments > +RECIPE= > +while [ $# -gt 0 ] > +do > + arg=$1 > + case $arg in > + -l|--libc) > + if [ "$2" = "glibc" ] || [ "$2" = "musl" ] > + then > + LIBC_LIST="$2" > + else > + echo "Unrecognized libc option." > + usage && exit 1 > + fi > + shift > + shift > + ;; > + *) > + RECIPE="$1" > + shift > + ;; > + esac > +done > + > +set -- "$RECIPE" > + > +# run buildall for the given recipe and LIBC > +if [ -n "$1" ] > +then > + buildall "$1" "$LIBC_LIST" > +fi > + > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From peter.kjellerstedt at axis.com Tue Feb 11 01:08:28 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Tue, 11 Feb 2020 01:08:28 +0000 Subject: [OE-core] [PATCH] pkgconf: Remove pointless DEFAULT_PREFERENCE In-Reply-To: <20200210160224.21246-1-richard.purdie@linuxfoundation.org> References: <20200210160224.21246-1-richard.purdie@linuxfoundation.org> Message-ID: <034530475e114936a4a1c8b924905912@XBOX03.axis.com> > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Richard Purdie > Sent: den 10 februari 2020 17:02 > To: openembedded-core at lists.openembedded.org > Subject: [OE-core] [PATCH] pkgconf: Remove pointless DEFAULT_PREFERENCE > > There is no other version of pkgconfig to have a preference against, > remove the unneeded variable. The variable may be pointless, but I guess the intent was to make it clear that the original pkgconfig recipe (which still exists) is to be preferred? > Signed-off-by: Richard Purdie > --- > meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb > index 94bc112b9fd..732ca2a0348 100644 > --- a/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb > +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.6.3.bb > @@ -8,7 +8,6 @@ BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" > SECTION = "devel" > PROVIDES += "pkgconfig" > RPROVIDES_${PN} += "pkgconfig" > -DEFAULT_PREFERENCE = "-1" > > # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or > # ISC, but has different wording, so needs its own name. > -- > 2.20.1 //Peter From akuster808 at gmail.com Tue Feb 11 01:51:50 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 10 Feb 2020 17:51:50 -0800 Subject: [OE-core] [zeus 00/30] Pull request Message-ID: Consolidated pull request. Cover leter only. The following changes since commit 9b1bf083129be2b849db52d4f0eda9eb6077c97e: python2: add ntpath (2020-02-02 18:19:50 -0800) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib stable/zeus-next http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/zeus-next Alejandro del Castillo (1): opkg-utils: upgrade to version 0.4.2 Alexander Kanavin (1): perl: do not install files that contain build host specific data Anuj Mittal (3): Revert "bzip2: Fix CVE-2019-12900" curl: fix CVE-2019-15601 cpio: fix CVE-2019-14866 Joshua Watt (2): classes/reproducible_build: Read SDE file later mc: Fix build reproducibility Lee Chee Yang (1): rsync: whitelist CVE-2017-16548 Richard Purdie (17): opkg-utils: Fix reproducibility issues in opkg-build oeqa/reproducible: Improve test output and ensure deb+ipk compared sudo: Set vardir deterministically libxshmfence: Set shm directory deterministically mc: Set zipinfo presence determinstically mc: Fix manpage date indeterminism tar: Fix build determinism, disable rsh patch: Extend to native/nativesdk and depend upon libidn2: Fix reproducibility issue perl: Fix various reproducibile build issues openssl: Fix reproducibility issue iputils: Fix build determinism libinput: Fix determinism issue libgcrypt: Fix determinism issue sysvinit: Fix Reproducibility issue libevdev: Fix determinism issue ncurses: Fix reproducibility issue Ross Burton (2): gtk+3: sort resources for reproducible binaries sudo: specify where target tools are Taras Kondratiuk via Openembedded-core (1): gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os' Tom Hochstein (2): devtool/standard.py: Allow recipe to disable menuconfig logic u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig meta/classes/patch.bbclass | 7 + meta/classes/reproducible_build.bbclass | 40 ++- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +- meta/recipes-bsp/u-boot/u-boot.inc | 2 + .../openssl/openssl/reproducible.patch | 32 ++ .../openssl/openssl_1.1.1d.bb | 1 + meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-core/ncurses/ncurses.inc | 1 + .../recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 + meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...02-aarch64-ICE-on-Linux-kernel-with-.patch | 95 ++++++ ...Switch-all-scripts-to-use-Python-3.x.patch | 113 ------- ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 44 --- .../opkg-utils/fix-reproducibility.patch | 32 ++ .../opkg-utils/opkg-utils/pipefail.patch | 31 -- ...pkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} | 13 +- meta/recipes-devtools/patch/patch_2.7.6.bb | 3 + .../perl/files/determinism.patch | 81 +++++ meta/recipes-devtools/perl/perl-ptest.inc | 3 + meta/recipes-devtools/perl/perl_5.30.0.bb | 4 + meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch | 36 -- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + .../iputils/iputils_s20190709.bb | 3 +- meta/recipes-extended/libidn/libidn2_2.2.0.bb | 3 +- ...Add-option-to-control-configure-args.patch | 99 ++++++ .../recipes-extended/mc/files/nomandate.patch | 21 ++ meta/recipes-extended/mc/mc_4.8.23.bb | 7 +- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/sudo_1.8.27.bb | 10 +- meta/recipes-extended/tar/tar_1.32.bb | 2 + .../gtk+/gtk+3/sort-resources.patch | 19 ++ meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb | 1 + .../wayland/libinput/determinism.patch | 21 ++ .../wayland/libinput_1.14.1.bb | 4 +- .../xorg-lib/libxshmfence_1.3.bb | 2 + .../curl/curl/CVE-2019-15601.patch | 46 +++ meta/recipes-support/curl/curl_7.66.0.bb | 1 + .../libevdev/libevdev/determinism.patch | 34 ++ .../libevdev/libevdev_1.8.0.bb | 3 +- .../libgcrypt/files/determinism.patch | 32 ++ .../libgcrypt/libgcrypt_1.8.4.bb | 1 + scripts/lib/devtool/standard.py | 6 +- 44 files changed, 935 insertions(+), 252 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/pipefail.patch rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.4.1.bb => opkg-utils_0.4.2.bb} (83%) create mode 100644 meta/recipes-devtools/perl/files/determinism.patch delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch create mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch create mode 100644 meta/recipes-extended/mc/files/nomandate.patch create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2019-15601.patch create mode 100644 meta/recipes-support/libevdev/libevdev/determinism.patch create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch -- 2.17.1 From akuster808 at gmail.com Tue Feb 11 03:07:32 2020 From: akuster808 at gmail.com (akuster808) Date: Mon, 10 Feb 2020 19:07:32 -0800 Subject: [OE-core] [warrior][PATCH] libxml2: Fix CVE-2019-19956 In-Reply-To: <1581360561-30532-1-git-send-email-rahulk@mvista.com> References: <1581360561-30532-1-git-send-email-rahulk@mvista.com> Message-ID: <603e05c3-b568-a228-7821-5a48593b4c30@gmail.com> On 2/10/20 10:49 AM, Rahul Chauhan wrote: > Signed-off-by: Rahul Chauhan > --- > .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 ++++++++++++++++++++++ > meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + > 2 files changed, 39 insertions(+) > create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch What is the difference from the patch sent on the 6th? is this a version 2? - armin > > diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch > new file mode 100644 > index 0000000..43c3589 > --- /dev/null > +++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch > @@ -0,0 +1,38 @@ > +From 3cd2b25ddb04740be2880cfd78d60038452228b1 Mon Sep 17 00:00:00 2001 > +From: Zhipeng Xie > +Date: Wed, 7 Aug 2019 17:39:17 +0800 > +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover > + > +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl > +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to > +NULL and free newDoc will cause a memory leak. > + > +Found with libFuzzer. > + > +Closes #82. > + > +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549] > +CVE: CVE-2019-19956 > + > +Signed-off-by: Rahul Chauhan > +--- > + parser.c | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/parser.c b/parser.c > +index b7ecd65..491f5c9 100644 > +--- a/parser.c > ++++ b/parser.c > +@@ -13899,7 +13899,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, > + xmlFreeParserCtxt(ctxt); > + newDoc->intSubset = NULL; > + newDoc->extSubset = NULL; > +- newDoc->oldNs = NULL; > ++ if(doc != NULL) > ++ newDoc->oldNs = NULL; > + xmlFreeDoc(newDoc); > + > + return(ret); > +-- > +2.7.4 > + > diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb > index 62643bc..67c2d4f 100644 > --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb > +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb > @@ -23,6 +23,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ > file://fix-CVE-2017-8872.patch \ > file://fix-CVE-2018-14404.patch \ > file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ > + file://fix-CVE-2019-19956.patch \ > " > > SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" From alex.kiernan at gmail.com Tue Feb 11 07:22:01 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Tue, 11 Feb 2020 07:22:01 +0000 Subject: [OE-core] [OE-Core][PATCH] iputils: Fix systemd and ipv6 detection Message-ID: <20200211072201.80498-1-alex.kiernan@gmail.com> When systemd is enabled, ensure iputils detects it correctly. Split out IPv6 only features based on ipv6 enabled in DISTRO_FEATURES. Signed-off-by: Alex Kiernan --- .../iputils/iputils_s20190709.bb | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index e0d2ae160ee0..e671130e4933 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -23,16 +23,20 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?Ps\d+)" # breaks the version order. CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" -PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" +PACKAGECONFIG ??= "libcap libgcrypt rarpd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" -inherit meson update-alternatives +inherit meson systemd update-alternatives # Have to disable setcap/suid as its not deterministic EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" @@ -42,12 +46,12 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ + ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" PACKAGES += "${SPLITPKGS}" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-rarpd = "1" -ALLOW_EMPTY_${PN}-traceroute6 = "1" RDEPENDS_${PN} += "${SPLITPKGS}" FILES_${PN} = "" @@ -57,6 +61,11 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_sbindir}/rarpd" +FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd at .service" FILES_${PN}-rdisc = "${base_sbindir}/rdisc" FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ + ${PN}-rdisc" +SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" +SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" -- 2.17.1 From rahulchauhankitps at gmail.com Tue Feb 11 07:26:50 2020 From: rahulchauhankitps at gmail.com (rahul chauhan) Date: Tue, 11 Feb 2020 12:56:50 +0530 Subject: [OE-core] [warrior][PATCH] libxml2: Fix CVE-2019-19956 In-Reply-To: <603e05c3-b568-a228-7821-5a48593b4c30@gmail.com> References: <1581360561-30532-1-git-send-email-rahulk@mvista.com> <603e05c3-b568-a228-7821-5a48593b4c30@gmail.com> Message-ID: Hi Armin, Both patches are same. Since after submit the patch . I could not see my patch at https://patchwork.openembedded.org/project/oe-core/patches/ so I was suspect that my patch submitted properly or not. so I submitted this patch again. I have one quick question. After patch submission If I am not able to see my patch at https://patchwork.openembedded.org/project/oe-core/patches/ , is there any other way to check the patch submission status. Thanks & Regards Rahul Chauhan On Tue, Feb 11, 2020 at 8:37 AM akuster808 wrote: > > > On 2/10/20 10:49 AM, Rahul Chauhan wrote: > > Signed-off-by: Rahul Chauhan > > --- > > .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 > ++++++++++++++++++++++ > > meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + > > 2 files changed, 39 insertions(+) > > create mode 100644 > meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch > > What is the difference from the patch sent on the 6th? is this a version 2? > > - armin > > > > diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch > b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch > > new file mode 100644 > > index 0000000..43c3589 > > --- /dev/null > > +++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch > > @@ -0,0 +1,38 @@ > > +From 3cd2b25ddb04740be2880cfd78d60038452228b1 Mon Sep 17 00:00:00 2001 > > +From: Zhipeng Xie > > +Date: Wed, 7 Aug 2019 17:39:17 +0800 > > +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover > > + > > +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl > > +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to > > +NULL and free newDoc will cause a memory leak. > > + > > +Found with libFuzzer. > > + > > +Closes #82. > > + > > +Upstream-Status: Backport [ > https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549 > ] > > +CVE: CVE-2019-19956 > > + > > +Signed-off-by: Rahul Chauhan > > +--- > > + parser.c | 3 ++- > > + 1 file changed, 2 insertions(+), 1 deletion(-) > > + > > +diff --git a/parser.c b/parser.c > > +index b7ecd65..491f5c9 100644 > > +--- a/parser.c > > ++++ b/parser.c > > +@@ -13899,7 +13899,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr > doc, xmlSAXHandlerPtr sax, > > + xmlFreeParserCtxt(ctxt); > > + newDoc->intSubset = NULL; > > + newDoc->extSubset = NULL; > > +- newDoc->oldNs = NULL; > > ++ if(doc != NULL) > > ++ newDoc->oldNs = NULL; > > + xmlFreeDoc(newDoc); > > + > > + return(ret); > > +-- > > +2.7.4 > > + > > diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb > b/meta/recipes-core/libxml/libxml2_2.9.8.bb > > index 62643bc..67c2d4f 100644 > > --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb > > +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb > > @@ -23,6 +23,7 @@ SRC_URI = " > http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ > > file://fix-CVE-2017-8872.patch \ > > file://fix-CVE-2018-14404.patch \ > > file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ > > + file://fix-CVE-2019-19956.patch \ > > " > > > > SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Tue Feb 11 12:49:27 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 13:49:27 +0100 Subject: [OE-core] Future of sato and X in oe-core Message-ID: Hello, I'd like to lay out a few ideas/thoughts on what should be done with sato (matchbox bits) and X going forward. The inputs are: - Red Hat is the only company doing X maintenance anymore, and they're transitioning it to 'hard maintenance mode' https://blogs.gnome.org/uraeus/2019/06/24/on-the-road-to-fedora-workstation-31/ "Once we are done with this [xwayland gaining missing features] we expect X.org to go into hard maintenance mode fairly quickly. The reality is that X.org is basically maintained by us and thus once we stop paying attention to it there is unlikely to be any major new releases coming out and there might even be some bitrot setting in over time. We will keep an eye on it as we will want to ensure X.org stays supportable until the end of the RHEL8 lifecycle at a minimum, but let this be a friendly notice for everyone who rely the work we do maintaining the Linux graphics stack, get onto Wayland, that is where the future is. " - matchbox is reliant on gtk3 (to be obsoleted by gtk4 this year), and does not have a Wayland compositor. Yocto project does not have the resources to do the gtk4 port, or add a compositor. - no 'lightweight Wayland compositor with a desktop/launcher experience" has emerged in the open source space; I think the only realistic choice at the moment is the reference compositor Weston which provides a blank desktop with ability to open terminal windows. So the way I think things should be going (seeking opinions/inputs of course): - oe-core adopts Weston as the 'new sato'; all sato images that currently pull in matchbox and friends are changed to be Weston-based. Note that there is no requirement for 3D acceleration; Weston works with plain frame buffer device. However, both options should be supported and tested. Also, support for Xwayland should be tested. - oe-core continues to support and runtime-test X for as long as possible; for this a new image (say, 'core-image-sato-xorg') is created which will provide matchbox under X. However, once upstream bitrot sets in, and pain threshold is exceeded, this will be removed and/or relegated to a legacy layer. Thoughts? Regards, Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From rahulchauhankitps at gmail.com Tue Feb 11 13:06:26 2020 From: rahulchauhankitps at gmail.com (rahul chauhan) Date: Tue, 11 Feb 2020 18:36:26 +0530 Subject: [OE-core] [PATCH] ruby: fix CVE-2019-16254 In-Reply-To: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> References: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> Message-ID: Hi community members, This patch Fixes CVE-2019-16254 on zeus branch. patch test failed, since I did not use --subject-prefix="zeus][PATCH" at the time of patch submission to openembedded-core at lists.openembedded.org. should i resubmit this patch with --subject-prefix="zeus][PATCH" or can anyone guide me what should do next in this situation ? Thanks & Regards Rahul Chauhan On Mon, Feb 10, 2020 at 11:47 PM Rahul Chauhan wrote: > Signed-off-by: Rahul Chauhan > --- > .../ruby/ruby/fix-CVE-2019-16254.patch | 106 > +++++++++++++++++++++ > meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + > 2 files changed, 107 insertions(+) > create mode 100644 > meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch > > diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch > b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch > new file mode 100644 > index 0000000..704c850 > --- /dev/null > +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch > @@ -0,0 +1,106 @@ > +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001 > +From: Yusuke Endoh > +Date: Tue, 1 Oct 2019 12:29:18 +0900 > +Subject: [PATCH] WEBrick: prevent response splitting and header injection > + > +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16. > +The commit prevented CRLR, but did not address an isolated CR or an > +isolated LF. > + > +Upstream-Status: Backport > https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc > +CVE: CVE-2019-16254 > + > +Co-Authored-By: NARUSE, Yui > +Signed-off-by: Rahul Chauhan > +--- > + lib/webrick/httpresponse.rb | 3 ++- > + test/webrick/test_httpresponse.rb | 46 > +++++++++++++++++++++++++++++++++++++-- > + 2 files changed, 46 insertions(+), 3 deletions(-) > + > +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb > +index 6d77692..d26324c 100644 > +--- a/lib/webrick/httpresponse.rb > ++++ b/lib/webrick/httpresponse.rb > +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false) > + private > + > + def check_header(header_value) > +- if header_value =~ /\r\n/ > ++ header_value = header_value.to_s > ++ if /[\r\n]/ =~ header_value > + raise InvalidHeader > + else > + header_value > +diff --git a/test/webrick/test_httpresponse.rb > b/test/webrick/test_httpresponse.rb > +index 6263e0a..24a6968 100644 > +--- a/test/webrick/test_httpresponse.rb > ++++ b/test/webrick/test_httpresponse.rb > +@@ -29,7 +29,7 @@ def setup > + @res.keep_alive = true > + end > + > +- def test_prevent_response_splitting_headers > ++ def test_prevent_response_splitting_headers_crlf > + res['X-header'] = "malicious\r\nCookie: hack" > + io = StringIO.new > + res.send_response io > +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers > + refute_match 'hack', io.string > + end > + > +- def test_prevent_response_splitting_cookie_headers > ++ def test_prevent_response_splitting_cookie_headers_crlf > + user_input = "malicious\r\nCookie: hack" > + res.cookies << WEBrick::Cookie.new('author', user_input) > + io = StringIO.new > +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers > + refute_match 'hack', io.string > + end > + > ++ def test_prevent_response_splitting_headers_cr > ++ res['X-header'] = "malicious\rCookie: hack" > ++ io = StringIO.new > ++ res.send_response io > ++ io.rewind > ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) > ++ assert_equal '500', res.code > ++ refute_match 'hack', io.string > ++ end > ++ > ++ def test_prevent_response_splitting_cookie_headers_cr > ++ user_input = "malicious\rCookie: hack" > ++ res.cookies << WEBrick::Cookie.new('author', user_input) > ++ io = StringIO.new > ++ res.send_response io > ++ io.rewind > ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) > ++ assert_equal '500', res.code > ++ refute_match 'hack', io.string > ++ end > ++ > ++ def test_prevent_response_splitting_headers_lf > ++ res['X-header'] = "malicious\nCookie: hack" > ++ io = StringIO.new > ++ res.send_response io > ++ io.rewind > ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) > ++ assert_equal '500', res.code > ++ refute_match 'hack', io.string > ++ end > ++ > ++ def test_prevent_response_splitting_cookie_headers_lf > ++ user_input = "malicious\nCookie: hack" > ++ res.cookies << WEBrick::Cookie.new('author', user_input) > ++ io = StringIO.new > ++ res.send_response io > ++ io.rewind > ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) > ++ assert_equal '500', res.code > ++ refute_match 'hack', io.string > ++ end > ++ > + def test_304_does_not_log_warning > + res.status = 304 > + res.setup_header > +-- > +2.7.4 > diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb > b/meta/recipes-devtools/ruby/ruby_2.5.5.bb > index 223b037..58bb97f 100644 > --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb > +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb > @@ -3,6 +3,7 @@ require ruby.inc > SRC_URI += " \ > > file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ > file://run-ptest \ > + file://fix-CVE-2019-16254.patch \ > " > > SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" > -- > 2.7.4 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Tue Feb 11 13:16:15 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 14:16:15 +0100 Subject: [OE-core] [PATCH] ruby: fix CVE-2019-16254 In-Reply-To: References: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> Message-ID: Yes. You should always specify the target branch in the subject if it is not for master. Alex On Tue, 11 Feb 2020 at 14:06, rahul chauhan wrote: > Hi community members, > > This patch Fixes CVE-2019-16254 on zeus branch. > patch test failed, since I did not use --subject-prefix="zeus][PATCH" at > the time of patch submission to openembedded-core at lists.openembedded.org. > > should i resubmit this patch with --subject-prefix="zeus][PATCH" > or > can anyone guide me what should do next in this situation ? > > Thanks & Regards > Rahul Chauhan > > On Mon, Feb 10, 2020 at 11:47 PM Rahul Chauhan < > rahulchauhankitps at gmail.com> wrote: > >> Signed-off-by: Rahul Chauhan >> --- >> .../ruby/ruby/fix-CVE-2019-16254.patch | 106 >> +++++++++++++++++++++ >> meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + >> 2 files changed, 107 insertions(+) >> create mode 100644 >> meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >> >> diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >> b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >> new file mode 100644 >> index 0000000..704c850 >> --- /dev/null >> +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >> @@ -0,0 +1,106 @@ >> +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001 >> +From: Yusuke Endoh >> +Date: Tue, 1 Oct 2019 12:29:18 +0900 >> +Subject: [PATCH] WEBrick: prevent response splitting and header injection >> + >> +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16. >> +The commit prevented CRLR, but did not address an isolated CR or an >> +isolated LF. >> + >> +Upstream-Status: Backport >> https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc >> +CVE: CVE-2019-16254 >> + >> +Co-Authored-By: NARUSE, Yui >> +Signed-off-by: Rahul Chauhan >> +--- >> + lib/webrick/httpresponse.rb | 3 ++- >> + test/webrick/test_httpresponse.rb | 46 >> +++++++++++++++++++++++++++++++++++++-- >> + 2 files changed, 46 insertions(+), 3 deletions(-) >> + >> +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb >> +index 6d77692..d26324c 100644 >> +--- a/lib/webrick/httpresponse.rb >> ++++ b/lib/webrick/httpresponse.rb >> +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false) >> + private >> + >> + def check_header(header_value) >> +- if header_value =~ /\r\n/ >> ++ header_value = header_value.to_s >> ++ if /[\r\n]/ =~ header_value >> + raise InvalidHeader >> + else >> + header_value >> +diff --git a/test/webrick/test_httpresponse.rb >> b/test/webrick/test_httpresponse.rb >> +index 6263e0a..24a6968 100644 >> +--- a/test/webrick/test_httpresponse.rb >> ++++ b/test/webrick/test_httpresponse.rb >> +@@ -29,7 +29,7 @@ def setup >> + @res.keep_alive = true >> + end >> + >> +- def test_prevent_response_splitting_headers >> ++ def test_prevent_response_splitting_headers_crlf >> + res['X-header'] = "malicious\r\nCookie: hack" >> + io = StringIO.new >> + res.send_response io >> +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers >> + refute_match 'hack', io.string >> + end >> + >> +- def test_prevent_response_splitting_cookie_headers >> ++ def test_prevent_response_splitting_cookie_headers_crlf >> + user_input = "malicious\r\nCookie: hack" >> + res.cookies << WEBrick::Cookie.new('author', user_input) >> + io = StringIO.new >> +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers >> + refute_match 'hack', io.string >> + end >> + >> ++ def test_prevent_response_splitting_headers_cr >> ++ res['X-header'] = "malicious\rCookie: hack" >> ++ io = StringIO.new >> ++ res.send_response io >> ++ io.rewind >> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >> ++ assert_equal '500', res.code >> ++ refute_match 'hack', io.string >> ++ end >> ++ >> ++ def test_prevent_response_splitting_cookie_headers_cr >> ++ user_input = "malicious\rCookie: hack" >> ++ res.cookies << WEBrick::Cookie.new('author', user_input) >> ++ io = StringIO.new >> ++ res.send_response io >> ++ io.rewind >> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >> ++ assert_equal '500', res.code >> ++ refute_match 'hack', io.string >> ++ end >> ++ >> ++ def test_prevent_response_splitting_headers_lf >> ++ res['X-header'] = "malicious\nCookie: hack" >> ++ io = StringIO.new >> ++ res.send_response io >> ++ io.rewind >> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >> ++ assert_equal '500', res.code >> ++ refute_match 'hack', io.string >> ++ end >> ++ >> ++ def test_prevent_response_splitting_cookie_headers_lf >> ++ user_input = "malicious\nCookie: hack" >> ++ res.cookies << WEBrick::Cookie.new('author', user_input) >> ++ io = StringIO.new >> ++ res.send_response io >> ++ io.rewind >> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >> ++ assert_equal '500', res.code >> ++ refute_match 'hack', io.string >> ++ end >> ++ >> + def test_304_does_not_log_warning >> + res.status = 304 >> + res.setup_header >> +-- >> +2.7.4 >> diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb >> b/meta/recipes-devtools/ruby/ruby_2.5.5.bb >> index 223b037..58bb97f 100644 >> --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb >> +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb >> @@ -3,6 +3,7 @@ require ruby.inc >> SRC_URI += " \ >> >> file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ >> file://run-ptest \ >> + file://fix-CVE-2019-16254.patch \ >> " >> >> SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" >> -- >> 2.7.4 >> >> -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From rahulchauhankitps at gmail.com Tue Feb 11 13:27:49 2020 From: rahulchauhankitps at gmail.com (rahul chauhan) Date: Tue, 11 Feb 2020 18:57:49 +0530 Subject: [OE-core] [PATCH] ruby: fix CVE-2019-16254 In-Reply-To: References: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> Message-ID: Thanks Alexander, For quick response, should i resubmit this patch with --subject-prefix="zeus][PATCH" or should i submit the next patch version. On Tue, Feb 11, 2020 at 6:45 PM Alexander Kanavin wrote: > Yes. You should always specify the target branch in the subject if it is > not for master. > > Alex > > On Tue, 11 Feb 2020 at 14:06, rahul chauhan > wrote: > >> Hi community members, >> >> This patch Fixes CVE-2019-16254 on zeus branch. >> patch test failed, since I did not use --subject-prefix="zeus][PATCH" at >> the time of patch submission to openembedded-core at lists.openembedded.org. >> >> should i resubmit this patch with --subject-prefix="zeus][PATCH" >> or >> can anyone guide me what should do next in this situation ? >> >> Thanks & Regards >> Rahul Chauhan >> >> On Mon, Feb 10, 2020 at 11:47 PM Rahul Chauhan < >> rahulchauhankitps at gmail.com> wrote: >> >>> Signed-off-by: Rahul Chauhan >>> --- >>> .../ruby/ruby/fix-CVE-2019-16254.patch | 106 >>> +++++++++++++++++++++ >>> meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + >>> 2 files changed, 107 insertions(+) >>> create mode 100644 >>> meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>> >>> diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>> b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>> new file mode 100644 >>> index 0000000..704c850 >>> --- /dev/null >>> +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>> @@ -0,0 +1,106 @@ >>> +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001 >>> +From: Yusuke Endoh >>> +Date: Tue, 1 Oct 2019 12:29:18 +0900 >>> +Subject: [PATCH] WEBrick: prevent response splitting and header >>> injection >>> + >>> +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16. >>> +The commit prevented CRLR, but did not address an isolated CR or an >>> +isolated LF. >>> + >>> +Upstream-Status: Backport >>> https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc >>> +CVE: CVE-2019-16254 >>> + >>> +Co-Authored-By: NARUSE, Yui >>> +Signed-off-by: Rahul Chauhan >>> +--- >>> + lib/webrick/httpresponse.rb | 3 ++- >>> + test/webrick/test_httpresponse.rb | 46 >>> +++++++++++++++++++++++++++++++++++++-- >>> + 2 files changed, 46 insertions(+), 3 deletions(-) >>> + >>> +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb >>> +index 6d77692..d26324c 100644 >>> +--- a/lib/webrick/httpresponse.rb >>> ++++ b/lib/webrick/httpresponse.rb >>> +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false) >>> + private >>> + >>> + def check_header(header_value) >>> +- if header_value =~ /\r\n/ >>> ++ header_value = header_value.to_s >>> ++ if /[\r\n]/ =~ header_value >>> + raise InvalidHeader >>> + else >>> + header_value >>> +diff --git a/test/webrick/test_httpresponse.rb >>> b/test/webrick/test_httpresponse.rb >>> +index 6263e0a..24a6968 100644 >>> +--- a/test/webrick/test_httpresponse.rb >>> ++++ b/test/webrick/test_httpresponse.rb >>> +@@ -29,7 +29,7 @@ def setup >>> + @res.keep_alive = true >>> + end >>> + >>> +- def test_prevent_response_splitting_headers >>> ++ def test_prevent_response_splitting_headers_crlf >>> + res['X-header'] = "malicious\r\nCookie: hack" >>> + io = StringIO.new >>> + res.send_response io >>> +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers >>> + refute_match 'hack', io.string >>> + end >>> + >>> +- def test_prevent_response_splitting_cookie_headers >>> ++ def test_prevent_response_splitting_cookie_headers_crlf >>> + user_input = "malicious\r\nCookie: hack" >>> + res.cookies << WEBrick::Cookie.new('author', user_input) >>> + io = StringIO.new >>> +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers >>> + refute_match 'hack', io.string >>> + end >>> + >>> ++ def test_prevent_response_splitting_headers_cr >>> ++ res['X-header'] = "malicious\rCookie: hack" >>> ++ io = StringIO.new >>> ++ res.send_response io >>> ++ io.rewind >>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>> ++ assert_equal '500', res.code >>> ++ refute_match 'hack', io.string >>> ++ end >>> ++ >>> ++ def test_prevent_response_splitting_cookie_headers_cr >>> ++ user_input = "malicious\rCookie: hack" >>> ++ res.cookies << WEBrick::Cookie.new('author', user_input) >>> ++ io = StringIO.new >>> ++ res.send_response io >>> ++ io.rewind >>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>> ++ assert_equal '500', res.code >>> ++ refute_match 'hack', io.string >>> ++ end >>> ++ >>> ++ def test_prevent_response_splitting_headers_lf >>> ++ res['X-header'] = "malicious\nCookie: hack" >>> ++ io = StringIO.new >>> ++ res.send_response io >>> ++ io.rewind >>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>> ++ assert_equal '500', res.code >>> ++ refute_match 'hack', io.string >>> ++ end >>> ++ >>> ++ def test_prevent_response_splitting_cookie_headers_lf >>> ++ user_input = "malicious\nCookie: hack" >>> ++ res.cookies << WEBrick::Cookie.new('author', user_input) >>> ++ io = StringIO.new >>> ++ res.send_response io >>> ++ io.rewind >>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>> ++ assert_equal '500', res.code >>> ++ refute_match 'hack', io.string >>> ++ end >>> ++ >>> + def test_304_does_not_log_warning >>> + res.status = 304 >>> + res.setup_header >>> +-- >>> +2.7.4 >>> diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>> b/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>> index 223b037..58bb97f 100644 >>> --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>> +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>> @@ -3,6 +3,7 @@ require ruby.inc >>> SRC_URI += " \ >>> >>> file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ >>> file://run-ptest \ >>> + file://fix-CVE-2019-16254.patch \ >>> " >>> >>> SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" >>> -- >>> 2.7.4 >>> >>> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Tue Feb 11 13:34:45 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 14:34:45 +0100 Subject: [OE-core] [PATCH] ruby: fix CVE-2019-16254 In-Reply-To: References: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> Message-ID: Either way is fine. Alex On Tue, 11 Feb 2020 at 14:28, rahul chauhan wrote: > Thanks Alexander, > > For quick response, > should i resubmit this patch with --subject-prefix="zeus][PATCH" > or > should i submit the next patch version. > > On Tue, Feb 11, 2020 at 6:45 PM Alexander Kanavin > wrote: > >> Yes. You should always specify the target branch in the subject if it is >> not for master. >> >> Alex >> >> On Tue, 11 Feb 2020 at 14:06, rahul chauhan >> wrote: >> >>> Hi community members, >>> >>> This patch Fixes CVE-2019-16254 on zeus branch. >>> patch test failed, since I did not use --subject-prefix="zeus][PATCH" at >>> the time of patch submission to openembedded-core at lists.openembedded.org >>> . >>> >>> should i resubmit this patch with --subject-prefix="zeus][PATCH" >>> or >>> can anyone guide me what should do next in this situation ? >>> >>> Thanks & Regards >>> Rahul Chauhan >>> >>> On Mon, Feb 10, 2020 at 11:47 PM Rahul Chauhan < >>> rahulchauhankitps at gmail.com> wrote: >>> >>>> Signed-off-by: Rahul Chauhan >>>> --- >>>> .../ruby/ruby/fix-CVE-2019-16254.patch | 106 >>>> +++++++++++++++++++++ >>>> meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + >>>> 2 files changed, 107 insertions(+) >>>> create mode 100644 >>>> meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>>> >>>> diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>>> b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>>> new file mode 100644 >>>> index 0000000..704c850 >>>> --- /dev/null >>>> +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>>> @@ -0,0 +1,106 @@ >>>> +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001 >>>> +From: Yusuke Endoh >>>> +Date: Tue, 1 Oct 2019 12:29:18 +0900 >>>> +Subject: [PATCH] WEBrick: prevent response splitting and header >>>> injection >>>> + >>>> +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16. >>>> +The commit prevented CRLR, but did not address an isolated CR or an >>>> +isolated LF. >>>> + >>>> +Upstream-Status: Backport >>>> https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc >>>> +CVE: CVE-2019-16254 >>>> + >>>> +Co-Authored-By: NARUSE, Yui >>>> +Signed-off-by: Rahul Chauhan >>>> +--- >>>> + lib/webrick/httpresponse.rb | 3 ++- >>>> + test/webrick/test_httpresponse.rb | 46 >>>> +++++++++++++++++++++++++++++++++++++-- >>>> + 2 files changed, 46 insertions(+), 3 deletions(-) >>>> + >>>> +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb >>>> +index 6d77692..d26324c 100644 >>>> +--- a/lib/webrick/httpresponse.rb >>>> ++++ b/lib/webrick/httpresponse.rb >>>> +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false) >>>> + private >>>> + >>>> + def check_header(header_value) >>>> +- if header_value =~ /\r\n/ >>>> ++ header_value = header_value.to_s >>>> ++ if /[\r\n]/ =~ header_value >>>> + raise InvalidHeader >>>> + else >>>> + header_value >>>> +diff --git a/test/webrick/test_httpresponse.rb >>>> b/test/webrick/test_httpresponse.rb >>>> +index 6263e0a..24a6968 100644 >>>> +--- a/test/webrick/test_httpresponse.rb >>>> ++++ b/test/webrick/test_httpresponse.rb >>>> +@@ -29,7 +29,7 @@ def setup >>>> + @res.keep_alive = true >>>> + end >>>> + >>>> +- def test_prevent_response_splitting_headers >>>> ++ def test_prevent_response_splitting_headers_crlf >>>> + res['X-header'] = "malicious\r\nCookie: hack" >>>> + io = StringIO.new >>>> + res.send_response io >>>> +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers >>>> + refute_match 'hack', io.string >>>> + end >>>> + >>>> +- def test_prevent_response_splitting_cookie_headers >>>> ++ def test_prevent_response_splitting_cookie_headers_crlf >>>> + user_input = "malicious\r\nCookie: hack" >>>> + res.cookies << WEBrick::Cookie.new('author', user_input) >>>> + io = StringIO.new >>>> +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers >>>> + refute_match 'hack', io.string >>>> + end >>>> + >>>> ++ def test_prevent_response_splitting_headers_cr >>>> ++ res['X-header'] = "malicious\rCookie: hack" >>>> ++ io = StringIO.new >>>> ++ res.send_response io >>>> ++ io.rewind >>>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>>> ++ assert_equal '500', res.code >>>> ++ refute_match 'hack', io.string >>>> ++ end >>>> ++ >>>> ++ def test_prevent_response_splitting_cookie_headers_cr >>>> ++ user_input = "malicious\rCookie: hack" >>>> ++ res.cookies << WEBrick::Cookie.new('author', user_input) >>>> ++ io = StringIO.new >>>> ++ res.send_response io >>>> ++ io.rewind >>>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>>> ++ assert_equal '500', res.code >>>> ++ refute_match 'hack', io.string >>>> ++ end >>>> ++ >>>> ++ def test_prevent_response_splitting_headers_lf >>>> ++ res['X-header'] = "malicious\nCookie: hack" >>>> ++ io = StringIO.new >>>> ++ res.send_response io >>>> ++ io.rewind >>>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>>> ++ assert_equal '500', res.code >>>> ++ refute_match 'hack', io.string >>>> ++ end >>>> ++ >>>> ++ def test_prevent_response_splitting_cookie_headers_lf >>>> ++ user_input = "malicious\nCookie: hack" >>>> ++ res.cookies << WEBrick::Cookie.new('author', user_input) >>>> ++ io = StringIO.new >>>> ++ res.send_response io >>>> ++ io.rewind >>>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>>> ++ assert_equal '500', res.code >>>> ++ refute_match 'hack', io.string >>>> ++ end >>>> ++ >>>> + def test_304_does_not_log_warning >>>> + res.status = 304 >>>> + res.setup_header >>>> +-- >>>> +2.7.4 >>>> diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>>> b/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>>> index 223b037..58bb97f 100644 >>>> --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>>> +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>>> @@ -3,6 +3,7 @@ require ruby.inc >>>> SRC_URI += " \ >>>> >>>> file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ >>>> file://run-ptest \ >>>> + file://fix-CVE-2019-16254.patch \ >>>> " >>>> >>>> SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" >>>> -- >>>> 2.7.4 >>>> >>>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From rahulchauhankitps at gmail.com Tue Feb 11 13:35:04 2020 From: rahulchauhankitps at gmail.com (rahul chauhan) Date: Tue, 11 Feb 2020 19:05:04 +0530 Subject: [OE-core] [PATCH] ruby: fix CVE-2019-16254 In-Reply-To: References: <1581358619-5570-1-git-send-email-rahulchauhankitps@gmail.com> Message-ID: Ok, thanks. On Tue, Feb 11, 2020 at 7:04 PM Alexander Kanavin wrote: > Either way is fine. > > Alex > > On Tue, 11 Feb 2020 at 14:28, rahul chauhan > wrote: > >> Thanks Alexander, >> >> For quick response, >> should i resubmit this patch with --subject-prefix="zeus][PATCH" >> or >> should i submit the next patch version. >> >> On Tue, Feb 11, 2020 at 6:45 PM Alexander Kanavin >> wrote: >> >>> Yes. You should always specify the target branch in the subject if it is >>> not for master. >>> >>> Alex >>> >>> On Tue, 11 Feb 2020 at 14:06, rahul chauhan >>> wrote: >>> >>>> Hi community members, >>>> >>>> This patch Fixes CVE-2019-16254 on zeus branch. >>>> patch test failed, since I did not use --subject-prefix="zeus][PATCH" >>>> at the time of patch submission to >>>> openembedded-core at lists.openembedded.org. >>>> >>>> should i resubmit this patch with --subject-prefix="zeus][PATCH" >>>> or >>>> can anyone guide me what should do next in this situation ? >>>> >>>> Thanks & Regards >>>> Rahul Chauhan >>>> >>>> On Mon, Feb 10, 2020 at 11:47 PM Rahul Chauhan < >>>> rahulchauhankitps at gmail.com> wrote: >>>> >>>>> Signed-off-by: Rahul Chauhan >>>>> --- >>>>> .../ruby/ruby/fix-CVE-2019-16254.patch | 106 >>>>> +++++++++++++++++++++ >>>>> meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + >>>>> 2 files changed, 107 insertions(+) >>>>> create mode 100644 >>>>> meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>>>> >>>>> diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>>>> b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>>>> new file mode 100644 >>>>> index 0000000..704c850 >>>>> --- /dev/null >>>>> +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch >>>>> @@ -0,0 +1,106 @@ >>>>> +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001 >>>>> +From: Yusuke Endoh >>>>> +Date: Tue, 1 Oct 2019 12:29:18 +0900 >>>>> +Subject: [PATCH] WEBrick: prevent response splitting and header >>>>> injection >>>>> + >>>>> +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16. >>>>> +The commit prevented CRLR, but did not address an isolated CR or an >>>>> +isolated LF. >>>>> + >>>>> +Upstream-Status: Backport >>>>> https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc >>>>> +CVE: CVE-2019-16254 >>>>> + >>>>> +Co-Authored-By: NARUSE, Yui >>>>> +Signed-off-by: Rahul Chauhan >>>>> +--- >>>>> + lib/webrick/httpresponse.rb | 3 ++- >>>>> + test/webrick/test_httpresponse.rb | 46 >>>>> +++++++++++++++++++++++++++++++++++++-- >>>>> + 2 files changed, 46 insertions(+), 3 deletions(-) >>>>> + >>>>> +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb >>>>> +index 6d77692..d26324c 100644 >>>>> +--- a/lib/webrick/httpresponse.rb >>>>> ++++ b/lib/webrick/httpresponse.rb >>>>> +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false) >>>>> + private >>>>> + >>>>> + def check_header(header_value) >>>>> +- if header_value =~ /\r\n/ >>>>> ++ header_value = header_value.to_s >>>>> ++ if /[\r\n]/ =~ header_value >>>>> + raise InvalidHeader >>>>> + else >>>>> + header_value >>>>> +diff --git a/test/webrick/test_httpresponse.rb >>>>> b/test/webrick/test_httpresponse.rb >>>>> +index 6263e0a..24a6968 100644 >>>>> +--- a/test/webrick/test_httpresponse.rb >>>>> ++++ b/test/webrick/test_httpresponse.rb >>>>> +@@ -29,7 +29,7 @@ def setup >>>>> + @res.keep_alive = true >>>>> + end >>>>> + >>>>> +- def test_prevent_response_splitting_headers >>>>> ++ def test_prevent_response_splitting_headers_crlf >>>>> + res['X-header'] = "malicious\r\nCookie: hack" >>>>> + io = StringIO.new >>>>> + res.send_response io >>>>> +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers >>>>> + refute_match 'hack', io.string >>>>> + end >>>>> + >>>>> +- def test_prevent_response_splitting_cookie_headers >>>>> ++ def test_prevent_response_splitting_cookie_headers_crlf >>>>> + user_input = "malicious\r\nCookie: hack" >>>>> + res.cookies << WEBrick::Cookie.new('author', user_input) >>>>> + io = StringIO.new >>>>> +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers >>>>> + refute_match 'hack', io.string >>>>> + end >>>>> + >>>>> ++ def test_prevent_response_splitting_headers_cr >>>>> ++ res['X-header'] = "malicious\rCookie: hack" >>>>> ++ io = StringIO.new >>>>> ++ res.send_response io >>>>> ++ io.rewind >>>>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>>>> ++ assert_equal '500', res.code >>>>> ++ refute_match 'hack', io.string >>>>> ++ end >>>>> ++ >>>>> ++ def test_prevent_response_splitting_cookie_headers_cr >>>>> ++ user_input = "malicious\rCookie: hack" >>>>> ++ res.cookies << WEBrick::Cookie.new('author', user_input) >>>>> ++ io = StringIO.new >>>>> ++ res.send_response io >>>>> ++ io.rewind >>>>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>>>> ++ assert_equal '500', res.code >>>>> ++ refute_match 'hack', io.string >>>>> ++ end >>>>> ++ >>>>> ++ def test_prevent_response_splitting_headers_lf >>>>> ++ res['X-header'] = "malicious\nCookie: hack" >>>>> ++ io = StringIO.new >>>>> ++ res.send_response io >>>>> ++ io.rewind >>>>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>>>> ++ assert_equal '500', res.code >>>>> ++ refute_match 'hack', io.string >>>>> ++ end >>>>> ++ >>>>> ++ def test_prevent_response_splitting_cookie_headers_lf >>>>> ++ user_input = "malicious\nCookie: hack" >>>>> ++ res.cookies << WEBrick::Cookie.new('author', user_input) >>>>> ++ io = StringIO.new >>>>> ++ res.send_response io >>>>> ++ io.rewind >>>>> ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) >>>>> ++ assert_equal '500', res.code >>>>> ++ refute_match 'hack', io.string >>>>> ++ end >>>>> ++ >>>>> + def test_304_does_not_log_warning >>>>> + res.status = 304 >>>>> + res.setup_header >>>>> +-- >>>>> +2.7.4 >>>>> diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>>>> b/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>>>> index 223b037..58bb97f 100644 >>>>> --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>>>> +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb >>>>> @@ -3,6 +3,7 @@ require ruby.inc >>>>> SRC_URI += " \ >>>>> >>>>> file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ >>>>> file://run-ptest \ >>>>> + file://fix-CVE-2019-16254.patch \ >>>>> " >>>>> >>>>> SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" >>>>> -- >>>>> 2.7.4 >>>>> >>>>> -- >>>> _______________________________________________ >>>> Openembedded-core mailing list >>>> Openembedded-core at lists.openembedded.org >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>>> >>> -------------- next part -------------- An HTML attachment was scrubbed... URL: From rahulchauhankitps at gmail.com Tue Feb 11 13:43:08 2020 From: rahulchauhankitps at gmail.com (Rahul Chauhan) Date: Tue, 11 Feb 2020 19:13:08 +0530 Subject: [OE-core] [zeus][PATCH v2] ruby: fix CVE-2019-16254 Message-ID: <1581428588-3822-1-git-send-email-rahulchauhankitps@gmail.com> Signed-off-by: Rahul Chauhan --- .../ruby/ruby/fix-CVE-2019-16254.patch | 106 +++++++++++++++++++++ meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + 2 files changed, 107 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch new file mode 100644 index 0000000..704c850 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch @@ -0,0 +1,106 @@ +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001 +From: Yusuke Endoh +Date: Tue, 1 Oct 2019 12:29:18 +0900 +Subject: [PATCH] WEBrick: prevent response splitting and header injection + +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16. +The commit prevented CRLR, but did not address an isolated CR or an +isolated LF. + +Upstream-Status: Backport https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc +CVE: CVE-2019-16254 + +Co-Authored-By: NARUSE, Yui +Signed-off-by: Rahul Chauhan +--- + lib/webrick/httpresponse.rb | 3 ++- + test/webrick/test_httpresponse.rb | 46 +++++++++++++++++++++++++++++++++++++-- + 2 files changed, 46 insertions(+), 3 deletions(-) + +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb +index 6d77692..d26324c 100644 +--- a/lib/webrick/httpresponse.rb ++++ b/lib/webrick/httpresponse.rb +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false) + private + + def check_header(header_value) +- if header_value =~ /\r\n/ ++ header_value = header_value.to_s ++ if /[\r\n]/ =~ header_value + raise InvalidHeader + else + header_value +diff --git a/test/webrick/test_httpresponse.rb b/test/webrick/test_httpresponse.rb +index 6263e0a..24a6968 100644 +--- a/test/webrick/test_httpresponse.rb ++++ b/test/webrick/test_httpresponse.rb +@@ -29,7 +29,7 @@ def setup + @res.keep_alive = true + end + +- def test_prevent_response_splitting_headers ++ def test_prevent_response_splitting_headers_crlf + res['X-header'] = "malicious\r\nCookie: hack" + io = StringIO.new + res.send_response io +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers + refute_match 'hack', io.string + end + +- def test_prevent_response_splitting_cookie_headers ++ def test_prevent_response_splitting_cookie_headers_crlf + user_input = "malicious\r\nCookie: hack" + res.cookies << WEBrick::Cookie.new('author', user_input) + io = StringIO.new +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers + refute_match 'hack', io.string + end + ++ def test_prevent_response_splitting_headers_cr ++ res['X-header'] = "malicious\rCookie: hack" ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_cookie_headers_cr ++ user_input = "malicious\rCookie: hack" ++ res.cookies << WEBrick::Cookie.new('author', user_input) ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_headers_lf ++ res['X-header'] = "malicious\nCookie: hack" ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_cookie_headers_lf ++ user_input = "malicious\nCookie: hack" ++ res.cookies << WEBrick::Cookie.new('author', user_input) ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ + def test_304_does_not_log_warning + res.status = 304 + res.setup_header +-- +2.7.4 diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb b/meta/recipes-devtools/ruby/ruby_2.5.5.bb index 223b037..58bb97f 100644 --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb @@ -3,6 +3,7 @@ require ruby.inc SRC_URI += " \ file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://run-ptest \ + file://fix-CVE-2019-16254.patch \ " SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" -- 2.7.4 From alex.kanavin at gmail.com Tue Feb 11 13:57:48 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 14:57:48 +0100 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: <20200211135323.GA3234@localhost> References: <20200211135323.GA3234@localhost> Message-ID: The question is: what are the use cases for an 'example/reference UI'? Why have one at all at this point? Remember, the core project is severely under-staffed and we need to commit our limited resources wisely. Alex On Tue, 11 Feb 2020 at 14:53, Adrian Bunk wrote: > On Tue, Feb 11, 2020 at 01:49:27PM +0100, Alexander Kanavin wrote: > >... > > - matchbox is reliant on gtk3 (to be obsoleted by gtk4 this year), and > does > > not have a Wayland compositor. Yocto project does not have the resources > to > > do the gtk4 port, or add a compositor. > > > > - no 'lightweight Wayland compositor with a desktop/launcher experience" > > has emerged in the open source space; I think the only realistic choice > at > > the moment is the reference compositor Weston which provides a blank > > desktop with ability to open terminal windows. > > > > So the way I think things should be going (seeking opinions/inputs of > > course): > >... > > - oe-core continues to support and runtime-test X for as long as > possible; > > for this a new image (say, 'core-image-sato-xorg') is created which will > > provide matchbox under X. However, once upstream bitrot sets in, and pain > > threshold is exceeded, this will be removed and/or relegated to a legacy > > layer. > > > > Thoughts? > > matchbox made sense at a time when you could go into a shop and buy an > internet tablet with Linux running on 256 MB flash with 256 MB RAM. > > Part of the problem is that the only remaining usage of this branch > of matchbox development seems to be as example UI for Yocto. > > For matchbox/sato I am wondering whether replacing it with parts of > meta-xfce from meta-openembedded would be a good way forward. > > Upstream Xfce still seems to be 2-3 years away from gtk4 and Wayland > support, but at the point where supporting X might become a problem > this should be available. > > Xfce was my first thought as replacement since it appears to be > well-maintained in meta-openembedded, no strong opinion whether > it is actually the best option. > > > Regards, > > Alex > > cu > Adrian > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bunk at stusta.de Tue Feb 11 13:53:23 2020 From: bunk at stusta.de (Adrian Bunk) Date: Tue, 11 Feb 2020 15:53:23 +0200 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: Message-ID: <20200211135323.GA3234@localhost> On Tue, Feb 11, 2020 at 01:49:27PM +0100, Alexander Kanavin wrote: >... > - matchbox is reliant on gtk3 (to be obsoleted by gtk4 this year), and does > not have a Wayland compositor. Yocto project does not have the resources to > do the gtk4 port, or add a compositor. > > - no 'lightweight Wayland compositor with a desktop/launcher experience" > has emerged in the open source space; I think the only realistic choice at > the moment is the reference compositor Weston which provides a blank > desktop with ability to open terminal windows. > > So the way I think things should be going (seeking opinions/inputs of > course): >... > - oe-core continues to support and runtime-test X for as long as possible; > for this a new image (say, 'core-image-sato-xorg') is created which will > provide matchbox under X. However, once upstream bitrot sets in, and pain > threshold is exceeded, this will be removed and/or relegated to a legacy > layer. > > Thoughts? matchbox made sense at a time when you could go into a shop and buy an internet tablet with Linux running on 256 MB flash with 256 MB RAM. Part of the problem is that the only remaining usage of this branch of matchbox development seems to be as example UI for Yocto. For matchbox/sato I am wondering whether replacing it with parts of meta-xfce from meta-openembedded would be a good way forward. Upstream Xfce still seems to be 2-3 years away from gtk4 and Wayland support, but at the point where supporting X might become a problem this should be available. Xfce was my first thought as replacement since it appears to be well-maintained in meta-openembedded, no strong opinion whether it is actually the best option. > Regards, > Alex cu Adrian From alex.kanavin at gmail.com Tue Feb 11 14:01:20 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 15:01:20 +0100 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: <20200211135323.GA3234@localhost> Message-ID: Specifically (sorry for the rapid-followup), I think the main value proposition of core is integration and testing of various language toolchains and core libraries. UIs in embedded space can mean pretty much anything, and so I'd leave that to specialised layers. Alex On Tue, 11 Feb 2020 at 14:57, Alexander Kanavin wrote: > The question is: what are the use cases for an 'example/reference UI'? Why > have one at all at this point? Remember, the core project is severely > under-staffed and we need to commit our limited resources wisely. > > Alex > > On Tue, 11 Feb 2020 at 14:53, Adrian Bunk wrote: > >> On Tue, Feb 11, 2020 at 01:49:27PM +0100, Alexander Kanavin wrote: >> >... >> > - matchbox is reliant on gtk3 (to be obsoleted by gtk4 this year), and >> does >> > not have a Wayland compositor. Yocto project does not have the >> resources to >> > do the gtk4 port, or add a compositor. >> > >> > - no 'lightweight Wayland compositor with a desktop/launcher experience" >> > has emerged in the open source space; I think the only realistic choice >> at >> > the moment is the reference compositor Weston which provides a blank >> > desktop with ability to open terminal windows. >> > >> > So the way I think things should be going (seeking opinions/inputs of >> > course): >> >... >> > - oe-core continues to support and runtime-test X for as long as >> possible; >> > for this a new image (say, 'core-image-sato-xorg') is created which will >> > provide matchbox under X. However, once upstream bitrot sets in, and >> pain >> > threshold is exceeded, this will be removed and/or relegated to a legacy >> > layer. >> > >> > Thoughts? >> >> matchbox made sense at a time when you could go into a shop and buy an >> internet tablet with Linux running on 256 MB flash with 256 MB RAM. >> >> Part of the problem is that the only remaining usage of this branch >> of matchbox development seems to be as example UI for Yocto. >> >> For matchbox/sato I am wondering whether replacing it with parts of >> meta-xfce from meta-openembedded would be a good way forward. >> >> Upstream Xfce still seems to be 2-3 years away from gtk4 and Wayland >> support, but at the point where supporting X might become a problem >> this should be available. >> >> Xfce was my first thought as replacement since it appears to be >> well-maintained in meta-openembedded, no strong opinion whether >> it is actually the best option. >> >> > Regards, >> > Alex >> >> cu >> Adrian >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From trevor.gamblin at windriver.com Tue Feb 11 14:06:07 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Tue, 11 Feb 2020 09:06:07 -0500 Subject: [OE-core] [PATCH v2] bitbake-buildall: automate build testing for qemu MACHINEs In-Reply-To: References: <20200210234603.1718190-1-trevor.gamblin@windriver.com> Message-ID: <54185c02-4e1c-008f-b3d1-a97bea80771c@windriver.com> On 2/10/20 7:28 PM, Khem Raj wrote: > On Mon, Feb 10, 2020 at 3:47 PM Trevor Gamblin > wrote: >> bitbake-buildall simplifies the process of build testing an upgraded or >> patched recipe by cycling through the build steps for each available qemu >> target, with desired LIBC specified by the user as an option (defaulting >> to both glibc and musl if no option is provided). While building, a log >> file with the name "-buildall.log" is written, containing a PASS >> or FAIL line upon completion of the build for each architecture. For now, >> qemu targets are not selectable (i.e. the recipe is built for all qemu >> targets found in meta/conf/machine), but this functionality can be added >> in the future along with other useful options. >> >> The log file created by bitbake-buildall also includes some basic system >> info (e.g. build start time, hostname, host OS, host kernel). Since it is >> not guaranteed that tools such as lsb_release will be available on the >> host (it isn't by default on my Fedora machine), this information is >> collected manually. Additionally, the previous run's log is retained for >> comparison by renaming it in the format -buildall.log.old once a >> new set of builds is triggered for the same recipe. >> >> Finally, in v2, the line "set -o pipefail" has been removed to be fully >> POSIX-compatible. >> >> Sample log output: >> >> BITBAKE-BUILDALL LOG FOR aspell >> START TIME: 2020-02-05_15:57:41 >> HOSTNAME: yow-tgamblin-fedora2 >> HOST OS: Fedora 31 (Server Edition) >> HOST KERNEL: 5.4.10-200.fc31.x86_64 >> =============== >> BUILD RESULTS: >> [glibc] >> PASS: qemuarmv5 >> PASS: qemux86 >> PASS: qemuppc >> PASS: qemumips64 >> FAIL: qemux86-64 >> FAIL: qemumips >> FAIL: qemuarm >> FAIL: qemuarm64 >> FAIL: qemuriscv64 >> [musl] >> PASS: qemuarmv5 >> PASS: qemux86 >> PASS: qemuppc >> PASS: qemumips64 >> PASS: qemux86-64 >> PASS: qemumips >> PASS: qemuarm >> PASS: qemuarm64 >> PASS: qemuriscv64 >> =============== >> PASSED: 13 >> FAILED: 5 >> >> Signed-off-by: Trevor Gamblin >> --- >> scripts/bitbake-buildall | 120 +++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 120 insertions(+) >> create mode 100755 scripts/bitbake-buildall > if its building qemu machines only, then naming it build-qemuall.sh or > some such would be > better, I would avoid usine bitbake- prefix. That can confuse with bitbake tools The intent is that it can be extended to machines other than just qemu with later patches, so I'm hesitant to give it a qemu-specific name. I could rename it to something like buildall-targets. > >> diff --git a/scripts/bitbake-buildall b/scripts/bitbake-buildall >> new file mode 100755 >> index 0000000000..74a5994f2f >> --- /dev/null >> +++ b/scripts/bitbake-buildall >> @@ -0,0 +1,120 @@ >> +#!/bin/sh >> +# Copyright (c) 2020 Wind River Systems, Inc. >> +# >> +# SPDX-License-Identifier: GPL-2.0-only >> +# >> +# bitbake-buildall: a tool for automating build testing of recipes >> +# TODO: Add support for selecting which qemu architectures to build >> +# TODO: Add support for queueing up multiple recipe builds >> +# TODO: Add more logging options (e.g. local.conf info, bitbake env info) >> + >> +usage () >> +{ >> + base=$(basename "$0") >> + echo "Usage: $base [options] [recipename/target]" >> + echo "Executes a build of a given target for selected LIBCs. With no options, default to both libc and musl." >> + echo "Options:" >> + echo "-l, --libc Specify one of \"libc\" or \"musl\"" >> +} >> + >> + >> +buildall () >> +{ >> + # Get path to oe-core directory. Since oe-init-build-env prepends $PATH with >> + # the path to the scripts directory, get it from there >> + SCRIPTS_PATH="$(echo "$PATH" | cut -d ":" -f 1)" >> + OE_CORE_PATH=$(echo "$SCRIPTS_PATH" | sed 's|\(.*\)/.*|\1|') >> + >> + # Get target list and host machine information >> + TARGET_LIST=$(find "$OE_CORE_PATH"/meta/conf/machine -maxdepth 1 -type f | grep qemu | sed 's|.*/||' | sed -e 's/\.conf//') >> + >> + # Set LIBC value to use for the builds based on options provided by the user >> + if [ -n "$2" ] >> + then >> + LIBC_LIST="$2" >> + echo "$LIBC_LIST" >> + else >> + LIBC_LIST="glibc musl" >> + echo "$LIBC_LIST" >> + fi >> + >> + START_TIME=$(date "+%Y-%m-%d_%H:%M:%S") >> + LOG_FILE="$1-buildall.log" >> + OS_INFO=$(grep "PRETTY_NAME=" /etc/os-release | awk -F "=" '{print $2}' | sed -e 's/^"//' -e 's/"$//') >> + >> + # Append an existing log file for this build with .old if one exists >> + if [ -f "${LOG_FILE}" ] >> + then >> + mv "${LOG_FILE}" "${LOG_FILE}.old" >> + else >> + touch "${LOG_FILE}" >> + fi >> + >> + # Fill the log file with build and host info >> + echo "BITBAKE-BUILDALL LOG FOR $1" >> "${LOG_FILE}" >> + echo "START TIME: ${START_TIME}" >> "${LOG_FILE}" >> + echo "HOSTNAME: $(uname -n)" >> "${LOG_FILE}" >> + echo "HOST OS: ${OS_INFO}" >> "${LOG_FILE}" >> + echo "HOST KERNEL: $(uname -r)" >> "${LOG_FILE}" >> + echo "===============" >> "${LOG_FILE}" >> + echo "BUILD RESULTS:" >> "${LOG_FILE}" >> + >> + # start the builds for each MACHINE and TCLIBC >> + for j in ${LIBC_LIST} >> + do >> + echo "[$j]" >> "${LOG_FILE}" >> + for i in ${TARGET_LIST} >> + do >> + echo "$i" "$j"; \ >> + TCLIBC=$j MACHINE=$i bitbake "$1" && echo "PASS: $i" >> "${LOG_FILE}" || echo "FAIL: $i" >> "${LOG_FILE}" >> + done >> + done >> + >> + # Get pass/fail totals and add them to the end of the log >> + PASSED=$(grep "PASS:" "${LOG_FILE}" | wc -l) >> + FAILED=$(grep "FAIL:" "${LOG_FILE}" | wc -l) >> + >> + echo "===============" >> "${LOG_FILE}" >> + echo "PASSED: ${PASSED}" >> "${LOG_FILE}" >> + echo "FAILED: ${FAILED}" >> "${LOG_FILE}" >> +} >> + >> + >> +# fail entire script if any command fails >> +set -e >> + >> +# print usage and exit if not enough args given >> +[ $# -eq 0 ] && usage && exit 1 >> + >> +# handle arguments >> +RECIPE= >> +while [ $# -gt 0 ] >> +do >> + arg=$1 >> + case $arg in >> + -l|--libc) >> + if [ "$2" = "glibc" ] || [ "$2" = "musl" ] >> + then >> + LIBC_LIST="$2" >> + else >> + echo "Unrecognized libc option." >> + usage && exit 1 >> + fi >> + shift >> + shift >> + ;; >> + *) >> + RECIPE="$1" >> + shift >> + ;; >> + esac >> +done >> + >> +set -- "$RECIPE" >> + >> +# run buildall for the given recipe and LIBC >> +if [ -n "$1" ] >> +then >> + buildall "$1" "$LIBC_LIST" >> +fi >> + >> -- >> 2.24.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From bunk at stusta.de Tue Feb 11 14:13:47 2020 From: bunk at stusta.de (Adrian Bunk) Date: Tue, 11 Feb 2020 16:13:47 +0200 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: <20200211135323.GA3234@localhost> Message-ID: <20200211141347.GB3234@localhost> On Tue, Feb 11, 2020 at 03:01:20PM +0100, Alexander Kanavin wrote: > Specifically (sorry for the rapid-followup), I think the main value > proposition of core is integration and testing of various language > toolchains and core libraries. UIs in embedded space can mean pretty much > anything, and so I'd leave that to specialised layers. That's actually quite different from your original email. Your original email raised the problem that X might start to bitrot after the end of support for RHEL 8 in the year 2029 (sic). What functionality should be in core for users/demo/QA/... is not strictly related to X versus Wayland. > Alex cu Adrian From holzmayr at rsi-elektrotechnik.de Tue Feb 11 14:05:00 2020 From: holzmayr at rsi-elektrotechnik.de (Josef Holzmayr) Date: Tue, 11 Feb 2020 14:05:00 +0000 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: <20200211135323.GA3234@localhost> Message-ID: <20200211140500.hreujdfmfxuf4omh@jh-mailer> Howdy! On Tue, Feb 11, 2020 at 02:57:48PM +0100, Alexander Kanavin wrote: > The question is: what are the use cases for an 'example/reference UI'? Why > have one at all at this point? Remember, the core project is severely > under-staffed and we need to commit our limited resources wisely. My $.02 are, that while being a good test vehicle to build for us, it is actually giving a wrong impression to newcomers. Like "here is a DE to start off, and you can use this build like your desktop box" which is not at all true. So my votes are on, as long as we have something that *can* do *something* on screen with as little effort as possible, we should go for it. Maintaining a custom thing should be avoided. Greetz > > On Tue, 11 Feb 2020 at 14:53, Adrian Bunk wrote: > > > On Tue, Feb 11, 2020 at 01:49:27PM +0100, Alexander Kanavin wrote: > > >... > > > - matchbox is reliant on gtk3 (to be obsoleted by gtk4 this year), and > > does > > > not have a Wayland compositor. Yocto project does not have the resources > > to > > > do the gtk4 port, or add a compositor. > > > > > > - no 'lightweight Wayland compositor with a desktop/launcher experience" > > > has emerged in the open source space; I think the only realistic choice > > at > > > the moment is the reference compositor Weston which provides a blank > > > desktop with ability to open terminal windows. > > > > > > So the way I think things should be going (seeking opinions/inputs of > > > course): > > >... > > > - oe-core continues to support and runtime-test X for as long as > > possible; > > > for this a new image (say, 'core-image-sato-xorg') is created which will > > > provide matchbox under X. However, once upstream bitrot sets in, and pain > > > threshold is exceeded, this will be removed and/or relegated to a legacy > > > layer. > > > > > > Thoughts? > > > > matchbox made sense at a time when you could go into a shop and buy an > > internet tablet with Linux running on 256 MB flash with 256 MB RAM. > > > > Part of the problem is that the only remaining usage of this branch > > of matchbox development seems to be as example UI for Yocto. > > > > For matchbox/sato I am wondering whether replacing it with parts of > > meta-xfce from meta-openembedded would be a good way forward. > > > > Upstream Xfce still seems to be 2-3 years away from gtk4 and Wayland > > support, but at the point where supporting X might become a problem > > this should be available. > > > > Xfce was my first thought as replacement since it appears to be > > well-maintained in meta-openembedded, no strong opinion whether > > it is actually the best option. > > > > > Regards, > > > Alex > > > > cu > > Adrian > > > _______________________________________________ > Openembedded-architecture mailing list > Openembedded-architecture at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-architecture -- ??????????????? Josef Holzmayr Software Developer Embedded Systems Tel: +49 8444 9204-48 Fax: +49 8444 9204-50 R-S-I Elektrotechnik GmbH & Co. KG Woelkestrasse 11 D-85301 Schweitenkirchen www.rsi-elektrotechnik.de ??????????????? Amtsgericht Ingolstadt ? GmbH: HRB 191328 ? KG: HRA 170393 Gesch?ftsf?hrer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg Ust-IdNr: DE 128592548 _____________________________________________________________ Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363 Gesch?ftsf?hrer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg USt-IdNr.: DE 128592548 From alex.kanavin at gmail.com Tue Feb 11 14:35:03 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 15:35:03 +0100 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: <20200211141347.GB3234@localhost> References: <20200211135323.GA3234@localhost> <20200211141347.GB3234@localhost> Message-ID: X might and likely will start to bitrot sooner for those not using RHEL 8 and its very conservative and never changing software stack. I can imagine Red Hat has no interest in supporting it on Fedora going forward for instance, they'll just make Xwayland work, and rip the standalone server and its drivers and libraries out. Oe-core will have X for as long as the burden of fixing build errors and runtime issues with custom patches is not too painful. The point I am trying to make is that I am not convinced oe-core needs a 'real' ui at all, and opinion to the contrary should justify the need. Alex On Tue, 11 Feb 2020 at 15:13, Adrian Bunk wrote: > On Tue, Feb 11, 2020 at 03:01:20PM +0100, Alexander Kanavin wrote: > > Specifically (sorry for the rapid-followup), I think the main value > > proposition of core is integration and testing of various language > > toolchains and core libraries. UIs in embedded space can mean pretty much > > anything, and so I'd leave that to specialised layers. > > That's actually quite different from your original email. > > Your original email raised the problem that X might start to bitrot > after the end of support for RHEL 8 in the year 2029 (sic). > > What functionality should be in core for users/demo/QA/... > is not strictly related to X versus Wayland. > > > Alex > > cu > Adrian > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bunk at stusta.de Tue Feb 11 15:02:12 2020 From: bunk at stusta.de (Adrian Bunk) Date: Tue, 11 Feb 2020 17:02:12 +0200 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: <20200211135323.GA3234@localhost> <20200211141347.GB3234@localhost> Message-ID: <20200211150212.GC3234@localhost> On Tue, Feb 11, 2020 at 03:35:03PM +0100, Alexander Kanavin wrote: > X might and likely will start to bitrot sooner for those not using RHEL 8 > and its very conservative and never changing software stack. I can imagine > Red Hat has no interest in supporting it on Fedora going forward for > instance, they'll just make Xwayland work, and rip the standalone server > and its drivers and libraries out. There are plenty of other users big and small left, and most of the hardware support already moved to the kernel. Stale and stable is not necessarily bad for users, and X will not suddenly stop working. > Oe-core will have X for as long as the burden of fixing build errors and > runtime issues with custom patches is not too painful. If this is true, then let's revisit this topic in 10 years. And the solution would then likely be to switch from matchbox/sato to some desktop environment that supports wayland. > The point I am > trying to make is that I am not convinced oe-core needs a 'real' ui at all, > and opinion to the contrary should justify the need. The point I am trying to make is that this is a different discussion. And any "no UI in oe-core" decision would not have to wait until the point in the distant future when X might no longer be supportable. > Alex cu Adrian From kai.kang at windriver.com Tue Feb 11 15:07:41 2020 From: kai.kang at windriver.com (kai.kang at windriver.com) Date: Tue, 11 Feb 2020 23:07:41 +0800 Subject: [OE-core] [PATCH] glibc-package.inc: fix multilib headers conflict Message-ID: <20200211150741.2729-1-kai.kang@windriver.com> From: Kai Kang Pass bits/endianness.h and bits/struct_rwlock.h to oe_multilib_header in glibc-package.inc to fix files conflict: | Error: Transaction check error: | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 Signed-off-by: Kai Kang --- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 3aed7be4f8..285a9aa2f5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -87,7 +87,7 @@ do_install() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir} fi - oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h + oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h if [ -f ${D}${bindir}/mtrace ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace -- 2.17.1 From sjolley.yp.pm at gmail.com Tue Feb 11 15:51:26 2020 From: sjolley.yp.pm at gmail.com (sjolley.yp.pm at gmail.com) Date: Tue, 11 Feb 2020 07:51:26 -0800 Subject: [OE-core] Yocto Project Status WW06'20 Message-ID: <02bb01d5e0f3$1e6f19d0$5b4d4d70$@gmail.com> Current Dev Position: YP 3.1 M3 Next Deadline: YP 3.1 M3 build date 2/24/2020 Next Team Meetings: * Bug Triage meeting Thursday Feb. 13th at 7:30am PDT ( https://zoom.us/j/454367603) * Monthly Project Meeting Tuesday Mar. 3rd at 8am PDT ( https://zoom.us/j/990892712) * Weekly Engineering Sync Tuesday Feb. 11th at 8am PDT ( https://zoom.us/j/990892712) * Twitch - Next event is Tuesday Feb. 11th at 8am PDT ( https://www.twitch.tv/yocto_project) Key Status/Updates: * YP 3.1 M2 was released * We're now in a much better position with reproducibility issues after around 20 patches merged addressing various problems. Some issues still remain but the bulk of the issues appear to be under control now. * Due to the number and type of fixes found, the 3.0.2 rc1 build will be abandoned and rc2 built with the reproducibility fixes (as well as additional hashserv/multiconfig fixes). This delays 3.0.2 by a week but for a reasonable set of improvements. * YP 3.0.2 should therefore enter QA within the next day or so. * Review of newly queued warrior (2.7.3) patches will happen later this week once 3.0.2 is in QA. * With the new fixes and a small fix to the autobuilder code, we managed the first green "full" build in nearly three months. * The incoming patch queue is roughly under control again * We're collecting a list of companies, products and projects which use the Yocto Project on the wiki: https://wiki.yoctoproject.org/wiki/Project_Users Please add any you know are missing (or email Richard/Stephen who can add). * One worrying metric is that the WDD is now on level with the high of 2017 so our worst defect weighting in two years. This is sadly unsurprising and directly correlated to a lack of participation in the triage process and a lack of people working on general bug fixing. * The triage team is worried about attendance at triage meetings and the project is finding it hard to find people to help fix bugs. If anyone is willing to work on bugs, assistance would be greatly appreciated. YP 3.1 Milestone Dates: * YP 3.1 M3 build date 2/24/2020 * YP 3.1 M3 release date 3/6/2020 * YP 3.1 M4 build date 3/30/2020 * YP 3.1 M4 release date 4/24/2020 Planned upcoming dot releases: * YP 2.7.3 build date 2/10/2020 * YP 2.7.3 release date 2/21/2020 * YP 3.0.2 build date 2/3/2020 * YP 3.0.2 release date 2/14/2020 Tracking Metrics: * WDD 2728 (last week 2767) ( https://wiki.yoctoproject.org/charts/combo.html) * Poky Patch Metrics * Total patches found: 1361 (last week 1368) * Patches in the Pending State: 547 (40%) [last week 544 (40%)] The Yocto Project's technical governance is through its Technical Steering Committee, more information is available at: https://wiki.yoctoproject.org/wiki/TSC The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status [If anyone has suggestions for other information you'd like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From mark.hatle at kernel.crashing.org Tue Feb 11 15:54:46 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 11 Feb 2020 09:54:46 -0600 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: <20200211135323.GA3234@localhost> Message-ID: <4375c8dd-fdad-087d-7ef8-7a845c6ea7da@kernel.crashing.org> On 2/11/20 8:01 AM, Alexander Kanavin wrote: > Specifically (sorry for the rapid-followup), I think the main value proposition > of core is integration and testing of various language toolchains and core > libraries. UIs in embedded space can mean pretty much anything, and so I'd leave > that to specialised layers. > > Alex > > On Tue, 11 Feb 2020 at 14:57, Alexander Kanavin > wrote: > > The question is: what are the use cases for an 'example/reference UI'? Why > have one at all at this point? Remember, the core project is severely > under-staffed and we need to commit our limited resources wisely. I don't think an example/reference UI is useful -- OTHER THEN -- we need a way to test that the framework(s) that are provided are functional. So lets, assume Wayland/Weston combo.. we still need something that can use the mouse, show that the cursor is being drawn properly, clicks are registered, etc etc etc.. I do think that we need to include a graphical framework (X.org, wayland/weston combo, etc..) as well as a basic set of examples that can be used to verify that they are working properly. There is a secondary 'problem' which I see more as a business issue then a technical one, everyone wants to have a way to 'demo the OpenEmbedded'. It's pretty hard to demo a build system, so they like to have a device that boots quickly and goes to something graphical that shows it's "working". --Mark > Alex > > On Tue, 11 Feb 2020 at 14:53, Adrian Bunk > wrote: > > On Tue, Feb 11, 2020 at 01:49:27PM +0100, Alexander Kanavin wrote: > >... > > - matchbox is reliant on gtk3 (to be obsoleted by gtk4 this year), and > does > > not have a Wayland compositor. Yocto project does not have the > resources to > > do the gtk4 port, or add a compositor. > > > > - no 'lightweight Wayland compositor with a desktop/launcher experience" > > has emerged in the open source space; I think the only realistic choice at > > the moment is the reference compositor Weston which provides a blank > > desktop with ability to open terminal windows. > > > > So the way I think things should be going (seeking opinions/inputs of > > course): > >... > > - oe-core continues to support and runtime-test X for as long as possible; > > for this a new image (say, 'core-image-sato-xorg') is created which will > > provide matchbox under X. However, once upstream bitrot sets in, and pain > > threshold is exceeded, this will be removed and/or relegated to a legacy > > layer. > > > > Thoughts? > > matchbox made sense at a time when you could go into a shop and buy an > internet tablet with Linux running on 256 MB flash with 256 MB RAM. > > Part of the problem is that the only remaining usage of this branch > of matchbox development seems to be as example UI for Yocto. > > For matchbox/sato I am wondering whether replacing it with parts of > meta-xfce from meta-openembedded would be a good way forward. > > Upstream Xfce still seems to be 2-3 years away from gtk4 and Wayland > support, but at the point where supporting X might become a problem > this should be available. > > Xfce was my first thought as replacement since it appears to be > well-maintained in meta-openembedded, no strong opinion whether > it is actually the best option. > > > Regards, > > Alex > > cu > Adrian > > > _______________________________________________ > Openembedded-architecture mailing list > Openembedded-architecture at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-architecture > From oleksandr.s.popovych at globallogic.com Tue Feb 11 15:55:42 2020 From: oleksandr.s.popovych at globallogic.com (Oleksandr Popovych) Date: Tue, 11 Feb 2020 17:55:42 +0200 Subject: [OE-core] [PATCH v4] expat: Added ptest Message-ID: <20200211155542.11190-1-oleksandr.s.popovych@globallogic.com> For ptest support for this package several additional patches and run-ptest script were added and recipe was changed. Signed-off-by: Oleksandr Popovych --- ...d-Makefile-targets-for-ptest-support.patch | 38 ++++++++++++++ ...ort-for-ptests-in-form-of-new-target.patch | 31 ++++++++++++ ...ed-suitable-format-of-tests-in-ptest.patch | 50 +++++++++++++++++++ meta/recipes-core/expat/expat/run-ptest | 3 ++ meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- 5 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch create mode 100644 meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch create mode 100644 meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch create mode 100644 meta/recipes-core/expat/expat/run-ptest diff --git a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch new file mode 100644 index 0000000000..32488060ee --- /dev/null +++ b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch @@ -0,0 +1,38 @@ +From ce803ec3d7b095cb55686f9cd5d3f01d34a31a5e Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:41:45 +0200 +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support + +install-ptest, runtests and check tagrets are added. + +Signed-off-by: Oleksandr Popovych +--- + Makefile.am | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 5e1d37d..c63b44a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -152,3 +152,18 @@ qa: + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh ++ ++.PHONY: install-ptest ++install-ptest: ++ echo $(S) ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ ++ install runtests runtestspp $(DESTDIR)) ++ cp Makefile $(DESTDIR) ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile ++ ++.PHONY: runtests ++runtests: ++ @echo "C variant of tests:" ++ @$(CHECKER) ./runtests$(EXEEXT) -q ++ @echo "C++ variant of tests:" ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch new file mode 100644 index 0000000000..cf8a2495e9 --- /dev/null +++ b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch @@ -0,0 +1,31 @@ +From 2b209a025f62fb1be7b32599aa80703ce8ecd76a Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:43:57 +0200 +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target + +configure.am file changed, according to this advice: +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite + +Signed-off-by: Oleksandr Popovych +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d58ac03..8e6b41e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) + AC_CONFIG_AUX_DIR([conftools]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST +-AM_INIT_AUTOMAKE +- ++AM_INIT_AUTOMAKE([serial-tests]) ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) + + dnl + dnl Increment LIBREVISION if source code has changed at all +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch new file mode 100644 index 0000000000..5d1daefc92 --- /dev/null +++ b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch @@ -0,0 +1,50 @@ +From b2e236e238f8bab42651313ea198b27355945d97 Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:44:56 +0200 +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest + +Some changes in testcases code were applied for testcase engine. +This was just adding of message outputs in "RESULT: TESTNAME" form... + +Signed-off-by: Oleksandr Popovych +--- + tests/minicheck.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/minicheck.c b/tests/minicheck.c +index a5a1efb..b39cda9 100644 +--- a/tests/minicheck.c ++++ b/tests/minicheck.c +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + if (tc->setup != NULL) { + /* setup */ + if (setjmp(env)) { ++ printf("SKIP: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + } + /* test */ + if (setjmp(env)) { ++ printf("FAIL: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { + /* teardown */ + if (tc->teardown != NULL) { + if (setjmp(env)) { ++ printf("PASS: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } + tc->teardown(); + } ++ printf("PASS: %s\n", _check_current_function); + } + tc = tc->next_tcase; + } +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..df994c0838 --- /dev/null +++ b/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,3 @@ +#!/bin/bash + +make -k runtests diff --git a/meta/recipes-core/expat/expat_2.2.9.bb b/meta/recipes-core/expat/expat_2.2.9.bb index 8f3db41352..420ffddc80 100644 --- a/meta/recipes-core/expat/expat_2.2.9.bb +++ b/meta/recipes-core/expat/expat_2.2.9.bb @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ + file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" -inherit autotools lib_package +inherit autotools ptest lib_package + +RDEPENDS_${PN}-ptest += "make bash" do_configure_prepend () { rm -f ${S}/conftools/libtool.m4 } +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From mark.hatle at kernel.crashing.org Tue Feb 11 15:58:21 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 11 Feb 2020 09:58:21 -0600 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: <20200211135323.GA3234@localhost> <20200211141347.GB3234@localhost> Message-ID: <8b9de58b-7d65-dc89-69ec-4b5d40667184@kernel.crashing.org> On 2/11/20 8:35 AM, Alexander Kanavin wrote: > X might and likely will start to bitrot sooner for those not using RHEL 8 and > its very conservative and never changing software stack. I can imagine Red Hat > has no interest in supporting it on Fedora going forward for instance, they'll > just make Xwayland work, and rip the standalone server and its drivers and > libraries out.? X is incredibly stable code base. I think as long as there are no major changes, the bitrot will be 'minor'. I'm more worried about security response, especially as it goes longer and longer with only a small set of maintainers of last resort. > Oe-core will have X for as long as the burden of fixing build errors and runtime > issues with custom patches is not too painful. The point I am trying to make is > that I am not convinced oe-core needs a 'real' ui at all, and opinion to the > contrary should justify the need. It's already OE's responsibility to fix build errors and integration run-time issues. When the burden goes beyond our resources, then we need to stop or find a champion who will taker that burden. I think we need to plan for that for all of the components of the system, not just X, but X is a good starting point. I also don't think oe-core itself needs a 'real' UI, and as my previous response said -- we do need something though to test that the graphical framework is working properly. In the past this often comes back to needing a LOT of a UI in order to adequately test all of the components of the system. If wayland/weston has a proper test suite that exercises all of the various parts of and pieces of the systems -- then the need for a UI drops considerably. (but we still have the need for some sort of example/demostration...) --Mark > Alex > > On Tue, 11 Feb 2020 at 15:13, Adrian Bunk > wrote: > > On Tue, Feb 11, 2020 at 03:01:20PM +0100, Alexander Kanavin wrote: > > Specifically (sorry for the rapid-followup), I think the main value > > proposition of core is integration and testing of various language > > toolchains and core libraries. UIs in embedded space can mean pretty much > > anything, and so I'd leave that to specialised layers. > > That's actually quite different from your original email. > > Your original email raised the problem that X might start to bitrot > after the end of support for RHEL 8 in the year 2029 (sic). > > What functionality should be in core for users/demo/QA/... > is not strictly related to X versus Wayland. > > > Alex > > cu > Adrian > > > _______________________________________________ > Openembedded-architecture mailing list > Openembedded-architecture at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-architecture > From patchwork at patchwork.openembedded.org Tue Feb 11 16:02:18 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Tue, 11 Feb 2020 16:02:18 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_expat=3A_A?= =?utf-8?q?dded_ptest?= In-Reply-To: <20200211155542.11190-1-oleksandr.s.popovych@globallogic.com> References: <20200211155542.11190-1-oleksandr.s.popovych@globallogic.com> Message-ID: <20200211160218.2277.43270@do> == Series Details == Series: expat: Added ptest Revision: 1 URL : https://patchwork.openembedded.org/series/22559/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From oleksandr.s.popovych at globallogic.com Tue Feb 11 16:37:02 2020 From: oleksandr.s.popovych at globallogic.com (Oleksandr Popovych) Date: Tue, 11 Feb 2020 18:37:02 +0200 Subject: [OE-core] [PATCH v5] expat: Added ptest Message-ID: <20200211163702.11877-1-oleksandr.s.popovych@globallogic.com> For ptest support for this package several additional patches and run-ptest script were added and recipe was changed. Upstream-Status: Submitted [openembedded-core at lists.openembedded.org] Signed-off-by: Oleksandr Popovych --- ...d-Makefile-targets-for-ptest-support.patch | 38 ++++++++++++++ ...ort-for-ptests-in-form-of-new-target.patch | 31 ++++++++++++ ...ed-suitable-format-of-tests-in-ptest.patch | 50 +++++++++++++++++++ meta/recipes-core/expat/expat/run-ptest | 3 ++ meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- 5 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch create mode 100644 meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch create mode 100644 meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch create mode 100644 meta/recipes-core/expat/expat/run-ptest diff --git a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch new file mode 100644 index 0000000000..32488060ee --- /dev/null +++ b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch @@ -0,0 +1,38 @@ +From ce803ec3d7b095cb55686f9cd5d3f01d34a31a5e Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:41:45 +0200 +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support + +install-ptest, runtests and check tagrets are added. + +Signed-off-by: Oleksandr Popovych +--- + Makefile.am | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 5e1d37d..c63b44a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -152,3 +152,18 @@ qa: + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh ++ ++.PHONY: install-ptest ++install-ptest: ++ echo $(S) ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ ++ install runtests runtestspp $(DESTDIR)) ++ cp Makefile $(DESTDIR) ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile ++ ++.PHONY: runtests ++runtests: ++ @echo "C variant of tests:" ++ @$(CHECKER) ./runtests$(EXEEXT) -q ++ @echo "C++ variant of tests:" ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch new file mode 100644 index 0000000000..cf8a2495e9 --- /dev/null +++ b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch @@ -0,0 +1,31 @@ +From 2b209a025f62fb1be7b32599aa80703ce8ecd76a Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:43:57 +0200 +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target + +configure.am file changed, according to this advice: +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite + +Signed-off-by: Oleksandr Popovych +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d58ac03..8e6b41e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) + AC_CONFIG_AUX_DIR([conftools]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST +-AM_INIT_AUTOMAKE +- ++AM_INIT_AUTOMAKE([serial-tests]) ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) + + dnl + dnl Increment LIBREVISION if source code has changed at all +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch new file mode 100644 index 0000000000..5d1daefc92 --- /dev/null +++ b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch @@ -0,0 +1,50 @@ +From b2e236e238f8bab42651313ea198b27355945d97 Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:44:56 +0200 +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest + +Some changes in testcases code were applied for testcase engine. +This was just adding of message outputs in "RESULT: TESTNAME" form... + +Signed-off-by: Oleksandr Popovych +--- + tests/minicheck.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/minicheck.c b/tests/minicheck.c +index a5a1efb..b39cda9 100644 +--- a/tests/minicheck.c ++++ b/tests/minicheck.c +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + if (tc->setup != NULL) { + /* setup */ + if (setjmp(env)) { ++ printf("SKIP: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + } + /* test */ + if (setjmp(env)) { ++ printf("FAIL: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { + /* teardown */ + if (tc->teardown != NULL) { + if (setjmp(env)) { ++ printf("PASS: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } + tc->teardown(); + } ++ printf("PASS: %s\n", _check_current_function); + } + tc = tc->next_tcase; + } +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..df994c0838 --- /dev/null +++ b/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,3 @@ +#!/bin/bash + +make -k runtests diff --git a/meta/recipes-core/expat/expat_2.2.9.bb b/meta/recipes-core/expat/expat_2.2.9.bb index 8f3db41352..420ffddc80 100644 --- a/meta/recipes-core/expat/expat_2.2.9.bb +++ b/meta/recipes-core/expat/expat_2.2.9.bb @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ + file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" -inherit autotools lib_package +inherit autotools ptest lib_package + +RDEPENDS_${PN}-ptest += "make bash" do_configure_prepend () { rm -f ${S}/conftools/libtool.m4 } +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From raj.khem at gmail.com Tue Feb 11 16:36:57 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 11 Feb 2020 08:36:57 -0800 Subject: [OE-core] [PATCH v2] bitbake-buildall: automate build testing for qemu MACHINEs In-Reply-To: <54185c02-4e1c-008f-b3d1-a97bea80771c@windriver.com> References: <20200210234603.1718190-1-trevor.gamblin@windriver.com> <54185c02-4e1c-008f-b3d1-a97bea80771c@windriver.com> Message-ID: On Tue, Feb 11, 2020 at 6:06 AM Trevor Gamblin wrote: > > > On 2/10/20 7:28 PM, Khem Raj wrote: > > On Mon, Feb 10, 2020 at 3:47 PM Trevor Gamblin > > wrote: > >> bitbake-buildall simplifies the process of build testing an upgraded or > >> patched recipe by cycling through the build steps for each available qemu > >> target, with desired LIBC specified by the user as an option (defaulting > >> to both glibc and musl if no option is provided). While building, a log > >> file with the name "-buildall.log" is written, containing a PASS > >> or FAIL line upon completion of the build for each architecture. For now, > >> qemu targets are not selectable (i.e. the recipe is built for all qemu > >> targets found in meta/conf/machine), but this functionality can be added > >> in the future along with other useful options. > >> > >> The log file created by bitbake-buildall also includes some basic system > >> info (e.g. build start time, hostname, host OS, host kernel). Since it is > >> not guaranteed that tools such as lsb_release will be available on the > >> host (it isn't by default on my Fedora machine), this information is > >> collected manually. Additionally, the previous run's log is retained for > >> comparison by renaming it in the format -buildall.log.old once a > >> new set of builds is triggered for the same recipe. > >> > >> Finally, in v2, the line "set -o pipefail" has been removed to be fully > >> POSIX-compatible. > >> > >> Sample log output: > >> > >> BITBAKE-BUILDALL LOG FOR aspell > >> START TIME: 2020-02-05_15:57:41 > >> HOSTNAME: yow-tgamblin-fedora2 > >> HOST OS: Fedora 31 (Server Edition) > >> HOST KERNEL: 5.4.10-200.fc31.x86_64 > >> =============== > >> BUILD RESULTS: > >> [glibc] > >> PASS: qemuarmv5 > >> PASS: qemux86 > >> PASS: qemuppc > >> PASS: qemumips64 > >> FAIL: qemux86-64 > >> FAIL: qemumips > >> FAIL: qemuarm > >> FAIL: qemuarm64 > >> FAIL: qemuriscv64 > >> [musl] > >> PASS: qemuarmv5 > >> PASS: qemux86 > >> PASS: qemuppc > >> PASS: qemumips64 > >> PASS: qemux86-64 > >> PASS: qemumips > >> PASS: qemuarm > >> PASS: qemuarm64 > >> PASS: qemuriscv64 > >> =============== > >> PASSED: 13 > >> FAILED: 5 > >> > >> Signed-off-by: Trevor Gamblin > >> --- > >> scripts/bitbake-buildall | 120 +++++++++++++++++++++++++++++++++++++++ > >> 1 file changed, 120 insertions(+) > >> create mode 100755 scripts/bitbake-buildall > > if its building qemu machines only, then naming it build-qemuall.sh or > > some such would be > > better, I would avoid usine bitbake- prefix. That can confuse with bitbake tools > > The intent is that it can be extended to machines other than just qemu > with later patches, so I'm hesitant to give it a qemu-specific name. > its not clear if its generic enough, its grepping into hardcoded paths in oe-core repo which perhaps makes it specific. > I could rename it to something like buildall-targets. > since we use bitbake- for general tooling around bitbake, this seems not fit that bill. > > > >> diff --git a/scripts/bitbake-buildall b/scripts/bitbake-buildall > >> new file mode 100755 > >> index 0000000000..74a5994f2f > >> --- /dev/null > >> +++ b/scripts/bitbake-buildall > >> @@ -0,0 +1,120 @@ > >> +#!/bin/sh > >> +# Copyright (c) 2020 Wind River Systems, Inc. > >> +# > >> +# SPDX-License-Identifier: GPL-2.0-only > >> +# > >> +# bitbake-buildall: a tool for automating build testing of recipes > >> +# TODO: Add support for selecting which qemu architectures to build > >> +# TODO: Add support for queueing up multiple recipe builds > >> +# TODO: Add more logging options (e.g. local.conf info, bitbake env info) > >> + > >> +usage () > >> +{ > >> + base=$(basename "$0") > >> + echo "Usage: $base [options] [recipename/target]" > >> + echo "Executes a build of a given target for selected LIBCs. With no options, default to both libc and musl." > >> + echo "Options:" > >> + echo "-l, --libc Specify one of \"libc\" or \"musl\"" > >> +} > >> + > >> + > >> +buildall () > >> +{ > >> + # Get path to oe-core directory. Since oe-init-build-env prepends $PATH with > >> + # the path to the scripts directory, get it from there > >> + SCRIPTS_PATH="$(echo "$PATH" | cut -d ":" -f 1)" > >> + OE_CORE_PATH=$(echo "$SCRIPTS_PATH" | sed 's|\(.*\)/.*|\1|') > >> + > >> + # Get target list and host machine information > >> + TARGET_LIST=$(find "$OE_CORE_PATH"/meta/conf/machine -maxdepth 1 -type f | grep qemu | sed 's|.*/||' | sed -e 's/\.conf//') > >> + > >> + # Set LIBC value to use for the builds based on options provided by the user > >> + if [ -n "$2" ] > >> + then > >> + LIBC_LIST="$2" > >> + echo "$LIBC_LIST" > >> + else > >> + LIBC_LIST="glibc musl" > >> + echo "$LIBC_LIST" > >> + fi > >> + > >> + START_TIME=$(date "+%Y-%m-%d_%H:%M:%S") > >> + LOG_FILE="$1-buildall.log" > >> + OS_INFO=$(grep "PRETTY_NAME=" /etc/os-release | awk -F "=" '{print $2}' | sed -e 's/^"//' -e 's/"$//') > >> + > >> + # Append an existing log file for this build with .old if one exists > >> + if [ -f "${LOG_FILE}" ] > >> + then > >> + mv "${LOG_FILE}" "${LOG_FILE}.old" > >> + else > >> + touch "${LOG_FILE}" > >> + fi > >> + > >> + # Fill the log file with build and host info > >> + echo "BITBAKE-BUILDALL LOG FOR $1" >> "${LOG_FILE}" > >> + echo "START TIME: ${START_TIME}" >> "${LOG_FILE}" > >> + echo "HOSTNAME: $(uname -n)" >> "${LOG_FILE}" > >> + echo "HOST OS: ${OS_INFO}" >> "${LOG_FILE}" > >> + echo "HOST KERNEL: $(uname -r)" >> "${LOG_FILE}" > >> + echo "===============" >> "${LOG_FILE}" > >> + echo "BUILD RESULTS:" >> "${LOG_FILE}" > >> + > >> + # start the builds for each MACHINE and TCLIBC > >> + for j in ${LIBC_LIST} > >> + do > >> + echo "[$j]" >> "${LOG_FILE}" > >> + for i in ${TARGET_LIST} > >> + do > >> + echo "$i" "$j"; \ > >> + TCLIBC=$j MACHINE=$i bitbake "$1" && echo "PASS: $i" >> "${LOG_FILE}" || echo "FAIL: $i" >> "${LOG_FILE}" > >> + done > >> + done > >> + > >> + # Get pass/fail totals and add them to the end of the log > >> + PASSED=$(grep "PASS:" "${LOG_FILE}" | wc -l) > >> + FAILED=$(grep "FAIL:" "${LOG_FILE}" | wc -l) > >> + > >> + echo "===============" >> "${LOG_FILE}" > >> + echo "PASSED: ${PASSED}" >> "${LOG_FILE}" > >> + echo "FAILED: ${FAILED}" >> "${LOG_FILE}" > >> +} > >> + > >> + > >> +# fail entire script if any command fails > >> +set -e > >> + > >> +# print usage and exit if not enough args given > >> +[ $# -eq 0 ] && usage && exit 1 > >> + > >> +# handle arguments > >> +RECIPE= > >> +while [ $# -gt 0 ] > >> +do > >> + arg=$1 > >> + case $arg in > >> + -l|--libc) > >> + if [ "$2" = "glibc" ] || [ "$2" = "musl" ] > >> + then > >> + LIBC_LIST="$2" > >> + else > >> + echo "Unrecognized libc option." > >> + usage && exit 1 > >> + fi > >> + shift > >> + shift > >> + ;; > >> + *) > >> + RECIPE="$1" > >> + shift > >> + ;; > >> + esac > >> +done > >> + > >> +set -- "$RECIPE" > >> + > >> +# run buildall for the given recipe and LIBC > >> +if [ -n "$1" ] > >> +then > >> + buildall "$1" "$LIBC_LIST" > >> +fi > >> + > >> -- > >> 2.24.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kanavin at gmail.com Tue Feb 11 16:44:44 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 17:44:44 +0100 Subject: [OE-core] [PATCH v5] expat: Added ptest In-Reply-To: <20200211163702.11877-1-oleksandr.s.popovych@globallogic.com> References: <20200211163702.11877-1-oleksandr.s.popovych@globallogic.com> Message-ID: Upstream status should be in the patch file that you added to the recipe (just above the signed off), not in the commit message. On Tue 11. Feb 2020 at 17.37, Oleksandr Popovych via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > For ptest support for this package several additional patches and > run-ptest script were added and recipe was changed. > > Upstream-Status: Submitted [openembedded-core at lists.openembedded.org] > > Signed-off-by: Oleksandr Popovych > --- > ...d-Makefile-targets-for-ptest-support.patch | 38 ++++++++++++++ > ...ort-for-ptests-in-form-of-new-target.patch | 31 ++++++++++++ > ...ed-suitable-format-of-tests-in-ptest.patch | 50 +++++++++++++++++++ > meta/recipes-core/expat/expat/run-ptest | 3 ++ > meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- > 5 files changed, 133 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > create mode 100644 > meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > create mode 100644 > meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > create mode 100644 meta/recipes-core/expat/expat/run-ptest > > diff --git > a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > new file mode 100644 > index 0000000000..32488060ee > --- /dev/null > +++ > b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > @@ -0,0 +1,38 @@ > +From ce803ec3d7b095cb55686f9cd5d3f01d34a31a5e Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:41:45 +0200 > +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support > + > +install-ptest, runtests and check tagrets are added. > + > +Signed-off-by: Oleksandr Popovych > +--- > + Makefile.am | 15 +++++++++++++++ > + 1 file changed, 15 insertions(+) > + > +diff --git a/Makefile.am b/Makefile.am > +index 5e1d37d..c63b44a 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -152,3 +152,18 @@ qa: > + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh > + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh > + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh > ++ > ++.PHONY: install-ptest > ++install-ptest: > ++ echo $(S) > ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ > ++ install runtests runtestspp $(DESTDIR)) > ++ cp Makefile $(DESTDIR) > ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile > ++ > ++.PHONY: runtests > ++runtests: > ++ @echo "C variant of tests:" > ++ @$(CHECKER) ./runtests$(EXEEXT) -q > ++ @echo "C++ variant of tests:" > ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q > +-- > +2.17.1 > + > diff --git > a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > new file mode 100644 > index 0000000000..cf8a2495e9 > --- /dev/null > +++ > b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > @@ -0,0 +1,31 @@ > +From 2b209a025f62fb1be7b32599aa80703ce8ecd76a Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:43:57 +0200 > +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target > + > +configure.am file changed, according to this advice: > +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite > + > +Signed-off-by: Oleksandr Popovych > +--- > + configure.ac | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index d58ac03..8e6b41e 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) > + AC_CONFIG_AUX_DIR([conftools]) > + AC_CONFIG_MACRO_DIR([m4]) > + AC_CANONICAL_HOST > +-AM_INIT_AUTOMAKE > +- > ++AM_INIT_AUTOMAKE([serial-tests]) > ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) > + > + dnl > + dnl Increment LIBREVISION if source code has changed at all > +-- > +2.17.1 > + > diff --git > a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > new file mode 100644 > index 0000000000..5d1daefc92 > --- /dev/null > +++ > b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > @@ -0,0 +1,50 @@ > +From b2e236e238f8bab42651313ea198b27355945d97 Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:44:56 +0200 > +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest > + > +Some changes in testcases code were applied for testcase engine. > +This was just adding of message outputs in "RESULT: TESTNAME" form... > + > +Signed-off-by: Oleksandr Popovych > +--- > + tests/minicheck.c | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/tests/minicheck.c b/tests/minicheck.c > +index a5a1efb..b39cda9 100644 > +--- a/tests/minicheck.c > ++++ b/tests/minicheck.c > +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { > + if (tc->setup != NULL) { > + /* setup */ > + if (setjmp(env)) { > ++ printf("SKIP: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { > + } > + /* test */ > + if (setjmp(env)) { > ++ printf("FAIL: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { > + /* teardown */ > + if (tc->teardown != NULL) { > + if (setjmp(env)) { > ++ printf("PASS: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > + tc->teardown(); > + } > ++ printf("PASS: %s\n", _check_current_function); > + } > + tc = tc->next_tcase; > + } > +-- > +2.17.1 > + > diff --git a/meta/recipes-core/expat/expat/run-ptest > b/meta/recipes-core/expat/expat/run-ptest > new file mode 100644 > index 0000000000..df994c0838 > --- /dev/null > +++ b/meta/recipes-core/expat/expat/run-ptest > @@ -0,0 +1,3 @@ > +#!/bin/bash > + > +make -k runtests > diff --git a/meta/recipes-core/expat/expat_2.2.9.bb > b/meta/recipes-core/expat/expat_2.2.9.bb > index 8f3db41352..420ffddc80 100644 > --- a/meta/recipes-core/expat/expat_2.2.9.bb > +++ b/meta/recipes-core/expat/expat_2.2.9.bb > @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" > > SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ > file://libtool-tag.patch \ > + > file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ > + > file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ > + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch > \ > + file://run-ptest \ > " > > SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" > SRC_URI[sha256sum] = > "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" > > -inherit autotools lib_package > +inherit autotools ptest lib_package > + > +RDEPENDS_${PN}-ptest += "make bash" > > do_configure_prepend () { > rm -f ${S}/conftools/libtool.m4 > } > > +do_compile_ptest() { > + oe_runmake buildtest-TESTS > +} > + > BBCLASSEXTEND = "native nativesdk" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From patchwork at patchwork.openembedded.org Tue Feb 11 17:02:23 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Tue, 11 Feb 2020 17:02:23 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_expat=3A_A?= =?utf-8?q?dded_ptest_=28rev2=29?= In-Reply-To: <20200211163702.11877-1-oleksandr.s.popovych@globallogic.com> References: <20200211163702.11877-1-oleksandr.s.popovych@globallogic.com> Message-ID: <20200211170223.2277.38643@do> == Series Details == Series: expat: Added ptest (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22559/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From alex.kanavin at gmail.com Tue Feb 11 17:46:19 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 18:46:19 +0100 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: <8b9de58b-7d65-dc89-69ec-4b5d40667184@kernel.crashing.org> References: <20200211135323.GA3234@localhost> <20200211141347.GB3234@localhost> <8b9de58b-7d65-dc89-69ec-4b5d40667184@kernel.crashing.org> Message-ID: On Tue, 11 Feb 2020 at 16:58, Mark Hatle wrote: > > I also don't think oe-core itself needs a 'real' UI, and as my previous > response > said -- we do need something though to test that the graphical framework is > working properly. > > In the past this often comes back to needing a LOT of a UI in order to > adequately test all of the components of the system. If wayland/weston > has a > proper test suite that exercises all of the various parts of and pieces of > the > systems -- then the need for a UI drops considerably. > > (but we still have the need for some sort of example/demostration...) > Wayland/weston do have test suites, neither of which we currently use. I don't know how much they exercise all the moving parts, but the tests do exist. As for the demo/examples, I think we have reached the point where we can outsource the eye candy to the Internet and not bother with 'apps'. Specifically, just bundle epiphany/webkit into core-image-weston-demo, and make a nice looking landing page somewhere on yoctoproject.org that links to various HD video sites and WebGL demonstrators. As long as both GL and h.264/whatnot are HW accelerated, this should look and feel fine, even in qemu with virgl and kvm acceleration to a recent x86 CPU family. For what it's worth, with my mbition.io hat on, I do not care in the slightest for X anymore, and wouldn't blink an eye if all of it would disappear from oe-core tomorrow. What I wanted to gauge is whether people still use X for *new* product development, and for what reasons, and how much resistance there is to the idea of switching the default graphical stack in oe-core to weston. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Tue Feb 11 17:53:38 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 11 Feb 2020 17:53:38 +0000 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: Message-ID: <2a9e05eadae5df35ae1c13be4484fd6d3e8fed19.camel@linuxfoundation.org> Hi Alex, Thanks for bringing this up. On Tue, 2020-02-11 at 13:49 +0100, Alexander Kanavin wrote: > I'd like to lay out a few ideas/thoughts on what should be done with > sato (matchbox bits) and X going forward. The inputs are: > > - Red Hat is the only company doing X maintenance anymore, and > they're transitioning it to 'hard maintenance mode' > https://blogs.gnome.org/uraeus/2019/06/24/on-the-road-to-fedora-workstation-31/ > "Once we are done with this [xwayland gaining missing features] we > expect X.org to go into hard maintenance mode fairly quickly. The > reality is that X.org is basically maintained by us and thus once we > stop paying attention to it there is unlikely to be any major new > releases coming out and there might even be some bitrot setting in > over time. We will keep an eye on it as we will want to ensure X.org > stays supportable until the end of the RHEL8 lifecycle at a minimum, > but let this be a friendly notice for everyone who rely the work we > do maintaining the Linux graphics stack, get onto Wayland, that is > where the future is. > " X.Org is definitely going to be shrinking market share going forwards. That said its going to take a few years for this to happen, its not going to be gone in 6 or 12 months. I'd hope that it should be a relatively low maintenance burden over the next couple of years as it won't change much, it will mainly be things like gcc changes that will affect it. > - matchbox is reliant on gtk3 (to be obsoleted by gtk4 this year), > and does not have a Wayland compositor. Yocto project does not have > the resources to do the gtk4 port, or add a compositor. Whilst gtk4 will come out, gtk3 will continue for a while yet, it feels like we only just got rid of gtk2+! :) > - no 'lightweight Wayland compositor with a desktop/launcher > experience" has emerged in the open source space; I think the only > realistic choice at the moment is the reference compositor Weston > which provides a blank desktop with ability to open terminal windows. > > So the way I think things should be going (seeking opinions/inputs of > course): > > - oe-core adopts Weston as the 'new sato'; all sato images that > currently pull in matchbox and friends are changed to be Weston- > based. Note that there is no requirement for 3D acceleration; Weston > works with plain frame buffer device. However, both options should be > supported and tested. Also, support for Xwayland should be tested. > > - oe-core continues to support and runtime-test X for as long as > possible; for this a new image (say, 'core-image-sato-xorg') is > created which will provide matchbox under X. However, once upstream > bitrot sets in, and pain threshold is exceeded, this will be removed > and/or relegated to a legacy layer. > > Thoughts? I still strongly believe we need something in core which pulls together all our pieces into a UI where you can test key elements of what we build. If we don't have sato how do we actually test the core or demo it? I think we shouldn't rush into things here. We should ramp up our wayland testing and make the wayland images more useful/comprehensive and then look at moving more of our tests from sato to the wayland images. So in summary, yes, I think we do retarget our testing over time and strengthen when were testing under wayland. I probably don't see that needing to happen quite as quickly as you do though! Cheers, Richard From martin.jansa at gmail.com Tue Feb 11 17:59:57 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Tue, 11 Feb 2020 18:59:57 +0100 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: <2a9e05eadae5df35ae1c13be4484fd6d3e8fed19.camel@linuxfoundation.org> References: <2a9e05eadae5df35ae1c13be4484fd6d3e8fed19.camel@linuxfoundation.org> Message-ID: <20200211175957.mmmyembd5z4bhvwr@jama> On Tue, Feb 11, 2020 at 05:53:38PM +0000, Richard Purdie wrote: > I still strongly believe we need something in core which pulls together > all our pieces into a UI where you can test key elements of what we > build. If we don't have sato how do we actually test the core or demo > it? > > I think we shouldn't rush into things here. We should ramp up our > wayland testing and make the wayland images more useful/comprehensive > and then look at moving more of our tests from sato to the wayland > images. > > So in summary, yes, I think we do retarget our testing over time and > strengthen when were testing under wayland. I probably don't see that > needing to happen quite as quickly as you do though! Agreed, it might be nicer to have x11 separated in some meta-x11 layer and meta-sato in another layer as well, but as long as there is no clear replacement and x11 in oe-core doesn't cause too much work I think that dropping x11 from DISTRO_FEATURES is working quite nicely for people who don't care about x11 at all already. Maybe it would make sense to remove x11 from default DISTRO_FEATURES and/or include opengl+wayland instead? Cheers, -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From alex.kanavin at gmail.com Tue Feb 11 18:06:57 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 11 Feb 2020 19:06:57 +0100 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: <2a9e05eadae5df35ae1c13be4484fd6d3e8fed19.camel@linuxfoundation.org> References: <2a9e05eadae5df35ae1c13be4484fd6d3e8fed19.camel@linuxfoundation.org> Message-ID: On Tue, 11 Feb 2020 at 18:53, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > > I still strongly believe we need something in core which pulls together > all our pieces into a UI where you can test key elements of what we > build. If we don't have sato how do we actually test the core or demo > it? > See my other email I just wrote; I think epiphany/webkit under weston is able to replace sato more or less fully in this aspect, and actually do more when it comes to modern embedded UI use cases which involve video and 3D. > I think we shouldn't rush into things here. We should ramp up our > wayland testing and make the wayland images more useful/comprehensive > and then look at moving more of our tests from sato to the wayland > images. > Certainly no rush here and this transition will proceed carefully and will take years, but then I am famous for mercilessly removing things from oe-core, and X with sato would be the biggest one yet! :) Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Wed Feb 12 00:48:52 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 11 Feb 2020 16:48:52 -0800 Subject: [OE-core] [PATCH] libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled Message-ID: <20200212004852.4046470-1-raj.khem@gmail.com> opkg also depends on libsolv and can needlessly pull in rpm even if the O_P_M does not desire to use rpm Signed-off-by: Khem Raj --- meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb index 502f4e0e85..265a27c00d 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit cmake -PACKAGECONFIG ??= "rpm" +PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" -- 2.25.0 From trevor.gamblin at windriver.com Wed Feb 12 02:06:56 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Tue, 11 Feb 2020 21:06:56 -0500 Subject: [OE-core] [PATCH] buildall-qemu: automate build testing for qemu MACHINEs Message-ID: <20200212020656.291916-1-trevor.gamblin@windriver.com> buildall-qemu simplifies the process of build testing an upgraded or patched recipe by cycling through the build steps for each available qemu target, with desired LIBC specified by the user as an option (defaulting to both glibc and musl if no option is provided). While building, a log file with the name "-buildall.log" is written, containing a PASS or FAIL line upon completion of the build for each architecture. For now, qemu targets are not selectable (i.e. the recipe is built for all qemu targets found in meta/conf/machine), but this functionality can be added in the future along with other useful options. The log file created by buildall-qemu also includes some basic system info (e.g. build start time, hostname, host OS, host kernel). Since it is not guaranteed that tools such as lsb_release will be available on the host (it isn't by default on my Fedora machine), this information is collected manually. Additionally, the previous run's log is retained for comparison by renaming it in the format -buildall.log.old once a new set of builds is triggered for the same recipe. Sample log output: BUILDALL-QEMU LOG FOR aspell START TIME: 2020-02-11_19:50:02 HOSTNAME: yow-tgamblin-fedora2 HOST OS: Fedora 31 (Server Edition) HOST KERNEL: 5.4.10-200.fc31.x86_64 =============== BUILD RESULTS: [glibc] PASS: qemuarmv5 PASS: qemux86 PASS: qemuppc PASS: qemumips64 PASS: qemux86-64 PASS: qemumips PASS: qemuarm PASS: qemuarm64 PASS: qemuriscv64 [musl] PASS: qemuarmv5 PASS: qemux86 PASS: qemuppc PASS: qemumips64 PASS: qemux86-64 FAIL: qemumips FAIL: qemuarm FAIL: qemuarm64 FAIL: qemuriscv64 =============== PASSED: 14 FAILED: 4 Signed-off-by: Trevor Gamblin --- scripts/buildall-qemu | 120 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100755 scripts/buildall-qemu diff --git a/scripts/buildall-qemu b/scripts/buildall-qemu new file mode 100755 index 0000000000..a5a626d2a2 --- /dev/null +++ b/scripts/buildall-qemu @@ -0,0 +1,120 @@ +#!/bin/sh +# Copyright (c) 2020 Wind River Systems, Inc. +# +# SPDX-License-Identifier: GPL-2.0-only +# +# buildall-qemu: a tool for automating build testing of recipes +# TODO: Add support for selecting which qemu architectures to build +# TODO: Add support for queueing up multiple recipe builds +# TODO: Add more logging options (e.g. local.conf info, bitbake env info) + +usage () +{ + base=$(basename "$0") + echo "Usage: $base [options] [recipename/target]" + echo "Executes a build of a given target for selected LIBCs. With no options, default to both libc and musl." + echo "Options:" + echo "-l, --libc Specify one of \"libc\" or \"musl\"" +} + + +buildall () +{ + # Get path to oe-core directory. Since oe-init-build-env prepends $PATH with + # the path to the scripts directory, get it from there + SCRIPTS_PATH="$(echo "$PATH" | cut -d ":" -f 1)" + OE_CORE_PATH=$(echo "$SCRIPTS_PATH" | sed 's|\(.*\)/.*|\1|') + + # Get target list and host machine information + TARGET_LIST=$(find "$OE_CORE_PATH"/meta/conf/machine -maxdepth 1 -type f | grep qemu | sed 's|.*/||' | sed -e 's/\.conf//') + + # Set LIBC value to use for the builds based on options provided by the user + if [ -n "$2" ] + then + LIBC_LIST="$2" + echo "$LIBC_LIST" + else + LIBC_LIST="glibc musl" + echo "$LIBC_LIST" + fi + + START_TIME=$(date "+%Y-%m-%d_%H:%M:%S") + LOG_FILE="$1-buildall.log" + OS_INFO=$(grep "PRETTY_NAME=" /etc/os-release | awk -F "=" '{print $2}' | sed -e 's/^"//' -e 's/"$//') + + # Append an existing log file for this build with .old if one exists + if [ -f "${LOG_FILE}" ] + then + mv "${LOG_FILE}" "${LOG_FILE}.old" + else + touch "${LOG_FILE}" + fi + + # Fill the log file with build and host info + echo "BUILDALL-QEMU LOG FOR $1" >> "${LOG_FILE}" + echo "START TIME: ${START_TIME}" >> "${LOG_FILE}" + echo "HOSTNAME: $(uname -n)" >> "${LOG_FILE}" + echo "HOST OS: ${OS_INFO}" >> "${LOG_FILE}" + echo "HOST KERNEL: $(uname -r)" >> "${LOG_FILE}" + echo "===============" >> "${LOG_FILE}" + echo "BUILD RESULTS:" >> "${LOG_FILE}" + + # start the builds for each MACHINE and TCLIBC + for j in ${LIBC_LIST} + do + echo "[$j]" >> "${LOG_FILE}" + for i in ${TARGET_LIST} + do + echo "$i" "$j"; \ + TCLIBC=$j MACHINE=$i bitbake "$1" && echo "PASS: $i" >> "${LOG_FILE}" || echo "FAIL: $i" >> "${LOG_FILE}" + done + done + + # Get pass/fail totals and add them to the end of the log + PASSED=$(grep "PASS:" "${LOG_FILE}" | wc -l) + FAILED=$(grep "FAIL:" "${LOG_FILE}" | wc -l) + + echo "===============" >> "${LOG_FILE}" + echo "PASSED: ${PASSED}" >> "${LOG_FILE}" + echo "FAILED: ${FAILED}" >> "${LOG_FILE}" +} + + +# fail entire script if any command fails +set -e + +# print usage and exit if not enough args given +[ $# -eq 0 ] && usage && exit 1 + +# handle arguments +RECIPE= +while [ $# -gt 0 ] +do + arg=$1 + case $arg in + -l|--libc) + if [ "$2" = "glibc" ] || [ "$2" = "musl" ] + then + LIBC_LIST="$2" + else + echo "Unrecognized libc option." + usage && exit 1 + fi + shift + shift + ;; + *) + RECIPE="$1" + shift + ;; + esac +done + +set -- "$RECIPE" + +# run buildall for the given recipe and LIBC +if [ -n "$1" ] +then + buildall "$1" "$LIBC_LIST" +fi + -- 2.24.1 From jpewhacker at gmail.com Wed Feb 12 03:14:31 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Tue, 11 Feb 2020 21:14:31 -0600 Subject: [OE-core] [PATCH 0/4] oeqa: Run diffoscop on saved output Message-ID: <20200212031435.792802-1-JPEWhacker@gmail.com> Adds recipes to build the diffoscope tool and run it when the OEQA reproducible build test saves output to a local path. This should make it much easier to debug reproducible build issues from the autobuilder, since the published output can be easily viewed on the website. Joshua Watt (4): python: Add libarchive-c recipe python: Add magic recipe recipes-support: Add diffoscope recipe oeqa: reproducible: Run diffoscope on saved output meta/conf/distro/include/maintainers.inc | 3 +++ meta/lib/oeqa/selftest/cases/reproducible.py | 24 +++++++++++++------ .../python/python3-libarchive-c_2.9.bb | 17 +++++++++++++ .../python/python3-magic_0.4.15.bb | 19 +++++++++++++++ .../diffoscope/diffoscope_136.bb | 15 ++++++++++++ 5 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-libarchive-c_2.9.bb create mode 100644 meta/recipes-devtools/python/python3-magic_0.4.15.bb create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb -- 2.23.0 From jpewhacker at gmail.com Wed Feb 12 03:14:32 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Tue, 11 Feb 2020 21:14:32 -0600 Subject: [OE-core] [PATCH 1/4] python: Add libarchive-c recipe In-Reply-To: <20200212031435.792802-1-JPEWhacker@gmail.com> References: <20200212031435.792802-1-JPEWhacker@gmail.com> Message-ID: <20200212031435.792802-2-JPEWhacker@gmail.com> The libarchive python module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt --- meta/conf/distro/include/maintainers.inc | 1 + .../python/python3-libarchive-c_2.9.bb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-libarchive-c_2.9.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index c68e9edf634..abbdb74a0d3 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -579,6 +579,7 @@ RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk References: <20200212031435.792802-1-JPEWhacker@gmail.com> Message-ID: <20200212031435.792802-3-JPEWhacker@gmail.com> The python-magic module is used by diffoscope tool to make build comparisons. Signed-off-by: Joshua Watt --- meta/conf/distro/include/maintainers.inc | 1 + .../python/python3-magic_0.4.15.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-magic_0.4.15.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index abbdb74a0d3..171a43615e3 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -580,6 +580,7 @@ RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk References: <20200212031435.792802-1-JPEWhacker@gmail.com> Message-ID: <20200212031435.792802-4-JPEWhacker@gmail.com> Diffoscope is the universal diff tool, capable of comparing many different formats. Signed-off-by: Joshua Watt --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 171a43615e3..4a267faabce 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi " RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle " RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin " RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia " +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt " RECIPE_MAINTAINER_pn-diffstat = "Chen Qi " RECIPE_MAINTAINER_pn-diffutils = "Chen Qi " RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia " diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_136.bb new file mode 100644 index 00000000000..a00f281deb0 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb @@ -0,0 +1,15 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +HOMEPAGE = "https://diffoscope.org/" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73" +SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" + +BBCLASSEXTEND = "native" -- 2.23.0 From jpewhacker at gmail.com Wed Feb 12 03:14:35 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Tue, 11 Feb 2020 21:14:35 -0600 Subject: [OE-core] [PATCH 4/4] oeqa: reproducible: Run diffoscope on saved output In-Reply-To: <20200212031435.792802-1-JPEWhacker@gmail.com> References: <20200212031435.792802-1-JPEWhacker@gmail.com> Message-ID: <20200212031435.792802-5-JPEWhacker@gmail.com> If there are differing packages and they are being saved for review, automatically run diffoscope on them and include the output in the saved output. The output is currently done in HTML format since these are typically published on a webpage by the autobuilder. Signed-off-by: Joshua Watt --- meta/lib/oeqa/selftest/cases/reproducible.py | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index f6433c9a02b..d3fd8c392b8 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: MIT # -# Copyright 2019 by Garmin Ltd. or its subsidiaries +# Copyright 2019-2020 by Garmin Ltd. or its subsidiaries from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars @@ -167,10 +167,16 @@ class ReproducibleTests(OESelftestTestCase): return d def test_reproducible_builds(self): + def strip_topdir(s): + if s.startswith(self.topdir): + return s[len(self.topdir):] + return s + # Build native utilities self.write_config('') - bitbake("diffutils-native -c addto_recipe_sysroot") + bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") + diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") if self.save_results: os.makedirs(self.save_results, exist_ok=True) @@ -206,18 +212,22 @@ class ReproducibleTests(OESelftestTestCase): if self.save_results: for d in result.different: - self.copy_file(d.reference, '/'.join([save_dir, d.reference])) - self.copy_file(d.test, '/'.join([save_dir, d.test])) + self.copy_file(d.reference, '/'.join([save_dir, 'packages', strip_topdir(d.reference)])) + self.copy_file(d.test, '/'.join([save_dir, 'packages', strip_topdir(d.test)])) if result.missing or result.different: fails.append("The following %s packages are missing or different: %s" % (c, '\n'.join(r.test for r in (result.missing + result.different)))) - if fails: - self.fail('\n'.join(fails)) - # Clean up empty directories if self.save_results: if not os.listdir(save_dir): os.rmdir(save_dir) + else: + self.logger.info('Running diffoscope') + runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], + native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) + + if fails: + self.fail('\n'.join(fails)) -- 2.23.0 From akuster808 at gmail.com Wed Feb 12 03:28:19 2020 From: akuster808 at gmail.com (akuster808) Date: Tue, 11 Feb 2020 19:28:19 -0800 Subject: [OE-core] [PATCH 0/4] oeqa: Run diffoscop on saved output In-Reply-To: <20200212031435.792802-1-JPEWhacker@gmail.com> References: <20200212031435.792802-1-JPEWhacker@gmail.com> Message-ID: <4c205c3c-51b5-06e2-c918-98991af43e5b@gmail.com> On 2/11/20 7:14 PM, Joshua Watt wrote: > Adds recipes to build the diffoscope tool and run it when the OEQA > reproducible build test saves output to a local path. This should make > it much easier to debug reproducible build issues from the autobuilder, > since the published output can be easily viewed on the website.\ Thanks > > Joshua Watt (4): > python: Add libarchive-c recipe > python: Add magic recipe > recipes-support: Add diffoscope recipe > oeqa: reproducible: Run diffoscope on saved output > > meta/conf/distro/include/maintainers.inc | 3 +++ > meta/lib/oeqa/selftest/cases/reproducible.py | 24 +++++++++++++------ > .../python/python3-libarchive-c_2.9.bb | 17 +++++++++++++ > .../python/python3-magic_0.4.15.bb | 19 +++++++++++++++ > .../diffoscope/diffoscope_136.bb | 15 ++++++++++++ > 5 files changed, 71 insertions(+), 7 deletions(-) > create mode 100644 meta/recipes-devtools/python/python3-libarchive-c_2.9.bb > create mode 100644 meta/recipes-devtools/python/python3-magic_0.4.15.bb > create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb > From raj.khem at gmail.com Wed Feb 12 05:19:36 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 11 Feb 2020 21:19:36 -0800 Subject: [OE-core] [PATCH] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm Message-ID: <20200212051936.1610922-1-raj.khem@gmail.com> dnf does not work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj --- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 8 ++++++++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f1ad..9e6d5741af 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,11 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +python () { + pkgb = d.getVar("PACKAGE_CLASSES") + pkgn = d.getVar("PN") + pkgv = d.getVar("PV") + if "package_rpm" not in pkgb: + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in libsolv" % (pkgn, pkgv)) +} diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435b32..5c9326ca64 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -27,3 +27,10 @@ EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +python () { + pkgb = d.getVar("PACKAGE_CLASSES") + pkgn = d.getVar("PN") + pkgv = d.getVar("PV") + if "package_rpm" not in pkgb: + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in libsolv" % (pkgn, pkgv)) +} -- 2.25.0 From yi.zhao at windriver.com Wed Feb 12 06:24:40 2020 From: yi.zhao at windriver.com (Yi Zhao) Date: Wed, 12 Feb 2020 14:24:40 +0800 Subject: [OE-core] [PATCH] python3: install _tkinter.*.so to python3-tkinter package Message-ID: <20200212062440.621-1-yi.zhao@windriver.com> When enable PACKAGECONFIG[tk], we should install _tkinter.*.so to python3-tkinter package rather than python3-misc package. Fixes: ERROR: python3-3.8.1-r0 do_package_qa: QA Issue: /usr/lib/python3.8/lib-dynload/_tkinter.cpython-38-x86_64-linux-gnu.so contained in package python3-misc requires libtk8.6.so()(64bit), but no providers found in RDEPENDS_python3-misc? [file-rdeps] Signed-off-by: Yi Zhao --- meta/recipes-devtools/python/python3/python3-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index cbfa8d59d3..251271cb84 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -1127,6 +1127,7 @@ "core" ], "files": [ + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so", "${libdir}/python${PYTHON_MAJMIN}/tkinter" ], "cached": [] -- 2.17.1 From alex.kanavin at gmail.com Wed Feb 12 07:11:11 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 12 Feb 2020 08:11:11 +0100 Subject: [OE-core] [PATCH] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: <20200212051936.1610922-1-raj.khem@gmail.com> References: <20200212051936.1610922-1-raj.khem@gmail.com> Message-ID: Please let?s try to avoid anonymous python. What problem does this solve? If package_rpm is not enabled, then there should not be a dependency chain that builds these anyway. Alex On Wed 12. Feb 2020 at 6.20, Khem Raj wrote: > dnf does not work with opkg or dpkg/apt anyway > > Signed-off-by: Khem Raj > --- > meta/recipes-devtools/dnf/dnf_4.2.2.bb | 8 ++++++++ > meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 7 +++++++ > 2 files changed, 15 insertions(+) > > diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > index f38167f1ad..9e6d5741af 100644 > --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > @@ -84,3 +84,11 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service > dnf-makecache.timer \ > dnf-automatic-notifyonly.service > dnf-automatic-notifyonly.timer \ > " > SYSTEMD_AUTO_ENABLE ?= "disable" > + > +python () { > + pkgb = d.getVar("PACKAGE_CLASSES") > + pkgn = d.getVar("PN") > + pkgv = d.getVar("PV") > + if "package_rpm" not in pkgb: > + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in libsolv" > % (pkgn, pkgv)) > +} > diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > index 882c435b32..5c9326ca64 100644 > --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > @@ -27,3 +27,10 @@ EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" > > BBCLASSEXTEND = "native nativesdk" > > +python () { > + pkgb = d.getVar("PACKAGE_CLASSES") > + pkgn = d.getVar("PN") > + pkgv = d.getVar("PV") > + if "package_rpm" not in pkgb: > + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in libsolv" > % (pkgn, pkgv)) > +} > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kiernan at gmail.com Wed Feb 12 07:15:11 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Wed, 12 Feb 2020 07:15:11 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: upgrade v244.1 -> v244.2 Message-ID: <20200212071511.120383-1-alex.kiernan@gmail.com> Commits from v244-stable: 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan --- .../systemd/{systemd-boot_244.1.bb => systemd-boot_244.2.bb} | 0 .../systemd/{systemd-conf_244.1.bb => systemd-conf_244.2.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- .../recipes-core/systemd/{systemd_244.1.bb => systemd_244.2.bb} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.2.bb} (100%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.2.bb} (100%) rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.2.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.2.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.2.bb diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.2.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.2.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96ecc4f..549147c1874d 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "3ca4db9469dce2c0914933db4948456a367c5dc7" SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.2.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.2.bb -- 2.17.1 From alex.kanavin at gmail.com Wed Feb 12 07:20:07 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 12 Feb 2020 08:20:07 +0100 Subject: [OE-core] [OE-Core][PATCH] systemd: upgrade v244.1 -> v244.2 In-Reply-To: <20200212071511.120383-1-alex.kiernan@gmail.com> References: <20200212071511.120383-1-alex.kiernan@gmail.com> Message-ID: I think 244.3 is latest? Alex On Wed 12. Feb 2020 at 8.15, Alex Kiernan wrote: > Commits from v244-stable: > > 77c04ce5c270 hwdb: update to v245-rc1 > b4eb8848240c Fix typo in function name > e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve > callback/userdata instead of caching it > 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages > 5926f9f1723f polkit: use structured initialization > 0697d0d972c8 polkit: on async pk requests, re-validate action/details > 2589995acdb2 polkit: reuse some common bus message appending code > 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error > 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? > bus-polkit.c > 1325dfb5778d test: adapt to the new capsh format > 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 > 3034855a5b62 presets: "disable" all passive targets by default > c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a > single value > 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the > lease > 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 > f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf > ddc5dca8a73b sd-boot: fix typo > 2bbbe9ae41ab test: Synchronize journal before reading from it > 072485d661d7 sd-bus: fix introspection bug in signal parameter names > 80af3cf5e36b efi: fix build. > d7ede1ade564 generator: order growfs for the root fs after > systemd-remount-fs > e9904998213d loginctl: use /org/freedesktop/login1/session/auto when > "lock-session" is called without argument > 82dd4caf014c Documentation update for x-systemd.{before,after} > a60459764d9d man: fix typo in systemd.netdev Xfrm example > fc053e2dfb3f timesyncd: log louder when we refuse a server due to root > distance > af0e630693fa resolved: drop DNSSEC root key that is not valid anymore > ae59f1666ca6 journal: don't use startswith() on something that is not a > NUL-terminated string > 536ef6d72bc6 test: add test for > https://github.com/systemd/systemd/issues/14560 > b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to > stdout/stderr by default > a1561a08f2d5 pkgconf: add full generator paths > e5f2d11489ec tree-wide: we forgot to destroy some bus errors > ea67fd42067b mount: make checks on perpetual mount units more lax > 2f23c648bce4 core: never allow perpetual units to be masked > 9ba11dffb09a typo: "May modify to" -> "May modify" > 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot > mode > 4c2d72b53091 sysctl: downgrade message when we have no permission > c001a285a3a2 Clarify journald.conf MaxLevelStore documentation > 45d52c7615fd logind: refuse overriding idle hint on tty sessions > b1a0be45b4ee cgroup: update only siblings that got realized once > e6d694254fe1 mount: mark an existing "mounting" unit from > /proc/self/mountinfo as "just_mounted" > d8fd38769c36 journalctl: Correctly handle combination of --reverse and > --lines (fixes #1596) > cd19bd31d808 journalctl: Correctly handle --show-cursor in combination > with --until or --since and --reverse > 1320aa92dc0a core: fix re-realization of cgroup siblings > 14164ec6bc77 core: propagate service state to socket in more load states > c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in > UNIT FILE LOAD PATH > 26f3a534f1ab core: be more restrictive on the dependency types we allow > to be created transiently > 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions > 7d5060d53994 man: fix option name > 98c03090274a Support Plugable UD-PRO8 dock > e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat > 7057fe863007 man: fix documentation of IBM VIO device naming > f8d1df1045be man: slightly extend documentation on difference between > ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD > 1faf5dde4d4a boot: fix osrel parser > 65d247af1786 udev: do not use exact match of file permission > 6da978f89b48 network: lower the log-level of harmless message > 5d8a614f926c hwdb: ignore keys added in kernel 5.5 > 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb > b2f342f92b54 systemd.exec: document the file system for EnvironmentFile > paths > 945f3a231f6f systemd-analyze: fixed typo in documentation > 2c8ae283b0ee test-condition: fix group check condition > 6b48479f4582 umount: show correct error message > faba5b2ba8c9 Revert "Drop dbus activation stub service" > 3dd98f1998f9 man: add section about user manager units > 1c80a8ced006 man: add remote-*.targets to the bootup sequence > 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW > 561923291383 [man] note which UID ranges will get user journals > 588a23ef2684 [man] fix URL > 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory > exists > 93074c962e3a network: introduce AddPrefixRoute= and deprecate > PrefixRoute= > a8ad020ea0ba shared/dropin: fix assert for invalid drop-in > 946cdba156dd initrd: make udev cleanup service confict trigger and > settle too > c0a8a92e6027 man: we support growing xfs too these days > 608d88273494 time-util: deal with systems where userspace has 64bit > time_t but kernel does not > cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export > tar/raw > 73435b219553 systemctl: show what verbs support --dry-run in the help > page > dc56b94e1308 cryptsetup-generator: unconfuse writing of the device > timeout > 0757ad565573 shared/install: log syntax error for invalid > DefaultInstance= > d2471109d999 shared/install: provide a nicer error message for invalid > WantedBy=/Required= values > > Signed-off-by: Alex Kiernan > --- > > .../systemd/{systemd-boot_244.1.bb => systemd-boot_244.2.bb} | 0 > .../systemd/{systemd-conf_244.1.bb => systemd-conf_244.2.bb} | 0 > meta/recipes-core/systemd/systemd.inc | 2 +- > .../recipes-core/systemd/{systemd_244.1.bb => systemd_244.2.bb} | 0 > 4 files changed, 1 insertion(+), 1 deletion(-) > rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => > systemd-boot_244.2.bb} (100%) > rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => > systemd-conf_244.2.bb} (100%) > rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.2.bb} > (100%) > > diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb > b/meta/recipes-core/systemd/systemd-boot_244.2.bb > similarity index 100% > rename from meta/recipes-core/systemd/systemd-boot_244.1.bb > rename to meta/recipes-core/systemd/systemd-boot_244.2.bb > diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb > b/meta/recipes-core/systemd/systemd-conf_244.2.bb > similarity index 100% > rename from meta/recipes-core/systemd/systemd-conf_244.1.bb > rename to meta/recipes-core/systemd/systemd-conf_244.2.bb > diff --git a/meta/recipes-core/systemd/systemd.inc > b/meta/recipes-core/systemd/systemd.inc > index 8c05a96ecc4f..549147c1874d 100644 > --- a/meta/recipes-core/systemd/systemd.inc > +++ b/meta/recipes-core/systemd/systemd.inc > @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" > LIC_FILES_CHKSUM = > "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ > > file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" > > -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" > +SRCREV = "3ca4db9469dce2c0914933db4948456a367c5dc7" > SRCBRANCH = "v244-stable" > SRC_URI = "git:// > github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} > > " > > diff --git a/meta/recipes-core/systemd/systemd_244.1.bb > b/meta/recipes-core/systemd/systemd_244.2.bb > similarity index 100% > rename from meta/recipes-core/systemd/systemd_244.1.bb > rename to meta/recipes-core/systemd/systemd_244.2.bb > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From zhe.he at windriver.com Wed Feb 12 07:35:57 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Wed, 12 Feb 2020 15:35:57 +0800 Subject: [OE-core] [PATCH] linux-yocto-dev: Add paravirt_kvm support for qemux86-64 Message-ID: <1581492957-290953-1-git-send-email-zhe.he@windriver.com> From: He Zhe This feature includes paravirtualized KVM guest support, including KVMCLOCK for enhancing clock accuracy of guest OS. With it we can prevent the following error. "clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large" Signed-off-by: He Zhe --- meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index afda849..c364a97 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -48,7 +48,7 @@ KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/ta KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" KERNEL_VERSION_SANITY_SKIP = "1" -- 2.7.4 From alex.kiernan at gmail.com Wed Feb 12 08:59:44 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Wed, 12 Feb 2020 08:59:44 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: upgrade v244.1 -> v244.2 In-Reply-To: References: <20200212071511.120383-1-alex.kiernan@gmail.com> Message-ID: On Wed, Feb 12, 2020 at 7:20 AM Alexander Kanavin wrote: > > I think 244.3 is latest? > Looks like upstream's done something funky... the tag's been pushed, but not the branch :| I'll pull it in later. > Alex > > On Wed 12. Feb 2020 at 8.15, Alex Kiernan wrote: >> >> Commits from v244-stable: >> >> 77c04ce5c270 hwdb: update to v245-rc1 >> b4eb8848240c Fix typo in function name >> e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it >> 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages >> 5926f9f1723f polkit: use structured initialization >> 0697d0d972c8 polkit: on async pk requests, re-validate action/details >> 2589995acdb2 polkit: reuse some common bus message appending code >> 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error >> 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c >> 1325dfb5778d test: adapt to the new capsh format >> 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 >> 3034855a5b62 presets: "disable" all passive targets by default >> c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value >> 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease >> 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 >> f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf >> ddc5dca8a73b sd-boot: fix typo >> 2bbbe9ae41ab test: Synchronize journal before reading from it >> 072485d661d7 sd-bus: fix introspection bug in signal parameter names >> 80af3cf5e36b efi: fix build. >> d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs >> e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument >> 82dd4caf014c Documentation update for x-systemd.{before,after} >> a60459764d9d man: fix typo in systemd.netdev Xfrm example >> fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance >> af0e630693fa resolved: drop DNSSEC root key that is not valid anymore >> ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string >> 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 >> b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default >> a1561a08f2d5 pkgconf: add full generator paths >> e5f2d11489ec tree-wide: we forgot to destroy some bus errors >> ea67fd42067b mount: make checks on perpetual mount units more lax >> 2f23c648bce4 core: never allow perpetual units to be masked >> 9ba11dffb09a typo: "May modify to" -> "May modify" >> 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode >> 4c2d72b53091 sysctl: downgrade message when we have no permission >> c001a285a3a2 Clarify journald.conf MaxLevelStore documentation >> 45d52c7615fd logind: refuse overriding idle hint on tty sessions >> b1a0be45b4ee cgroup: update only siblings that got realized once >> e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" >> d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) >> cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse >> 1320aa92dc0a core: fix re-realization of cgroup siblings >> 14164ec6bc77 core: propagate service state to socket in more load states >> c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH >> 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently >> 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions >> 7d5060d53994 man: fix option name >> 98c03090274a Support Plugable UD-PRO8 dock >> e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat >> 7057fe863007 man: fix documentation of IBM VIO device naming >> f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD >> 1faf5dde4d4a boot: fix osrel parser >> 65d247af1786 udev: do not use exact match of file permission >> 6da978f89b48 network: lower the log-level of harmless message >> 5d8a614f926c hwdb: ignore keys added in kernel 5.5 >> 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb >> b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths >> 945f3a231f6f systemd-analyze: fixed typo in documentation >> 2c8ae283b0ee test-condition: fix group check condition >> 6b48479f4582 umount: show correct error message >> faba5b2ba8c9 Revert "Drop dbus activation stub service" >> 3dd98f1998f9 man: add section about user manager units >> 1c80a8ced006 man: add remote-*.targets to the bootup sequence >> 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW >> 561923291383 [man] note which UID ranges will get user journals >> 588a23ef2684 [man] fix URL >> 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists >> 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= >> a8ad020ea0ba shared/dropin: fix assert for invalid drop-in >> 946cdba156dd initrd: make udev cleanup service confict trigger and settle too >> c0a8a92e6027 man: we support growing xfs too these days >> 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not >> cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw >> 73435b219553 systemctl: show what verbs support --dry-run in the help page >> dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout >> 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= >> d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values >> >> Signed-off-by: Alex Kiernan >> --- >> >> .../systemd/{systemd-boot_244.1.bb => systemd-boot_244.2.bb} | 0 >> .../systemd/{systemd-conf_244.1.bb => systemd-conf_244.2.bb} | 0 >> meta/recipes-core/systemd/systemd.inc | 2 +- >> .../recipes-core/systemd/{systemd_244.1.bb => systemd_244.2.bb} | 0 >> 4 files changed, 1 insertion(+), 1 deletion(-) >> rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.2.bb} (100%) >> rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.2.bb} (100%) >> rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.2.bb} (100%) >> >> diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.2.bb >> similarity index 100% >> rename from meta/recipes-core/systemd/systemd-boot_244.1.bb >> rename to meta/recipes-core/systemd/systemd-boot_244.2.bb >> diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.2.bb >> similarity index 100% >> rename from meta/recipes-core/systemd/systemd-conf_244.1.bb >> rename to meta/recipes-core/systemd/systemd-conf_244.2.bb >> diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc >> index 8c05a96ecc4f..549147c1874d 100644 >> --- a/meta/recipes-core/systemd/systemd.inc >> +++ b/meta/recipes-core/systemd/systemd.inc >> @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" >> LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ >> file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" >> >> -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" >> +SRCREV = "3ca4db9469dce2c0914933db4948456a367c5dc7" >> SRCBRANCH = "v244-stable" >> SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" >> >> diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.2.bb >> similarity index 100% >> rename from meta/recipes-core/systemd/systemd_244.1.bb >> rename to meta/recipes-core/systemd/systemd_244.2.bb >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Alex Kiernan From alex.kiernan at gmail.com Wed Feb 12 09:44:34 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Wed, 12 Feb 2020 09:44:34 +0000 Subject: [OE-core] [OE-Core][PATCH] systemd: upgrade v244.1 -> v244.3 Message-ID: <20200212094434.118167-1-alex.kiernan@gmail.com> Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan --- .../systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 0 .../systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 5 +++-- .../systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (100%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96ecc4f..6861767f82fa 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,9 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" +# v244.3 failed to push the branch, undo nobranch=1 when next updating +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;nobranch=1" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- 2.17.1 From alex.kiernan at gmail.com Wed Feb 12 10:35:26 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Wed, 12 Feb 2020 10:35:26 +0000 Subject: [OE-core] [OE-Core][PATCH] devicetree.bbclass: include symbols in base DT Message-ID: <20200212103526.61149-1-alex.kiernan@gmail.com> When processing overlays, the base device tree must be compiled with symbols, otherwise attempting to apply overlays in U-Boot will fail with: failed on fdt_overlay_apply(): FDT_ERR_NOTFOUND base fdt does did not have a /__symbols__ node make sure you've compiled with -@ Signed-off-by: Alex Kiernan --- meta/classes/devicetree.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/devicetree.bbclass b/meta/classes/devicetree.bbclass index d8779c794378..c772ab2ab93e 100644 --- a/meta/classes/devicetree.bbclass +++ b/meta/classes/devicetree.bbclass @@ -59,7 +59,7 @@ DT_BOOT_CPU ??= "0" DTC_FLAGS ?= "-R ${DT_RESERVED_MAP} -b ${DT_BOOT_CPU}" DTC_PPFLAGS ?= "-nostdinc -undef -D__DTS__ -x assembler-with-cpp" -DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE}" +DTC_BFLAGS ?= "-p ${DT_PADDING_SIZE} -@" DTC_OFLAGS ?= "-p 0 -@ -H epapr" python () { -- 2.17.1 From wangmy at cn.fujitsu.com Wed Feb 12 18:35:05 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Wed, 12 Feb 2020 10:35:05 -0800 Subject: [OE-core] [PATCH] python3-pip: upgrade 19.3.1 -> 20.0.2 Message-ID: <1581532506-107041-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/python/{python3-pip_19.3.1.bb => python3-pip_20.0.2.bb} (81%) diff --git a/meta/recipes-devtools/python/python3-pip_19.3.1.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb similarity index 81% rename from meta/recipes-devtools/python/python3-pip_19.3.1.bb rename to meta/recipes-devtools/python/python3-pip_20.0.2.bb index d27e6fce5c..08738fb2f9 100644 --- a/meta/recipes-devtools/python/python3-pip_19.3.1.bb +++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" -SRC_URI[md5sum] = "1aaaf90fbafc50e7ba1e66ffceb00960" -SRC_URI[sha256sum] = "21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7" +SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" +SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" inherit pypi distutils3 -- 2.17.1 From wangmy at cn.fujitsu.com Wed Feb 12 18:35:06 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Wed, 12 Feb 2020 10:35:06 -0800 Subject: [OE-core] [PATCH v2] ruby: upgrade 2.6.5 -> 2.7.0 In-Reply-To: <1581532506-107041-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581532506-107041-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581532506-107041-2-git-send-email-wangmy@cn.fujitsu.com> 0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch Removed since it is included in 2.7.0. refresh the following patch: 0002-Obey-LDFLAGS-for-the-link-of-libruby.patch add the following patch to solve build error: 0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch [error message] ERROR: ruby-2.7.0-r0 do_package_qa: QA Issue: /usr/lib/ruby/gems/2.7.0/gems/racc-1.4.16/bin/y2racc contained in package ruby requires /usr/local/bin/ruby, but no providers found in RDEPENDS_ruby? [file-rdeps] format of file COPYING is updated. LEGAL notice information is updated. Signed-off-by: Wang Mingyu --- meta/recipes-devtools/ruby/ruby.inc | 4 +- ...of-libexec-y2racc-and-libexec-racc2y.patch | 38 +++++++ ...Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 +- ...ck-finite-isinf-isnan-as-macros-firs.patch | 103 ------------------ .../ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} | 6 +- 5 files changed, 47 insertions(+), 112 deletions(-) create mode 100644 meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch delete mode 100644 meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch rename meta/recipes-devtools/ruby/{ruby_2.6.5.bb => ruby_2.7.0.bb} (91%) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f012..a38b3fe624 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ + file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000000..f316bed7bd --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch @@ -0,0 +1,38 @@ +From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Sat, 8 Feb 2020 15:16:14 +0800 +Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. + +change /usr/local/bin/ruby to /usr/bin/env ruby. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + libexec/racc2y | 2 +- + libexec/y2racc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexec/racc2y b/libexec/racc2y +index f88d73ed2c..74e49cfa21 100755 +--- a/libexec/racc2y ++++ b/libexec/racc2y +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +diff --git a/libexec/y2racc b/libexec/y2racc +index 7933f94153..36daf864e1 100755 +--- a/libexec/y2racc ++++ b/libexec/y2racc +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/ruby ++#!/usr/bin/env ruby + # + # $Id$ + # +-- +2.17.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8bd73..b31dee1128 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby Signed-off-by: Christopher Larson Upstream-Status: Pending --- - Makefile.in | 2 +- + template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in +diff --git a/template/Makefile.in b/template/Makefile.in index fa1e19ef37..bbd07fa34b 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/template/Makefile.in ++++ b/template/Makefile.in @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3e8c..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 -From: nobu -Date: Fri, 8 Feb 2019 07:22:55 +0000 -Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ruby-core:91487] [Bug #15595] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk at 67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e - ---- -Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] -Signed-off-by: Andr?? Draszik ---- - aclocal.m4 | 1 + - configure.ac | 13 ++++--------- - tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ - 3 files changed, 18 insertions(+), 9 deletions(-) - create mode 100644 tool/m4/ruby_replace_funcs.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index b0fe3eb959..ed7d14ef63 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) - m4_include([tool/m4/ruby_mingw32.m4]) - m4_include([tool/m4/ruby_prepend_option.m4]) - m4_include([tool/m4/ruby_prog_gnu_ld.m4]) -+m4_include([tool/m4/ruby_replace_funcs.m4]) - m4_include([tool/m4/ruby_replace_type.m4]) - m4_include([tool/m4/ruby_rm_recursive.m4]) - m4_include([tool/m4/ruby_setjmp_type.m4]) -diff --git a/configure.ac b/configure.ac -index 2c4d2888d2..2691da6a3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -946,9 +946,6 @@ main() - ac_cv_func_fsync=yes - ac_cv_func_seekdir=yes - ac_cv_func_telldir=yes -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes -- ac_cv_func_finite=yes - ac_cv_func_lchown=yes - ac_cv_func_link=yes - ac_cv_func_readlink=yes -@@ -999,9 +996,6 @@ main() - [netbsd*], [ LIBS="-lm $LIBS" - ], - [dragonfly*], [ LIBS="-lm $LIBS" -- # isinf() and isnan() are macros on DragonFly. -- ac_cv_func_isinf=yes -- ac_cv_func_isnan=yes - ], - [aix*],[ LIBS="-lm $LIBS" - ac_cv_func_round=no -@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) - AC_REPLACE_FUNCS(erf) - AC_REPLACE_FUNCS(explicit_bzero) - AC_REPLACE_FUNCS(ffs) --AC_REPLACE_FUNCS(finite) - AC_REPLACE_FUNCS(flock) - AC_REPLACE_FUNCS(hypot) --AC_REPLACE_FUNCS(isinf) --AC_REPLACE_FUNCS(isnan) - AC_REPLACE_FUNCS(lgamma_r) - AC_REPLACE_FUNCS(memmove) - AC_REPLACE_FUNCS(nan) -@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) - AC_REPLACE_FUNCS(strstr) - AC_REPLACE_FUNCS(tgamma) - -+RUBY_REPLACE_FUNC([finite], [@%:@include ]) -+RUBY_REPLACE_FUNC([isinf], [@%:@include ]) -+RUBY_REPLACE_FUNC([isnan], [@%:@include ]) -+ - # for missing/setproctitle.c - AS_CASE(["$target_os"], - [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], -diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 -new file mode 100644 -index 0000000000..d0612e29a0 ---- /dev/null -+++ b/tool/m4/ruby_replace_funcs.m4 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+dnl RUBY_REPLACE_FUNC [func] [included] -+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl -+ AC_CHECK_DECL([$1],dnl -+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl -+ [AC_REPLACE_FUNCS($1)],dnl -+ [$2])dnl -+]) -+ -+dnl RUBY_REPLACE_FUNCS [funcs] [included] -+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl -+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl -+]) --- -2.23.0.rc1 - diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb similarity index 91% rename from meta/recipes-devtools/ruby/ruby_2.6.5.bb rename to meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee09f..c796318717 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -1,13 +1,13 @@ require ruby.inc SRC_URI += " \ - file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://remove_has_include_macros.patch \ file://run-ptest \ + file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ " -SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" -SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" +SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" +SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- 2.17.1 From alex.kiernan at gmail.com Wed Feb 12 11:33:36 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Wed, 12 Feb 2020 11:33:36 +0000 Subject: [OE-core] [OE-Core][PATCH] kernel-fitimage: fix devicetree reproducibility Message-ID: <20200212113336.62171-1-alex.kiernan@gmail.com> Ensure that the order of dtb/dtbo files in the generated fitimage is reproducible. Fixes: 71bfa9838cbf ("kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE") Signed-off-by: Alex Kiernan --- meta/classes/kernel-fitimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index d1b8cdc1f049..72b05ff8d1dd 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -391,7 +391,7 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do DTB=$(echo "${DTB}" | tr '/' '_') DTBS="${DTBS} ${DTB}" fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" -- 2.17.1 From bunk at stusta.de Wed Feb 12 11:40:18 2020 From: bunk at stusta.de (Adrian Bunk) Date: Wed, 12 Feb 2020 13:40:18 +0200 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: <2a9e05eadae5df35ae1c13be4484fd6d3e8fed19.camel@linuxfoundation.org> Message-ID: <20200212114018.GA4081@localhost> On Tue, Feb 11, 2020 at 07:06:57PM +0100, Alexander Kanavin wrote: > On Tue, 11 Feb 2020 at 18:53, Richard Purdie < > richard.purdie at linuxfoundation.org> wrote: > > > I still strongly believe we need something in core which pulls together > > all our pieces into a UI where you can test key elements of what we > > build. If we don't have sato how do we actually test the core or demo > > it? > > See my other email I just wrote; I think epiphany/webkit under weston is > able to replace sato more or less fully in this aspect, Regarding dependencies and buildtime, epiphany/webkit is the largest part of sato. If you anyways want core to ship all the multimedia libraries and ruby and rust and plenty of other packages, then an additional desktop environment in core would be relatively lightweight. A small core would be headless. > and actually do > more when it comes to modern embedded UI use cases which involve video and > 3D. >... epiphany/webkit is a strange option to support in core for that, moving Qt back into core instead would bring more usage in actual products instead of shipping test/demo-only software. > Alex cu Adrian From patchwork at patchwork.openembedded.org Wed Feb 12 12:02:40 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 12 Feb 2020 12:02:40 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_kernel-fit?= =?utf-8?q?image=3A_fix_devicetree_reproducibility?= In-Reply-To: <20200212113336.62171-1-alex.kiernan@gmail.com> References: <20200212113336.62171-1-alex.kiernan@gmail.com> Message-ID: <20200212120240.2276.91891@do> == Series Details == Series: kernel-fitimage: fix devicetree reproducibility Revision: 1 URL : https://patchwork.openembedded.org/series/22582/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 44a4ac2294) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From oleksandr.s.popovych at globallogic.com Wed Feb 12 12:19:11 2020 From: oleksandr.s.popovych at globallogic.com (Oleksandr Popovych) Date: Wed, 12 Feb 2020 14:19:11 +0200 Subject: [OE-core] [PATCH v6] expat: Added ptest Message-ID: <20200212121911.4752-1-oleksandr.s.popovych@globallogic.com> For ptest support for this package several additional patches and run-ptest script were added and recipe was changed. Signed-off-by: Oleksandr Popovych --- ...d-Makefile-targets-for-ptest-support.patch | 40 ++++++++++++++ ...ort-for-ptests-in-form-of-new-target.patch | 33 ++++++++++++ ...ed-suitable-format-of-tests-in-ptest.patch | 52 +++++++++++++++++++ meta/recipes-core/expat/expat/run-ptest | 3 ++ meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- 5 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch create mode 100644 meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch create mode 100644 meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch create mode 100644 meta/recipes-core/expat/expat/run-ptest diff --git a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch new file mode 100644 index 0000000000..de213b4bc5 --- /dev/null +++ b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch @@ -0,0 +1,40 @@ +From e306bd4849f61f50dad1f5d29fb650c347d78ad6 Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:41:45 +0200 +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support + +install-ptest, runtests and check tagrets are added. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Oleksandr Popovych +--- + Makefile.am | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 5e1d37d..c63b44a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -152,3 +152,18 @@ qa: + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh ++ ++.PHONY: install-ptest ++install-ptest: ++ echo $(S) ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ ++ install runtests runtestspp $(DESTDIR)) ++ cp Makefile $(DESTDIR) ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile ++ ++.PHONY: runtests ++runtests: ++ @echo "C variant of tests:" ++ @$(CHECKER) ./runtests$(EXEEXT) -q ++ @echo "C++ variant of tests:" ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch new file mode 100644 index 0000000000..26ae144a37 --- /dev/null +++ b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch @@ -0,0 +1,33 @@ +From 9a5085243b632a777f55269f7f6d2e40dd73a7bc Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:43:57 +0200 +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target + +configure.am file changed, according to this advice: +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Oleksandr Popovych +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d58ac03..8e6b41e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) + AC_CONFIG_AUX_DIR([conftools]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST +-AM_INIT_AUTOMAKE +- ++AM_INIT_AUTOMAKE([serial-tests]) ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) + + dnl + dnl Increment LIBREVISION if source code has changed at all +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch new file mode 100644 index 0000000000..9a85a26117 --- /dev/null +++ b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch @@ -0,0 +1,52 @@ +From 825f344543676fc3314f4e074163fd638db8e8f9 Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych +Date: Thu, 6 Feb 2020 13:44:56 +0200 +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest + +Some changes in testcases code were applied for testcase engine. +This was just adding of message outputs in "RESULT: TESTNAME" form... + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Oleksandr Popovych +--- + tests/minicheck.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/minicheck.c b/tests/minicheck.c +index a5a1efb..b39cda9 100644 +--- a/tests/minicheck.c ++++ b/tests/minicheck.c +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + if (tc->setup != NULL) { + /* setup */ + if (setjmp(env)) { ++ printf("SKIP: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { + } + /* test */ + if (setjmp(env)) { ++ printf("FAIL: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { + /* teardown */ + if (tc->teardown != NULL) { + if (setjmp(env)) { ++ printf("PASS: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } + tc->teardown(); + } ++ printf("PASS: %s\n", _check_current_function); + } + tc = tc->next_tcase; + } +-- +2.17.1 + diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..df994c0838 --- /dev/null +++ b/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,3 @@ +#!/bin/bash + +make -k runtests diff --git a/meta/recipes-core/expat/expat_2.2.9.bb b/meta/recipes-core/expat/expat_2.2.9.bb index 8f3db41352..420ffddc80 100644 --- a/meta/recipes-core/expat/expat_2.2.9.bb +++ b/meta/recipes-core/expat/expat_2.2.9.bb @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ + file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" -inherit autotools lib_package +inherit autotools ptest lib_package + +RDEPENDS_${PN}-ptest += "make bash" do_configure_prepend () { rm -f ${S}/conftools/libtool.m4 } +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From alex.kiernan at gmail.com Wed Feb 12 13:05:16 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Wed, 12 Feb 2020 13:05:16 +0000 Subject: [OE-core] [OE-Core][PATCH] kernel-fitimage: fix devicetree reproducibility In-Reply-To: <20200212113336.62171-1-alex.kiernan@gmail.com> References: <20200212113336.62171-1-alex.kiernan@gmail.com> Message-ID: On Wed, Feb 12, 2020 at 11:33 AM Alex Kiernan wrote: > > Ensure that the order of dtb/dtbo files in the generated fitimage is > reproducible. > > Fixes: 71bfa9838cbf ("kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE") > Signed-off-by: Alex Kiernan > --- > I'd not realised the previous change was still in master-next. I'll squash this one into that. -- Alex Kiernan From alex.kiernan at gmail.com Wed Feb 12 13:26:36 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Wed, 12 Feb 2020 13:26:36 +0000 Subject: [OE-core] [OE-Core][PATCH v2] kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE Message-ID: <20200212132636.63599-1-alex.kiernan@gmail.com> When using EXTERNAL_KERNEL_DEVICETREE, collect DTB overlays too (*.dtbo) as well as iterating down into sub-directories so using the behaviour for naming which matches KERNEL_DEVICETREE. Signed-off-by: Alex Kiernan --- Changes in v2: - ensure that the order of dtb/dtbo files in the generated fitimage is reproducible. meta/classes/kernel-fitimage.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index ec18a3d69921..72b05ff8d1dd 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -391,11 +391,10 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb; do - DTB=`basename ${DTBFILE}` + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do DTB=$(echo "${DTB}" | tr '/' '_') DTBS="${DTBS} ${DTB}" - fitimage_emit_section_dtb ${1} ${DTB} ${DTBFILE} + fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" done fi -- 2.17.1 From raj.khem at gmail.com Wed Feb 12 15:11:32 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 07:11:32 -0800 Subject: [OE-core] [PATCH] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212051936.1610922-1-raj.khem@gmail.com> Message-ID: On Tue, Feb 11, 2020 at 11:11 PM Alexander Kanavin wrote: > > Please let?s try to avoid anonymous python. What problem does this solve? If package_rpm is not enabled, then there should not be a dependency chain that builds these anyway. for non rpm backend opkg, rpm is pulled in which is not desired because opkg depends on libsolv and libsolv by default depends on rpm which I sent another patch to decouple, This caused opkg images to fail tests because testing infra found rpm in the image and ran tests for it which obviously would fail. libsolv does have rpm support as packageconfig but when that is disabled then libdnf does not build anymore since it expects rpmdb support in libsolv. so when we do world builds with opkg as package management then dnf and libdbf starts to fail due to their RPM needs. IF there was an override to identity packaging backends then we could have used that If you have better suggestions to avoid anon python here, I am all ears. > > Alex > > On Wed 12. Feb 2020 at 6.20, Khem Raj wrote: >> >> dnf does not work with opkg or dpkg/apt anyway >> >> Signed-off-by: Khem Raj >> --- >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 8 ++++++++ >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 7 +++++++ >> 2 files changed, 15 insertions(+) >> >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> index f38167f1ad..9e6d5741af 100644 >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> @@ -84,3 +84,11 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ >> dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ >> " >> SYSTEMD_AUTO_ENABLE ?= "disable" >> + >> +python () { >> + pkgb = d.getVar("PACKAGE_CLASSES") >> + pkgn = d.getVar("PN") >> + pkgv = d.getVar("PV") >> + if "package_rpm" not in pkgb: >> + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in libsolv" % (pkgn, pkgv)) >> +} >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> index 882c435b32..5c9326ca64 100644 >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> @@ -27,3 +27,10 @@ EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" >> >> BBCLASSEXTEND = "native nativesdk" >> >> +python () { >> + pkgb = d.getVar("PACKAGE_CLASSES") >> + pkgn = d.getVar("PN") >> + pkgv = d.getVar("PV") >> + if "package_rpm" not in pkgb: >> + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in libsolv" % (pkgn, pkgv)) >> +} >> -- >> 2.25.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kanavin at gmail.com Wed Feb 12 15:30:19 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 12 Feb 2020 16:30:19 +0100 Subject: [OE-core] [PATCH] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212051936.1610922-1-raj.khem@gmail.com> Message-ID: Maybe we can package rpm better so that the binaries and the libraries go into separate packages? Then libsolv would only pull in the rpm libraries and rpm tests would be skipped? Alex On Wed 12. Feb 2020 at 16.12, Khem Raj wrote: > On Tue, Feb 11, 2020 at 11:11 PM Alexander Kanavin > wrote: > > > > Please let?s try to avoid anonymous python. What problem does this > solve? If package_rpm is not enabled, then there should not be a dependency > chain that builds these anyway. > > for non rpm backend opkg, rpm is pulled in which is not desired > because opkg depends on libsolv > and libsolv by default depends on rpm which I sent another patch to > decouple, This caused opkg images to fail tests because testing infra > found rpm in the image and ran tests for it which obviously would > fail. > > libsolv does have rpm support as packageconfig but when that > is disabled then libdnf does not build anymore since it expects rpmdb > support in libsolv. > > so when we do world builds with opkg as package management then dnf > and libdbf starts to fail > due to their RPM needs. > > IF there was an override to identity packaging backends then we could > have used that > > If you have better suggestions to avoid anon python here, I am all ears. > > > > > Alex > > > > On Wed 12. Feb 2020 at 6.20, Khem Raj wrote: > >> > >> dnf does not work with opkg or dpkg/apt anyway > >> > >> Signed-off-by: Khem Raj > >> --- > >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 8 ++++++++ > >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 7 +++++++ > >> 2 files changed, 15 insertions(+) > >> > >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> index f38167f1ad..9e6d5741af 100644 > >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> @@ -84,3 +84,11 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service > dnf-makecache.timer \ > >> dnf-automatic-notifyonly.service > dnf-automatic-notifyonly.timer \ > >> " > >> SYSTEMD_AUTO_ENABLE ?= "disable" > >> + > >> +python () { > >> + pkgb = d.getVar("PACKAGE_CLASSES") > >> + pkgn = d.getVar("PN") > >> + pkgv = d.getVar("PV") > >> + if "package_rpm" not in pkgb: > >> + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in > libsolv" % (pkgn, pkgv)) > >> +} > >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> index 882c435b32..5c9326ca64 100644 > >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> @@ -27,3 +27,10 @@ EXTRA_OECMAKE_append_class-nativesdk = " > -DWITH_GIR=OFF" > >> > >> BBCLASSEXTEND = "native nativesdk" > >> > >> +python () { > >> + pkgb = d.getVar("PACKAGE_CLASSES") > >> + pkgn = d.getVar("PN") > >> + pkgv = d.getVar("PV") > >> + if "package_rpm" not in pkgb: > >> + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in > libsolv" % (pkgn, pkgv)) > >> +} > >> -- > >> 2.25.0 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From martin.jansa at gmail.com Wed Feb 12 16:32:55 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Wed, 12 Feb 2020 17:32:55 +0100 Subject: [OE-core] [PATCH] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212051936.1610922-1-raj.khem@gmail.com> Message-ID: Will this work for you without anonymous python? I think it should. PNBLACKLIST[dnf] ?= "${@oe.utils.conditional('PACKAGE_CLASSES', 'package_rpm', '' 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" On Wed, Feb 12, 2020 at 4:12 PM Khem Raj wrote: > On Tue, Feb 11, 2020 at 11:11 PM Alexander Kanavin > wrote: > > > > Please let?s try to avoid anonymous python. What problem does this > solve? If package_rpm is not enabled, then there should not be a dependency > chain that builds these anyway. > > for non rpm backend opkg, rpm is pulled in which is not desired > because opkg depends on libsolv > and libsolv by default depends on rpm which I sent another patch to > decouple, This caused opkg images to fail tests because testing infra > found rpm in the image and ran tests for it which obviously would > fail. > > libsolv does have rpm support as packageconfig but when that > is disabled then libdnf does not build anymore since it expects rpmdb > support in libsolv. > > so when we do world builds with opkg as package management then dnf > and libdbf starts to fail > due to their RPM needs. > > IF there was an override to identity packaging backends then we could > have used that > > If you have better suggestions to avoid anon python here, I am all ears. > > > > > Alex > > > > On Wed 12. Feb 2020 at 6.20, Khem Raj wrote: > >> > >> dnf does not work with opkg or dpkg/apt anyway > >> > >> Signed-off-by: Khem Raj > >> --- > >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 8 ++++++++ > >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 7 +++++++ > >> 2 files changed, 15 insertions(+) > >> > >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> index f38167f1ad..9e6d5741af 100644 > >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> @@ -84,3 +84,11 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service > dnf-makecache.timer \ > >> dnf-automatic-notifyonly.service > dnf-automatic-notifyonly.timer \ > >> " > >> SYSTEMD_AUTO_ENABLE ?= "disable" > >> + > >> +python () { > >> + pkgb = d.getVar("PACKAGE_CLASSES") > >> + pkgn = d.getVar("PN") > >> + pkgv = d.getVar("PV") > >> + if "package_rpm" not in pkgb: > >> + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in > libsolv" % (pkgn, pkgv)) > >> +} > >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> index 882c435b32..5c9326ca64 100644 > >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> @@ -27,3 +27,10 @@ EXTRA_OECMAKE_append_class-nativesdk = " > -DWITH_GIR=OFF" > >> > >> BBCLASSEXTEND = "native nativesdk" > >> > >> +python () { > >> + pkgb = d.getVar("PACKAGE_CLASSES") > >> + pkgn = d.getVar("PN") > >> + pkgv = d.getVar("PV") > >> + if "package_rpm" not in pkgb: > >> + raise bb.parse.SkipPackage("%s-%s Needs rpmdb support in > libsolv" % (pkgn, pkgv)) > >> +} > >> -- > >> 2.25.0 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From chris.laplante at agilent.com Wed Feb 12 16:51:17 2020 From: chris.laplante at agilent.com (chris.laplante at agilent.com) Date: Wed, 12 Feb 2020 16:51:17 +0000 Subject: [OE-core] Cache unihash ... doesn't match BB_UNIHASH ... In-Reply-To: References: <6109c3315b8a215881c134441b74d0753820b5c8.camel@linuxfoundation.org> Message-ID: > One is occasionally I get a lot of undeterministic metadata errors when BB_CACHE_POLICY = "cache", multiconfig, and hash equiv are > enabled. The errors are all on recipes for which SRCREV = "${AUTOREV}". It doesn't always happen. But it did just now when I rebased > our "zeus-modified" branch onto the upstream "zeus" branch, to get the changes starting with > 7dc72fde6edeb5d6ac6b3832530998afeea67cbc. > > Two is that, sometimes "Initializing tasks" stage appears stuck at 44% for a couple minutes. I traced it down to this code in > runqueue.py (line 1168 on zeus): > > ? ? ? ? # Iterate over the task list and call into the siggen code > ? ? ? ? dealtwith = set() > ? ? ? ? todeal = set(self.runtaskentries) > ? ? ? ? while len(todeal) > 0: > ? ? ? ? ? ? for tid in todeal.copy(): > ? ? ? ? ? ? ? ? if len(self.runtaskentries[tid].depends - dealtwith) == 0: > ? ? ? ? ? ? ? ? ? ? dealtwith.add(tid) > ? ? ? ? ? ? ? ? ? ? todeal.remove(tid) > ? ? ? ? ? ? ? ? ? ? self.prepare_task_hash(tid) > > When I instrument the loop to print out the size of "todeal", I see it decrease very slowly, sometimes only a couple at a time. I'm > guessing this is because prepare_task_hash is contacting the hash equiv server, in a serial manner here. I'm over my work VPN which > makes things extra slow. Is there an opportunity for batching here? > > Batching is hard because the hashes you request might depend on hashes previous received from the server. It might be possible to > figure out these dependencies and submit multiple batch requests, but this would require some work in the code. Another option > would be to have some multi-level caching scheme where you can have a local database that mirrors your centralized server. > > If you have any ideas on how to make it faster, we would love to hear your opinion :) Gotcha, unfortunately I don't have any ideas right now :/. Regarding the first issue, any ideas there? Thanks, Chris From randy.macleod at windriver.com Wed Feb 12 17:17:05 2020 From: randy.macleod at windriver.com (Randy MacLeod) Date: Wed, 12 Feb 2020 12:17:05 -0500 Subject: [OE-core] [PATCH v6] expat: Added ptest In-Reply-To: <20200212121911.4752-1-oleksandr.s.popovych@globallogic.com> References: <20200212121911.4752-1-oleksandr.s.popovych@globallogic.com> Message-ID: On 2/12/20 7:19 AM, Oleksandr Popovych via Openembedded-core wrote: > For ptest support for this package several additional patches and > run-ptest script were added and recipe was changed. > > Signed-off-by: Oleksandr Popovych > --- > ...d-Makefile-targets-for-ptest-support.patch | 40 ++++++++++++++ > ...ort-for-ptests-in-form-of-new-target.patch | 33 ++++++++++++ > ...ed-suitable-format-of-tests-in-ptest.patch | 52 +++++++++++++++++++ > meta/recipes-core/expat/expat/run-ptest | 3 ++ > meta/recipes-core/expat/expat_2.2.9.bb | 12 ++++- > 5 files changed, 139 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > create mode 100644 meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > create mode 100644 meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > create mode 100644 meta/recipes-core/expat/expat/run-ptest > > diff --git a/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > new file mode 100644 > index 0000000000..de213b4bc5 > --- /dev/null > +++ b/meta/recipes-core/expat/expat/0001-expat-Added-Makefile-targets-for-ptest-support.patch > @@ -0,0 +1,40 @@ > +From e306bd4849f61f50dad1f5d29fb650c347d78ad6 Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:41:45 +0200 > +Subject: [PATCH 1/3] expat: Added Makefile targets for ptest support > + > +install-ptest, runtests and check tagrets are added. > + > +Upstream-Status: Inappropriate [oe-core specific] > + > +Signed-off-by: Oleksandr Popovych > +--- > + Makefile.am | 15 +++++++++++++++ > + 1 file changed, 15 insertions(+) > + > +diff --git a/Makefile.am b/Makefile.am > +index 5e1d37d..c63b44a 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -152,3 +152,18 @@ qa: > + QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh > + QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh > + QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh > ++ > ++.PHONY: install-ptest > ++install-ptest: if you call this, install-test and don't change the behaviour used when testing self-hosted development, then perhaps the upstream will accept the changes. > ++ echo $(S) > ++ (if [ -d tests/.libs ] ; then cd tests/.libs; fi; \ > ++ install runtests runtestspp $(DESTDIR)) > ++ cp Makefile $(DESTDIR) > ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile > ++ > ++.PHONY: runtests > ++runtests: > ++ @echo "C variant of tests:" > ++ @$(CHECKER) ./runtests$(EXEEXT) -q > ++ @echo "C++ variant of tests:" > ++ @$(CHECKER) ./runtestspp$(EXEEXT) -q > +-- > +2.17.1 > + > diff --git a/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > new file mode 100644 > index 0000000000..26ae144a37 > --- /dev/null > +++ b/meta/recipes-core/expat/expat/0002-expat-Added-support-for-ptests-in-form-of-new-target.patch > @@ -0,0 +1,33 @@ > +From 9a5085243b632a777f55269f7f6d2e40dd73a7bc Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:43:57 +0200 > +Subject: [PATCH 2/3] expat: Added support for ptests in form of new target > + > +configure.am file changed, according to this advice: > +https://wiki.yoctoproject.org/wiki/Ptest#Building_the_test_suite > + > +Upstream-Status: Inappropriate [oe-core specific] > + > +Signed-off-by: Oleksandr Popovych > +--- > + configure.ac | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index d58ac03..8e6b41e 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([Makefile.in]) > + AC_CONFIG_AUX_DIR([conftools]) > + AC_CONFIG_MACRO_DIR([m4]) > + AC_CANONICAL_HOST > +-AM_INIT_AUTOMAKE > +- > ++AM_INIT_AUTOMAKE([serial-tests]) > ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) Cross-compiling is increasingly common. Upstream might accept you changes to split up building, installing and running tests. Same goes for the PASS/ FAIL printfs below. Working with upstream takes a bit more time but if we don't have to carry patches for years, it's worth it. Finally, how about adding the test results in the long log with info about the image and machine used? The time needed to run the tests will be useful to determine if these ptests can be added to: ? meta/conf/distro/include/ptest-packagelists.inc and you could do that if the tests run in < 30 seconds in qemux86-64 with kvm support. Thanks, ../Randy > + > + dnl > + dnl Increment LIBREVISION if source code has changed at all > +-- > +2.17.1 > + > diff --git a/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > new file mode 100644 > index 0000000000..9a85a26117 > --- /dev/null > +++ b/meta/recipes-core/expat/expat/0003-expat-Added-suitable-format-of-tests-in-ptest.patch > @@ -0,0 +1,52 @@ > +From 825f344543676fc3314f4e074163fd638db8e8f9 Mon Sep 17 00:00:00 2001 > +From: Oleksandr Popovych > +Date: Thu, 6 Feb 2020 13:44:56 +0200 > +Subject: [PATCH 3/3] expat: Added suitable format of tests in ptest > + > +Some changes in testcases code were applied for testcase engine. > +This was just adding of message outputs in "RESULT: TESTNAME" form... > + > +Upstream-Status: Inappropriate [oe-core specific] > + > +Signed-off-by: Oleksandr Popovych > +--- > + tests/minicheck.c | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/tests/minicheck.c b/tests/minicheck.c > +index a5a1efb..b39cda9 100644 > +--- a/tests/minicheck.c > ++++ b/tests/minicheck.c > +@@ -164,6 +164,7 @@ srunner_run_all(SRunner *runner, int verbosity) { > + if (tc->setup != NULL) { > + /* setup */ > + if (setjmp(env)) { > ++ printf("SKIP: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > +@@ -171,6 +172,7 @@ srunner_run_all(SRunner *runner, int verbosity) { > + } > + /* test */ > + if (setjmp(env)) { > ++ printf("FAIL: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > +@@ -179,11 +181,13 @@ srunner_run_all(SRunner *runner, int verbosity) { > + /* teardown */ > + if (tc->teardown != NULL) { > + if (setjmp(env)) { > ++ printf("PASS: %s\n", _check_current_function); > + add_failure(runner, verbosity); > + continue; > + } > + tc->teardown(); > + } > ++ printf("PASS: %s\n", _check_current_function); > + } > + tc = tc->next_tcase; > + } > +-- > +2.17.1 > + > diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest > new file mode 100644 > index 0000000000..df994c0838 > --- /dev/null > +++ b/meta/recipes-core/expat/expat/run-ptest > @@ -0,0 +1,3 @@ > +#!/bin/bash > + > +make -k runtests > diff --git a/meta/recipes-core/expat/expat_2.2.9.bb b/meta/recipes-core/expat/expat_2.2.9.bb > index 8f3db41352..420ffddc80 100644 > --- a/meta/recipes-core/expat/expat_2.2.9.bb > +++ b/meta/recipes-core/expat/expat_2.2.9.bb > @@ -8,15 +8,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" > > SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ > file://libtool-tag.patch \ > + file://0001-expat-Added-Makefile-targets-for-ptest-support.patch \ > + file://0002-expat-Added-support-for-ptests-in-form-of-new-target.patch \ > + file://0003-expat-Added-suitable-format-of-tests-in-ptest.patch \ > + file://run-ptest \ > " > > SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" > SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" > > -inherit autotools lib_package > +inherit autotools ptest lib_package > + > +RDEPENDS_${PN}-ptest += "make bash" > > do_configure_prepend () { > rm -f ${S}/conftools/libtool.m4 > } > > +do_compile_ptest() { > + oe_runmake buildtest-TESTS > +} > + > BBCLASSEXTEND = "native nativesdk" -- # Randy MacLeod # Wind River Linux From raj.khem at gmail.com Wed Feb 12 17:18:04 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 09:18:04 -0800 Subject: [OE-core] [PATCH] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212051936.1610922-1-raj.khem@gmail.com> Message-ID: On 2/12/20 8:32 AM, Martin Jansa wrote: > Will this work for you without anonymous python? I think it should. > > PNBLACKLIST[dnf] ?= "${@oe.utils.conditional('PACKAGE_CLASSES', > 'package_rpm', '' 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" I like this better than anon python. Perhaps worth it in a v2 > > On Wed, Feb 12, 2020 at 4:12 PM Khem Raj > wrote: > > On Tue, Feb 11, 2020 at 11:11 PM Alexander Kanavin > > wrote: > > > > Please let?s try to avoid anonymous python. What problem does > this solve? If package_rpm is not enabled, then there should not be > a dependency chain that builds these anyway. > > for non rpm backend opkg, rpm is pulled in which is not desired > because opkg depends on libsolv > and libsolv by default depends on rpm which I sent another patch to > decouple, This caused opkg images to fail tests because testing infra > found rpm in the image and ran tests for it which obviously would > fail. > > ?libsolv does have rpm support as packageconfig but when that > is disabled then libdnf does not build anymore since it expects rpmdb > support in libsolv. > > so when we do world builds with opkg as package management then dnf > and libdbf starts to fail > due to their RPM needs. > > IF there was an override to identity packaging backends then we could > have used that > > If you have better suggestions to avoid anon python here, I am all ears. > > > > > Alex > > > > On Wed 12. Feb 2020 at 6.20, Khem Raj > wrote: > >> > >> dnf does not work with opkg or dpkg/apt anyway > >> > >> Signed-off-by: Khem Raj > > >> --- > >>? meta/recipes-devtools/dnf/dnf_4.2.2.bb > ? ? | 8 ++++++++ > >>? meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > | 7 +++++++ > >>? 2 files changed, 15 insertions(+) > >> > >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > > >> index f38167f1ad..9e6d5741af 100644 > >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> @@ -84,3 +84,11 @@ SYSTEMD_SERVICE_${PN} = > "dnf-makecache.service dnf-makecache.timer \ > >>? ? ? ? ? ? ? ? ? ? ? ? ? ?dnf-automatic-notifyonly.service > dnf-automatic-notifyonly.timer \ > >>? " > >>? SYSTEMD_AUTO_ENABLE ?= "disable" > >> + > >> +python () { > >> +? ? pkgb = d.getVar("PACKAGE_CLASSES") > >> +? ? pkgn = d.getVar("PN") > >> +? ? pkgv = d.getVar("PV") > >> +? ? if "package_rpm" not in pkgb: > >> +? ? ? ? raise bb.parse.SkipPackage("%s-%s Needs rpmdb support > in libsolv" % (pkgn, pkgv)) > >> +} > >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > > b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > > >> index 882c435b32..5c9326ca64 100644 > >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > > >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > > >> @@ -27,3 +27,10 @@ EXTRA_OECMAKE_append_class-nativesdk = " > -DWITH_GIR=OFF" > >> > >>? BBCLASSEXTEND = "native nativesdk" > >> > >> +python () { > >> +? ? pkgb = d.getVar("PACKAGE_CLASSES") > >> +? ? pkgn = d.getVar("PN") > >> +? ? pkgv = d.getVar("PV") > >> +? ? if "package_rpm" not in pkgb: > >> +? ? ? ? raise bb.parse.SkipPackage("%s-%s Needs rpmdb support > in libsolv" % (pkgn, pkgv)) > >> +} > >> -- > >> 2.25.0 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > From raj.khem at gmail.com Wed Feb 12 19:19:27 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 11:19:27 -0800 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm Message-ID: <20200212191927.2708197-1-raj.khem@gmail.com> dnf does not work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj --- v2: Use PNBLACKLIST instead of anon python meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f1ad..220f1aabbd 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435b32..49afa04812 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 12 22:00:28 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 12 Feb 2020 23:00:28 +0100 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: <20200212191927.2708197-1-raj.khem@gmail.com> References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: I would still prefer to just split rpm packaging into binaries and libraries, and avoid the need to blacklist and tweak recipes based on what PACKAGE_CLASSES is set to altogether. That setting should not leak into recipes, and should only matter from do_package onwards. Can you look into the rpm recipe please? Alex On Wed, 12 Feb 2020 at 20:19, Khem Raj wrote: > dnf does not work with opkg or dpkg/apt anyway > > Signed-off-by: Khem Raj > --- > v2: Use PNBLACKLIST instead of anon python > > meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ > meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > index f38167f1ad..220f1aabbd 100644 > --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service > dnf-makecache.timer \ > dnf-automatic-notifyonly.service > dnf-automatic-notifyonly.timer \ > " > SYSTEMD_AUTO_ENABLE ?= "disable" > + > +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > index 882c435b32..49afa04812 100644 > --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" > EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" > > BBCLASSEXTEND = "native nativesdk" > +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Wed Feb 12 22:16:08 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 14:16:08 -0800 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: On Wed, Feb 12, 2020 at 2:00 PM Alexander Kanavin wrote: > > I would still prefer to just split rpm packaging into binaries and libraries, and avoid the need to blacklist and tweak recipes based on what PACKAGE_CLASSES is set to altogether. That setting should not leak into recipes, and should only matter from do_package onwards. Can you look into the rpm recipe please? > dnf and dnf related packages expecting rpmdb support in libresolv. I do not know dnf well enough to fix it and moreover it has no direct use for my usecase either. I also don't see a point of entertaining dnf for non-rpm backends. Its not intended for that either even if we were to make dnf not want rpmdb what good will it do to build for distros who do not use rpm. These changes do not change poky defaults which use rpm as default. OE-core does not and I dont know of any opkg user who also has rpmdb needed. > Alex > > On Wed, 12 Feb 2020 at 20:19, Khem Raj wrote: >> >> dnf does not work with opkg or dpkg/apt anyway >> >> Signed-off-by: Khem Raj >> --- >> v2: Use PNBLACKLIST instead of anon python >> >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + >> 2 files changed, 3 insertions(+) >> >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> index f38167f1ad..220f1aabbd 100644 >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ >> dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ >> " >> SYSTEMD_AUTO_ENABLE ?= "disable" >> + >> +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> index 882c435b32..49afa04812 100644 >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" >> EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" >> >> BBCLASSEXTEND = "native nativesdk" >> +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" >> >> -- >> 2.25.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From kexin.hao at windriver.com Thu Feb 13 02:31:41 2020 From: kexin.hao at windriver.com (Kevin Hao) Date: Thu, 13 Feb 2020 10:31:41 +0800 Subject: [OE-core] [PATCH] wic: Honor APPEND Message-ID: <20200213023141.1657-1-kexin.hao@windriver.com> APPEND is used to add additional parameters to kernel by features, such as read-only-rootfs. So we should honor this variable when we compose the kernel parameter in wic. I know we also can resolve this kind of issue by using the .wks.in template introduced by commit 42e870c5ed4b ("image_types.bbclass: support template .wks.in files for wic"), but the APPEND is needed by all the wks, it would seems pretty ridiculous to me to change all the .wks to .wks.in and then foist the APPEND into them. So the APPEND is definitely deserved to export to the wic directly. [Yocto #12809] Signed-off-by: Kevin Hao --- meta/classes/image_types_wic.bbclass | 2 +- scripts/lib/wic/ksparser.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index fc9b106a9a81..b83308b45cb5 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -4,7 +4,7 @@ WICVARS ?= "\ BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ - KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME" + KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND" inherit ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 707a2e801962..650b976223e0 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -246,6 +246,11 @@ class KickStart(): elif line.startswith('bootloader'): if not self.bootloader: self.bootloader = parsed + # Concatenate the strings set in APPEND + append_var = get_bitbake_var("APPEND") + if append_var: + self.bootloader.append = ' '.join(filter(None, \ + (self.bootloader.append, append_var))) else: err = "%s:%d: more than one bootloader specified" \ % (confpath, lineno) -- 2.25.0.191.gde93cc14ab7e From alex.kanavin at gmail.com Thu Feb 13 04:49:42 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 05:49:42 +0100 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: But you do not need to fix or touch dnf at all. You only need to adjust rpm packaging and split it in two parts instead of bundling everything into a single package. Alex On Wed 12. Feb 2020 at 23.16, Khem Raj wrote: > On Wed, Feb 12, 2020 at 2:00 PM Alexander Kanavin > wrote: > > > > I would still prefer to just split rpm packaging into binaries and > libraries, and avoid the need to blacklist and tweak recipes based on what > PACKAGE_CLASSES is set to altogether. That setting should not leak into > recipes, and should only matter from do_package onwards. Can you look into > the rpm recipe please? > > > > dnf and dnf related packages expecting rpmdb support in libresolv. I > do not know dnf well enough to fix it and moreover it has no direct > use for my usecase either. I also don't see a point of entertaining > dnf for non-rpm backends. Its not intended for that either even if we > were to make dnf not want rpmdb what good will it do to build for > distros who do not use rpm. These changes do not change poky defaults > which use rpm as default. OE-core does not and I dont know of any > opkg user who also has rpmdb needed. > > > Alex > > > > On Wed, 12 Feb 2020 at 20:19, Khem Raj wrote: > >> > >> dnf does not work with opkg or dpkg/apt anyway > >> > >> Signed-off-by: Khem Raj > >> --- > >> v2: Use PNBLACKLIST instead of anon python > >> > >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ > >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + > >> 2 files changed, 3 insertions(+) > >> > >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> index f38167f1ad..220f1aabbd 100644 > >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service > dnf-makecache.timer \ > >> dnf-automatic-notifyonly.service > dnf-automatic-notifyonly.timer \ > >> " > >> SYSTEMD_AUTO_ENABLE ?= "disable" > >> + > >> +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> index 882c435b32..49afa04812 100644 > >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" > >> EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" > >> > >> BBCLASSEXTEND = "native nativesdk" > >> +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > >> > >> -- > >> 2.25.0 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 13 06:01:07 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:01:07 -0800 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: On Wed, Feb 12, 2020 at 8:49 PM Alexander Kanavin wrote: > > But you do not need to fix or touch dnf at all. You only need to adjust rpm packaging and split it in two parts instead of bundling everything into a single package. > when we do world builds without package_rpm, dnf and related packages get compiled which is unnecessary and moreover wrong and when we mark libsolv to enable rpmdb only for package_rpm, this becomes even more evident. Perhaps, I am missing what you intend to convey, in that case maybe you can send code changes to support what you are intending here. > Alex > > On Wed 12. Feb 2020 at 23.16, Khem Raj wrote: >> >> On Wed, Feb 12, 2020 at 2:00 PM Alexander Kanavin >> wrote: >> > >> > I would still prefer to just split rpm packaging into binaries and libraries, and avoid the need to blacklist and tweak recipes based on what PACKAGE_CLASSES is set to altogether. That setting should not leak into recipes, and should only matter from do_package onwards. Can you look into the rpm recipe please? >> > >> >> dnf and dnf related packages expecting rpmdb support in libresolv. I >> do not know dnf well enough to fix it and moreover it has no direct >> use for my usecase either. I also don't see a point of entertaining >> dnf for non-rpm backends. Its not intended for that either even if we >> were to make dnf not want rpmdb what good will it do to build for >> distros who do not use rpm. These changes do not change poky defaults >> which use rpm as default. OE-core does not and I dont know of any >> opkg user who also has rpmdb needed. >> >> > Alex >> > >> > On Wed, 12 Feb 2020 at 20:19, Khem Raj wrote: >> >> >> >> dnf does not work with opkg or dpkg/apt anyway >> >> >> >> Signed-off-by: Khem Raj >> >> --- >> >> v2: Use PNBLACKLIST instead of anon python >> >> >> >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ >> >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + >> >> 2 files changed, 3 insertions(+) >> >> >> >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> index f38167f1ad..220f1aabbd 100644 >> >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ >> >> dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ >> >> " >> >> SYSTEMD_AUTO_ENABLE ?= "disable" >> >> + >> >> +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" >> >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> index 882c435b32..49afa04812 100644 >> >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" >> >> EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" >> >> >> >> BBCLASSEXTEND = "native nativesdk" >> >> +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" >> >> >> >> -- >> >> 2.25.0 >> >> >> >> -- >> >> _______________________________________________ >> >> Openembedded-core mailing list >> >> Openembedded-core at lists.openembedded.org >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kiernan at gmail.com Thu Feb 13 06:16:49 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Thu, 13 Feb 2020 06:16:49 +0000 Subject: [OE-core] [OE-Core][PATCH v2] systemd: upgrade v244.1 -> v244.3 Message-ID: <20200213061649.102346-1-alex.kiernan@gmail.com> Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan --- Changes in v2: - fix SRC_URI now v244.3 tag exists on v244-stable .../systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} | 0 .../systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- .../recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (100%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96ecc4f..e73b397b5d64 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- 2.17.1 From alex.kiernan at gmail.com Thu Feb 13 06:21:30 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Thu, 13 Feb 2020 06:21:30 +0000 Subject: [OE-core] [OE-Core][PATCH v2] iputils: Fix systemd and ipv6 detection Message-ID: <20200213062130.103110-1-alex.kiernan@gmail.com> When systemd is enabled, ensure iputils detects it correctly. Split out IPv6 only features based on ipv6 enabled in DISTRO_FEATURES. Signed-off-by: Alex Kiernan --- Changes in v2: - ninfod: fix systemd Documentation url error - rarpd: rdisc: Drop PrivateUsers ...-fix-systemd-Documentation-url-error.patch | 28 +++++++++++ .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 +++++++++++++++++++ .../iputils/iputils_s20190709.bb | 23 +++++++--- 3 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch create mode 100644 meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch new file mode 100644 index 000000000000..58bbb3122b48 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch @@ -0,0 +1,28 @@ +From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001 +From: Andrea Stevanato +Date: Tue, 5 Nov 2019 19:08:30 +0000 +Subject: [PATCH] ninfod: fix systemd Documentation url error + +systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8) + +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9] +Signed-of-by: Alex Kiernan +--- + systemd/ninfod.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in +index 5ab69ca00e96..8e79fcd9238e 100644 +--- a/systemd/ninfod.service.in ++++ b/systemd/ninfod.service.in +@@ -1,6 +1,6 @@ + [Unit] + Description=Respond to IPv6 Node Information Queries +-Documentation=ninfod(8) ++Documentation=man:ninfod(8) + Requires=network.target + After=network.target + +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch new file mode 100644 index 000000000000..d7367caf7877 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch @@ -0,0 +1,46 @@ +From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 13 Feb 2020 06:08:45 +0000 +Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers + +Neither rarpd nor rdisc can gain the necessary capabilities with +PrivateUsers enabled. + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + systemd/rarpd.service.in | 1 - + systemd/rdisc.service.in | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in +index e600c10c93e6..f5d7621a7ce8 100644 +--- a/systemd/rarpd.service.in ++++ b/systemd/rarpd.service.in +@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW + DynamicUser=yes + PrivateTmp=yes + PrivateDevices=yes +-PrivateUsers=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in +index 4e2a1ec9d0e5..a71b87d36b37 100644 +--- a/systemd/rdisc.service.in ++++ b/systemd/rdisc.service.in +@@ -8,9 +8,10 @@ After=network.target + EnvironmentFile=-/etc/sysconfig/rdisc + ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS + ++CapabilityBoundingSet=CAP_NET_RAW + AmbientCapabilities=CAP_NET_RAW + PrivateTmp=yes +-PrivateUsers=yes ++DynamicUser=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index e0d2ae160ee0..2aed6b56ca99 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -12,6 +12,8 @@ DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils \ file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ + file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ + file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ " SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" @@ -23,16 +25,20 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?Ps\d+)" # breaks the version order. CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" -PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" +PACKAGECONFIG ??= "libcap libgcrypt rarpd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" -inherit meson update-alternatives +inherit meson systemd update-alternatives # Have to disable setcap/suid as its not deterministic EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" @@ -42,12 +48,12 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ + ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" PACKAGES += "${SPLITPKGS}" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-rarpd = "1" -ALLOW_EMPTY_${PN}-traceroute6 = "1" RDEPENDS_${PN} += "${SPLITPKGS}" FILES_${PN} = "" @@ -57,6 +63,11 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_sbindir}/rarpd" +FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd at .service" FILES_${PN}-rdisc = "${base_sbindir}/rdisc" FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ + ${PN}-rdisc" +SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" +SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" -- 2.17.1 From denis at denix.org Thu Feb 13 06:23:44 2020 From: denis at denix.org (Denys Dmytriyenko) Date: Thu, 13 Feb 2020 01:23:44 -0500 Subject: [OE-core] [PATCH] wayland: upgrade 1.17.0 -> 1.18.0 Message-ID: <1581575024-31531-1-git-send-email-denis@denix.org> From: Denys Dmytriyenko This is the official release for Wayland 1.18. The main new features in this release are: - Add support for the Meson build system (autotools is still supported but will be removed in a future release) - Add API to tag proxy objects to allow applications and toolkits to share the same Wayland connection - Track wayland-server timers in user-space to prevent creating too many FDs - Add wl_global_remove, a new function to mitigate race conditions with globals https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html 2 upstreamed patches are dropped. Signed-off-by: Denys Dmytriyenko --- ...1-scanner-Add-configure-check-for-strndup.patch | 50 ------- ...l_priv_signal-to-wayland-server-private.h.patch | 166 --------------------- .../{wayland_1.17.0.bb => wayland_1.18.0.bb} | 8 +- 3 files changed, 3 insertions(+), 221 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch rename meta/recipes-graphics/wayland/{wayland_1.17.0.bb => wayland_1.18.0.bb} (84%) diff --git a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch b/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch deleted file mode 100644 index c443587..0000000 --- a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3c8b4467a1ca229e72fb5223787ed400a19c65c0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Fri, 25 Oct 2019 21:03:23 -0500 -Subject: [PATCH] scanner: Add configure check for strndup - -Some platforms may not have strndup() (e.g. MinGW), so provide a -equivalent implementation if it's not found. - -Upstream-Status: Accepted [4a1f348c20157db7bd7c759fdeb23fbe8729c571] -Signed-off-by: Joshua Watt ---- - configure.ac | 2 +- - src/scanner.c | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d56f2b..1c99e21 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,7 +63,7 @@ fi - AC_SUBST(GCC_CFLAGS) - - AC_CHECK_HEADERS([sys/prctl.h]) --AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl]) -+AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl strndup]) - - AC_ARG_ENABLE([libraries], - [AC_HELP_STRING([--disable-libraries], -diff --git a/src/scanner.c b/src/scanner.c -index a94be5d..27004bc 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -916,6 +916,17 @@ verify_arguments(struct parse_context *ctx, - - } - -+#ifndef HAVE_STRNDUP -+char * -+strndup(const char *s, size_t size) -+{ -+ char *r = malloc(size + 1); -+ strncpy(r, s, size); -+ r[size] = '\0'; -+ return r; -+} -+#endif -+ - static void - end_element(void *data, const XML_Char *name) - { diff --git a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch b/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch deleted file mode 100644 index b05b875..0000000 --- a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch +++ /dev/null @@ -1,166 +0,0 @@ -From e746f3bf7c8bb2f5dcf9e93edffc23b56eff12d0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Tue, 5 Nov 2019 09:09:50 -0600 -Subject: [PATCH] Move wl_priv_signal to wayland-server-private.h - -Including wayland-server-core.h in wayland-private.h is problematic -because wayland-private.h is included by wayland-scanner which should be -able to build against non-POSIX platforms (e.g. MinGW). The only reason -that wayland-server-core.h was included in wayland-private.h was for the -wl_private_signal definitions, so move those to a -wayland-server-private.h file that can be included by both -wayland-server.c and the tests. - -Upstream-Status: Accepted [e7d88f35eb89cf0cc77cbddd834cacc63683a9cc] -Signed-off-by: Joshua Watt ---- - Makefile.am | 3 +- - src/wayland-private.h | 22 +-------------- - src/wayland-server-private.h | 53 ++++++++++++++++++++++++++++++++++++ - src/wayland-server.c | 1 + - tests/newsignal-test.c | 2 +- - 5 files changed, 58 insertions(+), 23 deletions(-) - create mode 100644 src/wayland-server-private.h - -diff --git a/Makefile.am b/Makefile.am -index f47d055..026d981 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,7 +56,8 @@ libwayland_private_la_SOURCES = \ - src/connection.c \ - src/wayland-os.c \ - src/wayland-os.h \ -- src/wayland-private.h -+ src/wayland-private.h \ -+ src/wayland-server-private.h - - include_HEADERS = \ - src/wayland-util.h \ -diff --git a/src/wayland-private.h b/src/wayland-private.h -index 29516ec..dc7d12f 100644 ---- a/src/wayland-private.h -+++ b/src/wayland-private.h -@@ -31,11 +31,11 @@ - #include - #include - #include -+#include - - #define WL_HIDE_DEPRECATED 1 - - #include "wayland-util.h" --#include "wayland-server-core.h" - - /* Invalid memory address */ - #define WL_ARRAY_POISON_PTR (void *) 4 -@@ -236,26 +236,6 @@ zalloc(size_t s) - return calloc(1, s); - } - --struct wl_priv_signal { -- struct wl_list listener_list; -- struct wl_list emit_list; --}; -- --void --wl_priv_signal_init(struct wl_priv_signal *signal); -- --void --wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -- --struct wl_listener * --wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -- --void --wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -- --void --wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -- - void - wl_connection_close_fds_in(struct wl_connection *connection, int max); - -diff --git a/src/wayland-server-private.h b/src/wayland-server-private.h -new file mode 100644 -index 0000000..23fa458 ---- /dev/null -+++ b/src/wayland-server-private.h -@@ -0,0 +1,53 @@ -+/* -+ * Copyright ? 2008-2011 Kristian H?gsberg -+ * Copyright ? 2011 Intel Corporation -+ * Copyright ? 2013 Jason Ekstrand -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ * SOFTWARE. -+ */ -+ -+#ifndef WAYLAND_SERVER_PRIVATE_H -+#define WAYLAND_SERVER_PRIVATE_H -+ -+#include "wayland-server-core.h" -+ -+struct wl_priv_signal { -+ struct wl_list listener_list; -+ struct wl_list emit_list; -+}; -+ -+void -+wl_priv_signal_init(struct wl_priv_signal *signal); -+ -+void -+wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener *listener); -+ -+struct wl_listener * -+wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t notify); -+ -+void -+wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); -+ -+void -+wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); -+ -+#endif -diff --git a/src/wayland-server.c b/src/wayland-server.c -index 19f6a76..d6f0206 100644 ---- a/src/wayland-server.c -+++ b/src/wayland-server.c -@@ -45,6 +45,7 @@ - - #include "wayland-util.h" - #include "wayland-private.h" -+#include "wayland-server-private.h" - #include "wayland-server.h" - #include "wayland-os.h" - -diff --git a/tests/newsignal-test.c b/tests/newsignal-test.c -index 47c429b..f3a7bd9 100644 ---- a/tests/newsignal-test.c -+++ b/tests/newsignal-test.c -@@ -26,7 +26,7 @@ - #include - - #include "test-runner.h" --#include "wayland-private.h" -+#include "wayland-server-private.h" - - static void - signal_notify(struct wl_listener *listener, void *data) diff --git a/meta/recipes-graphics/wayland/wayland_1.17.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb similarity index 84% rename from meta/recipes-graphics/wayland/wayland_1.17.0.bb rename to meta/recipes-graphics/wayland/wayland_1.18.0.bb index 12916a0..7a3f075 100644 --- a/meta/recipes-graphics/wayland/wayland_1.17.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,12 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ - file://0001-scanner-Add-configure-check-for-strndup.patch \ - file://0002-Move-wl_priv_signal-to-wayland-server-private.h.patch \ + file://fixpathinpcfiles.patch \ " -SRC_URI[md5sum] = "d91f970aea11fd549eae023d06f91af3" -SRC_URI[sha256sum] = "72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4" +SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" +SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -- 2.7.4 From patchwork at patchwork.openembedded.org Thu Feb 13 06:32:50 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Thu, 13 Feb 2020 06:32:50 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_iputils=3A?= =?utf-8?q?_Fix_systemd_and_ipv6_detection_=28rev2=29?= In-Reply-To: <20200213062130.103110-1-alex.kiernan@gmail.com> References: <20200213062130.103110-1-alex.kiernan@gmail.com> Message-ID: <20200213063250.2276.60932@do> == Series Details == Series: iputils: Fix systemd and ipv6 detection (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22554/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fix Sign off the added patch file (meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From raj.khem at gmail.com Thu Feb 13 06:38:10 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:10 -0800 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes Message-ID: - Update gdb to 9.1 and musl to latest - Fix packages busybox, ltp to build with musl exposed 64bit time_t problems - rest of all fixes are found testing core-image-sato-sdk on qemuarm/qemux86_64 - Add a check for gold being used on rv32/rv64 The following changes since commit 34535f3e0ca6f6e37e6457fc800dfbfff64d9298: bitbake: doc: minor tweaks to ch 1 of BB user manual (2020-02-08 17:41:17 +0000) are available in the Git repository at: git://git.yoctoproject.org/poky-contrib kraj/pu http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kraj/pu Khem Raj (9): qemuarm: Disable highmem when QB_MACHINE is virt oeqa: Use --disable-maintainer-mode configure option libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled dnf,libdnf: Ignore if PACKAGE_CLASSES does not have rpm musl: Update to latest tip gdb: Upgrade to 9.1 release busybox: Backport patches to support removal of __NR_clock_gettime binutils: Bail out if gold is used on 32/64 bit RISC-V ltp: Fix tescases with 64bit time_t using 32bit arches meta/conf/distro/include/tcmode-default.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- ...rappers-around-clock_gettime-closes-.patch | 113 +++++++++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + meta/recipes-core/musl/musl_git.bb | 2 +- meta/recipes-devtools/binutils/binutils.inc | 7 + meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 + meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 --- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 +++ ...ian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 ...ake-man-install-relative-to-DESTDIR.patch} | 9 +- ...x-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...ort-for-Renesas-SH-sh4-architecture.patch} | 41 +++--- ...eadline.a-when-using-disable-static.patch} | 13 +- ...s.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...atch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...9-resolve-restrict-keyword-conflict.patch} | 17 +-- ...> 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++- ...h => 0011-gdbserver-ctrl-c-handling.patch} | 31 ++-- .../gdb/gdb/CVE-2019-1010180.patch | 132 ------------------ .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + .../libsolv/libsolv_0.7.10.bb | 2 +- ...or-time64-unsafe-syscalls-before-usi.patch | 81 +++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + 32 files changed, 416 insertions(+), 258 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch delete mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} (100%) rename meta/recipes-devtools/gdb/gdb/{0002-make-man-install-relative-to-DESTDIR.patch => 0001-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0005-Add-support-for-Renesas-SH-sh4-architecture.patch => 0004-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0006-Dont-disable-libreadline.a-when-using-disable-static.patch => 0005-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0007-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0008-Use-exorted-definitions-of-SIGRTMIN.patch => 0007-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0009-Change-order-of-CFLAGS.patch => 0008-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0010-resolve-restrict-keyword-conflict.patch => 0009-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0011-Fix-invalid-sigprocmask-call.patch => 0010-Fix-invalid-sigprocmask-call.patch} (65%) rename meta/recipes-devtools/gdb/gdb/{0001-gdbserver-ctrl-c-handling.patch => 0011-gdbserver-ctrl-c-handling.patch} (45%) delete mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_8.3.1.bb => gdb_9.1.bb} (100%) create mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:15 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:15 -0800 Subject: [OE-core] [PATCH 1/9] qemuarm: Disable highmem when QB_MACHINE is virt In-Reply-To: References: Message-ID: <4b64efecf0750245cd0bb42d2864533688d8530f.1581575578.git.raj.khem@gmail.com> running ptests on qemuarm returns fails since it finds errors in kernel logs like below *********************** Central error: [ 4.338465] pci-host-generic 4010000000.pcie: ECAM ioremap failed *********************** Since its a 32bit kernel 4010000000 address is truncated to 10000000 and ends up in conflicts with VIRT_PCIE_MMIO, which ranges from 0x10000000 to 0x3efeffff This is happening because the linux-yocto kernel is not compiled with LPAE support, however, virt machine for qemuarm assumes that by default Should LPAE be enabled by default in kernel config is a separate question Signed-off-by: Khem Raj --- meta/conf/machine/qemuarm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 26f40b1419..367fcef019 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -11,7 +11,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" -QB_MACHINE = "-machine virt" +QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:16 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:16 -0800 Subject: [OE-core] [PATCH 2/9] oeqa: Use --disable-maintainer-mode configure option In-Reply-To: References: Message-ID: since the versions of autotools might differ on target and build host, plus difference in timestamps for configure and system can result in reconfigure lets avoid that by disabling maintainer mode Avoids error: newly created file is older than distributed files! [YOCTO #13779] Suggested-by: Andre McCurdy Signed-off-by: Khem Raj --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd37e..d0f91668b2 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('--disable-maintainer-mode','') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb38f..902e93f623 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:17 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:17 -0800 Subject: [OE-core] [PATCH 3/9] libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled In-Reply-To: References: Message-ID: <03e628eda8b5438fbc6fb1cd09e0d850485d2dd6.1581575578.git.raj.khem@gmail.com> opkg also depends on libsolv and can needlessly pull in rpm even if the O_P_M does not desire to use rpm Signed-off-by: Khem Raj --- meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb index 502f4e0e85..265a27c00d 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit cmake -PACKAGECONFIG ??= "rpm" +PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:18 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:18 -0800 Subject: [OE-core] [PATCH 4/9] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: Message-ID: <9bb12593baf723d5b00320c25c0658c77919c304.1581575578.git.raj.khem@gmail.com> dnf does not work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj --- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f1ad..220f1aabbd 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435b32..49afa04812 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:19 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:19 -0800 Subject: [OE-core] [PATCH 5/9] musl: Update to latest tip In-Reply-To: References: Message-ID: <8002e94e6b5f865feb0a17a2454d53b7f748e965.1581575578.git.raj.khem@gmail.com> Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4f2e..b6ec6fe9af 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:20 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:20 -0800 Subject: [OE-core] [PATCH 6/9] gdb: Upgrade to 9.1 release In-Reply-To: References: Message-ID: <650b515ce0c79adcbba39cdf47bc23f764ca1465.1581575578.git.raj.khem@gmail.com> Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 --- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 +++ ...ian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 ...ake-man-install-relative-to-DESTDIR.patch} | 9 +- ...x-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...ort-for-Renesas-SH-sh4-architecture.patch} | 41 +++--- ...eadline.a-when-using-disable-static.patch} | 13 +- ...s.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...atch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...9-resolve-restrict-keyword-conflict.patch} | 17 +-- ...> 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++- ...h => 0011-gdbserver-ctrl-c-handling.patch} | 31 ++-- .../gdb/gdb/CVE-2019-1010180.patch | 132 ------------------ .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 18 files changed, 107 insertions(+), 253 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} (100%) rename meta/recipes-devtools/gdb/gdb/{0002-make-man-install-relative-to-DESTDIR.patch => 0001-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0005-Add-support-for-Renesas-SH-sh4-architecture.patch => 0004-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0006-Dont-disable-libreadline.a-when-using-disable-static.patch => 0005-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0007-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0008-Use-exorted-definitions-of-SIGRTMIN.patch => 0007-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0009-Change-order-of-CFLAGS.patch => 0008-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0010-resolve-restrict-keyword-conflict.patch => 0009-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0011-Fix-invalid-sigprocmask-call.patch => 0010-Fix-invalid-sigprocmask-call.patch} (65%) rename meta/recipes-devtools/gdb/gdb/{0001-gdbserver-ctrl-c-handling.patch => 0011-gdbserver-ctrl-c-handling.patch} (45%) delete mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_8.3.1.bb => gdb_9.1.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5ae16..b451f0ba26 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f3ce..0000000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000000..d019e6b384 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5410..82287ea13a 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74c09..6067caf63d 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512ef7..c4bab7bb1a 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840cafe2e..fd165d4b81 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee62be..d0360da439 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bfa14..d222d01083 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5fd60..09896611f0 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26835..18168c6bae 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f250..8f15c49d0e 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c391..5209c00275 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch similarity index 45% rename from meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch rename to meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch index 71fe7f83b6..eedd94c4d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -1,19 +1,32 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to interrupt the attached process. -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] Author: Josh Gao Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) static void linux_request_interrupt (void) { diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a713..0000000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:22 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:22 -0800 Subject: [OE-core] [PATCH 8/9] binutils: Bail out if gold is used on 32/64 bit RISC-V In-Reply-To: References: Message-ID: <11cf7d82deafd496d30a4a28a38a3b1121762f9e.1581575578.git.raj.khem@gmail.com> gold is not supporting risc-v yet and, this will cause subltle errors during build e.g. autoconf not finding certain features like visibility and it could take a while to unwind the problem. Its better to error out early Remove dwp and ld.gold for rv32 as well Signed-off-by: Khem Raj --- meta/recipes-devtools/binutils/binutils.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 0fb6cae407..f06ccc31b7 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -40,6 +40,7 @@ FILES_${PN}-dev = " \ LDGOLD_ALTS ?= "ld.gold dwp" LDGOLD_ALTS_riscv64 = "" +LDGOLD_ALTS_riscv32 = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -83,6 +84,7 @@ LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" + # This is necessary due to a bug in the binutils Makefiles # EXTRA_OEMAKE = "configure-build-libiberty all" @@ -163,3 +165,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d): + bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") +} -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:21 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:21 -0800 Subject: [OE-core] [PATCH 7/9] busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: References: Message-ID: <0ed1fb312bbdfc1bcda92d8f153cbca0ba39fb1e.1581575578.git.raj.khem@gmail.com> This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj --- ...rappers-around-clock_gettime-closes-.patch | 113 ++++++++++++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 43 +++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000000..f6fbed338a --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..944526b7ca --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..58a6c0d8a0 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102eb2b..bbc5fa1572 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 06:38:23 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 12 Feb 2020 22:38:23 -0800 Subject: [OE-core] [PATCH 9/9] ltp: Fix tescases with 64bit time_t using 32bit arches In-Reply-To: References: Message-ID: <02efd07db0d224016689a0a43321742e406079ef.1581575578.git.raj.khem@gmail.com> This helps it compile on musl Fixes | tst_clocks.c:31:17: error: 'SYS_clock_getres' undeclared (first use in this function); did you mean 'tst_clock_getres Signed-off-by: Khem Raj --- ...or-time64-unsafe-syscalls-before-usi.patch | 81 +++++++++++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch new file mode 100644 index 0000000000..92e5fdfe6e --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -0,0 +1,81 @@ +From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Feb 2020 22:22:17 -0800 +Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them + +musl is using 64bit time_t now on 32bit architectures and these syscalls +no longer exist, therefore its better to check for them being available +before using them + +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Signed-off-by: Khem Raj +--- + lib/tst_clocks.c | 9 +++++++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ + 3 files changed, 17 insertions(+) + +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 35798a4aaf..6a5b05c4ea 100644 +--- a/lib/tst_clocks.c ++++ b/lib/tst_clocks.c +@@ -28,15 +28,24 @@ + + int tst_clock_getres(clockid_t clk_id, struct timespec *res) + { ++#if defined(__NR_clock_getres) + return syscall(SYS_clock_getres, clk_id, res); ++#endif ++ return -1; + } + + int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + return syscall(SYS_clock_gettime, clk_id, ts); ++#endif ++ return -1; + } + + int tst_clock_settime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_settime) + return syscall(SYS_clock_settime, clk_id, ts); ++#endif ++ return -1; + } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9b..b498de5b68 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +@@ -41,7 +41,11 @@ + #include + #include + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + char *TCID = "gettimeofday01"; + int TST_TOTAL = 1; +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e8..218e017df8 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +@@ -23,7 +23,11 @@ + + #include "tst_test.h" + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + static volatile sig_atomic_t done; + static char *str_rtime; +-- +2.25.0 + diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20190930.bb index 2853b1c819..19bd7bc9c6 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20190930.bb @@ -42,6 +42,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ + file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " S = "${WORKDIR}/git" -- 2.25.0 From bunk at stusta.de Thu Feb 13 07:31:51 2020 From: bunk at stusta.de (Adrian Bunk) Date: Thu, 13 Feb 2020 09:31:51 +0200 Subject: [OE-core] [PATCH 8/9] binutils: Bail out if gold is used on 32/64 bit RISC-V In-Reply-To: <11cf7d82deafd496d30a4a28a38a3b1121762f9e.1581575578.git.raj.khem@gmail.com> References: <11cf7d82deafd496d30a4a28a38a3b1121762f9e.1581575578.git.raj.khem@gmail.com> Message-ID: <20200213073151.GA20530@localhost> On Wed, Feb 12, 2020 at 10:38:22PM -0800, Khem Raj wrote: > gold is not supporting risc-v yet and, this will cause subltle errors > during build e.g. autoconf not finding certain features like visibility > and it could take a while to unwind the problem. Its better to error out > early >... > @@ -163,3 +165,8 @@ inherit update-alternatives > ALTERNATIVE_PRIORITY = "100" > > ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" > + > +python () { > + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d): > + bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") > +} This lacks some check for RISC-V, currently it errors for all architectures. cu Adrian From alex.kanavin at gmail.com Thu Feb 13 07:53:24 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 08:53:24 +0100 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: World builds also enable apt and dpkg, but there is no problem with that for you? There is no consistency here; if you want to start excluding things from world based on what packaging is enabled, you need to treat all options equally, including deb and ipk. The original problem was that libsolv pulls in the full set of rpm executables and libraries, which erroneously triggers the rpm test on target. We can solve this by making libsolv pull in only the rpm libraries and not executables, so that rpm test will be skipped. Or maybe even make the test itself check whether rpm is the packaging format and skip otherwise. Alex On Thu 13. Feb 2020 at 7.01, Khem Raj wrote: > On Wed, Feb 12, 2020 at 8:49 PM Alexander Kanavin > wrote: > > > > But you do not need to fix or touch dnf at all. You only need to adjust > rpm packaging and split it in two parts instead of bundling everything into > a single package. > > > > when we do world builds without package_rpm, dnf and related packages > get compiled which is unnecessary and moreover wrong and when we mark > libsolv to enable rpmdb only for package_rpm, this becomes even more > evident. > > Perhaps, I am missing what you intend to convey, in that case maybe you > can send > code changes to support what you are intending here. > > > Alex > > > > On Wed 12. Feb 2020 at 23.16, Khem Raj wrote: > >> > >> On Wed, Feb 12, 2020 at 2:00 PM Alexander Kanavin > >> wrote: > >> > > >> > I would still prefer to just split rpm packaging into binaries and > libraries, and avoid the need to blacklist and tweak recipes based on what > PACKAGE_CLASSES is set to altogether. That setting should not leak into > recipes, and should only matter from do_package onwards. Can you look into > the rpm recipe please? > >> > > >> > >> dnf and dnf related packages expecting rpmdb support in libresolv. I > >> do not know dnf well enough to fix it and moreover it has no direct > >> use for my usecase either. I also don't see a point of entertaining > >> dnf for non-rpm backends. Its not intended for that either even if we > >> were to make dnf not want rpmdb what good will it do to build for > >> distros who do not use rpm. These changes do not change poky defaults > >> which use rpm as default. OE-core does not and I dont know of any > >> opkg user who also has rpmdb needed. > >> > >> > Alex > >> > > >> > On Wed, 12 Feb 2020 at 20:19, Khem Raj wrote: > >> >> > >> >> dnf does not work with opkg or dpkg/apt anyway > >> >> > >> >> Signed-off-by: Khem Raj > >> >> --- > >> >> v2: Use PNBLACKLIST instead of anon python > >> >> > >> >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ > >> >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + > >> >> 2 files changed, 3 insertions(+) > >> >> > >> >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> >> index f38167f1ad..220f1aabbd 100644 > >> >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > >> >> @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service > dnf-makecache.timer \ > >> >> dnf-automatic-notifyonly.service > dnf-automatic-notifyonly.timer \ > >> >> " > >> >> SYSTEMD_AUTO_ENABLE ?= "disable" > >> >> + > >> >> +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > >> >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> >> index 882c435b32..49afa04812 100644 > >> >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > >> >> @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " > -DWITH_GIR=OFF" > >> >> EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" > >> >> > >> >> BBCLASSEXTEND = "native nativesdk" > >> >> +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > >> >> > >> >> -- > >> >> 2.25.0 > >> >> > >> >> -- > >> >> _______________________________________________ > >> >> Openembedded-core mailing list > >> >> Openembedded-core at lists.openembedded.org > >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 13 08:08:54 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 09:08:54 +0100 Subject: [OE-core] [PATCH] wayland: upgrade 1.17.0 -> 1.18.0 In-Reply-To: <1581575024-31531-1-git-send-email-denis@denix.org> References: <1581575024-31531-1-git-send-email-denis@denix.org> Message-ID: Can you prepare the meson conversion as a separate patch please? Alex On Thu 13. Feb 2020 at 7.29, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko > > This is the official release for Wayland 1.18. The main new features in > this release are: > > - Add support for the Meson build system (autotools is still supported > but will be removed in a future release) > - Add API to tag proxy objects to allow applications and toolkits to > share the same Wayland connection > - Track wayland-server timers in user-space to prevent creating too > many FDs > - Add wl_global_remove, a new function to mitigate race conditions with > globals > > https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html > > 2 upstreamed patches are dropped. > > Signed-off-by: Denys Dmytriyenko > --- > ...1-scanner-Add-configure-check-for-strndup.patch | 50 ------- > ...l_priv_signal-to-wayland-server-private.h.patch | 166 > --------------------- > .../{wayland_1.17.0.bb => wayland_1.18.0.bb} | 8 +- > 3 files changed, 3 insertions(+), 221 deletions(-) > delete mode 100644 > meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch > delete mode 100644 > meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch > rename meta/recipes-graphics/wayland/{wayland_1.17.0.bb => > wayland_1.18.0.bb} (84%) > > diff --git > a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch > b/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch > deleted file mode 100644 > index c443587..0000000 > --- > a/meta/recipes-graphics/wayland/wayland/0001-scanner-Add-configure-check-for-strndup.patch > +++ /dev/null > @@ -1,50 +0,0 @@ > -From 3c8b4467a1ca229e72fb5223787ed400a19c65c0 Mon Sep 17 00:00:00 2001 > -From: Joshua Watt > -Date: Fri, 25 Oct 2019 21:03:23 -0500 > -Subject: [PATCH] scanner: Add configure check for strndup > - > -Some platforms may not have strndup() (e.g. MinGW), so provide a > -equivalent implementation if it's not found. > - > -Upstream-Status: Accepted [4a1f348c20157db7bd7c759fdeb23fbe8729c571] > -Signed-off-by: Joshua Watt > ---- > - configure.ac | 2 +- > - src/scanner.c | 11 +++++++++++ > - 2 files changed, 12 insertions(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index 8d56f2b..1c99e21 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -63,7 +63,7 @@ fi > - AC_SUBST(GCC_CFLAGS) > - > - AC_CHECK_HEADERS([sys/prctl.h]) > --AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl]) > -+AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl strndup]) > - > - AC_ARG_ENABLE([libraries], > - [AC_HELP_STRING([--disable-libraries], > -diff --git a/src/scanner.c b/src/scanner.c > -index a94be5d..27004bc 100644 > ---- a/src/scanner.c > -+++ b/src/scanner.c > -@@ -916,6 +916,17 @@ verify_arguments(struct parse_context *ctx, > - > - } > - > -+#ifndef HAVE_STRNDUP > -+char * > -+strndup(const char *s, size_t size) > -+{ > -+ char *r = malloc(size + 1); > -+ strncpy(r, s, size); > -+ r[size] = '\0'; > -+ return r; > -+} > -+#endif > -+ > - static void > - end_element(void *data, const XML_Char *name) > - { > diff --git > a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch > b/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch > deleted file mode 100644 > index b05b875..0000000 > --- > a/meta/recipes-graphics/wayland/wayland/0002-Move-wl_priv_signal-to-wayland-server-private.h.patch > +++ /dev/null > @@ -1,166 +0,0 @@ > -From e746f3bf7c8bb2f5dcf9e93edffc23b56eff12d0 Mon Sep 17 00:00:00 2001 > -From: Joshua Watt > -Date: Tue, 5 Nov 2019 09:09:50 -0600 > -Subject: [PATCH] Move wl_priv_signal to wayland-server-private.h > - > -Including wayland-server-core.h in wayland-private.h is problematic > -because wayland-private.h is included by wayland-scanner which should be > -able to build against non-POSIX platforms (e.g. MinGW). The only reason > -that wayland-server-core.h was included in wayland-private.h was for the > -wl_private_signal definitions, so move those to a > -wayland-server-private.h file that can be included by both > -wayland-server.c and the tests. > - > -Upstream-Status: Accepted [e7d88f35eb89cf0cc77cbddd834cacc63683a9cc] > -Signed-off-by: Joshua Watt > ---- > - Makefile.am | 3 +- > - src/wayland-private.h | 22 +-------------- > - src/wayland-server-private.h | 53 ++++++++++++++++++++++++++++++++++++ > - src/wayland-server.c | 1 + > - tests/newsignal-test.c | 2 +- > - 5 files changed, 58 insertions(+), 23 deletions(-) > - create mode 100644 src/wayland-server-private.h > - > -diff --git a/Makefile.am b/Makefile.am > -index f47d055..026d981 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -56,7 +56,8 @@ libwayland_private_la_SOURCES = \ > - src/connection.c \ > - src/wayland-os.c \ > - src/wayland-os.h \ > -- src/wayland-private.h > -+ src/wayland-private.h \ > -+ src/wayland-server-private.h > - > - include_HEADERS = \ > - src/wayland-util.h \ > -diff --git a/src/wayland-private.h b/src/wayland-private.h > -index 29516ec..dc7d12f 100644 > ---- a/src/wayland-private.h > -+++ b/src/wayland-private.h > -@@ -31,11 +31,11 @@ > - #include > - #include > - #include > -+#include > - > - #define WL_HIDE_DEPRECATED 1 > - > - #include "wayland-util.h" > --#include "wayland-server-core.h" > - > - /* Invalid memory address */ > - #define WL_ARRAY_POISON_PTR (void *) 4 > -@@ -236,26 +236,6 @@ zalloc(size_t s) > - return calloc(1, s); > - } > - > --struct wl_priv_signal { > -- struct wl_list listener_list; > -- struct wl_list emit_list; > --}; > -- > --void > --wl_priv_signal_init(struct wl_priv_signal *signal); > -- > --void > --wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener > *listener); > -- > --struct wl_listener * > --wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t > notify); > -- > --void > --wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); > -- > --void > --wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); > -- > - void > - wl_connection_close_fds_in(struct wl_connection *connection, int max); > - > -diff --git a/src/wayland-server-private.h b/src/wayland-server-private.h > -new file mode 100644 > -index 0000000..23fa458 > ---- /dev/null > -+++ b/src/wayland-server-private.h > -@@ -0,0 +1,53 @@ > -+/* > -+ * Copyright ? 2008-2011 Kristian H?gsberg > -+ * Copyright ? 2011 Intel Corporation > -+ * Copyright ? 2013 Jason Ekstrand > -+ * > -+ * Permission is hereby granted, free of charge, to any person obtaining > -+ * a copy of this software and associated documentation files (the > -+ * "Software"), to deal in the Software without restriction, including > -+ * without limitation the rights to use, copy, modify, merge, publish, > -+ * distribute, sublicense, and/or sell copies of the Software, and to > -+ * permit persons to whom the Software is furnished to do so, subject to > -+ * the following conditions: > -+ * > -+ * The above copyright notice and this permission notice (including the > -+ * next paragraph) shall be included in all copies or substantial > -+ * portions of the Software. > -+ * > -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > -+ * SOFTWARE. > -+ */ > -+ > -+#ifndef WAYLAND_SERVER_PRIVATE_H > -+#define WAYLAND_SERVER_PRIVATE_H > -+ > -+#include "wayland-server-core.h" > -+ > -+struct wl_priv_signal { > -+ struct wl_list listener_list; > -+ struct wl_list emit_list; > -+}; > -+ > -+void > -+wl_priv_signal_init(struct wl_priv_signal *signal); > -+ > -+void > -+wl_priv_signal_add(struct wl_priv_signal *signal, struct wl_listener > *listener); > -+ > -+struct wl_listener * > -+wl_priv_signal_get(struct wl_priv_signal *signal, wl_notify_func_t > notify); > -+ > -+void > -+wl_priv_signal_emit(struct wl_priv_signal *signal, void *data); > -+ > -+void > -+wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data); > -+ > -+#endif > -diff --git a/src/wayland-server.c b/src/wayland-server.c > -index 19f6a76..d6f0206 100644 > ---- a/src/wayland-server.c > -+++ b/src/wayland-server.c > -@@ -45,6 +45,7 @@ > - > - #include "wayland-util.h" > - #include "wayland-private.h" > -+#include "wayland-server-private.h" > - #include "wayland-server.h" > - #include "wayland-os.h" > - > -diff --git a/tests/newsignal-test.c b/tests/newsignal-test.c > -index 47c429b..f3a7bd9 100644 > ---- a/tests/newsignal-test.c > -+++ b/tests/newsignal-test.c > -@@ -26,7 +26,7 @@ > - #include > - > - #include "test-runner.h" > --#include "wayland-private.h" > -+#include "wayland-server-private.h" > - > - static void > - signal_notify(struct wl_listener *listener, void *data) > diff --git a/meta/recipes-graphics/wayland/wayland_1.17.0.bb > b/meta/recipes-graphics/wayland/wayland_1.18.0.bb > similarity index 84% > rename from meta/recipes-graphics/wayland/wayland_1.17.0.bb > rename to meta/recipes-graphics/wayland/wayland_1.18.0.bb > index 12916a0..7a3f075 100644 > --- a/meta/recipes-graphics/wayland/wayland_1.17.0.bb > +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb > @@ -13,12 +13,10 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ > DEPENDS = "expat libffi wayland-native" > > SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ > - file://fixpathinpcfiles.patch \ > - file://0001-scanner-Add-configure-check-for-strndup.patch \ > - > file://0002-Move-wl_priv_signal-to-wayland-server-private.h.patch \ > + file://fixpathinpcfiles.patch \ > " > -SRC_URI[md5sum] = "d91f970aea11fd549eae023d06f91af3" > -SRC_URI[sha256sum] = > "72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4" > +SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" > +SRC_URI[sha256sum] = > "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" > > UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" > > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 13 08:19:35 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 09:19:35 +0100 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: I took a look at meta/lib/oeqa/runtime/cases/rpm.py. All tests depend on test_rpm_query, which should be skipped if rpm is not used for packaging: status, output = self.target.run('ls /var/lib/rpm/') if status != 0: self.skipTest('No /var/lib/rpm on target') Can you please check, how the tests fails for you exactly, and why /var/lib/rpm exists (and what is the content of it)? The test used to have the check I am talking about, but it was removed by commit 633bd85270922d71ab4b1f94cd166da51fbe1458 Author: Richard Purdie Date: Thu Nov 8 19:55:17 2018 +0000 oeqa/runtime/cases: Improve test dependency information ... - @classmethod - def setUpClass(cls): - if cls.tc.td['PACKAGE_CLASSES'].split()[0] != 'package_rpm': - cls.skipTest('Tests require image to be build from rpm') Alex On Thu, 13 Feb 2020 at 08:53, Alexander Kanavin wrote: > World builds also enable apt and dpkg, but there is no problem with that > for you? There is no consistency here; if you want to start excluding > things from world based on what packaging is enabled, you need to treat all > options equally, including deb and ipk. > > The original problem was that libsolv pulls in the full set of rpm > executables and libraries, which erroneously triggers the rpm test on > target. We can solve this by making libsolv pull in only the rpm libraries > and not executables, so that rpm test will be skipped. Or maybe even make > the test itself check whether rpm is the packaging format and skip > otherwise. > > Alex > > On Thu 13. Feb 2020 at 7.01, Khem Raj wrote: > >> On Wed, Feb 12, 2020 at 8:49 PM Alexander Kanavin >> wrote: >> > >> > But you do not need to fix or touch dnf at all. You only need to adjust >> rpm packaging and split it in two parts instead of bundling everything into >> a single package. >> > >> >> when we do world builds without package_rpm, dnf and related packages >> get compiled which is unnecessary and moreover wrong and when we mark >> libsolv to enable rpmdb only for package_rpm, this becomes even more >> evident. >> >> Perhaps, I am missing what you intend to convey, in that case maybe you >> can send >> code changes to support what you are intending here. >> >> > Alex >> > >> > On Wed 12. Feb 2020 at 23.16, Khem Raj wrote: >> >> >> >> On Wed, Feb 12, 2020 at 2:00 PM Alexander Kanavin >> >> wrote: >> >> > >> >> > I would still prefer to just split rpm packaging into binaries and >> libraries, and avoid the need to blacklist and tweak recipes based on what >> PACKAGE_CLASSES is set to altogether. That setting should not leak into >> recipes, and should only matter from do_package onwards. Can you look into >> the rpm recipe please? >> >> > >> >> >> >> dnf and dnf related packages expecting rpmdb support in libresolv. I >> >> do not know dnf well enough to fix it and moreover it has no direct >> >> use for my usecase either. I also don't see a point of entertaining >> >> dnf for non-rpm backends. Its not intended for that either even if we >> >> were to make dnf not want rpmdb what good will it do to build for >> >> distros who do not use rpm. These changes do not change poky defaults >> >> which use rpm as default. OE-core does not and I dont know of any >> >> opkg user who also has rpmdb needed. >> >> >> >> > Alex >> >> > >> >> > On Wed, 12 Feb 2020 at 20:19, Khem Raj wrote: >> >> >> >> >> >> dnf does not work with opkg or dpkg/apt anyway >> >> >> >> >> >> Signed-off-by: Khem Raj >> >> >> --- >> >> >> v2: Use PNBLACKLIST instead of anon python >> >> >> >> >> >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ >> >> >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + >> >> >> 2 files changed, 3 insertions(+) >> >> >> >> >> >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> >> index f38167f1ad..220f1aabbd 100644 >> >> >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> >> @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service >> dnf-makecache.timer \ >> >> >> dnf-automatic-notifyonly.service >> dnf-automatic-notifyonly.timer \ >> >> >> " >> >> >> SYSTEMD_AUTO_ENABLE ?= "disable" >> >> >> + >> >> >> +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', >> 'package_rpm', '', 'does not build correctly without package_rpm in >> PACKAGE_CLASSES', d)}" >> >> >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> >> index 882c435b32..49afa04812 100644 >> >> >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> >> @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " >> -DWITH_GIR=OFF" >> >> >> EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" >> >> >> >> >> >> BBCLASSEXTEND = "native nativesdk" >> >> >> +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', >> 'package_rpm', '', 'does not build correctly without package_rpm in >> PACKAGE_CLASSES', d)}" >> >> >> >> >> >> -- >> >> >> 2.25.0 >> >> >> >> >> >> -- >> >> >> _______________________________________________ >> >> >> Openembedded-core mailing list >> >> >> Openembedded-core at lists.openembedded.org >> >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 13 08:21:43 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:43 -0800 Subject: [OE-core] [PATCH v2 00/10] recipe updates, testing fixes Message-ID: - Update gdb to 9.1 and musl to latest - Fix packages busybox, ltp to build with musl exposed 64bit time_t problems - rest of all fixes are found testing core-image-sato-sdk on qemuarm/qemux86_64 - Add a check for gold being used on rv32/rv64 - crosssdk is changed to not use target distro features The following changes since commit 34535f3e0ca6f6e37e6457fc800dfbfff64d9298: bitbake: doc: minor tweaks to ch 1 of BB user manual (2020-02-08 17:41:17 +0000) are available in the Git repository at: git://git.yoctoproject.org/poky-contrib kraj/pu http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kraj/pu Khem Raj (10): qemuarm: Disable highmem when QB_MACHINE is virt oeqa: Use --disable-maintainer-mode configure option libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled dnf,libdnf: Ignore if PACKAGE_CLASSES does not have rpm musl: Update to latest tip gdb: Upgrade to 9.1 release busybox: Backport patches to support removal of __NR_clock_gettime ltp: Fix tescases with 64bit time_t using 32bit arches crosssdk: Set natisdk specific distro features binutils: Bail out if gold is used on 32/64 bit RISC-V meta/classes/crosssdk.bbclass | 6 + meta/conf/distro/include/tcmode-default.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- ...rappers-around-clock_gettime-closes-.patch | 113 +++++++++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 53 +++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 43 ++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + meta/recipes-core/musl/musl_git.bb | 2 +- meta/recipes-devtools/binutils/binutils.inc | 7 + meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 + meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 --- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 +++ ...ian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 ...ake-man-install-relative-to-DESTDIR.patch} | 9 +- ...x-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...ort-for-Renesas-SH-sh4-architecture.patch} | 41 +++--- ...eadline.a-when-using-disable-static.patch} | 13 +- ...s.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...atch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...9-resolve-restrict-keyword-conflict.patch} | 17 +-- ...> 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++- ...h => 0011-gdbserver-ctrl-c-handling.patch} | 31 ++-- .../gdb/gdb/CVE-2019-1010180.patch | 132 ------------------ .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + .../libsolv/libsolv_0.7.10.bb | 2 +- ...or-time64-unsafe-syscalls-before-usi.patch | 81 +++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + 33 files changed, 422 insertions(+), 258 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch delete mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} (100%) rename meta/recipes-devtools/gdb/gdb/{0002-make-man-install-relative-to-DESTDIR.patch => 0001-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0005-Add-support-for-Renesas-SH-sh4-architecture.patch => 0004-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0006-Dont-disable-libreadline.a-when-using-disable-static.patch => 0005-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0007-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0008-Use-exorted-definitions-of-SIGRTMIN.patch => 0007-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0009-Change-order-of-CFLAGS.patch => 0008-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0010-resolve-restrict-keyword-conflict.patch => 0009-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0011-Fix-invalid-sigprocmask-call.patch => 0010-Fix-invalid-sigprocmask-call.patch} (65%) rename meta/recipes-devtools/gdb/gdb/{0001-gdbserver-ctrl-c-handling.patch => 0011-gdbserver-ctrl-c-handling.patch} (45%) delete mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_8.3.1.bb => gdb_9.1.bb} (100%) create mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch -- 2.25.0 From alex.kanavin at gmail.com Thu Feb 13 08:21:39 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 09:21:39 +0100 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, 13 Feb 2020 at 07:38, Khem Raj wrote: > libsolv: Enable rpm packageconfig by default only if rpm O_P_M is > enabled > dnf,libdnf: Ignore if PACKAGE_CLASSES does not have rpm > I'd like to request that these two are held back until we figure out what is going wrong with the rpm test (see separate thread). Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 13 08:21:50 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:50 -0800 Subject: [OE-core] [PATCH 01/10] qemuarm: Disable highmem when QB_MACHINE is virt In-Reply-To: References: Message-ID: <4b64efecf0750245cd0bb42d2864533688d8530f.1581580428.git.raj.khem@gmail.com> running ptests on qemuarm returns fails since it finds errors in kernel logs like below *********************** Central error: [ 4.338465] pci-host-generic 4010000000.pcie: ECAM ioremap failed *********************** Since its a 32bit kernel 4010000000 address is truncated to 10000000 and ends up in conflicts with VIRT_PCIE_MMIO, which ranges from 0x10000000 to 0x3efeffff This is happening because the linux-yocto kernel is not compiled with LPAE support, however, virt machine for qemuarm assumes that by default Should LPAE be enabled by default in kernel config is a separate question Signed-off-by: Khem Raj --- meta/conf/machine/qemuarm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 26f40b1419..367fcef019 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -11,7 +11,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" -QB_MACHINE = "-machine virt" +QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:51 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:51 -0800 Subject: [OE-core] [PATCH 02/10] oeqa: Use --disable-maintainer-mode configure option In-Reply-To: References: Message-ID: since the versions of autotools might differ on target and build host, plus difference in timestamps for configure and system can result in reconfigure lets avoid that by disabling maintainer mode Avoids error: newly created file is older than distributed files! [YOCTO #13779] Suggested-by: Andre McCurdy Signed-off-by: Khem Raj --- meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +- meta/lib/oeqa/sdk/cases/buildcpio.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 4bd72dd37e..d0f91668b2 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure() + self.project.run_configure('--disable-maintainer-mode','') self.project.run_make() self.project.run_install() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index b0beafb38f..902e93f623 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -28,7 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:52 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:52 -0800 Subject: [OE-core] [PATCH 03/10] libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled In-Reply-To: References: Message-ID: <03e628eda8b5438fbc6fb1cd09e0d850485d2dd6.1581580428.git.raj.khem@gmail.com> opkg also depends on libsolv and can needlessly pull in rpm even if the O_P_M does not desire to use rpm Signed-off-by: Khem Raj --- meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb index 502f4e0e85..265a27c00d 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit cmake -PACKAGECONFIG ??= "rpm" +PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:53 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:53 -0800 Subject: [OE-core] [PATCH 04/10] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: Message-ID: <9bb12593baf723d5b00320c25c0658c77919c304.1581580428.git.raj.khem@gmail.com> dnf does not work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj --- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f1ad..220f1aabbd 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435b32..49afa04812 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:54 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:54 -0800 Subject: [OE-core] [PATCH 05/10] musl: Update to latest tip In-Reply-To: References: Message-ID: <8002e94e6b5f865feb0a17a2454d53b7f748e965.1581580428.git.raj.khem@gmail.com> Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4f2e..b6ec6fe9af 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:55 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:55 -0800 Subject: [OE-core] [PATCH 06/10] gdb: Upgrade to 9.1 release In-Reply-To: References: Message-ID: <650b515ce0c79adcbba39cdf47bc23f764ca1465.1581580428.git.raj.khem@gmail.com> Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 --- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 +++ ...ian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 ...ake-man-install-relative-to-DESTDIR.patch} | 9 +- ...x-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...ort-for-Renesas-SH-sh4-architecture.patch} | 41 +++--- ...eadline.a-when-using-disable-static.patch} | 13 +- ...s.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...atch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...9-resolve-restrict-keyword-conflict.patch} | 17 +-- ...> 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++- ...h => 0011-gdbserver-ctrl-c-handling.patch} | 31 ++-- .../gdb/gdb/CVE-2019-1010180.patch | 132 ------------------ .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 18 files changed, 107 insertions(+), 253 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} (100%) rename meta/recipes-devtools/gdb/gdb/{0002-make-man-install-relative-to-DESTDIR.patch => 0001-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0005-Add-support-for-Renesas-SH-sh4-architecture.patch => 0004-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0006-Dont-disable-libreadline.a-when-using-disable-static.patch => 0005-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0007-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0008-Use-exorted-definitions-of-SIGRTMIN.patch => 0007-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0009-Change-order-of-CFLAGS.patch => 0008-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0010-resolve-restrict-keyword-conflict.patch => 0009-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0011-Fix-invalid-sigprocmask-call.patch => 0010-Fix-invalid-sigprocmask-call.patch} (65%) rename meta/recipes-devtools/gdb/gdb/{0001-gdbserver-ctrl-c-handling.patch => 0011-gdbserver-ctrl-c-handling.patch} (45%) delete mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_8.3.1.bb => gdb_9.1.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 936db5ae16..b451f0ba26 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.1%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f3ce..0000000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000000..d019e6b384 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5410..82287ea13a 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74c09..6067caf63d 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512ef7..c4bab7bb1a 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840cafe2e..fd165d4b81 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee62be..d0360da439 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bfa14..d222d01083 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5fd60..09896611f0 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26835..18168c6bae 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f250..8f15c49d0e 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c391..5209c00275 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch similarity index 45% rename from meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch rename to meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch index 71fe7f83b6..eedd94c4d4 100644 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -1,19 +1,32 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to interrupt the attached process. -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] Author: Josh Gao Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) static void linux_request_interrupt (void) { diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a713..0000000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:56 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:56 -0800 Subject: [OE-core] [PATCH 07/10] busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: References: Message-ID: <0ed1fb312bbdfc1bcda92d8f153cbca0ba39fb1e.1581580428.git.raj.khem@gmail.com> This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj --- ...rappers-around-clock_gettime-closes-.patch | 113 ++++++++++++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 43 +++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000000..f6fbed338a --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..944526b7ca --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..58a6c0d8a0 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102eb2b..bbc5fa1572 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:57 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:57 -0800 Subject: [OE-core] [PATCH 08/10] ltp: Fix tescases with 64bit time_t using 32bit arches In-Reply-To: References: Message-ID: <7c9d0ee973049010b4a49b2391f3da7ea75b29dc.1581580428.git.raj.khem@gmail.com> This helps it compile on musl Fixes | tst_clocks.c:31:17: error: 'SYS_clock_getres' undeclared (first use in this function); did you mean 'tst_clock_getres Signed-off-by: Khem Raj --- ...or-time64-unsafe-syscalls-before-usi.patch | 81 +++++++++++++++++++ meta/recipes-extended/ltp/ltp_20190930.bb | 1 + 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch new file mode 100644 index 0000000000..92e5fdfe6e --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -0,0 +1,81 @@ +From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Feb 2020 22:22:17 -0800 +Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them + +musl is using 64bit time_t now on 32bit architectures and these syscalls +no longer exist, therefore its better to check for them being available +before using them + +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Signed-off-by: Khem Raj +--- + lib/tst_clocks.c | 9 +++++++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ + 3 files changed, 17 insertions(+) + +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 35798a4aaf..6a5b05c4ea 100644 +--- a/lib/tst_clocks.c ++++ b/lib/tst_clocks.c +@@ -28,15 +28,24 @@ + + int tst_clock_getres(clockid_t clk_id, struct timespec *res) + { ++#if defined(__NR_clock_getres) + return syscall(SYS_clock_getres, clk_id, res); ++#endif ++ return -1; + } + + int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + return syscall(SYS_clock_gettime, clk_id, ts); ++#endif ++ return -1; + } + + int tst_clock_settime(clockid_t clk_id, struct timespec *ts) + { ++#if defined(__NR_clock_settime) + return syscall(SYS_clock_settime, clk_id, ts); ++#endif ++ return -1; + } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9b..b498de5b68 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +@@ -41,7 +41,11 @@ + #include + #include + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + char *TCID = "gettimeofday01"; + int TST_TOTAL = 1; +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e8..218e017df8 100644 +--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c ++++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +@@ -23,7 +23,11 @@ + + #include "tst_test.h" + ++#ifdef __NR_gettimeofday + #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#else ++#define gettimeofday(a,b) (-1) ++#endif + + static volatile sig_atomic_t done; + static char *str_rtime; +-- +2.25.0 + diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20190930.bb index 2853b1c819..19bd7bc9c6 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20190930.bb @@ -42,6 +42,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ + file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " S = "${WORKDIR}/git" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:58 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:58 -0800 Subject: [OE-core] [PATCH 09/10] crosssdk: Set natisdk specific distro features In-Reply-To: References: Message-ID: <8f211fc072b26ed9b3418fef4bead2644966d797.1581580428.git.raj.khem@gmail.com> Currently, normal distro features e.g. ld-is-gold is impacting crosssdk recipes, which actually should not be the case, since that feature is essentially intended for target packages and not nativesdk packages Signed-off-by: Khem Raj --- meta/classes/crosssdk.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index c718a09025..04aecb694e 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -5,9 +5,15 @@ NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" MACHINEOVERRIDES = "" PACKAGE_ARCH = "${SDK_ARCH}" + python () { # set TUNE_PKGARCH to SDK_ARCH d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) + # Set features here to prevent appends and distro features backfill + # from modifying nativesdk distro features + features = set(d.getVar("DISTRO_FEATURES_NATIVESDK").split()) + filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVESDK"), d).split()) + d.setVar("DISTRO_FEATURES", " ".join(sorted(features | filtered))) } STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -- 2.25.0 From raj.khem at gmail.com Thu Feb 13 08:21:59 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 00:21:59 -0800 Subject: [OE-core] [PATCH 10/10] binutils: Bail out if gold is used on 32/64 bit RISC-V In-Reply-To: References: Message-ID: gold is not supporting risc-v yet and, this will cause subltle errors during build e.g. autoconf not finding certain features like visibility and it could take a while to unwind the problem. Its better to error out early Remove dwp and ld.gold for rv32 as well Signed-off-by: Khem Raj --- meta/recipes-devtools/binutils/binutils.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 0fb6cae407..a4b9aa586d 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -40,6 +40,7 @@ FILES_${PN}-dev = " \ LDGOLD_ALTS ?= "ld.gold dwp" LDGOLD_ALTS_riscv64 = "" +LDGOLD_ALTS_riscv32 = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -83,6 +84,7 @@ LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" + # This is necessary due to a bug in the binutils Makefiles # EXTRA_OEMAKE = "configure-build-libiberty all" @@ -163,3 +165,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): + bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") +} -- 2.25.0 From yi.zhao at windriver.com Thu Feb 13 08:55:01 2020 From: yi.zhao at windriver.com (Yi Zhao) Date: Thu, 13 Feb 2020 16:55:01 +0800 Subject: [OE-core] [PATCH] ppp: Security fix CVE-2020-8597 Message-ID: <20200213085501.3398-1-yi.zhao@windriver.com> CVE-2020-8597: eap.c in pppd in ppp 2.4.2 through 2.4.8 has an rhostname buffer overflow in the eap_request and eap_response functions. References: https://nvd.nist.gov/vuln/detail/CVE-2020-8597 Patch from: https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426 Signed-off-by: Yi Zhao --- ...01-pppd-Fix-bounds-check-in-EAP-code.patch | 47 +++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch new file mode 100644 index 0000000000..b7ba7ba643 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch @@ -0,0 +1,47 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] + +CVE: CVE-2020-8597 + +Signed-off-by: Yi Zhao +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f5..1b93db0 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +-- +2.17.1 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 644cde4562..60c56dd0bd 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -33,6 +33,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ file://ppp-2.4.7-DES-openssl.patch \ + file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " SRC_URI_append_libc-musl = "\ -- 2.17.1 From alex.kiernan at gmail.com Thu Feb 13 10:00:29 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Thu, 13 Feb 2020 10:00:29 +0000 Subject: [OE-core] [OE-Core][PATCH v3] iputils: Fix systemd and ipv6 detection Message-ID: <20200213100029.36126-1-alex.kiernan@gmail.com> When systemd is enabled, ensure iputils detects it correctly. Split out IPv6 only features based on ipv6 enabled in DISTRO_FEATURES. Signed-off-by: Alex Kiernan --- Changes in v3: - fix typo in SoB Changes in v2: - ninfod: fix systemd Documentation url error - rarpd: rdisc: Drop PrivateUsers ...-fix-systemd-Documentation-url-error.patch | 28 +++++++++++ .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 +++++++++++++++++++ .../iputils/iputils_s20190709.bb | 23 +++++++--- 3 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch create mode 100644 meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch new file mode 100644 index 000000000000..03a3f5602dc6 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch @@ -0,0 +1,28 @@ +From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001 +From: Andrea Stevanato +Date: Tue, 5 Nov 2019 19:08:30 +0000 +Subject: [PATCH] ninfod: fix systemd Documentation url error + +systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8) + +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9] +Signed-off-by: Alex Kiernan +--- + systemd/ninfod.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in +index 5ab69ca00e96..8e79fcd9238e 100644 +--- a/systemd/ninfod.service.in ++++ b/systemd/ninfod.service.in +@@ -1,6 +1,6 @@ + [Unit] + Description=Respond to IPv6 Node Information Queries +-Documentation=ninfod(8) ++Documentation=man:ninfod(8) + Requires=network.target + After=network.target + +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch new file mode 100644 index 000000000000..d7367caf7877 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch @@ -0,0 +1,46 @@ +From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 13 Feb 2020 06:08:45 +0000 +Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers + +Neither rarpd nor rdisc can gain the necessary capabilities with +PrivateUsers enabled. + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + systemd/rarpd.service.in | 1 - + systemd/rdisc.service.in | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in +index e600c10c93e6..f5d7621a7ce8 100644 +--- a/systemd/rarpd.service.in ++++ b/systemd/rarpd.service.in +@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW + DynamicUser=yes + PrivateTmp=yes + PrivateDevices=yes +-PrivateUsers=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in +index 4e2a1ec9d0e5..a71b87d36b37 100644 +--- a/systemd/rdisc.service.in ++++ b/systemd/rdisc.service.in +@@ -8,9 +8,10 @@ After=network.target + EnvironmentFile=-/etc/sysconfig/rdisc + ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS + ++CapabilityBoundingSet=CAP_NET_RAW + AmbientCapabilities=CAP_NET_RAW + PrivateTmp=yes +-PrivateUsers=yes ++DynamicUser=yes + ProtectSystem=strict + ProtectHome=yes + ProtectControlGroups=yes +-- +2.17.1 + diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index e0d2ae160ee0..2aed6b56ca99 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb @@ -12,6 +12,8 @@ DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils \ file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ + file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ + file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ " SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" @@ -23,16 +25,20 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?Ps\d+)" # breaks the version order. CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" -PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" +PACKAGECONFIG ??= "libcap libgcrypt rarpd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" -inherit meson update-alternatives +inherit meson systemd update-alternatives # Have to disable setcap/suid as its not deterministic EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" @@ -42,12 +48,12 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ + ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" PACKAGES += "${SPLITPKGS}" ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-rarpd = "1" -ALLOW_EMPTY_${PN}-traceroute6 = "1" RDEPENDS_${PN} += "${SPLITPKGS}" FILES_${PN} = "" @@ -57,6 +63,11 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_sbindir}/rarpd" +FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd at .service" FILES_${PN}-rdisc = "${base_sbindir}/rdisc" FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ + ${PN}-rdisc" +SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" +SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" -- 2.17.1 From sno at netbsd.org Thu Feb 13 13:36:16 2020 From: sno at netbsd.org (Jens Rehsack) Date: Thu, 13 Feb 2020 14:36:16 +0100 Subject: [OE-core] [RESEND PATCH v2] make: 4.2.1 -> 4.3 Message-ID: <20200213133616.19507-1-sno@netbsd.org> Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Signed-off-by: Jens Rehsack --- meta/recipes-devtools/make/make.inc | 4 +- ...b-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- ...b-Do-not-assume-glibc-glob-internals.patch | 38 ---------- meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- meta/recipes-devtools/make/make_4.3.bb | 10 +++ 5 files changed, 11 insertions(+), 123 deletions(-) delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb create mode 100644 meta/recipes-devtools/make/make_4.3.bb diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc6d3..4142cf23d3 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d40c3..0000000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9f6e..0000000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0cd58..0000000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000000..a3eb9d92f2 --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,10 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From rpjday at crashcourse.ca Thu Feb 13 13:21:57 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Thu, 13 Feb 2020 08:21:57 -0500 (EST) Subject: [OE-core] [PATCH] icecc.bbclass: replace superfluous "+=" with "=" Message-ID: Signed-off-by: Robert P. J. Day --- that's the only example of that i can see. diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index bc3d6f4cc8..d095305ed8 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -105,7 +105,7 @@ def icecc_dep_prepend(d): return "icecc-create-env-native" return "" -DEPENDS_prepend += "${@icecc_dep_prepend(d)} " +DEPENDS_prepend = "${@icecc_dep_prepend(d)} " get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC" def get_cross_kernel_cc(bb,d): -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== From richard.purdie at linuxfoundation.org Thu Feb 13 14:09:41 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 13 Feb 2020 14:09:41 +0000 Subject: [OE-core] [PATCH] package_ipk: Minor import tweak + ensure packages regenerated Message-ID: <20200213140941.18270-1-richard.purdie@linuxfoundation.org> The recent opkg-utils change didn't update all the packages since its marked as ABISAFE (and has to be due to update-alternatives). Fix a minor import issue to avoid multiple imports of glob which also causes packages to re-generate. Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 4f23977032f..25d1ab725ad 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -45,6 +45,7 @@ def ipk_write_pkg(pkg, d): import subprocess import textwrap import collections + import glob def cleanupcontrol(root): for p in ['CONTROL', 'DEBIAN']: @@ -101,8 +102,7 @@ def ipk_write_pkg(pkg, d): bb.utils.mkdirhier(pkgoutdir) os.chdir(root) cleanupcontrol(root) - from glob import glob - g = glob('*') + g = glob.glob('*') if not g and localdata.getVar('ALLOW_EMPTY', False) != "1": bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR'))) return -- 2.20.1 From richard.purdie at linuxfoundation.org Thu Feb 13 14:24:39 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 13 Feb 2020 14:24:39 +0000 Subject: [OE-core] [PATCH] wpa-supplicant: add virtual supplicant In-Reply-To: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> References: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> Message-ID: On Mon, 2020-02-10 at 16:42 -0500, Maxime Roussin-B?langer wrote: > There is a second supplicant raising, iwd. User should be > able to switch between wpa-supplicant and iwd. Let's provide > a virtual package. > > ConnMan, systemd-networkd and NetworkManager supports iwd. > > Signed-off-by: Maxime Roussin-B?langer > --- > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb | 3 +++ > meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +- > 2 files changed, 4 insertions(+), 1 deletion(-) I know its not easy to understand but we don't support virtual/* names in the runtime namespace, only the build time one (PROVIDES/DEPENDS). Grep for VIRTUAL-RUNTIME to see how we handle this (its ugly I know). Cheers, Richard From patchwork at patchwork.openembedded.org Thu Feb 13 14:32:19 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Thu, 13 Feb 2020 14:32:19 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_package=5F?= =?utf-8?q?ipk=3A_Minor_import_tweak_+_ensure_packages_regenerated?= In-Reply-To: <20200213140941.18270-1-richard.purdie@linuxfoundation.org> References: <20200213140941.18270-1-richard.purdie@linuxfoundation.org> Message-ID: <20200213143219.2276.77092@do> == Series Details == Series: package_ipk: Minor import tweak + ensure packages regenerated Revision: 1 URL : https://patchwork.openembedded.org/series/22606/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at ef24a545d1) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From richard.purdie at linuxfoundation.org Thu Feb 13 14:57:40 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 13 Feb 2020 14:57:40 +0000 Subject: [OE-core] [PATCH 07/10] busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <0ed1fb312bbdfc1bcda92d8f153cbca0ba39fb1e.1581580428.git.raj.khem@gmail.com> References: <0ed1fb312bbdfc1bcda92d8f153cbca0ba39fb1e.1581580428.git.raj.khem@gmail.com> Message-ID: On Thu, 2020-02-13 at 00:21 -0800, Khem Raj wrote: > This helps compiling with musl on 32bit arches now that musl has > switched to 64bit time_t > > Signed-off-by: Khem Raj > --- > ...rappers-around-clock_gettime-closes-.patch | 113 ++++++++++++++++++ > ...-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++ > ...-Use-64-prefix-syscall-if-we-have-to.patch | 43 +++++++ > meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + > 4 files changed, 212 insertions(+) > create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch > create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch > create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch Patches fail to apply: https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/1797 Will abort this test run, drop this and try again. Cheers, Richard From rpjday at crashcourse.ca Thu Feb 13 15:01:12 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Thu, 13 Feb 2020 10:01:12 -0500 (EST) Subject: [OE-core] oe-core: IMAGE_INSTALL_append = "bash" Message-ID: i have some scripts that wander the layers and look for possible typos, and i ran across this: meta/lib/oeqa/selftest/cases/incompatible_lic.py:IMAGE_INSTALL_append = "bash" should that value have a leading space or not? i'll let someone else deal with that if it needs fixing. rday From maxime.roussinbelanger at gmail.com Thu Feb 13 15:22:13 2020 From: maxime.roussinbelanger at gmail.com (=?UTF-8?Q?Maxime_Roussin=2DB=C3=A9langer?=) Date: Thu, 13 Feb 2020 10:22:13 -0500 Subject: [OE-core] [PATCH] wpa-supplicant: add virtual supplicant In-Reply-To: References: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> Message-ID: On Thu, Feb 13, 2020 at 9:24 AM Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > > On Mon, 2020-02-10 at 16:42 -0500, Maxime Roussin-B?langer wrote: > > There is a second supplicant raising, iwd. User should be > > able to switch between wpa-supplicant and iwd. Let's provide > > a virtual package. > > > > ConnMan, systemd-networkd and NetworkManager supports iwd. > > > > Signed-off-by: Maxime Roussin-B?langer > > --- > > meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb | 3 +++ > > meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +- > > 2 files changed, 4 insertions(+), 1 deletion(-) > > I know its not easy to understand but we don't support virtual/* names > in the runtime namespace, only the build time one (PROVIDES/DEPENDS). > > Grep for VIRTUAL-RUNTIME to see how we handle this (its ugly I know). Hmm interesting! If I follow correctly that's mean I have to create: VIRTUAL-RUNTIME_wireless-daemon and then people can override it. If the (R)DEPENDS on a recipe change depending on the wireless daemon that was chosen(i.e. connman), do you handle it with d.getVar and d.setVar("DEPENDS... inside a anonymous python function inside the recipe? The packageconfig would like this ? PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, ${VIRTUAL-RUNTIME_wireless-daemon}, ${VIRTUAL-RUNTIME_wireless-daemon}" Example: if VIRTUAL-RUNTIME_wireless-daemon == "iwd": DEPENDS += "iwd" EXTRA_OECONF += "--enable-iwd" elif VIRTUAL-RUNTIME_wireless-daemon == "wpa-supplicant": DEPENDS += "wpa-supplicant" Thanks, Max. > > Cheers, > > Richard -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Thu Feb 13 15:27:17 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 13 Feb 2020 15:27:17 +0000 Subject: [OE-core] [PATCH] wpa-supplicant: add virtual supplicant In-Reply-To: References: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> Message-ID: <928575d17e93b117b6f555d674089560161d6c97.camel@linuxfoundation.org> On Thu, 2020-02-13 at 10:22 -0500, Maxime Roussin-B?langer wrote: > On Thu, Feb 13, 2020 at 9:24 AM Richard Purdie < > richard.purdie at linuxfoundation.org> wrote: > > I know its not easy to understand but we don't support virtual/* > > names in the runtime namespace, only the build time one > > (PROVIDES/DEPENDS). > > Grep for VIRTUAL-RUNTIME to see how we handle this (its ugly I > know). > > Hmm interesting! > > If I follow correctly that's mean I have to create: > > VIRTUAL-RUNTIME_wireless-daemon and then people can override it. Correct. > If the (R)DEPENDS on a recipe change depending on the wireless daemon > that > was chosen(i.e. connman), do you handle it with d.getVar and > d.setVar("DEPENDS... inside a > anonymous python function inside the recipe? > > The packageconfig would like this ? > > PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, ${VIRTUAL- > RUNTIME_wireless-daemon}, ${VIRTUAL-RUNTIME_wireless-daemon}" > > Example: > > if VIRTUAL-RUNTIME_wireless-daemon == "iwd": > DEPENDS += "iwd" > EXTRA_OECONF += "--enable-iwd" > elif VIRTUAL-RUNTIME_wireless-daemon == "wpa-supplicant": > DEPENDS += "wpa-supplicant" At this point it suggests they're not interchangeable and therefore not simple runtime switchable dependencies. The closest analogy is the "ld-is-gold" DISTRO_FEATURE when you have something that isn't compatible like this. Cheers, Richard From maxime.roussinbelanger at gmail.com Thu Feb 13 15:54:33 2020 From: maxime.roussinbelanger at gmail.com (=?UTF-8?Q?Maxime_Roussin=2DB=C3=A9langer?=) Date: Thu, 13 Feb 2020 10:54:33 -0500 Subject: [OE-core] [PATCH] wpa-supplicant: add virtual supplicant In-Reply-To: <928575d17e93b117b6f555d674089560161d6c97.camel@linuxfoundation.org> References: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> <928575d17e93b117b6f555d674089560161d6c97.camel@linuxfoundation.org> Message-ID: On Thu, Feb 13, 2020 at 10:27 AM Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > > On Thu, 2020-02-13 at 10:22 -0500, Maxime Roussin-B?langer wrote: > > On Thu, Feb 13, 2020 at 9:24 AM Richard Purdie < > > richard.purdie at linuxfoundation.org> wrote: > > > I know its not easy to understand but we don't support virtual/* > > > names in the runtime namespace, only the build time one > > > (PROVIDES/DEPENDS). > > > Grep for VIRTUAL-RUNTIME to see how we handle this (its ugly I > > know). > > > > Hmm interesting! > > > > If I follow correctly that's mean I have to create: > > > > VIRTUAL-RUNTIME_wireless-daemon and then people can override it. > > Correct. > > > If the (R)DEPENDS on a recipe change depending on the wireless daemon > > that > > was chosen(i.e. connman), do you handle it with d.getVar and > > d.setVar("DEPENDS... inside a > > anonymous python function inside the recipe? > > > > The packageconfig would like this ? > > > > PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, ${VIRTUAL- > > RUNTIME_wireless-daemon}, ${VIRTUAL-RUNTIME_wireless-daemon}" > > > > Example: > > > > if VIRTUAL-RUNTIME_wireless-daemon == "iwd": > > DEPENDS += "iwd" > > EXTRA_OECONF += "--enable-iwd" > > elif VIRTUAL-RUNTIME_wireless-daemon == "wpa-supplicant": > > DEPENDS += "wpa-supplicant" > > At this point it suggests they're not interchangeable and therefore not > simple runtime switchable dependencies. > > The closest analogy is the "ld-is-gold" DISTRO_FEATURE when you have > something that isn't compatible like this. I realize that my example isn't the proper one.. sorry about that! We can probably simplify with PACKAGECONFIG. Maybe the right solution would be to provide two packageconfig? PACKAGECONFIG[iwd] = "--enable-iwd, --disable-wifi, iwd, iwd" PACKAGECONFIG[wpa-supplicant] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" They are mutually exclusive, is this something that can be done through PACKAGECONFIG? Maybe we don't deal with the conflicts that can occur if a user activates both? It would probably fail at configure time? What is good practice here? At the same time, it is VERY weird for a system to have iwd and wpa_supplicant. If I recall correctly, iwd has an error message with another wireless daemon run concurrently. I would like to be able to force the user to choose only one... because I think having both is an error. Thanks, Max. > > Cheers, > > Richard -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 13 16:00:56 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 17:00:56 +0100 Subject: [OE-core] [PATCH] wpa-supplicant: add virtual supplicant In-Reply-To: References: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> <928575d17e93b117b6f555d674089560161d6c97.camel@linuxfoundation.org> Message-ID: On Thu, 13 Feb 2020 at 16:55, Maxime Roussin-B?langer < maxime.roussinbelanger at gmail.com> wrote: > PACKAGECONFIG[iwd] = "--enable-iwd, --disable-wifi, iwd, iwd" > PACKAGECONFIG[wpa-supplicant] = "--enable-wifi, --disable-wifi, > wpa-supplicant, wpa-supplicant" > The problem with this, is that enabling one but not the other will combine into '--enable-iwd --disable-wifi' which is not what is intended. I am not sure why you need to specify them as both build and runtime dependencies, can you clarify why? Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 13 16:06:35 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 08:06:35 -0800 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: On Wed, Feb 12, 2020 at 11:53 PM Alexander Kanavin wrote: > World builds also enable apt and dpkg, but there is no problem with that > for you? There is no consistency here; if you want to start excluding > things from world based on what packaging is enabled, you need to treat all > options equally, including deb and ipk. > No, problem is that if One wants to use opkg backend then rpm drags along but apt or dpkg don?t World builds are also problem but secondary Please try to understand the entirety of problem I tried everything to keep it building but i could not and I have been saying that all along If you can come up with patches to dnf to build with libresolv that is not build with rpm support we might get to built however I don?t think it will of any use at runtime > > The original problem was that libsolv pulls in the full set of rpm > executables and libraries, which erroneously triggers the rpm test on > target. We can solve this by making libsolv pull in only the rpm libraries > and not executables, > Libsolve already has option to disable rpmdb support and we use it so that rpm test will be skipped. Or maybe even make the test itself check > whether rpm is the packaging format and skip otherwise. > No. Skipping test is just symptom of the problem I knew we could paper over it but that?s not the point Even if test is made to pass rpm will be dragged into Images which is not desired > Alex > > On Thu 13. Feb 2020 at 7.01, Khem Raj wrote: > >> On Wed, Feb 12, 2020 at 8:49 PM Alexander Kanavin >> wrote: >> > >> > But you do not need to fix or touch dnf at all. You only need to adjust >> rpm packaging and split it in two parts instead of bundling everything into >> a single package. >> > >> >> when we do world builds without package_rpm, dnf and related packages >> get compiled which is unnecessary and moreover wrong and when we mark >> libsolv to enable rpmdb only for package_rpm, this becomes even more >> evident. >> >> Perhaps, I am missing what you intend to convey, in that case maybe you >> can send >> code changes to support what you are intending here. >> >> > Alex >> > >> > On Wed 12. Feb 2020 at 23.16, Khem Raj wrote: >> >> >> >> On Wed, Feb 12, 2020 at 2:00 PM Alexander Kanavin >> >> wrote: >> >> > >> >> > I would still prefer to just split rpm packaging into binaries and >> libraries, and avoid the need to blacklist and tweak recipes based on what >> PACKAGE_CLASSES is set to altogether. That setting should not leak into >> recipes, and should only matter from do_package onwards. Can you look into >> the rpm recipe please? >> >> > >> >> >> >> dnf and dnf related packages expecting rpmdb support in libresolv. I >> >> do not know dnf well enough to fix it and moreover it has no direct >> >> use for my usecase either. I also don't see a point of entertaining >> >> dnf for non-rpm backends. Its not intended for that either even if we >> >> were to make dnf not want rpmdb what good will it do to build for >> >> distros who do not use rpm. These changes do not change poky defaults >> >> which use rpm as default. OE-core does not and I dont know of any >> >> opkg user who also has rpmdb needed. >> >> >> >> > Alex >> >> > >> >> > On Wed, 12 Feb 2020 at 20:19, Khem Raj wrote: >> >> >> >> >> >> dnf does not work with opkg or dpkg/apt anyway >> >> >> >> >> >> Signed-off-by: Khem Raj >> >> >> --- >> >> >> v2: Use PNBLACKLIST instead of anon python >> >> >> >> >> >> meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ >> >> >> meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + >> >> >> 2 files changed, 3 insertions(+) >> >> >> >> >> >> diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> >> index f38167f1ad..220f1aabbd 100644 >> >> >> --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> >> +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb >> >> >> @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service >> dnf-makecache.timer \ >> >> >> dnf-automatic-notifyonly.service >> dnf-automatic-notifyonly.timer \ >> >> >> " >> >> >> SYSTEMD_AUTO_ENABLE ?= "disable" >> >> >> + >> >> >> +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', >> 'package_rpm', '', 'does not build correctly without package_rpm in >> PACKAGE_CLASSES', d)}" >> >> >> diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> >> index 882c435b32..49afa04812 100644 >> >> >> --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> >> +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb >> >> >> @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " >> -DWITH_GIR=OFF" >> >> >> EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" >> >> >> >> >> >> BBCLASSEXTEND = "native nativesdk" >> >> >> +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', >> 'package_rpm', '', 'does not build correctly without package_rpm in >> PACKAGE_CLASSES', d)}" >> >> >> >> >> >> -- >> >> >> 2.25.0 >> >> >> >> >> >> -- >> >> >> _______________________________________________ >> >> >> Openembedded-core mailing list >> >> >> Openembedded-core at lists.openembedded.org >> >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 13 16:07:38 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 08:07:38 -0800 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, Feb 13, 2020 at 12:21 AM Alexander Kanavin wrote: > On Thu, 13 Feb 2020 at 07:38, Khem Raj wrote: > >> libsolv: Enable rpm packageconfig by default only if rpm O_P_M is >> enabled >> dnf,libdnf: Ignore if PACKAGE_CLASSES does not have rpm >> > > I'd like to request that these two are held back until we figure out what > is going wrong with the rpm test (see separate thread). > We already know what?s going on what more Do you want to know ? > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 13 16:08:31 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 08:08:31 -0800 Subject: [OE-core] [PATCH 8/9] binutils: Bail out if gold is used on 32/64 bit RISC-V In-Reply-To: <20200213073151.GA20530@localhost> References: <11cf7d82deafd496d30a4a28a38a3b1121762f9e.1581575578.git.raj.khem@gmail.com> <20200213073151.GA20530@localhost> Message-ID: On Wed, Feb 12, 2020 at 11:31 PM Adrian Bunk wrote: > On Wed, Feb 12, 2020 at 10:38:22PM -0800, Khem Raj wrote: > > gold is not supporting risc-v yet and, this will cause subltle errors > > during build e.g. autoconf not finding certain features like visibility > > and it could take a while to unwind the problem. Its better to error out > > early > >... > > @@ -163,3 +165,8 @@ inherit update-alternatives > > ALTERNATIVE_PRIORITY = "100" > > > > ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" > > + > > +python () { > > + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, > d): > > + bb.fatal("Gold linker does not _yet_ support RISC-V > architecture please remove ld-is-gold from DISTRO_FEATURES") > > +} > > This lacks some check for RISC-V, > currently it errors for all architectures. Yes this in itself was not enough please try the v2 series > > cu > Adrian > -------------- next part -------------- An HTML attachment was scrubbed... URL: From maxime.roussinbelanger at gmail.com Thu Feb 13 16:13:49 2020 From: maxime.roussinbelanger at gmail.com (=?UTF-8?Q?Maxime_Roussin=2DB=C3=A9langer?=) Date: Thu, 13 Feb 2020 11:13:49 -0500 Subject: [OE-core] [PATCH] wpa-supplicant: add virtual supplicant In-Reply-To: References: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> <928575d17e93b117b6f555d674089560161d6c97.camel@linuxfoundation.org> Message-ID: On Thu, Feb 13, 2020 at 11:00 AM Alexander Kanavin wrote: > > On Thu, 13 Feb 2020 at 16:55, Maxime Roussin-B?langer < maxime.roussinbelanger at gmail.com> wrote: >> >> PACKAGECONFIG[iwd] = "--enable-iwd, --disable-wifi, iwd, iwd" >> PACKAGECONFIG[wpa-supplicant] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" > > > The problem with this, is that enabling one but not the other will combine into '--enable-iwd --disable-wifi' which is not what is intended. Actually, it is what is intended, the `--disable-wifi` will disable wpa-supplicant support, but keep the wifi support from other plugins (i.e. iwd). I agree that maybe the `--enable-wifi` is probably not the best option name, but I am not sure I can something about it :) > > > I am not sure why you need to specify them as both build and runtime dependencies, can you clarify why? iwd is probably not needed as a build dependency.. I would have to recheck that. ConnMan needs the runtime for the dbus interface that iwd exposes. wpa-supplicant is probably the same thing. I'm not sure why originally wpa-supplicant is specified as a build dependency. It's been there for 5 years.. Thanks, Max. > > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 13 16:19:38 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 17:19:38 +0100 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, 13 Feb 2020 at 17:07, Khem Raj wrote: > >> I'd like to request that these two are held back until we figure out what >> is going wrong with the rpm test (see separate thread). >> > > We already know what?s going on what more > Do you want to know ? > As the rpm maintainer, yes I do. The test is not being skipped when it should be, and I'd like to know why. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 13 16:25:22 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 17:25:22 +0100 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: On Thu, 13 Feb 2020 at 17:06, Khem Raj wrote: > No, problem is that if One wants to use opkg backend then rpm drags along > but apt or dpkg don?t > > Even if test is made to pass rpm will be dragged into > Images which is not desired > We can modify the rpm packaging so that only the library from rpm that libresolv links with, but not the executables or other libraries are in the image. Would you be ok with that? Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From scott.branden at broadcom.com Thu Feb 13 16:25:33 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Thu, 13 Feb 2020 08:25:33 -0800 Subject: [OE-core] [PATCH] ffmpeg: add PACKAGECONFIG support for x265 Message-ID: <20200213162533.3755-1-scott.branden@broadcom.com> Add PACKAGECONFIG support for x265 in ffmpeg. Signed-off-by: Scott Branden --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index a3cf0c1a37..20a8249b02 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -74,6 +74,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" +PACKAGECONFIG[x265] = "--enable-libx265,--disable-libx265,x265" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -- 2.17.1 From scott.branden at broadcom.com Thu Feb 13 16:39:18 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Thu, 13 Feb 2020 08:39:18 -0800 Subject: [OE-core] [meta-multimedia][PATCH] x265: add x265 recipe Message-ID: <20200213163918.29470-1-scott.branden@broadcom.com> Add x265 recipe for latest tag of Release_3.2 branch (3.2.1). Signed-off-by: Scott Branden --- .../recipes-multimedia/x265/x265_3.2.1.bb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb new file mode 100644 index 0000000000..68c1a55c8c --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "H.265/HEVC video encoder" +DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." +HOMEPAGE = "http://www.videolan.org/developers/x265.html" + +LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" + +DEPENDS = "nasm-native gnutls zlib libpcre" + +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz" + +S = "${WORKDIR}/x265_${PV}/source" + +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca" +SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc" + +inherit lib_package pkgconfig cmake + +AS[unexport] = "1" + +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE_x86 = ".*" +COMPATIBLE_MACHINE_x86-64 = ".*" -- 2.17.1 From raj.khem at gmail.com Thu Feb 13 16:42:20 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 08:42:20 -0800 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: On Thu, Feb 13, 2020 at 8:24 AM Alexander Kanavin wrote: > On Thu, 13 Feb 2020 at 17:06, Khem Raj wrote: > >> No, problem is that if One wants to use opkg backend then rpm drags along >> but apt or dpkg don?t >> >> Even if test is made to pass rpm will be dragged into >> Images which is not desired >> > > We can modify the rpm packaging so that only the library from rpm that > libresolv links with, but not the executables or other libraries are in the > image. Would you be ok with that? > This still sneaks in pieces of rpm into distros where rpm is not needed so better would be to retool dnf to not demand rpm support in libsolv and break the dependency chain. Opkg is usually sought for small systems and last thing we want is unneeded dependencies I would rather use the OE configuration powers as such but I am not opposed to such a solution > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 13 16:44:25 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 08:44:25 -0800 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, Feb 13, 2020 at 8:19 AM Alexander Kanavin wrote: > On Thu, 13 Feb 2020 at 17:07, Khem Raj wrote: > >> >>> I'd like to request that these two are held back until we figure out >>> what is going wrong with the rpm test (see separate thread). >>> >> >> We already know what?s going on what more >> Do you want to know ? >> > > As the rpm maintainer, yes I do. The test is not being skipped when it > should be, and I'd like to know why. > I see that as separate issue orthogonal to these patches > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 13 16:53:06 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 17:53:06 +0100 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, 13 Feb 2020 at 17:44, Khem Raj wrote: > I'd like to request that these two are held back until we figure out what >>>> is going wrong with the rpm test (see separate thread). >>>> >>> >>> We already know what?s going on what more >>> Do you want to know ? >>> >> >> As the rpm maintainer, yes I do. The test is not being skipped when it >> should be, and I'd like to know why. >> > > I see that as separate issue orthogonal to these patches > Merging these patches will exclude rpm from images, and so will mask the issue, so it's not orthogonal. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 13 16:58:09 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 17:58:09 +0100 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: On Thu, 13 Feb 2020 at 17:42, Khem Raj wrote: > This still sneaks in pieces of rpm into distros where rpm is not needed so > better would be to retool dnf to not demand rpm support in libsolv and > break the dependency chain. Opkg is usually sought for small systems and > last thing we want is unneeded dependencies > > I would rather use the OE configuration powers as such but I am not > opposed to such a solution > You can always set these things (rpm disabling in libsolv, blacklisting libdnf/dnf) in your distro configuration, but I would like less complexity and special-casing in poky, not more, for the pieces that I maintain at least. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From zhe.he at windriver.com Thu Feb 13 18:38:44 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Fri, 14 Feb 2020 02:38:44 +0800 Subject: [OE-core] [PATCH] perf: Correct the substitution of python shebangs Message-ID: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> From: He Zhe To make the native python3 are always used, - Move the substitution of /usr/bin/python3 to first, otherwise the possible original /usr/bin/python3 would be changed to /usr/bin/env python33. - Add substitution for ${S}/scripts/ Signed-off-by: He Zhe --- meta/recipes-kernel/perf/perf.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b066..14a9090 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -240,10 +240,17 @@ do_configure_prepend () { # use /usr/bin/env instead of version specific python for s in `find ${S}/tools/perf/ -name '*.py'`; do + sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" + done + + for s in `find ${S}/scripts/ -name '*.py'`; do sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- 2.7.4 From scott.branden at broadcom.com Thu Feb 13 19:18:15 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Thu, 13 Feb 2020 11:18:15 -0800 Subject: [OE-core] [PATCH] perf: Correct the substitution of python shebangs In-Reply-To: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> References: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> Message-ID: Thank you - works for me.? I've been waiting for a fix! On 2020-02-13 10:38 a.m., zhe.he at windriver.com wrote: > From: He Zhe > > To make the native python3 are always used, > > - Move the substitution of /usr/bin/python3 to first, otherwise the > possible original /usr/bin/python3 would be changed to > /usr/bin/env python33. > - Add substitution for ${S}/scripts/ > > Signed-off-by: He Zhe Tested-by: Scott Branden > --- > meta/recipes-kernel/perf/perf.bb | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > index 6d1b066..14a9090 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -240,10 +240,17 @@ do_configure_prepend () { > > # use /usr/bin/env instead of version specific python > for s in `find ${S}/tools/perf/ -name '*.py'`; do > + sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > + done > + > + for s in `find ${S}/scripts/ -name '*.py'`; do > sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > done > > # unistd.h can be out of sync between libc-headers and the captured version in the perf source From alex.kanavin at gmail.com Thu Feb 13 19:26:41 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 20:26:41 +0100 Subject: [OE-core] [meta-multimedia][PATCH] x265: add x265 recipe In-Reply-To: <20200213163918.29470-1-scott.branden@broadcom.com> References: <20200213163918.29470-1-scott.branden@broadcom.com> Message-ID: Wrong mailing list, should go to oe-devel. Alex On Thu, 13 Feb 2020 at 17:39, Scott Branden via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > Add x265 recipe for latest tag of Release_3.2 branch (3.2.1). > > Signed-off-by: Scott Branden > --- > .../recipes-multimedia/x265/x265_3.2.1.bb | 24 +++++++++++++++++++ > 1 file changed, 24 insertions(+) > create mode 100644 > meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb > > diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/ > x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/ > x265_3.2.1.bb > new file mode 100644 > index 0000000000..68c1a55c8c > --- /dev/null > +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/ > x265_3.2.1.bb > @@ -0,0 +1,24 @@ > +SUMMARY = "H.265/HEVC video encoder" > +DESCRIPTION = "A free software library and application for encoding video > streams into the H.265/HEVC format." > +HOMEPAGE = "http://www.videolan.org/developers/x265.html" > + > +LICENSE = "GPLv2" > +LICENSE_FLAGS = "commercial" > +LIC_FILES_CHKSUM = > "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" > + > +DEPENDS = "nasm-native gnutls zlib libpcre" > + > +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz" > + > +S = "${WORKDIR}/x265_${PV}/source" > + > +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca" > +SRC_URI[sha256sum] = > "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc" > + > +inherit lib_package pkgconfig cmake > + > +AS[unexport] = "1" > + > +COMPATIBLE_MACHINE = "^$" > +COMPATIBLE_MACHINE_x86 = ".*" > +COMPATIBLE_MACHINE_x86-64 = ".*" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bruce.ashfield at gmail.com Thu Feb 13 19:45:12 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Thu, 13 Feb 2020 14:45:12 -0500 Subject: [OE-core] [PATCH] perf: Correct the substitution of python shebangs In-Reply-To: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> References: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> Message-ID: On Thu, Feb 13, 2020 at 1:39 PM wrote: > > From: He Zhe > > To make the native python3 are always used, > FWIW, a very similar patch was sent 10 days ago. Did you confirm that it isn't in master-next already ? see: "[OE-core] [PATCH] perf: Additional fixes for 5.5+" Bruce > - Move the substitution of /usr/bin/python3 to first, otherwise the > possible original /usr/bin/python3 would be changed to > /usr/bin/env python33. > - Add substitution for ${S}/scripts/ > > Signed-off-by: He Zhe > --- > meta/recipes-kernel/perf/perf.bb | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > index 6d1b066..14a9090 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -240,10 +240,17 @@ do_configure_prepend () { > > # use /usr/bin/env instead of version specific python > for s in `find ${S}/tools/perf/ -name '*.py'`; do > + sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > + done > + > + for s in `find ${S}/scripts/ -name '*.py'`; do > sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > done > > # unistd.h can be out of sync between libc-headers and the captured version in the perf source > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From scott.branden at broadcom.com Thu Feb 13 19:49:40 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Thu, 13 Feb 2020 11:49:40 -0800 Subject: [OE-core] [PATCH] perf: Correct the substitution of python shebangs In-Reply-To: References: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> Message-ID: On 2020-02-13 11:45 a.m., Bruce Ashfield wrote: > On Thu, Feb 13, 2020 at 1:39 PM wrote: >> From: He Zhe >> >> To make the native python3 are always used, >> > FWIW, a very similar patch was sent 10 days ago. Did you confirm that it isn't > in master-next already ? It's not in master-next as far as I can tell. > > see: "[OE-core] [PATCH] perf: Additional fixes for 5.5+" > > Bruce > >> - Move the substitution of /usr/bin/python3 to first, otherwise the >> possible original /usr/bin/python3 would be changed to >> /usr/bin/env python33. >> - Add substitution for ${S}/scripts/ >> >> Signed-off-by: He Zhe >> --- >> meta/recipes-kernel/perf/perf.bb | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb >> index 6d1b066..14a9090 100644 >> --- a/meta/recipes-kernel/perf/perf.bb >> +++ b/meta/recipes-kernel/perf/perf.bb >> @@ -240,10 +240,17 @@ do_configure_prepend () { >> >> # use /usr/bin/env instead of version specific python >> for s in `find ${S}/tools/perf/ -name '*.py'`; do >> + sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" >> sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" >> sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" >> sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" >> + done >> + >> + for s in `find ${S}/scripts/ -name '*.py'`; do >> sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" >> + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" >> + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" >> + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" >> done >> >> # unistd.h can be out of sync between libc-headers and the captured version in the perf source >> -- >> 2.7.4 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > From bruce.ashfield at gmail.com Thu Feb 13 20:45:32 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Thu, 13 Feb 2020 15:45:32 -0500 Subject: [OE-core] [PATCH] perf: Correct the substitution of python shebangs In-Reply-To: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> References: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> Message-ID: On Thu, Feb 13, 2020 at 1:39 PM wrote: > > From: He Zhe > > To make the native python3 are always used, > > - Move the substitution of /usr/bin/python3 to first, otherwise the > possible original /usr/bin/python3 would be changed to > /usr/bin/env python33. > - Add substitution for ${S}/scripts/ > > Signed-off-by: He Zhe > --- > meta/recipes-kernel/perf/perf.bb | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > index 6d1b066..14a9090 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -240,10 +240,17 @@ do_configure_prepend () { > > # use /usr/bin/env instead of version specific python > for s in `find ${S}/tools/perf/ -name '*.py'`; do > + sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" Rather than messing around with the order of these, we should just combine them into a single sed invocation. When I started those substitutions, there weren't so many. As was mentioned in the other perf patch and review: sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} or some variant of the regex should fix them all. > sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > + done > + > + for s in `find ${S}/scripts/ -name '*.py'`; do It would be better to not have two loops doing the same thing, why not combine the two ? In the other review, the single script that was causing the problem was specifically pointed out .. and while I also agree that we can just substitute them all, technically, if we haven't run them, we don't know they are py3 safe. But minimally, getting them into a single for loop is something we should do (also part of that other patch/review). Bruce > sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > done > > # unistd.h can be out of sync between libc-headers and the captured version in the perf source > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From raj.khem at gmail.com Thu Feb 13 21:35:47 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 13:35:47 -0800 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: References: <20200212191927.2708197-1-raj.khem@gmail.com> Message-ID: On Thu, Feb 13, 2020 at 8:57 AM Alexander Kanavin wrote: > On Thu, 13 Feb 2020 at 17:42, Khem Raj wrote: > >> This still sneaks in pieces of rpm into distros where rpm is not needed >> so better would be to retool dnf to not demand rpm support in libsolv and >> break the dependency chain. Opkg is usually sought for small systems and >> last thing we want is unneeded dependencies >> >> I would rather use the OE configuration powers as such but I am not >> opposed to such a solution >> > > You can always set these things (rpm disabling in libsolv, blacklisting > libdnf/dnf) in your distro configuration, but I would like less complexity > and special-casing in poky, not more, for the pieces that I maintain at > least. > Btw it?s being proposed for Oe-core not poky and in Oe core rpm is not default backend but opkg is Moreover it is being done in a way where poky default are being taken into account I really fail to understand your line of arguments Here I am sorry, there seems to be no technical arguments for alternatives but for convenience I certainly can this goes unsaid and it just takes distro one step away from Oe-core > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 13 21:37:36 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 13:37:36 -0800 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, Feb 13, 2020 at 8:52 AM Alexander Kanavin wrote: > On Thu, 13 Feb 2020 at 17:44, Khem Raj wrote: > >> I'd like to request that these two are held back until we figure out what >>>>> is going wrong with the rpm test (see separate thread). >>>>> >>>> >>>> We already know what?s going on what more >>>> Do you want to know ? >>>> >>> >>> As the rpm maintainer, yes I do. The test is not being skipped when it >>> should be, and I'd like to know why. >>> >> >> I see that as separate issue orthogonal to these patches >> > > Merging these patches will exclude rpm from images, and so will mask the > issue, so it's not orthogonal. > are you actively working to fix the test case ? In that case it would be justified to hold them > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 13 22:05:30 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 13 Feb 2020 23:05:30 +0100 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, 13 Feb 2020 at 22:37, Khem Raj wrote: > >> Merging these patches will exclude rpm from images, and so will mask the >> issue, so it's not orthogonal. >> > > are you actively working to fix the test case ? > In that case it would be justified to hold them > The test case that is failing for you (with ipk/opkg and core-image-sato-sdk) is passing just fine on the autobuilder [1], so I am missing information on how to reproduce. I have requested this information from you here [2] and got no answer so far. Or is it some other test that is failing? That isn't entirely clear. [1] https://autobuilder.yoctoproject.org/typhoon/#/builders/76/builds/1554/steps/8/logs/step1c [2] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/292774.html Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From obi at opendreambox.org Thu Feb 13 23:18:33 2020 From: obi at opendreambox.org (Andreas Oberritter) Date: Fri, 14 Feb 2020 00:18:33 +0100 Subject: [OE-core] [PATCH] wpa-supplicant: add virtual supplicant In-Reply-To: References: <20200210214211.2696-1-maxime.roussinbelanger@gmail.com> <928575d17e93b117b6f555d674089560161d6c97.camel@linuxfoundation.org> Message-ID: <20200214001833.6a4c1a50@opendreambox.org> On Thu, 13 Feb 2020 11:13:49 -0500 Maxime Roussin-B?langer wrote: > On Thu, Feb 13, 2020 at 11:00 AM Alexander Kanavin > wrote: > > > > On Thu, 13 Feb 2020 at 16:55, Maxime Roussin-B?langer < > maxime.roussinbelanger at gmail.com> wrote: > >> > >> PACKAGECONFIG[iwd] = "--enable-iwd, --disable-wifi, iwd, iwd" > >> PACKAGECONFIG[wpa-supplicant] = "--enable-wifi, --disable-wifi, > wpa-supplicant, wpa-supplicant" > > > > > > The problem with this, is that enabling one but not the other will > combine into '--enable-iwd --disable-wifi' which is not what is intended. > > Actually, it is what is intended, the `--disable-wifi` will disable > wpa-supplicant support, but keep the wifi support from other plugins (i.e. > iwd). > > I agree that maybe the `--enable-wifi` is probably not the best option > name, but I am not sure I can something about it :) It should be the user's responsibility (or the image recipe's) to choose the wifi daemon, and it should be possible to uninstall one and install the other from a package feed, or even to install both at the same time and use one for wlan0 and the other for wlan1. Debian enables support for both daemons in connman and has the following package metadata: Recommends: wpasupplicant | iwd I don't know whether there's a way to generate that line in OE. If not, you could try to fake it by adding RPROVIDES_${PN} = "iwd-or-wpasupplicant" or something similar to both daemon's recipes and recommending that in recipes supporting both daemons. Best regards, Andreas From alistair.francis at wdc.com Thu Feb 13 23:25:28 2020 From: alistair.francis at wdc.com (Alistair Francis) Date: Thu, 13 Feb 2020 15:25:28 -0800 Subject: [OE-core] [PATCH] strace: Update to 5.5 Message-ID: <20200213232528.30517-1-alistair.francis@wdc.com> Update strace to 5.5. This includes a small change in the license file to change the date to 2020. Signed-off-by: Alistair Francis --- ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- ...yscall_info-to-__ptrace_syscall_info.patch | 52 ------------------- .../strace/strace/Makefile-ptest.patch | 6 ++- .../strace/disable-git-version-gen.patch | 4 +- .../strace/strace/mips-SIGEMT.patch | 2 +- ...st-test-for-m32-mx32-compile-support.patch | 43 --------------- .../strace/strace/ptest-spacesave.patch | 17 ++++-- .../strace/strace/sys_headers.patch | 25 --------- .../strace/strace/uintptr_t.patch | 12 ++++- .../strace/strace/update-gawk-paths.patch | 2 +- .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- 11 files changed, 36 insertions(+), 138 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch delete mode 100644 meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%) diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 52d2cdcdc5..235e803641 100644 --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 9 Feb 2017 01:27:49 -0800 Subject: [PATCH] caps-abbrev.awk: fix gawk's path diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch deleted file mode 100644 index dd0617a15f..0000000000 --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Dec 2019 10:18:38 -0800 -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info - -glibc 2.31+ has defined __ptrace_syscall_info [1] - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - get_personality.h | 2 ++ - ptrace.h | 2 ++ - 2 files changed, 4 insertions(+) - ---- a/get_personality.h -+++ b/get_personality.h -@@ -10,7 +10,9 @@ - - # include "ptrace.h" - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO - extern int - get_personality_from_syscall_info(const struct ptrace_syscall_info *); -+# endif - - #endif /* !STRACE_GET_PERSONALITY_H */ ---- a/ptrace.h -+++ b/ptrace.h -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { - }; - # endif - -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO -+# define ptrace_syscall_info __ptrace_syscall_info -+# endif - # if !HAVE_DECL_PTRACE_PEEKUSER - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # endif ---- a/configure.ac -+++ b/configure.ac -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n - AC_CHECK_TYPES(m4_normalize([ - struct pt_all_user_regs, - struct ia64_fpreg, -- struct ptrace_peeksiginfo_args -+ struct ptrace_peeksiginfo_args, -+ struct __ptrace_syscall_info - ]),,, [#include ]) - - # For kernels that do not have v3.10-rc1~201^2~11 diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 1f01ef79f2..42c1893f39 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal tests/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 5fefff33e9..e8dbd7f273 100644 --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,4 +1,4 @@ -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 13:33:50 -0800 Subject: [PATCH] strace: remove need for scripts @@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 949b058..4ba989c 100644 +index dd4f13f..65f000b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,12 @@ diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch index 0d3192b345..e86da9707c 100644 --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch @@ -1,4 +1,4 @@ -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Aug 2016 23:47:57 -0700 Subject: [PATCH] strace: Fix build with mips/mips64 on musl diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted file mode 100644 index ae22105cbe..0000000000 --- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 18 Jan 2016 11:00:00 -0800 -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support - -When using the default OE toolchain for x86-64, the basic checks for --m32 and -mx32 compile support in mpers.m4 pass but later attempts to -actually use the toolchain with -m32 fail, e.g. - - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, - | from ../strace-4.11/defs.h:55, - | from mpers-m32/kernel_dirent.c:32: - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory - -Make the mpers.m4 tests more robust so that configure correctly -detects the limitations of the OE toolchain. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy - ---- - m4/mpers.m4 | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/m4/mpers.m4 -+++ b/m4/mpers.m4 -@@ -103,6 +103,7 @@ case "$arch" in - CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG" - AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_cc=yes], - [st_cv_cc=no])]) -@@ -110,6 +111,7 @@ case "$arch" in - AC_CACHE_CHECK([for mpers_name personality runtime support], - [st_cv_runtime], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+ #include - int main(){return 0;}]])], - [st_cv_runtime=yes], - [st_cv_runtime=no], diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch index 3e32cc388c..c5d8ff9207 100644 --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -1,3 +1,8 @@ +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 29 May 2019 00:10:32 +0100 +Subject: [PATCH] strace: Tweak ptest disk space management + If the test is successful, remove the log and exp files. This stops strace using around 600MB of disk space and running our ptest images out of space. @@ -5,10 +10,14 @@ RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] -Index: strace-4.26/tests/gen_tests.sh -=================================================================== ---- strace-4.26.orig/tests/gen_tests.sh -+++ strace-4.26/tests/gen_tests.sh +--- + tests/gen_tests.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 3540204..5e1e7c9 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh @@ -62,6 +62,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch deleted file mode 100644 index d1b704e0d9..0000000000 --- a/meta/recipes-devtools/strace/strace/sys_headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -Remove configure checks for few sys/ headers - -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers -for kernel headers in libc if available, here strace is trying to match -traced process's APIs to syscalls kernel structures - -Removing the checks makes it default to right kernel UAPI headers under linux/ - -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] -Suggested-by: Rich Felker -Signed-off-by: Khem Raj ---- a/configure.ac -+++ b/configure.ac -@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([ - sys/conf.h - sys/eventfd.h - sys/fanotify.h -- sys/ipc.h -- sys/msg.h - sys/quota.h -- sys/sem.h -- sys/shm.h - sys/signalfd.h - sys/xattr.h - ustat.h diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch index 6d3dd6fb98..088d685af0 100644 --- a/meta/recipes-devtools/strace/strace/uintptr_t.patch +++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -1,10 +1,20 @@ -include stdint.h for getting uintptr_t definition +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Nov 2019 20:05:08 -0800 +Subject: [PATCH] include stdint.h for getting uintptr_t definition fixes do_compile_ptest_base tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? Upstream-Status: Pending Signed-off-by: Khem Raj + +--- + tests/fanotify_mark.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c +index aade643..de579f3 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -18,6 +18,7 @@ diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 7077048c75..d46b147de5 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -1,4 +1,4 @@ -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb similarity index 80% rename from meta/recipes-devtools/strace/strace_5.4.bb rename to meta/recipes-devtools/strace/strace_5.5.bb index 1e428ccd64..6e7d63949d 100644 --- a/meta/recipes-devtools/strace/strace_5.4.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ - file://more-robust-test-for-m32-mx32-compile-support.patch \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ @@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ - file://sys_headers.patch \ - file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \ " -SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" -SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" inherit autotools ptest -- 2.25.0 From richard.purdie at linuxfoundation.org Thu Feb 13 23:38:06 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 13 Feb 2020 23:38:06 +0000 Subject: [OE-core] [PATCH 6/9] gdb: Upgrade to 9.1 release In-Reply-To: <650b515ce0c79adcbba39cdf47bc23f764ca1465.1581575578.git.raj.khem@gmail.com> References: <650b515ce0c79adcbba39cdf47bc23f764ca1465.1581575578.git.raj.khem@gmail.com> Message-ID: On Wed, 2020-02-12 at 22:38 -0800, Khem Raj wrote: > Drop security patches which are now in 9.1 already > Forward port rest of patches to 9.1 > Detailed changes [1] > > [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html > > Signed-off-by: Khem Raj Something odd is going on as another patch failure: https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1551 Cheers, Richard From richard.purdie at linuxfoundation.org Thu Feb 13 23:39:43 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 13 Feb 2020 23:39:43 +0000 Subject: [OE-core] [OE-Core][PATCH v2] systemd: upgrade v244.1 -> v244.3 In-Reply-To: <20200213061649.102346-1-alex.kiernan@gmail.com> References: <20200213061649.102346-1-alex.kiernan@gmail.com> Message-ID: <6557ee9b5ee8375cc9e7ee79336975f2cd8c4468.camel@linuxfoundation.org> On Thu, 2020-02-13 at 06:16 +0000, Alex Kiernan wrote: > Commits from v244-stable: I think this causes: https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/1557 (systemd-boot patch failures) Cheers, Richard From akuster808 at gmail.com Fri Feb 14 00:24:42 2020 From: akuster808 at gmail.com (akuster808) Date: Thu, 13 Feb 2020 16:24:42 -0800 Subject: [OE-core] [PATCH] strace: Update to 5.5 In-Reply-To: <20200213232528.30517-1-alistair.francis@wdc.com> References: <20200213232528.30517-1-alistair.francis@wdc.com> Message-ID: On 2/13/20 3:25 PM, Alistair Francis wrote: > Update strace to 5.5. This includes a small change in the license file > to change the date to 2020. Have you run the ptests for this? Will this help help address this following open defect? https://bugzilla.yoctoproject.org/show_bug.cgi?id=13785 - armin > Signed-off-by: Alistair Francis > --- > ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- > ...yscall_info-to-__ptrace_syscall_info.patch | 52 ------------------- > .../strace/strace/Makefile-ptest.patch | 6 ++- > .../strace/disable-git-version-gen.patch | 4 +- > .../strace/strace/mips-SIGEMT.patch | 2 +- > ...st-test-for-m32-mx32-compile-support.patch | 43 --------------- > .../strace/strace/ptest-spacesave.patch | 17 ++++-- > .../strace/strace/sys_headers.patch | 25 --------- > .../strace/strace/uintptr_t.patch | 12 ++++- > .../strace/strace/update-gawk-paths.patch | 2 +- > .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- > 11 files changed, 36 insertions(+), 138 deletions(-) > delete mode 100644 meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > delete mode 100644 meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch > delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch > rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%) > > diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > index 52d2cdcdc5..235e803641 100644 > --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > @@ -1,4 +1,4 @@ > -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 > +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 > From: Robert Yang > Date: Thu, 9 Feb 2017 01:27:49 -0800 > Subject: [PATCH] caps-abbrev.awk: fix gawk's path > diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > deleted file mode 100644 > index dd0617a15f..0000000000 > --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 > -From: Khem Raj > -Date: Sat, 21 Dec 2019 10:18:38 -0800 > -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info > - > -glibc 2.31+ has defined __ptrace_syscall_info [1] > - > -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 > - > -Upstream-Status: Pending > -Signed-off-by: Khem Raj > ---- > - get_personality.h | 2 ++ > - ptrace.h | 2 ++ > - 2 files changed, 4 insertions(+) > - > ---- a/get_personality.h > -+++ b/get_personality.h > -@@ -10,7 +10,9 @@ > - > - # include "ptrace.h" > - > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO > - extern int > - get_personality_from_syscall_info(const struct ptrace_syscall_info *); > -+# endif > - > - #endif /* !STRACE_GET_PERSONALITY_H */ > ---- a/ptrace.h > -+++ b/ptrace.h > -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { > - }; > - # endif > - > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO > -+# define ptrace_syscall_info __ptrace_syscall_info > -+# endif > - # if !HAVE_DECL_PTRACE_PEEKUSER > - # define PTRACE_PEEKUSER PTRACE_PEEKUSR > - # endif > ---- a/configure.ac > -+++ b/configure.ac > -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n > - AC_CHECK_TYPES(m4_normalize([ > - struct pt_all_user_regs, > - struct ia64_fpreg, > -- struct ptrace_peeksiginfo_args > -+ struct ptrace_peeksiginfo_args, > -+ struct __ptrace_syscall_info > - ]),,, [#include ]) > - > - # For kernels that do not have v3.10-rc1~201^2~11 > diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > index 1f01ef79f2..42c1893f39 100644 > --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > @@ -1,4 +1,4 @@ > -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 > +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 > From: Gabriel Barbu > Date: Thu, 25 Jul 2013 15:28:33 +0200 > Subject: [PATCH] strace: Add ptest > @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal > tests/Makefile.am | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > +diff --git a/tests/Makefile.am b/tests/Makefile.am > +index 8cf4c36..66162eb 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ > @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal > AM_CFLAGS = $(WARN_CFLAGS) > AM_CPPFLAGS = $(ARCH_MFLAGS) \ > -I$(builddir) \ > -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h > +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h > CLEANFILES = ksysent.h > > include ../scno.am > diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch > index 5fefff33e9..e8dbd7f273 100644 > --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch > +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch > @@ -1,4 +1,4 @@ > -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 > +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 > From: Andre McCurdy > Date: Mon, 18 Jan 2016 13:33:50 -0800 > Subject: [PATCH] strace: remove need for scripts > @@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > -index 949b058..4ba989c 100644 > +index dd4f13f..65f000b 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -12,12 +12,12 @@ > diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch > index 0d3192b345..e86da9707c 100644 > --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch > +++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch > @@ -1,4 +1,4 @@ > -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 > +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Sun, 7 Aug 2016 23:47:57 -0700 > Subject: [PATCH] strace: Fix build with mips/mips64 on musl > diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch > deleted file mode 100644 > index ae22105cbe..0000000000 > --- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001 > -From: Andre McCurdy > -Date: Mon, 18 Jan 2016 11:00:00 -0800 > -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support > - > -When using the default OE toolchain for x86-64, the basic checks for > --m32 and -mx32 compile support in mpers.m4 pass but later attempts to > -actually use the toolchain with -m32 fail, e.g. > - > - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, > - | from ../strace-4.11/defs.h:55, > - | from mpers-m32/kernel_dirent.c:32: > - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory > - > -Make the mpers.m4 tests more robust so that configure correctly > -detects the limitations of the OE toolchain. > - > -Upstream-Status: Pending > - > -Signed-off-by: Andre McCurdy > - > ---- > - m4/mpers.m4 | 2 ++ > - 1 file changed, 2 insertions(+) > - > ---- a/m4/mpers.m4 > -+++ b/m4/mpers.m4 > -@@ -103,6 +103,7 @@ case "$arch" in > - CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG" > - AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc], > - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include > -+ #include > - int main(){return 0;}]])], > - [st_cv_cc=yes], > - [st_cv_cc=no])]) > -@@ -110,6 +111,7 @@ case "$arch" in > - AC_CACHE_CHECK([for mpers_name personality runtime support], > - [st_cv_runtime], > - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include > -+ #include > - int main(){return 0;}]])], > - [st_cv_runtime=yes], > - [st_cv_runtime=no], > diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch > index 3e32cc388c..c5d8ff9207 100644 > --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch > +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch > @@ -1,3 +1,8 @@ > +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 > +From: Richard Purdie > +Date: Wed, 29 May 2019 00:10:32 +0100 > +Subject: [PATCH] strace: Tweak ptest disk space management > + > If the test is successful, remove the log and exp files. This stops strace > using around 600MB of disk space and running our ptest images out of space. > > @@ -5,10 +10,14 @@ RP 2019/5/29 > > Upstream-Status: Inappropriate [specific to OE image space issues] > > -Index: strace-4.26/tests/gen_tests.sh > -=================================================================== > ---- strace-4.26.orig/tests/gen_tests.sh > -+++ strace-4.26/tests/gen_tests.sh > +--- > + tests/gen_tests.sh | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh > +index 3540204..5e1e7c9 100755 > +--- a/tests/gen_tests.sh > ++++ b/tests/gen_tests.sh > @@ -62,6 +62,7 @@ while read -r name arg0 args; do { > $hdr > . "\${srcdir=.}/init.sh" > diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch > deleted file mode 100644 > index d1b704e0d9..0000000000 > --- a/meta/recipes-devtools/strace/strace/sys_headers.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -Remove configure checks for few sys/ headers > - > -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers > -for kernel headers in libc if available, here strace is trying to match > -traced process's APIs to syscalls kernel structures > - > -Removing the checks makes it default to right kernel UAPI headers under linux/ > - > -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] > -Suggested-by: Rich Felker > -Signed-off-by: Khem Raj > ---- a/configure.ac > -+++ b/configure.ac > -@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([ > - sys/conf.h > - sys/eventfd.h > - sys/fanotify.h > -- sys/ipc.h > -- sys/msg.h > - sys/quota.h > -- sys/sem.h > -- sys/shm.h > - sys/signalfd.h > - sys/xattr.h > - ustat.h > diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch > index 6d3dd6fb98..088d685af0 100644 > --- a/meta/recipes-devtools/strace/strace/uintptr_t.patch > +++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch > @@ -1,10 +1,20 @@ > -include stdint.h for getting uintptr_t definition > +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Tue, 5 Nov 2019 20:05:08 -0800 > +Subject: [PATCH] include stdint.h for getting uintptr_t definition > > fixes do_compile_ptest_base > tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? > > Upstream-Status: Pending > Signed-off-by: Khem Raj > + > +--- > + tests/fanotify_mark.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c > +index aade643..de579f3 100644 > --- a/tests/fanotify_mark.c > +++ b/tests/fanotify_mark.c > @@ -18,6 +18,7 @@ > diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch > index 7077048c75..d46b147de5 100644 > --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch > +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch > @@ -1,4 +1,4 @@ > -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 > +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 > From: Andre McCurdy > Date: Mon, 18 Jan 2016 11:01:00 -0800 > Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk > diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb > similarity index 80% > rename from meta/recipes-devtools/strace/strace_5.4.bb > rename to meta/recipes-devtools/strace/strace_5.5.bb > index 1e428ccd64..6e7d63949d 100644 > --- a/meta/recipes-devtools/strace/strace_5.4.bb > +++ b/meta/recipes-devtools/strace/strace_5.5.bb > @@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool" > HOMEPAGE = "http://strace.io" > SECTION = "console/utils" > LICENSE = "LGPL-2.1+ & GPL-2+" > -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" > +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" > > SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ > file://disable-git-version-gen.patch \ > - file://more-robust-test-for-m32-mx32-compile-support.patch \ > file://update-gawk-paths.patch \ > file://Makefile-ptest.patch \ > file://run-ptest \ > @@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ > file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ > file://ptest-spacesave.patch \ > file://uintptr_t.patch \ > - file://sys_headers.patch \ > - file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \ > " > -SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" > -SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" > +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" > +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" > > inherit autotools ptest > From andrew at avilution.com Fri Feb 14 00:49:23 2020 From: andrew at avilution.com (Andrew Boos) Date: Thu, 13 Feb 2020 18:49:23 -0600 Subject: [OE-core] Unknown Postinstall Scriptlet Failing to Defer Boot Message-ID: Hi, I am working on a bitbake build and I am running into an issue where a postinst scriptlet is failing via "exit 1" to defer to first boot and I cannot figure out which recipe is causing the issue. Does anybody have any tips on identifying which recipe is actually exiting with a failure? The error log says that it is in imagemagick but the recipe does not have any postinst scripts defined. Also, there are no imagemagick .bbappend files in my layers. ( https://github.com/openembedded/meta-openembedded/blob/sumo/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb ) Thanks, Andrew -------------- next part -------------- An HTML attachment was scrubbed... URL: From alistair23 at gmail.com Fri Feb 14 00:44:22 2020 From: alistair23 at gmail.com (Alistair Francis) Date: Thu, 13 Feb 2020 16:44:22 -0800 Subject: [OE-core] [PATCH] strace: Update to 5.5 In-Reply-To: References: <20200213232528.30517-1-alistair.francis@wdc.com> Message-ID: On Thu, Feb 13, 2020 at 4:24 PM akuster808 wrote: > > > > On 2/13/20 3:25 PM, Alistair Francis wrote: > > Update strace to 5.5. This includes a small change in the license file > > to change the date to 2020. > > Have you run the ptests for this? I haven't. > Will this help help address this following open defect? > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13785 I'm not sure. Alistair > > - armin > > > Signed-off-by: Alistair Francis > > --- > > ...0001-caps-abbrev.awk-fix-gawk-s-path.patch | 2 +- > > ...yscall_info-to-__ptrace_syscall_info.patch | 52 ------------------- > > .../strace/strace/Makefile-ptest.patch | 6 ++- > > .../strace/disable-git-version-gen.patch | 4 +- > > .../strace/strace/mips-SIGEMT.patch | 2 +- > > ...st-test-for-m32-mx32-compile-support.patch | 43 --------------- > > .../strace/strace/ptest-spacesave.patch | 17 ++++-- > > .../strace/strace/sys_headers.patch | 25 --------- > > .../strace/strace/uintptr_t.patch | 12 ++++- > > .../strace/strace/update-gawk-paths.patch | 2 +- > > .../strace/{strace_5.4.bb => strace_5.5.bb} | 9 ++-- > > 11 files changed, 36 insertions(+), 138 deletions(-) > > delete mode 100644 meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > > delete mode 100644 meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch > > delete mode 100644 meta/recipes-devtools/strace/strace/sys_headers.patch > > rename meta/recipes-devtools/strace/{strace_5.4.bb => strace_5.5.bb} (80%) > > > > diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > > index 52d2cdcdc5..235e803641 100644 > > --- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > > +++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch > > @@ -1,4 +1,4 @@ > > -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 > > +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 > > From: Robert Yang > > Date: Thu, 9 Feb 2017 01:27:49 -0800 > > Subject: [PATCH] caps-abbrev.awk: fix gawk's path > > diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > > deleted file mode 100644 > > index dd0617a15f..0000000000 > > --- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch > > +++ /dev/null > > @@ -1,52 +0,0 @@ > > -From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001 > > -From: Khem Raj > > -Date: Sat, 21 Dec 2019 10:18:38 -0800 > > -Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info > > - > > -glibc 2.31+ has defined __ptrace_syscall_info [1] > > - > > -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7 > > - > > -Upstream-Status: Pending > > -Signed-off-by: Khem Raj > > ---- > > - get_personality.h | 2 ++ > > - ptrace.h | 2 ++ > > - 2 files changed, 4 insertions(+) > > - > > ---- a/get_personality.h > > -+++ b/get_personality.h > > -@@ -10,7 +10,9 @@ > > - > > - # include "ptrace.h" > > - > > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO > > - extern int > > - get_personality_from_syscall_info(const struct ptrace_syscall_info *); > > -+# endif > > - > > - #endif /* !STRACE_GET_PERSONALITY_H */ > > ---- a/ptrace.h > > -+++ b/ptrace.h > > -@@ -186,6 +186,9 @@ struct ptrace_syscall_info { > > - }; > > - # endif > > - > > -+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO > > -+# define ptrace_syscall_info __ptrace_syscall_info > > -+# endif > > - # if !HAVE_DECL_PTRACE_PEEKUSER > > - # define PTRACE_PEEKUSER PTRACE_PEEKUSR > > - # endif > > ---- a/configure.ac > > -+++ b/configure.ac > > -@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n > > - AC_CHECK_TYPES(m4_normalize([ > > - struct pt_all_user_regs, > > - struct ia64_fpreg, > > -- struct ptrace_peeksiginfo_args > > -+ struct ptrace_peeksiginfo_args, > > -+ struct __ptrace_syscall_info > > - ]),,, [#include ]) > > - > > - # For kernels that do not have v3.10-rc1~201^2~11 > > diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > > index 1f01ef79f2..42c1893f39 100644 > > --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > > +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch > > @@ -1,4 +1,4 @@ > > -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 > > +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 > > From: Gabriel Barbu > > Date: Thu, 25 Jul 2013 15:28:33 +0200 > > Subject: [PATCH] strace: Add ptest > > @@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal > > tests/Makefile.am | 19 +++++++++++++++++++ > > 1 file changed, 19 insertions(+) > > > > +diff --git a/tests/Makefile.am b/tests/Makefile.am > > +index 8cf4c36..66162eb 100644 > > --- a/tests/Makefile.am > > +++ b/tests/Makefile.am > > @@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ > > @@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal > > AM_CFLAGS = $(WARN_CFLAGS) > > AM_CPPFLAGS = $(ARCH_MFLAGS) \ > > -I$(builddir) \ > > -@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h > > +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h > > CLEANFILES = ksysent.h > > > > include ../scno.am > > diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch > > index 5fefff33e9..e8dbd7f273 100644 > > --- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch > > +++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch > > @@ -1,4 +1,4 @@ > > -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 > > +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 > > From: Andre McCurdy > > Date: Mon, 18 Jan 2016 13:33:50 -0800 > > Subject: [PATCH] strace: remove need for scripts > > @@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > -index 949b058..4ba989c 100644 > > +index dd4f13f..65f000b 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -12,12 +12,12 @@ > > diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch > > index 0d3192b345..e86da9707c 100644 > > --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch > > +++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch > > @@ -1,4 +1,4 @@ > > -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 > > +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 > > From: Khem Raj > > Date: Sun, 7 Aug 2016 23:47:57 -0700 > > Subject: [PATCH] strace: Fix build with mips/mips64 on musl > > diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch > > deleted file mode 100644 > > index ae22105cbe..0000000000 > > --- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch > > +++ /dev/null > > @@ -1,43 +0,0 @@ > > -From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001 > > -From: Andre McCurdy > > -Date: Mon, 18 Jan 2016 11:00:00 -0800 > > -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support > > - > > -When using the default OE toolchain for x86-64, the basic checks for > > --m32 and -mx32 compile support in mpers.m4 pass but later attempts to > > -actually use the toolchain with -m32 fail, e.g. > > - > > - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, > > - | from ../strace-4.11/defs.h:55, > > - | from mpers-m32/kernel_dirent.c:32: > > - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory > > - > > -Make the mpers.m4 tests more robust so that configure correctly > > -detects the limitations of the OE toolchain. > > - > > -Upstream-Status: Pending > > - > > -Signed-off-by: Andre McCurdy > > - > > ---- > > - m4/mpers.m4 | 2 ++ > > - 1 file changed, 2 insertions(+) > > - > > ---- a/m4/mpers.m4 > > -+++ b/m4/mpers.m4 > > -@@ -103,6 +103,7 @@ case "$arch" in > > - CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG" > > - AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc], > > - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include > > -+ #include > > - int main(){return 0;}]])], > > - [st_cv_cc=yes], > > - [st_cv_cc=no])]) > > -@@ -110,6 +111,7 @@ case "$arch" in > > - AC_CACHE_CHECK([for mpers_name personality runtime support], > > - [st_cv_runtime], > > - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include > > -+ #include > > - int main(){return 0;}]])], > > - [st_cv_runtime=yes], > > - [st_cv_runtime=no], > > diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch > > index 3e32cc388c..c5d8ff9207 100644 > > --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch > > +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch > > @@ -1,3 +1,8 @@ > > +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 > > +From: Richard Purdie > > +Date: Wed, 29 May 2019 00:10:32 +0100 > > +Subject: [PATCH] strace: Tweak ptest disk space management > > + > > If the test is successful, remove the log and exp files. This stops strace > > using around 600MB of disk space and running our ptest images out of space. > > > > @@ -5,10 +10,14 @@ RP 2019/5/29 > > > > Upstream-Status: Inappropriate [specific to OE image space issues] > > > > -Index: strace-4.26/tests/gen_tests.sh > > -=================================================================== > > ---- strace-4.26.orig/tests/gen_tests.sh > > -+++ strace-4.26/tests/gen_tests.sh > > +--- > > + tests/gen_tests.sh | 1 + > > + 1 file changed, 1 insertion(+) > > + > > +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh > > +index 3540204..5e1e7c9 100755 > > +--- a/tests/gen_tests.sh > > ++++ b/tests/gen_tests.sh > > @@ -62,6 +62,7 @@ while read -r name arg0 args; do { > > $hdr > > . "\${srcdir=.}/init.sh" > > diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch > > deleted file mode 100644 > > index d1b704e0d9..0000000000 > > --- a/meta/recipes-devtools/strace/strace/sys_headers.patch > > +++ /dev/null > > @@ -1,25 +0,0 @@ > > -Remove configure checks for few sys/ headers > > - > > -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers > > -for kernel headers in libc if available, here strace is trying to match > > -traced process's APIs to syscalls kernel structures > > - > > -Removing the checks makes it default to right kernel UAPI headers under linux/ > > - > > -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] > > -Suggested-by: Rich Felker > > -Signed-off-by: Khem Raj > > ---- a/configure.ac > > -+++ b/configure.ac > > -@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([ > > - sys/conf.h > > - sys/eventfd.h > > - sys/fanotify.h > > -- sys/ipc.h > > -- sys/msg.h > > - sys/quota.h > > -- sys/sem.h > > -- sys/shm.h > > - sys/signalfd.h > > - sys/xattr.h > > - ustat.h > > diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch > > index 6d3dd6fb98..088d685af0 100644 > > --- a/meta/recipes-devtools/strace/strace/uintptr_t.patch > > +++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch > > @@ -1,10 +1,20 @@ > > -include stdint.h for getting uintptr_t definition > > +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 > > +From: Khem Raj > > +Date: Tue, 5 Nov 2019 20:05:08 -0800 > > +Subject: [PATCH] include stdint.h for getting uintptr_t definition > > > > fixes do_compile_ptest_base > > tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? > > > > Upstream-Status: Pending > > Signed-off-by: Khem Raj > > + > > +--- > > + tests/fanotify_mark.c | 1 + > > + 1 file changed, 1 insertion(+) > > + > > +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c > > +index aade643..de579f3 100644 > > --- a/tests/fanotify_mark.c > > +++ b/tests/fanotify_mark.c > > @@ -18,6 +18,7 @@ > > diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch > > index 7077048c75..d46b147de5 100644 > > --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch > > +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch > > @@ -1,4 +1,4 @@ > > -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 > > +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 > > From: Andre McCurdy > > Date: Mon, 18 Jan 2016 11:01:00 -0800 > > Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk > > diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb > > similarity index 80% > > rename from meta/recipes-devtools/strace/strace_5.4.bb > > rename to meta/recipes-devtools/strace/strace_5.5.bb > > index 1e428ccd64..6e7d63949d 100644 > > --- a/meta/recipes-devtools/strace/strace_5.4.bb > > +++ b/meta/recipes-devtools/strace/strace_5.5.bb > > @@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool" > > HOMEPAGE = "http://strace.io" > > SECTION = "console/utils" > > LICENSE = "LGPL-2.1+ & GPL-2+" > > -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" > > +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" > > > > SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ > > file://disable-git-version-gen.patch \ > > - file://more-robust-test-for-m32-mx32-compile-support.patch \ > > file://update-gawk-paths.patch \ > > file://Makefile-ptest.patch \ > > file://run-ptest \ > > @@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ > > file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ > > file://ptest-spacesave.patch \ > > file://uintptr_t.patch \ > > - file://sys_headers.patch \ > > - file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \ > > " > > -SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" > > -SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" > > +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" > > +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" > > > > inherit autotools ptest > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Fri Feb 14 01:33:09 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 17:33:09 -0800 Subject: [OE-core] [PATCH 6/9] gdb: Upgrade to 9.1 release In-Reply-To: References: <650b515ce0c79adcbba39cdf47bc23f764ca1465.1581575578.git.raj.khem@gmail.com> Message-ID: On Thu, Feb 13, 2020 at 3:38 PM Richard Purdie wrote: > > On Wed, 2020-02-12 at 22:38 -0800, Khem Raj wrote: > > Drop security patches which are now in 9.1 already > > Forward port rest of patches to 9.1 > > Detailed changes [1] > > > > [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html > > > > Signed-off-by: Khem Raj > > Something odd is going on as another patch failure: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1551 > perhaps pick from pull branch https://git.yoctoproject.org/clean/cgit.cgi/poky-contrib/log/?h=kraj/pu > Cheers, > > Richard > From raj.khem at gmail.com Fri Feb 14 01:39:34 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 17:39:34 -0800 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, Feb 13, 2020 at 2:05 PM Alexander Kanavin wrote: > > On Thu, 13 Feb 2020 at 22:37, Khem Raj wrote: >>> >>> >>> Merging these patches will exclude rpm from images, and so will mask the issue, so it's not orthogonal. >> >> >> are you actively working to fix the test case ? >> In that case it would be justified to hold them > > > The test case that is failing for you (with ipk/opkg and core-image-sato-sdk) is passing just fine on the autobuilder [1], so I am missing information on how to reproduce. I have requested this information from you here [2] and got no answer so far. Or is it some other test that is failing? That isn't entirely clear. > autobuilder runs poky, to reproduce this you will need to use oe-core+bitbake checkout and then for qemux86-64 bitbake -ctestimage core-image-sato-sdk-ptest it might also work in poky setup if you remove PACKAGE_CLASSES ?= "package_rpm" from local.conf > [1] https://autobuilder.yoctoproject.org/typhoon/#/builders/76/builds/1554/steps/8/logs/step1c > > [2] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/292774.html > > Alex From jpuhlman at mvista.com Fri Feb 14 02:01:54 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Thu, 13 Feb 2020 18:01:54 -0800 Subject: [OE-core] Unknown Postinstall Scriptlet Failing to Defer Boot In-Reply-To: References: Message-ID: <1b01b37f-ba3b-da34-8e04-81e3f2dd72fb@mvista.com> In these kind of cases, by providing the actual error message, people can provide more help. The recipe inherits update-alternatives and sets a large number of alternatives. The alternatives are done in the automatically added post install scripts. In all likelihood one of the listed links is wrong, or already a symlink or something similar. On 2/13/2020 4:49 PM, Andrew Boos wrote: > Hi, > > I am working on a bitbake build and I am running into an issue where a > postinst scriptlet is failing via "exit 1" to defer to first boot and > I cannot figure out which recipe is causing the issue. Does anybody > have any tips on identifying which recipe is actually exiting with a > failure? The error log says that it is in imagemagick but the recipe > does not have any postinst scripts defined. Also, there are no > imagemagick .bbappend files in my layers. > (https://github.com/openembedded/meta-openembedded/blob/sumo/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb) > > Thanks, > Andrew > > > Virus-free. www.avg.com > > > > <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2> > -- Jeremy A. Puhlman jpuhlman at mvista.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From zhe.he at windriver.com Fri Feb 14 03:41:30 2020 From: zhe.he at windriver.com (He Zhe) Date: Fri, 14 Feb 2020 11:41:30 +0800 Subject: [OE-core] [PATCH] perf: Correct the substitution of python shebangs In-Reply-To: References: <1581619124-194740-1-git-send-email-zhe.he@windriver.com> Message-ID: Thanks for your input. Since the old one doesn't make it to next branch and the thread hasn't had following replies, I'll send v2 as a summary. Zhe On 2/14/20 4:45 AM, Bruce Ashfield wrote: > On Thu, Feb 13, 2020 at 1:39 PM wrote: >> From: He Zhe >> >> To make the native python3 are always used, >> >> - Move the substitution of /usr/bin/python3 to first, otherwise the >> possible original /usr/bin/python3 would be changed to >> /usr/bin/env python33. >> - Add substitution for ${S}/scripts/ >> >> Signed-off-by: He Zhe >> --- >> meta/recipes-kernel/perf/perf.bb | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb >> index 6d1b066..14a9090 100644 >> --- a/meta/recipes-kernel/perf/perf.bb >> +++ b/meta/recipes-kernel/perf/perf.bb >> @@ -240,10 +240,17 @@ do_configure_prepend () { >> >> # use /usr/bin/env instead of version specific python >> for s in `find ${S}/tools/perf/ -name '*.py'`; do >> + sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > Rather than messing around with the order of these, we should just > combine them into a single sed invocation. When I started those > substitutions, there weren't so many. > > As was mentioned in the other perf patch and review: > > sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} > > or some variant of the regex should fix them all. > >> sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" >> sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" >> sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" >> + done >> + >> + for s in `find ${S}/scripts/ -name '*.py'`; do > It would be better to not have two loops doing the same thing, why not > combine the two ? In the other review, the single script that was > causing the problem was specifically pointed out .. and while I also > agree that we can just substitute them all, technically, if we haven't > run them, we don't know they are py3 safe. > > But minimally, getting them into a single for loop is something we > should do (also part of that other patch/review). > > Bruce > >> sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" >> + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" >> + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" >> + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" >> done >> >> # unistd.h can be out of sync between libc-headers and the captured version in the perf source >> -- >> 2.7.4 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II From zhe.he at windriver.com Fri Feb 14 03:44:54 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Fri, 14 Feb 2020 11:44:54 +0800 Subject: [OE-core] [PATCH v2] perf: Correct the substitution of python shebangs Message-ID: <20200214034454.40728-1-zhe.he@windriver.com> From: He Zhe To make the native python3 is always used, - Move the substitution of /usr/bin/python3 to first, otherwise the possible original /usr/bin/python3 would be changed to /usr/bin/env python33. - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b06693d..a6fb51d3db 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- 2.24.1 From zhe.he at windriver.com Fri Feb 14 03:56:44 2020 From: zhe.he at windriver.com (He Zhe) Date: Fri, 14 Feb 2020 11:56:44 +0800 Subject: [OE-core] [PATCH v2] perf: Correct the substitution of python shebangs In-Reply-To: <20200214034454.40728-1-zhe.he@windriver.com> References: <20200214034454.40728-1-zhe.he@windriver.com> Message-ID: commit log broken. Please ignore. I'll send v3. Zhe On 2/14/20 11:44 AM, zhe.he at windriver.com wrote: > From: He Zhe > > To make the native python3 is always used, > > - Move the substitution of /usr/bin/python3 to first, otherwise the > possible original /usr/bin/python3 would be changed to > /usr/bin/env python33. > - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the > following warning. > > File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix > _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) > ModuleNotFoundError: No module named '_sysconfigdata' > > This issue is first reported by Joel Stanley > The sed one-liner is credited to Anuj Mittal > > Signed-off-by: He Zhe > --- > meta/recipes-kernel/perf/perf.bb | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > index 6d1b06693d..a6fb51d3db 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -239,11 +239,8 @@ do_configure_prepend () { > fi > > # use /usr/bin/env instead of version specific python > - for s in `find ${S}/tools/perf/ -name '*.py'`; do > - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do > + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} > done > > # unistd.h can be out of sync between libc-headers and the captured version in the perf source From zhe.he at windriver.com Fri Feb 14 03:57:37 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Fri, 14 Feb 2020 11:57:37 +0800 Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs Message-ID: <20200214035737.9975-1-zhe.he@windriver.com> From: He Zhe To make the native python3 is always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b06693d..a6fb51d3db 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- 2.24.1 From Qi.Chen at windriver.com Fri Feb 14 04:33:06 2020 From: Qi.Chen at windriver.com (Chen, Qi) Date: Fri, 14 Feb 2020 04:33:06 +0000 Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs In-Reply-To: <20200214035737.9975-1-zhe.he@windriver.com> References: <20200214035737.9975-1-zhe.he@windriver.com> Message-ID: TA ________________________________________ From: openembedded-core-bounces at lists.openembedded.org [openembedded-core-bounces at lists.openembedded.org] on behalf of zhe.he at windriver.com [zhe.he at windriver.com] Sent: Friday, February 14, 2020 11:57 AM To: openembedded-core at lists.openembedded.org Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs From: He Zhe To make the native python3 is always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe --- meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b06693d..a6fb51d3db 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- 2.24.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core at lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core From masahiroy at kernel.org Fri Feb 14 05:18:07 2020 From: masahiroy at kernel.org (Masahiro Yamada) Date: Fri, 14 Feb 2020 14:18:07 +0900 Subject: [OE-core] [PATCH] bitbake.conf: do not let DISTROOVERRIDES fall back to empty string In-Reply-To: <20200113123731.15117-1-masahiroy@kernel.org> References: <20200113123731.15117-1-masahiroy@kernel.org> Message-ID: Hi. On Mon, Jan 13, 2020 at 9:37 PM Masahiro Yamada wrote: > > Commit abacd7243a2e ("bitbake.conf: fix distro-less failure expanding > FILESPATH") mended the littered DISROOVERRIDES when DISTRO is unset. > > Some time later, commit b7279f996397 ("bitbake.conf: Default DISTRO to > nodistro") added a weak default to 'DISTRO'. > > So, this line can go back to the original simple definition. > > Signed-off-by: Masahiro Yamada Please let me ping this in case this was missed. This looks like a good clean-up to me. > --- > > meta/conf/bitbake.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index 62b5466b71..d2b6ca840f 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -736,7 +736,7 @@ DISTRO_NAME ??= "OpenEmbedded" > OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" > LIBCOVERRIDE ?= "" > CLASSOVERRIDE ?= "class-target" > -DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" > +DISTROOVERRIDES ?= "${DISTRO}" > MACHINEOVERRIDES ?= "${MACHINE}" > > FILESOVERRIDES = "${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}" > -- > 2.17.1 > -- Best Regards Masahiro Yamada From nathan at nathanrossi.com Fri Feb 14 05:59:43 2020 From: nathan at nathanrossi.com (Nathan Rossi) Date: Fri, 14 Feb 2020 05:59:43 +0000 Subject: [OE-core] [PATCH 1/2] glibc-testsuite: Remove the do_install task Message-ID: <20200214055943.602254-1-nathan@nathanrossi.com> This task is not intended to be run as this recipe does not produce any packages or install any sysroot content. Additionally running this task behaves differently from a normal glibc build, and can result in issues. [YOCTO #13737] Signed-off-by: Nathan Rossi --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index 657fd4dbc1..c44f30bf1c 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -58,3 +58,4 @@ addtask do_check after do_compile inherit nopackages deltask do_stash_locale +deltask do_install --- 2.24.1 From nathan at nathanrossi.com Fri Feb 14 05:59:43 2020 From: nathan at nathanrossi.com (Nathan Rossi) Date: Fri, 14 Feb 2020 05:59:43 +0000 Subject: [OE-core] [PATCH 2/2] glibc-testsuite: Exclude this recipe from world builds In-Reply-To: <20200214055943.602254-1-nathan@nathanrossi.com> References: <20200214055943.602254-1-nathan@nathanrossi.com> Message-ID: <20200214055943.602254-2-nathan@nathanrossi.com> This recipe is intended to be run manually or via oeqa. [YOCTO #13737] Signed-off-by: Nathan Rossi --- meta/recipes-core/glibc/glibc-testsuite_2.31.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb index c44f30bf1c..d887aeff79 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.31.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.31.bb @@ -1,5 +1,7 @@ require glibc_${PV}.bb +EXCLUDE_FROM_WORLD = "1" + # handle PN differences FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" --- 2.24.1 From raj.khem at gmail.com Fri Feb 14 06:34:27 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 22:34:27 -0800 Subject: [OE-core] [PATCH 3/4] recipes-support: Add diffoscope recipe In-Reply-To: <20200212031435.792802-4-JPEWhacker@gmail.com> References: <20200212031435.792802-1-JPEWhacker@gmail.com> <20200212031435.792802-4-JPEWhacker@gmail.com> Message-ID: Hi Joshua I think it needs to be ignored on musl 15:37:23 ERROR: Nothing RPROVIDES 'squashfs-tools' (but /mnt/jenkins/workspace/Yocto-world-musl/sources/openembedded-core/meta/recipes-support/diffoscope/diffoscope_136.bb RDEPENDS on or otherwise requires it) 15:37:23 squashfs-tools was skipped: incompatible with host aarch64-yoe-linux-musl (not in COMPATIBLE_HOST) On Tue, Feb 11, 2020 at 7:15 PM Joshua Watt wrote: > > Diffoscope is the universal diff tool, capable of comparing many > different formats. > > Signed-off-by: Joshua Watt > --- > meta/conf/distro/include/maintainers.inc | 1 + > meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++++++++++++++ > 2 files changed, 16 insertions(+) > create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb > > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc > index 171a43615e3..4a267faabce 100644 > --- a/meta/conf/distro/include/maintainers.inc > +++ b/meta/conf/distro/include/maintainers.inc > @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi " > RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle " > RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin " > RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia " > +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt " > RECIPE_MAINTAINER_pn-diffstat = "Chen Qi " > RECIPE_MAINTAINER_pn-diffutils = "Chen Qi " > RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia " > diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_136.bb > new file mode 100644 > index 00000000000..a00f281deb0 > --- /dev/null > +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb > @@ -0,0 +1,15 @@ > +SUMMARY = "in-depth comparison of files, archives, and directories" > +HOMEPAGE = "https://diffoscope.org/" > +LICENSE = "GPL-3.0+" > +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > + > +PYPI_PACKAGE = "diffoscope" > + > +inherit pypi setuptools3 > + > +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73" > +SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15" > + > +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" > + > +BBCLASSEXTEND = "native" > -- > 2.23.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Fri Feb 14 07:03:52 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 23:03:52 -0800 Subject: [OE-core] [PATCH] swuashfs-tools: Enable on musl Message-ID: <20200214070352.1206450-1-raj.khem@gmail.com> Upstream has a patch [1] to fix musl builds, Prior to this it would not build on musl due to missing GNU extentions for fnmatch [1] https://github.com/plougher/squashfs-tools/commit/4280e74de14070869787a9166242f9ce2dafd82e Signed-off-by: Khem Raj --- meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 4fd33f8048..9bcf026ce2 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -12,9 +12,6 @@ SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ S = "${WORKDIR}/git/squashfs-tools" -# needs FNM_EXTMATCH -COMPATIBLE_HOST_libc-musl = 'null' - EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr reproducible" -- 2.25.0 From alex.kanavin at gmail.com Fri Feb 14 07:05:45 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 14 Feb 2020 08:05:45 +0100 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Fri, 14 Feb 2020 at 02:40, Khem Raj wrote: > > autobuilder runs poky, to reproduce this you will need to use > oe-core+bitbake checkout > > and then for qemux86-64 > > bitbake -ctestimage core-image-sato-sdk-ptest > If I set up a nodistro build, ptest packages are no longer available and build doesn't start: akanavin at ubuntu1804-ty:~/poky/build-nodistro$ bitbake core-image-sato-sdk-ptest ... ERROR: Nothing RPROVIDES 'acl-ptest' (but /home/akanavin/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb RDEPENDS on or otherwise requires it) Can you share the config (local.conf) I need to use? Or maybe you can show the failure you're getting. The tests should be skipped if /var/lib/rpm is absent on the target image, so I would like to find out why it is there (presumably). > it might also work in poky setup if you remove > PACKAGE_CLASSES ?= "package_rpm" > from local.conf > That's what the autobuilder test does, and then it passes, so I don't think this will help. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Fri Feb 14 07:14:36 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 23:14:36 -0800 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Thu, Feb 13, 2020 at 11:05 PM Alexander Kanavin wrote: > > On Fri, 14 Feb 2020 at 02:40, Khem Raj wrote: >> >> >> autobuilder runs poky, to reproduce this you will need to use >> oe-core+bitbake checkout >> >> and then for qemux86-64 >> >> bitbake -ctestimage core-image-sato-sdk-ptest > > > If I set up a nodistro build, ptest packages are no longer available and build doesn't start: > > akanavin at ubuntu1804-ty:~/poky/build-nodistro$ bitbake core-image-sato-sdk-ptest > ... > ERROR: Nothing RPROVIDES 'acl-ptest' (but /home/akanavin/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb RDEPENDS on or otherwise requires it) > local.conf I have DISTRO_FEATURES_append = " largefile opengl ptest multiarch wayland pam polkit " IMAGE_CLASSES += "testimage testsdk" > Can you share the config (local.conf) I need to use? Or maybe you can show the failure you're getting. The tests should be skipped if /var/lib/rpm is absent on the target image, so I would like to find out why it is there (presumably). > >> >> it might also work in poky setup if you remove >> PACKAGE_CLASSES ?= "package_rpm" >> from local.conf > > > That's what the autobuilder test does, and then it passes, so I don't think this will help. > > Alex From raj.khem at gmail.com Fri Feb 14 07:16:58 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 23:16:58 -0800 Subject: [OE-core] [OE-Core][PATCH v2] systemd: upgrade v244.1 -> v244.3 In-Reply-To: <6557ee9b5ee8375cc9e7ee79336975f2cd8c4468.camel@linuxfoundation.org> References: <20200213061649.102346-1-alex.kiernan@gmail.com> <6557ee9b5ee8375cc9e7ee79336975f2cd8c4468.camel@linuxfoundation.org> Message-ID: On Thu, Feb 13, 2020 at 3:40 PM Richard Purdie wrote: > > On Thu, 2020-02-13 at 06:16 +0000, Alex Kiernan wrote: > > Commits from v244-stable: > > I think this causes: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/1557 > > (systemd-boot patch failures) right http://errors.yoctoproject.org/Errors/Details/390912/ > > Cheers, > > Richard > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kiernan at gmail.com Fri Feb 14 07:25:57 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Fri, 14 Feb 2020 07:25:57 +0000 Subject: [OE-core] [OE-Core][PATCH v2] systemd: upgrade v244.1 -> v244.3 In-Reply-To: References: <20200213061649.102346-1-alex.kiernan@gmail.com> <6557ee9b5ee8375cc9e7ee79336975f2cd8c4468.camel@linuxfoundation.org> Message-ID: On Fri, Feb 14, 2020 at 7:17 AM Khem Raj wrote: > > On Thu, Feb 13, 2020 at 3:40 PM Richard Purdie > wrote: > > > > On Thu, 2020-02-13 at 06:16 +0000, Alex Kiernan wrote: > > > Commits from v244-stable: > > > > I think this causes: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/1557 > > > > (systemd-boot patch failures) > > right > http://errors.yoctoproject.org/Errors/Details/390912/ > Yeah... just trying to work out if there's a better way to handle the efi-cc stuff w/o having an even larger set of reverts against meson.build :| -- Alex Kiernan From raj.khem at gmail.com Fri Feb 14 07:34:28 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 13 Feb 2020 23:34:28 -0800 Subject: [OE-core] [RESEND PATCH v2] make: 4.2.1 -> 4.3 In-Reply-To: <20200213133616.19507-1-sno@netbsd.org> References: <20200213133616.19507-1-sno@netbsd.org> Message-ID: <29a7abd1-5516-a965-39c6-d63d7c568c03@gmail.com> On 2/13/20 5:36 AM, Jens Rehsack wrote: > Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html > > 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch > and 0002-glob-Do-not-assume-glibc-glob-internals.patch. > > 2) License has been changed to GPLv3 only > > 3) Important bug-fix is > * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html > > 4) Backward-incompatibilities: > * Number signs (#) appearing inside a macro reference or function invocation > no longer introduce comments and should not be escaped with backslashes > * Previously appending using '+=' to an empty variable would result in a value > starting with a space. Now the initial space is only added if the variable > already contains some value. Similarly, appending an empty string does not > add a trailing space. > Just assessing forward port work this will ensue, did you try some world builds ? > Signed-off-by: Jens Rehsack > --- > meta/recipes-devtools/make/make.inc | 4 +- > ...b-Do-not-assume-glibc-glob-internals.patch | 70 ------------------- > ...b-Do-not-assume-glibc-glob-internals.patch | 38 ---------- > meta/recipes-devtools/make/make_4.2.1.bb | 12 ---- > meta/recipes-devtools/make/make_4.3.bb | 10 +++ > 5 files changed, 11 insertions(+), 123 deletions(-) > delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch > delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch > delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb > create mode 100644 meta/recipes-devtools/make/make_4.3.bb > > diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc > index b8905bc6d3..4142cf23d3 100644 > --- a/meta/recipes-devtools/make/make.inc > +++ b/meta/recipes-devtools/make/make.inc > @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute > HOMEPAGE = "http://www.gnu.org/software/make/" > SECTION = "devel" > > -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ > - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ > - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ > +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ > " > > inherit autotools gettext pkgconfig texinfo > diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch > deleted file mode 100644 > index 2b6e4d40c3..0000000000 > --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch > +++ /dev/null > @@ -1,70 +0,0 @@ > -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 > -From: Paul Eggert > -Date: Sun, 24 Sep 2017 09:12:58 -0400 > -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. > - > -It has been proposed that glibc glob start using gl_lstat, > -which the API allows it to do. GNU 'make' should not get in > -the way of this. See: > -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html > - > -* dir.c (local_lstat): New function, like local_stat. > -(dir_setup_glob): Use it to initialize gl_lstat too, as the API > -requires. > ---- > -Upstream-Status: Backport > -Signed-off-by: Khem Raj > - > - dir.c | 29 +++++++++++++++++++++++++++-- > - 1 file changed, 27 insertions(+), 2 deletions(-) > - > -diff --git a/dir.c b/dir.c > -index f34bbf5..12eef30 100644 > ---- a/dir.c > -+++ b/dir.c > -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) > - } > - #endif > - > -+/* Similarly for lstat. */ > -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) > -+# ifndef VMS > -+# ifndef HAVE_SYS_STAT_H > -+int lstat (const char *path, struct stat *sbuf); > -+# endif > -+# else > -+ /* We are done with the fake lstat. Go back to the real lstat */ > -+# ifdef lstat > -+# undef lstat > -+# endif > -+# endif > -+# define local_lstat lstat > -+#elif defined(WINDOWS32) > -+/* Windows doesn't support lstat(). */ > -+# define local_lstat local_stat > -+#else > -+static int > -+local_lstat (const char *path, struct stat *buf) > -+{ > -+ int e; > -+ EINTRLOOP (e, lstat (path, buf)); > -+ return e; > -+} > -+#endif > -+ > - void > - dir_setup_glob (glob_t *gl) > - { > - gl->gl_opendir = open_dirstream; > - gl->gl_readdir = read_dirstream; > - gl->gl_closedir = free; > -+ gl->gl_lstat = local_lstat; > - gl->gl_stat = local_stat; > -- /* We don't bother setting gl_lstat, since glob never calls it. > -- The slot is only there for compatibility with 4.4 BSD. */ > - } > - > - void > --- > -2.16.1 > - > diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch > deleted file mode 100644 > index d49acd9f6e..0000000000 > --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 > -From: Paul Eggert > -Date: Sun, 24 Sep 2017 09:12:58 -0400 > -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. > - > -It has been proposed that glibc glob start using gl_lstat, > -which the API allows it to do. GNU 'make' should not get in > -the way of this. See: > -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html > - > -* dir.c (local_lstat): New function, like local_stat. > -(dir_setup_glob): Use it to initialize gl_lstat too, as the API > -requires. > ---- > -Upstream-Status: Backport > - > - configure.ac | 3 +-- > - 1 file changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/configure.ac b/configure.ac > -index 64ec870..e87901c 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], > - #include > - #include > - > --#define GLOB_INTERFACE_VERSION 1 > - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 > - # include > --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION > -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 > - gnu glob > - # endif > - #endif], > --- > -2.16.1 > - > diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb > deleted file mode 100644 > index c6e6a0cd58..0000000000 > --- a/meta/recipes-devtools/make/make_4.2.1.bb > +++ /dev/null > @@ -1,12 +0,0 @@ > -LICENSE = "GPLv3 & LGPLv2" > -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ > - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ > - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" > -require make.inc > - > -EXTRA_OECONF += "--without-guile" > - > -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" > -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" > - > -BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb > new file mode 100644 > index 0000000000..a3eb9d92f2 > --- /dev/null > +++ b/meta/recipes-devtools/make/make_4.3.bb > @@ -0,0 +1,10 @@ > +LICENSE = "GPLv3" > +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > +require make.inc > + > +EXTRA_OECONF += "--without-guile" > + > +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" > +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" > + > +BBCLASSEXTEND = "native nativesdk" > From chee.yang.lee at intel.com Fri Feb 14 08:00:59 2020 From: chee.yang.lee at intel.com (chee.yang.lee at intel.com) Date: Fri, 14 Feb 2020 16:00:59 +0800 Subject: [OE-core] [PATCH 1/2] bash: include patch 12-16 Message-ID: <1581667260-55575-1-git-send-email-chee.yang.lee@intel.com> From: Lee Chee Yang Signed-off-by: Lee Chee Yang --- meta/recipes-extended/bash/bash_5.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index 0c7b234..8ff9e6e 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -16,6 +16,11 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-012;apply=yes;striplevel=0;name=patch012 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-013;apply=yes;striplevel=0;name=patch013 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-014;apply=yes;striplevel=0;name=patch014 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-015;apply=yes;striplevel=0;name=patch015 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-016;apply=yes;striplevel=0;name=patch016 \ file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ @@ -50,6 +55,16 @@ SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" +SRC_URI[patch012.md5sum] = "1870268f62b907221b078ad109e1fa94" +SRC_URI[patch012.sha256sum] = "2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233" +SRC_URI[patch013.md5sum] = "40d923af4b952b01983ed4c889ae2653" +SRC_URI[patch013.sha256sum] = "f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a" +SRC_URI[patch014.md5sum] = "57857b22053c8167677e5e5ac5c6669b" +SRC_URI[patch014.sha256sum] = "5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589" +SRC_URI[patch015.md5sum] = "c4c6ea23d09a74eaa9385438e48fdf02" +SRC_URI[patch015.sha256sum] = "a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e" +SRC_URI[patch016.md5sum] = "a682ed6fa2c2e7a7c3ba6bdeada07fb5" +SRC_URI[patch016.sha256sum] = "ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d" DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -- 2.7.4 From chee.yang.lee at intel.com Fri Feb 14 08:01:00 2020 From: chee.yang.lee at intel.com (chee.yang.lee at intel.com) Date: Fri, 14 Feb 2020 16:01:00 +0800 Subject: [OE-core] [PATCH 2/2] libxml2: Fix CVE-2019-20388 In-Reply-To: <1581667260-55575-1-git-send-email-chee.yang.lee@intel.com> References: <1581667260-55575-1-git-send-email-chee.yang.lee@intel.com> Message-ID: <1581667260-55575-2-git-send-email-chee.yang.lee@intel.com> From: Lee Chee Yang see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 Signed-off-by: Lee Chee Yang --- .../libxml/libxml2/CVE-2019-20388.patch | 33 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000..49ff6fb --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,33 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 6a4097c..097aceb 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- 2.7.4 From richard.purdie at linuxfoundation.org Fri Feb 14 08:21:59 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 14 Feb 2020 08:21:59 +0000 Subject: [OE-core] [PATCH] xkeyboard-config: upgrade 2.28 -> 2.29 In-Reply-To: <1581356285-65315-2-git-send-email-wangmy@cn.fujitsu.com> References: <1581356285-65315-1-git-send-email-wangmy@cn.fujitsu.com> <1581356285-65315-2-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <0b5d9d0d5b160a7bf0ac9b309bbcf2b687fef580.camel@linuxfoundation.org> On Mon, 2020-02-10 at 09:38 -0800, Wang Mingyu wrote: > Signed-off-by: Wang Mingyu > --- > .../{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} | 4 > ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.28.bb => > xkeyboard-config_2.29.bb} (87%) This caused a build failure: https://autobuilder.yoctoproject.org/typhoon/#/builders/69/builds/1558 ERROR: xkeyboard-config-2.29-r0 do_compile: oe_runmake failed ERROR: xkeyboard-config-2.29-r0 do_compile: Execution of '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/temp/run.do_compile.17426' failed with exit code 1: Making all in compat make[1]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/compat' make[1]: Nothing to be done for 'all'. make[1]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/compat' Making all in geometry make[1]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/geometry' Making all in digital_vndr make[2]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/geometry/digital_vndr' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/geometry/digital_vndr' Making all in sgi_vndr make[2]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/geometry/sgi_vndr' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/geometry/sgi_vndr' make[2]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/geometry' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/geometry' make[1]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/geometry' Making all in keycodes make[1]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/keycodes' Making all in digital_vndr make[2]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/keycodes/digital_vndr' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/keycodes/digital_vndr' Making all in sgi_vndr make[2]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/keycodes/sgi_vndr' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/keycodes/sgi_vndr' make[2]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/keycodes' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/keycodes' make[1]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/keycodes' Making all in po make[1]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/po' make[1]: Nothing to be done for 'all'. make[1]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/po' Making all in rules make[1]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/rules' Making all in compat make[2]: Entering directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/rules/compat' ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mls --number=2 base.ml2_s.part ../../../xkeyboard-config-2.29/rules/compat/layoutsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mls --number=3 base.ml3_s.part ../../../xkeyboard-config-2.29/rules/compat/layoutsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mls --number=4 base.ml4_s.part ../../../xkeyboard-config-2.29/rules/compat/layoutsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mlvs --number=2 base.ml2v2_s.part ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mlvs --number=3 base.ml3v3_s.part ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mlvs --number=4 base.ml4v4_s.part ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mls base.ml_s.part ../../../xkeyboard-config-2.29/rules/compat/layoutsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mls --number=1 base.ml1_s.part ../../../xkeyboard-config-2.29/rules/compat/layoutsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mlvs base.mlv_s.part ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst ../../../xkeyboard-config-2.29/rules/compat/map-variants.py --want=mlvs --number=1 base.ml1v1_s.part ../../../xkeyboard-config-2.29/rules/compat/variantsMapping.lst Traceback (most recent call last): File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 133, in map_variant(fd, ns.files, ns.want, ns.number) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 107, in map_variant mappings = read_file(f) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 38, in read_file l2 = Layout(groups[1]) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 15, in __init__ self.layout = match[1] TypeError: '_sre.SRE_Match' object is not subscriptable Traceback (most recent call last): File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 133, in map_variant(fd, ns.files, ns.want, ns.number) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 107, in map_variant mappings = read_file(f) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 38, in read_file l2 = Layout(groups[1]) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 15, in __init__ self.layout = match[1] TypeError: '_sre.SRE_Match' object is not subscriptable Traceback (most recent call last): File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 133, in map_variant(fd, ns.files, ns.want, ns.number) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 107, in map_variant mappings = read_file(f) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 38, in read_file l2 = Layout(groups[1]) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 15, in __init__ self.layout = match[1] TypeError: '_sre.SRE_Match' object is not subscriptable Makefile:490: recipe for target 'base.ml4_s.part' failed make[2]: *** [base.ml4_s.part] Error 1 make[2]: *** Waiting for unfinished jobs.... Makefile:481: recipe for target 'base.ml1_s.part' failed make[2]: *** [base.ml1_s.part] Error 1 Traceback (most recent call last): File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 133, in map_variant(fd, ns.files, ns.want, ns.number) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 107, in map_variant mappings = read_file(f) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 38, in read_file l2 = Layout(groups[1]) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 15, in __init__ self.layout = match[1] TypeError: '_sre.SRE_Match' object is not subscriptable Makefile:505: recipe for target 'base.ml_s.part' failed make[2]: *** [base.ml_s.part] Error 1 Makefile:487: recipe for target 'base.ml3_s.part' failed make[2]: *** [base.ml3_s.part] Error 1 Traceback (most recent call last): File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 133, in map_variant(fd, ns.files, ns.want, ns.number) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 107, in map_variant mappings = read_file(f) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 38, in read_file l2 = Layout(groups[1]) File "../../../xkeyboard-config-2.29/rules/compat/map-variants.py", line 15, in __init__ self.layout = match[1] TypeError: '_sre.SRE_Match' object is not subscriptable Makefile:484: recipe for target 'base.ml2_s.part' failed make[2]: *** [base.ml2_s.part] Error 1 make[2]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/rules/compat' Makefile:552: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/home/pokybuild/yocto-worker/qa-extras/build/build/tmp/work/core2-64-poky-linux/xkeyboard-config/2.29-r0/build/rules' Makefile:456: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 WARNING: exit code 1 from a shell command. From patchwork at patchwork.openembedded.org Fri Feb 14 08:32:55 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 14 Feb 2020 08:32:55 -0000 Subject: [OE-core] =?utf-8?b?4pyXIHBhdGNodGVzdDogZmFpbHVyZSBmb3IgImJhc2g6?= =?utf-8?q?_include_patch_12-16=2E=2E=2E=22_and_1_more?= In-Reply-To: <1581667260-55575-1-git-send-email-chee.yang.lee@intel.com> References: <1581667260-55575-1-git-send-email-chee.yang.lee@intel.com> Message-ID: <20200214083255.2277.78112@do> == Series Details == Series: "bash: include patch 12-16..." and 1 more Revision: 1 URL : https://patchwork.openembedded.org/series/22618/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [2/2] libxml2: Fix CVE-2019-20388 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX" * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From chee.yang.lee at intel.com Fri Feb 14 11:28:09 2020 From: chee.yang.lee at intel.com (chee.yang.lee at intel.com) Date: Fri, 14 Feb 2020 19:28:09 +0800 Subject: [OE-core] [PATCH v2 1/2] bash: include patch 12-16 Message-ID: <1581679690-76669-1-git-send-email-chee.yang.lee@intel.com> From: Lee Chee Yang Signed-off-by: Lee Chee Yang --- meta/recipes-extended/bash/bash_5.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index 0c7b234..8ff9e6e 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -16,6 +16,11 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-012;apply=yes;striplevel=0;name=patch012 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-013;apply=yes;striplevel=0;name=patch013 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-014;apply=yes;striplevel=0;name=patch014 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-015;apply=yes;striplevel=0;name=patch015 \ + ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-016;apply=yes;striplevel=0;name=patch016 \ file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ @@ -50,6 +55,16 @@ SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" +SRC_URI[patch012.md5sum] = "1870268f62b907221b078ad109e1fa94" +SRC_URI[patch012.sha256sum] = "2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233" +SRC_URI[patch013.md5sum] = "40d923af4b952b01983ed4c889ae2653" +SRC_URI[patch013.sha256sum] = "f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a" +SRC_URI[patch014.md5sum] = "57857b22053c8167677e5e5ac5c6669b" +SRC_URI[patch014.sha256sum] = "5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589" +SRC_URI[patch015.md5sum] = "c4c6ea23d09a74eaa9385438e48fdf02" +SRC_URI[patch015.sha256sum] = "a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e" +SRC_URI[patch016.md5sum] = "a682ed6fa2c2e7a7c3ba6bdeada07fb5" +SRC_URI[patch016.sha256sum] = "ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d" DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -- 2.7.4 From chee.yang.lee at intel.com Fri Feb 14 11:28:10 2020 From: chee.yang.lee at intel.com (chee.yang.lee at intel.com) Date: Fri, 14 Feb 2020 19:28:10 +0800 Subject: [OE-core] [PATCH v2 2/2] libxml2: Fix CVE-2019-20388 In-Reply-To: <1581679690-76669-1-git-send-email-chee.yang.lee@intel.com> References: <1581679690-76669-1-git-send-email-chee.yang.lee@intel.com> Message-ID: <1581679690-76669-2-git-send-email-chee.yang.lee@intel.com> From: Lee Chee Yang see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 Signed-off-by: Lee Chee Yang --- .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000..4ee2d4f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,37 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +CVE: CVE-2019-20388 + +Signed-off-by: Zhipeng Xie +Signed-off-by: Lee Chee Yang +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 6a4097c..097aceb 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- 2.7.4 From alex.kanavin at gmail.com Fri Feb 14 12:19:59 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 14 Feb 2020 13:19:59 +0100 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Fri, 14 Feb 2020 at 08:15, Khem Raj wrote: > local.conf I have > > DISTRO_FEATURES_append = " largefile opengl ptest multiarch wayland pam > polkit " > IMAGE_CLASSES += "testimage testsdk" > Right, I'm running this now, it's a bit tricky because I have to do it on the Yocto AB. Big company's bureaucracy is causing delays in getting me a build machine :( Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Fri Feb 14 13:02:38 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 14 Feb 2020 13:02:38 +0000 Subject: [OE-core] [PATCH] staging: Handle races between binaries and their libs Message-ID: <20200214130238.20381-1-richard.purdie@linuxfoundation.org> There is a long standing issue where a binary could be installed into the sysroot before its library dependencies. We've always argued nothing should use the binary until its been installed by a dependency but there are issues around binaries which conflict with the host system, for example patch, python3, gzip and more. With the recent patch changes we've see issues like: ERROR: gdb-cross-canadian-powerpc-8.3.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/gdb-cross-canadian-powerpc/8.3.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0009-Change-order-of-CFLAGS.patch patch: /lib64/libattr.so.1: version `ATTR_1.3' not found (required by patch) Patch 0009-Change-order-of-CFLAGS.patch does not apply (enforce with -f) which is a symptom of this issue (libattr-native is a dependency of patch-native). There are other ways to fix this such as disabling libattr in patch, installing patch to a subdirectory and requiring PATH manipulation and so on. We can simply fix the staging code to handle /bin/ after everything else so lets do that and avoid all these other complications. Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 4dd2ed01010..530e23b1853 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -470,6 +470,7 @@ python extend_recipe_sysroot() { elif os.path.lexists(depdir + "/" + c): os.unlink(depdir + "/" + c) + binfiles = {} # Now handle installs for dep in configuredeps: c = setscenedeps[dep][0] @@ -562,7 +563,16 @@ python extend_recipe_sysroot() { if l.endswith("/"): staging_copydir(l, targetdir, dest, seendirs) continue - staging_copyfile(l, targetdir, dest, postinsts, seendirs) + if "/bin/" in l: + # defer /bin/* files until last in case they need libs + binfiles[l] = (targetdir, dest) + else: + staging_copyfile(l, targetdir, dest, postinsts, seendirs) + + # Handle deferred binfiles + for l in binfiles: + (targetdir, dest) = binfiles[l] + staging_copyfile(l, targetdir, dest, postinsts, seendirs) bb.note("Installed into sysroot: %s" % str(msg_adding)) bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists)) -- 2.20.1 From rpjday at crashcourse.ca Fri Feb 14 13:04:49 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Fri, 14 Feb 2020 08:04:49 -0500 (EST) Subject: [OE-core] what is MACHINE_HWCODECS used for these days? Message-ID: was documenting the use of [EXTRA_]IMAGE_FEATURES, and noticed that while the oe-core layer defines a related feature: core-image.bbclass:FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}" core-image.bbclass:MACHINE_HWCODECS ??= "" i see no actual usage of that variable in oe-core (the git log goes way back to 2013: commit 1cb370587fd72e3f0f69678748108cc4116767fb Author: Richard Purdie Date: Wed Jan 23 21:56:11 2013 -0800 core-image: Add hwcodecs IMAGE_FEATURE Currently hardware codecs are being injected in rather ugly ways and end up either in no or all images. This adds a dedicated IMAGE_FEATURE for them based on the MACHINE_HWCODECS variable. We may need to refine this in due course but this patch at least illustrates the concept. i looked through other layers on my system, and found some references in meta-intel: conf/machine/intel-core2-32.conf:MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi" conf/machine/intel-corei7-64.conf:MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} intel-vaapi-driver gstreamer1.0-vaapi" conf/machine/intel-skylake-64.conf:MACHINE_HWCODECS ?= "intel-media-driver intel-mediasdk intel-vaapi-driver gstreamer1.0-vaapi" but i see nothing in *that* layer that actually does anything with that variable after setting it. what is it used for? and how is it processed? rday From jpewhacker at gmail.com Fri Feb 14 13:15:06 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Fri, 14 Feb 2020 07:15:06 -0600 Subject: [OE-core] [PATCH 3/4] recipes-support: Add diffoscope recipe In-Reply-To: References: <20200212031435.792802-1-JPEWhacker@gmail.com> <20200212031435.792802-4-JPEWhacker@gmail.com> Message-ID: On Fri, Feb 14, 2020, 12:34 AM Khem Raj wrote: > Hi Joshua > > I think it needs to be ignored on musl > > 15:37:23 ERROR: Nothing RPROVIDES 'squashfs-tools' (but > > /mnt/jenkins/workspace/Yocto-world-musl/sources/openembedded-core/meta/recipes-support/diffoscope/ > diffoscope_136.bb > RDEPENDS on or otherwise requires it) > 15:37:23 squashfs-tools was skipped: incompatible with host > aarch64-yoe-linux-musl (not in COMPATIBLE_HOST > Would an RRECOMMENDS fix it? > On Tue, Feb 11, 2020 at 7:15 PM Joshua Watt wrote: > > > > Diffoscope is the universal diff tool, capable of comparing many > > different formats. > > > > Signed-off-by: Joshua Watt > > --- > > meta/conf/distro/include/maintainers.inc | 1 + > > meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++++++++++++++ > > 2 files changed, 16 insertions(+) > > create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb > > > > diff --git a/meta/conf/distro/include/maintainers.inc > b/meta/conf/distro/include/maintainers.inc > > index 171a43615e3..4a267faabce 100644 > > --- a/meta/conf/distro/include/maintainers.inc > > +++ b/meta/conf/distro/include/maintainers.inc > > @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi < > nathan at nathanrossi.com>" > > RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle < > mark.hatle at windriver.com>" > > RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin < > alex.kanavin at gmail.com>" > > RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia " > > +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt " > > RECIPE_MAINTAINER_pn-diffstat = "Chen Qi " > > RECIPE_MAINTAINER_pn-diffutils = "Chen Qi " > > RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia " > > diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb > b/meta/recipes-support/diffoscope/diffoscope_136.bb > > new file mode 100644 > > index 00000000000..a00f281deb0 > > --- /dev/null > > +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb > > @@ -0,0 +1,15 @@ > > +SUMMARY = "in-depth comparison of files, archives, and directories" > > +HOMEPAGE = "https://diffoscope.org/" > > +LICENSE = "GPL-3.0+" > > +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > + > > +PYPI_PACKAGE = "diffoscope" > > + > > +inherit pypi setuptools3 > > + > > +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73" > > +SRC_URI[sha256sum] = > "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15" > > + > > +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c > python3-magic" > > + > > +BBCLASSEXTEND = "native" > > -- > > 2.23.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bruce.ashfield at gmail.com Fri Feb 14 13:18:57 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Fri, 14 Feb 2020 08:18:57 -0500 Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs In-Reply-To: <20200214035737.9975-1-zhe.he@windriver.com> References: <20200214035737.9975-1-zhe.he@windriver.com> Message-ID: On Thu, Feb 13, 2020 at 10:58 PM wrote: > > From: He Zhe > > To make the native python3 is always used, > > - Use sed one-liner instead > - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the > following warning. > > File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix > _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) > ModuleNotFoundError: No module named '_sysconfigdata' > > This issue is first reported by Joel Stanley > The sed one-liner is credited to Anuj Mittal Thanks! This looks good to me. Cheers, Bruce > > Signed-off-by: He Zhe > --- > meta/recipes-kernel/perf/perf.bb | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > index 6d1b06693d..a6fb51d3db 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -239,11 +239,8 @@ do_configure_prepend () { > fi > > # use /usr/bin/env instead of version specific python > - for s in `find ${S}/tools/perf/ -name '*.py'`; do > - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do > + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} > done > > # unistd.h can be out of sync between libc-headers and the captured version in the perf source > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From richard.purdie at linuxfoundation.org Fri Feb 14 14:06:29 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 14 Feb 2020 14:06:29 +0000 Subject: [OE-core] [RESEND PATCH v2] make: 4.2.1 -> 4.3 In-Reply-To: <20200213133616.19507-1-sno@netbsd.org> References: <20200213133616.19507-1-sno@netbsd.org> Message-ID: <31a811fb1053f640ae6a35398f6723367a289b81.camel@linuxfoundation.org> On Thu, 2020-02-13 at 14:36 +0100, Jens Rehsack wrote: > Announcement: > https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html > > 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc- > glob-internals.patch > and 0002-glob-Do-not-assume-glibc-glob-internals.patch. > > 2) License has been changed to GPLv3 only > > 3) Important bug-fix is > * > https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html > > 4) Backward-incompatibilities: > * Number signs (#) appearing inside a macro reference or function > invocation > no longer introduce comments and should not be escaped with > backslashes > * Previously appending using '+=' to an empty variable would > result in a value > starting with a space. Now the initial space is only added if > the variable > already contains some value. Similarly, appending an empty > string does not > add a trailing space. > > Signed-off-by: Jens Rehsack It breaks nativesdk-make with meta-mingw: https://autobuilder.yoctoproject.org/typhoon/#/builders/89/builds/1562 Cheers, Richard From richard.purdie at linuxfoundation.org Fri Feb 14 14:18:28 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 14 Feb 2020 14:18:28 +0000 Subject: [OE-core] [PATCH 3/4] recipes-support: Add diffoscope recipe In-Reply-To: References: <20200212031435.792802-1-JPEWhacker@gmail.com> <20200212031435.792802-4-JPEWhacker@gmail.com> Message-ID: <15849ef67fdb2877d200a39259d9503664244d7b.camel@linuxfoundation.org> On Fri, 2020-02-14 at 07:15 -0600, Joshua Watt wrote: > > > On Fri, Feb 14, 2020, 12:34 AM Khem Raj wrote: > > Hi Joshua > > > > I think it needs to be ignored on musl > > > > 15:37:23 ERROR: Nothing RPROVIDES 'squashfs-tools' (but > > /mnt/jenkins/workspace/Yocto-world-musl/sources/openembedded- > > core/meta/recipes-support/diffoscope/diffoscope_136.bb > > RDEPENDS on or otherwise requires it) > > 15:37:23 squashfs-tools was skipped: incompatible with host > > aarch64-yoe-linux-musl (not in COMPATIBLE_HOST > > Would an RRECOMMENDS fix it? I merged your patch and one of mine to follow it adding a COMPATIBLE_HOST entry. I see Khem is fixing some other software so we may end up not needing it but we can remove later. Cheers, Richard From raj.khem at gmail.com Fri Feb 14 14:31:04 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 06:31:04 -0800 Subject: [OE-core] [PATCH 3/4] recipes-support: Add diffoscope recipe In-Reply-To: <15849ef67fdb2877d200a39259d9503664244d7b.camel@linuxfoundation.org> References: <20200212031435.792802-1-JPEWhacker@gmail.com> <20200212031435.792802-4-JPEWhacker@gmail.com> <15849ef67fdb2877d200a39259d9503664244d7b.camel@linuxfoundation.org> Message-ID: On Fri, Feb 14, 2020 at 6:18 AM Richard Purdie wrote: > > On Fri, 2020-02-14 at 07:15 -0600, Joshua Watt wrote: > > > > > > On Fri, Feb 14, 2020, 12:34 AM Khem Raj wrote: > > > Hi Joshua > > > > > > I think it needs to be ignored on musl > > > > > > 15:37:23 ERROR: Nothing RPROVIDES 'squashfs-tools' (but > > > /mnt/jenkins/workspace/Yocto-world-musl/sources/openembedded- > > > core/meta/recipes-support/diffoscope/diffoscope_136.bb > > > RDEPENDS on or otherwise requires it) > > > 15:37:23 squashfs-tools was skipped: incompatible with host > > > aarch64-yoe-linux-musl (not in COMPATIBLE_HOST > > > > Would an RRECOMMENDS fix it? > > I merged your patch and one of mine to follow it adding a > COMPATIBLE_HOST entry. > > I see Khem is fixing some other software so we may end up not needing > it but we can remove later. > right, we were unnecessarily masking squashfs-tools for musl > Cheers, > > Richard > From bunk at stusta.de Fri Feb 14 14:35:25 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 14 Feb 2020 16:35:25 +0200 Subject: [OE-core] [PATCH] swuashfs-tools: Enable on musl In-Reply-To: <20200214070352.1206450-1-raj.khem@gmail.com> References: <20200214070352.1206450-1-raj.khem@gmail.com> Message-ID: <20200214143525.GA31591@localhost> On Thu, Feb 13, 2020 at 11:03:52PM -0800, Khem Raj wrote: > Upstream has a patch [1] to fix musl builds, Prior to this it would not > build on musl due to missing GNU extentions for fnmatch > > [1] https://github.com/plougher/squashfs-tools/commit/4280e74de14070869787a9166242f9ce2dafd82e >... I did already remove a similar bogus squashfs-tools change from OE, with similar FNM_EXTMATCH "fixes" in ifupdown and elfutils also resulting in the expected runtime misbehaviour. I am not a fan of this musl way of fixing build failures by turning them into runtime breakages. cu Adrian From raj.khem at gmail.com Fri Feb 14 14:42:12 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 06:42:12 -0800 Subject: [OE-core] [PATCH] swuashfs-tools: Enable on musl In-Reply-To: <20200214143525.GA31591@localhost> References: <20200214070352.1206450-1-raj.khem@gmail.com> <20200214143525.GA31591@localhost> Message-ID: On Fri, Feb 14, 2020 at 6:35 AM Adrian Bunk wrote: > > On Thu, Feb 13, 2020 at 11:03:52PM -0800, Khem Raj wrote: > > Upstream has a patch [1] to fix musl builds, Prior to this it would not > > build on musl due to missing GNU extentions for fnmatch > > > > [1] https://github.com/plougher/squashfs-tools/commit/4280e74de14070869787a9166242f9ce2dafd82e > >... > > I did already remove a similar bogus squashfs-tools change from OE, > with similar FNM_EXTMATCH "fixes" in ifupdown and elfutils > also resulting in the expected runtime misbehaviour. > I think it would be better to use gnulib implementation for these packages you point out and those patches will be upstream worthy and make them portable as well. At least it is calling out bad elements. > I am not a fan of this musl way of fixing build failures by turning them > into runtime breakages. From alex.kiernan at gmail.com Fri Feb 14 14:43:39 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Fri, 14 Feb 2020 14:43:39 +0000 Subject: [OE-core] [OE-Core][PATCH v2] systemd: upgrade v244.1 -> v244.3 In-Reply-To: References: <20200213061649.102346-1-alex.kiernan@gmail.com> <6557ee9b5ee8375cc9e7ee79336975f2cd8c4468.camel@linuxfoundation.org> Message-ID: On Fri, Feb 14, 2020 at 7:25 AM Alex Kiernan wrote: > > On Fri, Feb 14, 2020 at 7:17 AM Khem Raj wrote: > > > > On Thu, Feb 13, 2020 at 3:40 PM Richard Purdie > > wrote: > > > > > > On Thu, 2020-02-13 at 06:16 +0000, Alex Kiernan wrote: > > > > Commits from v244-stable: > > > > > > I think this causes: > > > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/1557 > > > > > > (systemd-boot patch failures) > > > > right > > http://errors.yoctoproject.org/Errors/Details/390912/ > > > > Yeah... just trying to work out if there's a better way to handle the > efi-cc stuff w/o having an even larger set of reverts against > meson.build :| > It looks like by making meson.cross configurable I can drop all the reverts, which should get us to a better place for future upgrades. I've run the obvious pieces of oe-selftest, but I'll clean up the hacky mess I've got and send up a full patchset if we can push it through the autobuilders. Or reverting the latest commit on meson.build does fix it, but that feels like we're just digging an even deeper hole! -- Alex Kiernan From raj.khem at gmail.com Fri Feb 14 14:46:39 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 06:46:39 -0800 Subject: [OE-core] [PATCH] staging: Handle races between binaries and their libs In-Reply-To: <20200214130238.20381-1-richard.purdie@linuxfoundation.org> References: <20200214130238.20381-1-richard.purdie@linuxfoundation.org> Message-ID: On Fri, Feb 14, 2020 at 5:03 AM Richard Purdie wrote: > > There is a long standing issue where a binary could be installed into the > sysroot before its library dependencies. We've always argued nothing should > use the binary until its been installed by a dependency but there are issues > around binaries which conflict with the host system, for example patch, > python3, gzip and more. > > With the recent patch changes we've see issues like: > ERROR: gdb-cross-canadian-powerpc-8.3.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/gdb-cross-canadian-powerpc/8.3.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: > Applying patch 0009-Change-order-of-CFLAGS.patch > patch: /lib64/libattr.so.1: version `ATTR_1.3' not found (required by patch) > Patch 0009-Change-order-of-CFLAGS.patch does not apply (enforce with -f) > > which is a symptom of this issue (libattr-native is a dependency of patch-native). > ah so this was the problem I wondered > There are other ways to fix this such as disabling libattr in patch, installing > patch to a subdirectory and requiring PATH manipulation and so on. > > We can simply fix the staging code to handle /bin/ after everything else so lets > do that and avoid all these other complications. > > Signed-off-by: Richard Purdie > --- > meta/classes/staging.bbclass | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass > index 4dd2ed01010..530e23b1853 100644 > --- a/meta/classes/staging.bbclass > +++ b/meta/classes/staging.bbclass > @@ -470,6 +470,7 @@ python extend_recipe_sysroot() { > elif os.path.lexists(depdir + "/" + c): > os.unlink(depdir + "/" + c) > > + binfiles = {} > # Now handle installs > for dep in configuredeps: > c = setscenedeps[dep][0] > @@ -562,7 +563,16 @@ python extend_recipe_sysroot() { > if l.endswith("/"): > staging_copydir(l, targetdir, dest, seendirs) > continue > - staging_copyfile(l, targetdir, dest, postinsts, seendirs) > + if "/bin/" in l: > + # defer /bin/* files until last in case they need libs > + binfiles[l] = (targetdir, dest) > + else: > + staging_copyfile(l, targetdir, dest, postinsts, seendirs) > + > + # Handle deferred binfiles > + for l in binfiles: > + (targetdir, dest) = binfiles[l] > + staging_copyfile(l, targetdir, dest, postinsts, seendirs) > > bb.note("Installed into sysroot: %s" % str(msg_adding)) > bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists)) > -- > 2.20.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From rpjday at crashcourse.ca Fri Feb 14 14:49:10 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Fri, 14 Feb 2020 09:49:10 -0500 (EST) Subject: [OE-core] [PATCH] swuashfs-tools: Enable on musl In-Reply-To: <20200214143525.GA31591@localhost> References: <20200214070352.1206450-1-raj.khem@gmail.com> <20200214143525.GA31591@localhost> Message-ID: "swuashfs"? rday From richard.purdie at linuxfoundation.org Fri Feb 14 14:50:56 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 14 Feb 2020 14:50:56 +0000 Subject: [OE-core] [PATCH] staging: Handle races between binaries and their libs In-Reply-To: References: <20200214130238.20381-1-richard.purdie@linuxfoundation.org> Message-ID: <5ba479f630c8dbfb0516ee9a960acfab4fa0d4f5.camel@linuxfoundation.org> On Fri, 2020-02-14 at 06:46 -0800, Khem Raj wrote: > On Fri, Feb 14, 2020 at 5:03 AM Richard Purdie > wrote: > > There is a long standing issue where a binary could be installed > > into the > > sysroot before its library dependencies. We've always argued > > nothing should > > use the binary until its been installed by a dependency but there > > are issues > > around binaries which conflict with the host system, for example > > patch, > > python3, gzip and more. > > > > With the recent patch changes we've see issues like: > > ERROR: gdb-cross-canadian-powerpc-8.3.1-r0 do_patch: Command Error: > > 'quilt --quiltrc /home/pokybuild/yocto- > > worker/qemuppc/build/build/tmp/work/x86_64-nativesdk-pokysdk- > > linux/gdb-cross-canadian-powerpc/8.3.1-r0/recipe-sysroot- > > native/etc/quiltrc push' exited with 0 Output: > > Applying patch 0009-Change-order-of-CFLAGS.patch > > patch: /lib64/libattr.so.1: version `ATTR_1.3' not found (required > > by patch) > > Patch 0009-Change-order-of-CFLAGS.patch does not apply (enforce > > with -f) > > > > which is a symptom of this issue (libattr-native is a dependency of > > patch-native). > > > > ah so this was the problem I wondered Its one problem we're seeing, I'm still not sure those two other patches of yours apply cleanly though... :/ Cheers, Richard From raj.khem at gmail.com Fri Feb 14 15:37:55 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 07:37:55 -0800 Subject: [OE-core] [PATCH] swuashfs-tools: Enable on musl In-Reply-To: References: <20200214070352.1206450-1-raj.khem@gmail.com> <20200214143525.GA31591@localhost> Message-ID: On Fri, Feb 14, 2020 at 6:49 AM Robert P. J. Day wrote: > > > "swuashfs"? > I think I sent a v2 > rday From raj.khem at gmail.com Fri Feb 14 15:42:38 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 07:42:38 -0800 Subject: [OE-core] [PATCH 1/3] musl: Update to latest tip Message-ID: <20200214154240.2222810-1-raj.khem@gmail.com> Detailed changelog is here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f4853b4f2e..b6ec6fe9af 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" BASEVER = "1.1.24" -- 2.25.0 From raj.khem at gmail.com Fri Feb 14 15:42:39 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 07:42:39 -0800 Subject: [OE-core] [PATCH 2/3] gdb: Upgrade to 9.1 release In-Reply-To: <20200214154240.2222810-1-raj.khem@gmail.com> References: <20200214154240.2222810-1-raj.khem@gmail.com> Message-ID: <20200214154240.2222810-2-raj.khem@gmail.com> Drop security patches which are now in 9.1 already Forward port rest of patches to 9.1 Detailed changes [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 --- meta/recipes-devtools/gdb/gdb-9.1.inc | 21 +++ ...ian_8.3.1.bb => gdb-cross-canadian_9.1.bb} | 0 .../{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} | 0 .../gdb/0001-gdbserver-ctrl-c-handling.patch | 26 ---- ...ake-man-install-relative-to-DESTDIR.patch} | 9 +- ...x-nat-Define-_ABIO32-if-not-defined.patch} | 9 +- ...-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} | 7 +- ...ort-for-Renesas-SH-sh4-architecture.patch} | 41 +++--- ...eadline.a-when-using-disable-static.patch} | 13 +- ...s.h.patch => 0006-use-asm-sgidefs.h.patch} | 9 +- ...Use-exorted-definitions-of-SIGRTMIN.patch} | 11 +- ...atch => 0008-Change-order-of-CFLAGS.patch} | 13 +- ...9-resolve-restrict-keyword-conflict.patch} | 17 +-- ...> 0010-Fix-invalid-sigprocmask-call.patch} | 23 ++- .../gdb/0011-gdbserver-ctrl-c-handling.patch | 39 ++++++ .../gdb/gdb/CVE-2019-1010180.patch | 132 ------------------ .../gdb/{gdb_8.3.1.bb => gdb_9.1.bb} | 0 19 files changed, 124 insertions(+), 270 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-8.3.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-9.1.inc rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.3.1.bb => gdb-cross-canadian_9.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.3.1.bb => gdb-cross_9.1.bb} (100%) delete mode 100644 meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch rename meta/recipes-devtools/gdb/gdb/{0002-make-man-install-relative-to-DESTDIR.patch => 0001-make-man-install-relative-to-DESTDIR.patch} (77%) rename meta/recipes-devtools/gdb/gdb/{0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch => 0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch} (82%) rename meta/recipes-devtools/gdb/gdb/{0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch => 0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch} (89%) rename meta/recipes-devtools/gdb/gdb/{0005-Add-support-for-Renesas-SH-sh4-architecture.patch => 0004-Add-support-for-Renesas-SH-sh4-architecture.patch} (96%) rename meta/recipes-devtools/gdb/gdb/{0006-Dont-disable-libreadline.a-when-using-disable-static.patch => 0005-Dont-disable-libreadline.a-when-using-disable-static.patch} (83%) rename meta/recipes-devtools/gdb/gdb/{0007-use-asm-sgidefs.h.patch => 0006-use-asm-sgidefs.h.patch} (84%) rename meta/recipes-devtools/gdb/gdb/{0008-Use-exorted-definitions-of-SIGRTMIN.patch => 0007-Use-exorted-definitions-of-SIGRTMIN.patch} (81%) rename meta/recipes-devtools/gdb/gdb/{0009-Change-order-of-CFLAGS.patch => 0008-Change-order-of-CFLAGS.patch} (75%) rename meta/recipes-devtools/gdb/gdb/{0010-resolve-restrict-keyword-conflict.patch => 0009-resolve-restrict-keyword-conflict.patch} (80%) rename meta/recipes-devtools/gdb/gdb/{0011-Fix-invalid-sigprocmask-call.patch => 0010-Fix-invalid-sigprocmask-call.patch} (65%) create mode 100644 meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch rename meta/recipes-devtools/gdb/{gdb_8.3.1.bb => gdb_9.1.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce97c3..82530f5e7b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.33%" -GDBVERSION ?= "8.3%" +GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f3ce..0000000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000000..d019e6b384 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc @@ -0,0 +1,21 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" +SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_9.1.bb diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f83b6..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch similarity index 77% rename from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch rename to meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5410..82287ea13a 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch @@ -1,7 +1,7 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 +From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR +Subject: [PATCH] make man install relative to DESTDIR Upstream-Status: Pending @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 +index c6de14122c..c4b1214946 100644 --- a/sim/common/Makefile.in +++ b/sim/common/Makefile.in @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) @@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 infodir = @infodir@ includedir = @includedir@ --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch similarity index 82% rename from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch rename to meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74c09..6067caf63d 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 104c972f24..7f575b3363 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 89% rename from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512ef7..c4bab7bb1a 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj - --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ gdb/nat/ppc-linux.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 +index 5d8d67bec2..ffcf65ab58 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c @@ -23,7 +23,13 @@ @@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index d937a65b69..1fd54b4a0e 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch similarity index 96% rename from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch rename to meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840cafe2e..fd165d4b81 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch @@ -1,7 +1,7 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 +From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. +Subject: [PATCH] Add support for Renesas SH (sh4) architecture. gdb (7.4-1~cvs20111117.2) experimental; urgency=low . @@ -27,10 +27,10 @@ Signed-off-by: Khem Raj 11 files changed, 617 insertions(+), 29 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 +index c3e074b21f..42dd7af59c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ +@@ -2317,6 +2317,8 @@ ALLDEPFILES = \ sh-nbsd-nat.c \ sh-nbsd-tdep.c \ sh-tdep.c \ @@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 + sh-linux-nat.c \ sol2-tdep.c \ solib-aix.c \ - solib-spu.c \ + solib-svr4.c \ diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 +index ce52823729..5b5173a71a 100644 --- a/gdb/configure.host +++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; +@@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; s390*-*-linux*) gdb_host=linux ;; @@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 gdb_host=nbsd ;; sh*-*-openbsd*) gdb_host=nbsd ;; diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 +index 13c10eeeda..1d0d583a64 100644 --- a/gdb/sh-linux-tdep.c +++ b/gdb/sh-linux-tdep.c @@ -18,14 +18,37 @@ @@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 #include "glibc-tdep.h" #include "sh-tdep.h" #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { +@@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { sh_linux_rt_sigreturn_init }; @@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 /* GNU/Linux uses SVR4-style shared libraries. */ diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 +index e3aee0ac28..5958cf3688 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -21,6 +21,9 @@ @@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 len = TYPE_LENGTH (type); val = sh_justify_value_in_reg (gdbarch, args[argnum], len); -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, +@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, reg->how = DWARF2_FRAME_REG_UNDEFINED; } @@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 sh_alloc_frame_cache (void) { struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) +@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) return cache; } @@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 sh_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) +@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } @@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, +@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, the current frame. Frob regnum so that we pull the value from the correct place. */ if (regnum == gdbarch_pc_regnum (gdbarch)) @@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, +@@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, static struct gdbarch * sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { @@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 /* If there is already a candidate, use it. */ arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XCNEW (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); @@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) +@@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } @@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 +index 76e2e76e39..2710f63010 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -21,6 +21,12 @@ @@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 where each general-purpose register is stored inside the associated core file section. */ diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 +index 4914498f98..6e25cbed18 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -116,6 +116,11 @@ switch -glob -- [istarget] { @@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 static int count = 0; --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch similarity index 83% rename from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch rename to meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee62be..d0360da439 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 311feb9de3..24c0685d48 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index 1aabf6ede4..d957efde81 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -25510,7 +25510,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch similarity index 84% rename from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch rename to meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bfa14..d222d01083 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use +Subject: [PATCH] use Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index 7f575b3363..dc93a64a93 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch similarity index 81% rename from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch rename to meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5fd60..09896611f0 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch @@ -1,4 +1,4 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 +From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:31:40 -0700 Subject: [PATCH] Use exorted definitions of SIGRTMIN @@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 Upstream-Status: Submitted Signed-off-by: Khem Raj - --- gdb/linux-nat.c | 4 ++-- gdb/nat/linux-nat.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 +index 4484fa5c87..3bb0ee7a49 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) +@@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) /* NPTL reserves the first two RT signals, but does not provide any way for the debugger to query the signal numbers - fortunately they don't change. */ @@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 + sigaddset (set, SIGRTMIN + 1); } diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 +index 44dcbb7758..975d7276f6 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); +@@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); extern int lwp_is_stepping (struct lwp_info *lwp); diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch similarity index 75% rename from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch rename to meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26835..18168c6bae 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,18 +13,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 +index 16a9f2fd38..b9c8cd9c41 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch similarity index 80% rename from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch rename to meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f250..8f15c49d0e 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index d535a6a48b..7c34d5a1aa 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch similarity index 65% rename from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch rename to meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c391..5209c00275 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- - gdb/common/signals-state-save-restore.c | 2 +- + gdb/gdbsupport/signals-state-save-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c +index c292d498da..af9dcaeb08 100644 +--- a/gdb/gdbsupport/signals-state-save-restore.c ++++ b/gdb/gdbsupport/signals-state-save-restore.c +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000000..eedd94c4d4 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch @@ -0,0 +1,39 @@ +From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Nov 2018 18:00:23 -0800 +Subject: [PATCH] gdbserver ctrl-c handling + +This problem was created by the upstream commit 78708b7c8c +After applying the commit, it will send SIGINT to the process +group(-signal_pid). +But if we use gdbserver send SIGINT, and the attached process is not a +process +group leader, then the "kill (-signal_pid, SIGINT)" returns error and +fails to +interrupt the attached process. + +Upstream-Status: Submitted +[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] + +Author: Josh Gao +Signed-off-by: Zhixiong Chi +Signed-off-by: Khem Raj +--- + gdb/gdbserver/linux-low.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c +index 4255795ea6..762f8bafb6 100644 +--- a/gdb/gdbserver/linux-low.c ++++ b/gdb/gdbserver/linux-low.c +@@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) + static void + linux_request_interrupt (void) + { +- /* Send a SIGINT to the process group. This acts just like the user +- typed a ^C on the controlling terminal. */ +- kill (-signal_pid, SIGINT); ++ kill (signal_pid, SIGINT); + } + + /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a713..0000000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@?B); -747: const - - 8 *?(.: - ;'@?B); -701: const - - 8 *?D ? - (.: - ;'@?B); -71: const - - 8 *(.: - ;'@?B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.3.1.bb rename to meta/recipes-devtools/gdb/gdb_9.1.bb -- 2.25.0 From raj.khem at gmail.com Fri Feb 14 15:42:40 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 07:42:40 -0800 Subject: [OE-core] [PATCH 3/3] busybox: Backport patches to support removal of __NR_clock_gettime In-Reply-To: <20200214154240.2222810-1-raj.khem@gmail.com> References: <20200214154240.2222810-1-raj.khem@gmail.com> Message-ID: <20200214154240.2222810-3-raj.khem@gmail.com> This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj --- ...rappers-around-clock_gettime-closes-.patch | 113 ++++++++++++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 43 +++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 3 + 4 files changed, 212 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000000..f6fbed338a --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,113 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Signed-off-by: Denys Vlasenko +--- +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,11 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..944526b7ca --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..58a6c0d8a0 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102eb2b..bbc5fa1572 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -43,6 +43,9 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-Remove-stime-function-calls.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- 2.25.0 From raj.khem at gmail.com Fri Feb 14 15:44:04 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 07:44:04 -0800 Subject: [OE-core] [PATCH] staging: Handle races between binaries and their libs In-Reply-To: <5ba479f630c8dbfb0516ee9a960acfab4fa0d4f5.camel@linuxfoundation.org> References: <20200214130238.20381-1-richard.purdie@linuxfoundation.org> <5ba479f630c8dbfb0516ee9a960acfab4fa0d4f5.camel@linuxfoundation.org> Message-ID: On Fri, Feb 14, 2020 at 6:51 AM Richard Purdie wrote: > > On Fri, 2020-02-14 at 06:46 -0800, Khem Raj wrote: > > On Fri, Feb 14, 2020 at 5:03 AM Richard Purdie > > wrote: > > > There is a long standing issue where a binary could be installed > > > into the > > > sysroot before its library dependencies. We've always argued > > > nothing should > > > use the binary until its been installed by a dependency but there > > > are issues > > > around binaries which conflict with the host system, for example > > > patch, > > > python3, gzip and more. > > > > > > With the recent patch changes we've see issues like: > > > ERROR: gdb-cross-canadian-powerpc-8.3.1-r0 do_patch: Command Error: > > > 'quilt --quiltrc /home/pokybuild/yocto- > > > worker/qemuppc/build/build/tmp/work/x86_64-nativesdk-pokysdk- > > > linux/gdb-cross-canadian-powerpc/8.3.1-r0/recipe-sysroot- > > > native/etc/quiltrc push' exited with 0 Output: > > > Applying patch 0009-Change-order-of-CFLAGS.patch > > > patch: /lib64/libattr.so.1: version `ATTR_1.3' not found (required > > > by patch) > > > Patch 0009-Change-order-of-CFLAGS.patch does not apply (enforce > > > with -f) > > > > > > which is a symptom of this issue (libattr-native is a dependency of > > > patch-native). > > > > > > > ah so this was the problem I wondered > > Its one problem we're seeing, I'm still not sure those two other > patches of yours apply cleanly though... :/ > I have resent the patches for musl upgrade using git send-mail instead of ./scripts/send-pull-request, can you try these from mailing list ? > Cheers, > > Richard > From bunk at stusta.de Fri Feb 14 15:50:24 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 14 Feb 2020 17:50:24 +0200 Subject: [OE-core] [PATCH] swuashfs-tools: Enable on musl In-Reply-To: References: <20200214070352.1206450-1-raj.khem@gmail.com> <20200214143525.GA31591@localhost> Message-ID: <20200214155024.GB31591@localhost> On Fri, Feb 14, 2020 at 06:42:12AM -0800, Khem Raj wrote: > On Fri, Feb 14, 2020 at 6:35 AM Adrian Bunk wrote: > > > > On Thu, Feb 13, 2020 at 11:03:52PM -0800, Khem Raj wrote: > > > Upstream has a patch [1] to fix musl builds, Prior to this it would not > > > build on musl due to missing GNU extentions for fnmatch > > > > > > [1] https://github.com/plougher/squashfs-tools/commit/4280e74de14070869787a9166242f9ce2dafd82e > > >... > > > > I did already remove a similar bogus squashfs-tools change from OE, > > with similar FNM_EXTMATCH "fixes" in ifupdown and elfutils > > also resulting in the expected runtime misbehaviour. > > I think it would be better to use gnulib implementation for these > packages you point out > and those patches will be upstream worthy and make them portable > as well. Yes, this would be better since the resulting code would be working. But looking at the gnulib sources someone made gl_FUNC_FNMATCH_GNU do the wrong thing by "guessing yes" when cross-compiling for musl... > At least it is calling out bad elements. The only bad element is code that builds but silently does the wrong thing. Everything else is visible for users early during product development and can be mitigated. cu Adrian From anuj.mittal at intel.com Fri Feb 14 16:00:51 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Fri, 14 Feb 2020 16:00:51 +0000 Subject: [OE-core] [PATCH v2 2/2] libxml2: Fix CVE-2019-20388 In-Reply-To: <1581679690-76669-2-git-send-email-chee.yang.lee@intel.com> References: <1581679690-76669-1-git-send-email-chee.yang.lee@intel.com> <1581679690-76669-2-git-send-email-chee.yang.lee@intel.com> Message-ID: <7bd6489c601469c160a54642dc458821449a4bdf.camel@intel.com> On Fri, 2020-02-14 at 19:28 +0800, chee.yang.lee at intel.com wrote: > From: Lee Chee Yang > > see: > https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 > > Signed-off-by: Lee Chee Yang > --- > .../libxml/libxml2/CVE-2019-20388.patch | 37 > ++++++++++++++++++++++ > meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + > 2 files changed, 38 insertions(+) > create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019- > 20388.patch > > diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch > b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch > new file mode 100644 > index 0000000..4ee2d4f > --- /dev/null > +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch > @@ -0,0 +1,37 @@ > +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 > 2001 > +From: Zhipeng Xie > +Date: Tue, 20 Aug 2019 16:33:06 +0800 > +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream > + > +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun > +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble > +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize > +vctxt->xsiAssemble to 0 again which cause the alloced schema > +can not be freed anymore. > + > +Found with libFuzzer. > + > +Upstream-Status: Accepted [ > https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a > ] The status here should be Backport. Thanks, Anuj > +CVE: CVE-2019-20388 > + > +Signed-off-by: Zhipeng Xie > +Signed-off-by: Lee Chee Yang > +--- > + xmlschemas.c | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/xmlschemas.c b/xmlschemas.c > +index 301c8449..39d92182 100644 > +--- a/xmlschemas.c > ++++ b/xmlschemas.c > +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) > { > + vctxt->nberrors = 0; > + vctxt->depth = -1; > + vctxt->skipDepth = -1; > +- vctxt->xsiAssemble = 0; > + vctxt->hasKeyrefs = 0; > + #ifdef ENABLE_IDC_NODE_TABLES_TEST > + vctxt->createIDCNodeTables = 1; > +-- > +2.24.1 > + > diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb > b/meta/recipes-core/libxml/libxml2_2.9.10.bb > index 6a4097c..097aceb 100644 > --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb > +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb > @@ -21,6 +21,7 @@ SRC_URI = " > http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ > file://0001-Make-ptest-run-the-python-tests-if-python-is- > enabled.patch \ > file://fix-execution-of-ptests.patch \ > file://CVE-2020-7595.patch \ > + file://CVE-2019-20388.patch \ > " > > SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" > -- > 2.7.4 > From patchwork at patchwork.openembedded.org Fri Feb 14 16:02:51 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 14 Feb 2020 16:02:51 -0000 Subject: [OE-core] =?utf-8?b?4pyXIHBhdGNodGVzdDogZmFpbHVyZSBmb3IgIm11c2w6?= =?utf-8?q?_Update_to_latest_tip=2E=2E=2E=22_and_2_more_=28rev2=29?= In-Reply-To: <20200214154240.2222810-1-raj.khem@gmail.com> References: <20200214154240.2222810-1-raj.khem@gmail.com> Message-ID: <20200214160251.2276.27213@do> == Series Details == Series: "musl: Update to latest tip..." and 2 more (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/19281/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Upstream-Status is Submitted, but it is not mentioned where [test_upstream_status_presence_format] Suggested fix Include where 0011-gdbserver-ctrl-c-handling.patch was submitted Current Upstream-Status: Submitted Standard format Upstream-Status: Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From wangmy at cn.fujitsu.com Fri Feb 14 23:44:26 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 14 Feb 2020 15:44:26 -0800 Subject: [OE-core] [PATCH] ell: upgrade 0.27 -> 0.28 Message-ID: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} (83%) diff --git a/meta/recipes-core/ell/ell_0.27.bb b/meta/recipes-core/ell/ell_0.28.bb similarity index 83% rename from meta/recipes-core/ell/ell_0.27.bb rename to meta/recipes-core/ell/ell_0.28.bb index 503f1e22a3..464bf631e3 100644 --- a/meta/recipes-core/ell/ell_0.27.bb +++ b/meta/recipes-core/ell/ell_0.28.bb @@ -14,8 +14,8 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "e090d6a910a43c2a32114ba1cdc9f1f2" -SRC_URI[sha256sum] = "afc5441d6f6ece512a188b1e6aeabd7153de4f38989c897a2197ae50fc46da96" +SRC_URI[md5sum] = "e38089e54d4b41e508bbb7f37a4a59d9" +SRC_URI[sha256sum] = "6254fcb98d681cb2c3078dde462ba20bf90e6c10919204c6878a4381adcdb74b" do_configure_prepend () { mkdir -p ${S}/build-aux -- 2.17.1 From wangmy at cn.fujitsu.com Fri Feb 14 23:44:27 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 14 Feb 2020 15:44:27 -0800 Subject: [OE-core] [PATCH] icu: upgrade 64.2 -> 65.1 In-Reply-To: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581723869-21232-2-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} (88%) diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb similarity index 88% rename from meta/recipes-support/icu/icu_64.2.bb rename to meta/recipes-support/icu/icu_65.1.bb index 44caa43..bd932d7 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_65.1.bb @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" -SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339" +SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948" UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -- 2.7.4 From wangmy at cn.fujitsu.com Fri Feb 14 23:44:28 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 14 Feb 2020 15:44:28 -0800 Subject: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581723869-21232-3-git-send-email-wangmy@cn.fujitsu.com> libgpg-error-1.36-gawk5-support.patch Removed since it is included in 1.37. Signed-off-by: Wang Mingyu --- .../libgpg-error-1.36-gawk5-support.patch | 144 --------------------- .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d11..0000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 92% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab05..bf1da84 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,10 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- 2.7.4 From wangmy at cn.fujitsu.com Fri Feb 14 23:44:29 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 14 Feb 2020 15:44:29 -0800 Subject: [OE-core] [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0 In-Reply-To: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> References: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1581723869-21232-4-git-send-email-wangmy@cn.fujitsu.com> -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1" is added Signed-off-by: Wang Mingyu --- ...{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} (77%) diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb similarity index 77% rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb index 3aedf3d142..8f60834c17 100644 --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "python-devel" LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \ file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \ file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325" @@ -13,8 +13,8 @@ DEPENDS = "cairo python3" SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz" UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/" -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e" -SRC_URI[sha256sum] = "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531" +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4" +SRC_URI[sha256sum] = "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c" S = "${WORKDIR}/pycairo-${PV}" -- 2.17.1 From peter.kjellerstedt at axis.com Fri Feb 14 17:01:11 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Fri, 14 Feb 2020 17:01:11 +0000 Subject: [OE-core] [PATCH] staging: Handle races between binaries and their libs In-Reply-To: <20200214130238.20381-1-richard.purdie@linuxfoundation.org> References: <20200214130238.20381-1-richard.purdie@linuxfoundation.org> Message-ID: > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Richard Purdie > Sent: den 14 februari 2020 14:03 > To: openembedded-core at lists.openembedded.org > Subject: [OE-core] [PATCH] staging: Handle races between binaries and > their libs > > There is a long standing issue where a binary could be installed into the > sysroot before its library dependencies. We've always argued nothing should > use the binary until its been installed by a dependency but there are issues Change "its" to "it has". > around binaries which conflict with the host system, for example patch, > python3, gzip and more. > > With the recent patch changes we've see issues like: Change "see" to "seen". > ERROR: gdb-cross-canadian-powerpc-8.3.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/pokybuild/yocto-worker/qemuppc/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/gdb-cross-canadian-powerpc/8.3.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: > Applying patch 0009-Change-order-of-CFLAGS.patch > patch: /lib64/libattr.so.1: version `ATTR_1.3' not found (required by patch) > Patch 0009-Change-order-of-CFLAGS.patch does not apply (enforce with -f) > > which is a symptom of this issue (libattr-native is a dependency of patch-native). > > There are other ways to fix this such as disabling libattr in patch, installing > patch to a subdirectory and requiring PATH manipulation and so on. > > We can simply fix the staging code to handle /bin/ after everything else so lets Change "lets" to "let's". > do that and avoid all these other complications. Shouldn't /sbin/ be treated the same way as /bin/? //Peter > Signed-off-by: Richard Purdie > --- > meta/classes/staging.bbclass | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass > index 4dd2ed01010..530e23b1853 100644 > --- a/meta/classes/staging.bbclass > +++ b/meta/classes/staging.bbclass > @@ -470,6 +470,7 @@ python extend_recipe_sysroot() { > elif os.path.lexists(depdir + "/" + c): > os.unlink(depdir + "/" + c) > > + binfiles = {} > # Now handle installs > for dep in configuredeps: > c = setscenedeps[dep][0] > @@ -562,7 +563,16 @@ python extend_recipe_sysroot() { > if l.endswith("/"): > staging_copydir(l, targetdir, dest, seendirs) > continue > - staging_copyfile(l, targetdir, dest, postinsts, seendirs) > + if "/bin/" in l: > + # defer /bin/* files until last in case they need libs > + binfiles[l] = (targetdir, dest) > + else: > + staging_copyfile(l, targetdir, dest, postinsts, seendirs) > + > + # Handle deferred binfiles > + for l in binfiles: > + (targetdir, dest) = binfiles[l] > + staging_copyfile(l, targetdir, dest, postinsts, seendirs) > > bb.note("Installed into sysroot: %s" % str(msg_adding)) > bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists)) > -- > 2.20.1 //Peter From richard.purdie at linuxfoundation.org Fri Feb 14 17:33:24 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 14 Feb 2020 17:33:24 +0000 Subject: [OE-core] [PATCH] staging: Handle races between binaries and their libs In-Reply-To: References: <20200214130238.20381-1-richard.purdie@linuxfoundation.org> Message-ID: On Fri, 2020-02-14 at 17:01 +0000, Peter Kjellerstedt wrote: > Shouldn't /sbin/ be treated the same way as /bin/? I guess so, yes. I've done that. Cheers, Richard From alex.kanavin at gmail.com Fri Feb 14 17:46:35 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 14 Feb 2020 18:46:35 +0100 Subject: [OE-core] [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0 In-Reply-To: <1581723869-21232-4-git-send-email-wangmy@cn.fujitsu.com> References: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> <1581723869-21232-4-git-send-email-wangmy@cn.fujitsu.com> Message-ID: Thanks Wang, the recipe upgrade work is very appreciated, particularly because it doesn't fit very well into commercial product development and its typical incentives. Do you want to be the official maintainer for any of the oe-core recipes? In the sense that you would be listed for them in meta/conf/distro/include/maintainers.inc The benefits are - you can place the 'official' bit into your CV; you will also get monthly upgrade patches by email from AUH, so you don't have to create them yourself. Alex On Fri, 14 Feb 2020 at 17:12, Wang Mingyu wrote: > -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1" > is added > > Signed-off-by: Wang Mingyu > --- > ...{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb => > python3-pycairo_1.19.0.bb} (77%) > > diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb > b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb > similarity index 77% > rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb > rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb > index 3aedf3d142..8f60834c17 100644 > --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb > +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb > @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo" > BUGTRACKER = "http://bugs.freedesktop.org" > SECTION = "python-devel" > LICENSE = "LGPLv2.1 & MPLv1.1" > -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \ > +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \ > > file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \ > > file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325" > > @@ -13,8 +13,8 @@ DEPENDS = "cairo python3" > SRC_URI = " > https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz > " > UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/" > > -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e" > -SRC_URI[sha256sum] = > "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531" > +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4" > +SRC_URI[sha256sum] = > "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c" > > S = "${WORKDIR}/pycairo-${PV}" > > -- > 2.17.1 > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Fri Feb 14 18:00:07 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 10:00:07 -0800 Subject: [OE-core] [PATCH v2] busybox: Backport patches to support removal of __NR_clock_gettime Message-ID: <20200214180007.4107836-1-raj.khem@gmail.com> This helps compiling with musl on 32bit arches now that musl has switched to 64bit time_t Signed-off-by: Khem Raj --- v2: backport another similar patch for runsv refresh without meta-riscv patches ...rappers-around-clock_gettime-closes-.patch | 120 ++++++++++++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 53 ++++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 43 +++++++ ...-Use-64-prefix-syscall-if-we-have-to.patch | 46 +++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 4 + 5 files changed, 266 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch create mode 100644 meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch new file mode 100644 index 0000000000..1217daa108 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -0,0 +1,120 @@ +From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 24 Oct 2019 16:26:55 +0200 +Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 + +12091 "Direct use of __NR_clock_gettime is not time64-safe". + +function old new delta +runsv_main 1698 1712 +14 +startservice 378 383 +5 +get_mono 31 25 -6 +date_main 932 926 -6 +gettimeofday_ns 17 - -17 +------------------------------------------------------------------------------ +(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] +Signed-off-by: Denys Vlasenko +--- + Makefile.flags | 6 ++++-- + coreutils/date.c | 16 +++------------- + libbb/time.c | 11 +---------- + runit/runsv.c | 11 +---------- + 4 files changed, 9 insertions(+), 35 deletions(-) + +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -129,10 +129,12 @@ endif + # fall back to using a temp file: + CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) + ifeq ($(CRYPT_AVAILABLE),y) +-LDLIBS += m crypt ++LDLIBS += m rt crypt + else +-LDLIBS += m ++LDLIBS += m rt + endif ++# libm may be needed for dc, awk, ntpd ++# librt may be needed for clock_gettime() + + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -33,10 +33,9 @@ + //config: Enable option (-I) to output an ISO-8601 compliant + //config: date/time string. + //config: +-//config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) ++//config: default n # stat's nanosecond field is a bit non-portable + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) +- /* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ +- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); +-#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 +- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- * This simplifies the code for us as we don't need to convert +- * between 64-bit and 32-bit. We also don't have a way to +- * report overflow errors here. +- */ +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); ++#if ENABLE_FEATURE_DATE_NANO ++ clock_gettime(CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + #define CLOCK_MONOTONIC 1 + #endif + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) +-#elif __TIMESIZE == 64 +- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ if (clock_gettime(CLOCK_MONOTONIC, ts)) + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -51,18 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG + #if ENABLE_MONOTONIC_SYSCALL + #include + +-/* libc has incredibly messy way of doing this, +- * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { +-#if defined(__NR_clock_gettime) +- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); +-#elif __TIMESIZE == 64 +- syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); +-#else +-# error "We currently don't support architectures without " \ +- "the __NR_clock_gettime syscall and 32-bit time_t" +-#endif ++ clock_gettime(CLOCK_REALTIME, ts); + } + #else + static void gettimeofday_ns(struct timespec *ts) diff --git a/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..944526b7ca --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-date-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,53 @@ +From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:49 -0700 +Subject: [PATCH] date: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t fall back to the libc call. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + coreutils/date.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -36,7 +36,7 @@ + //config:# defaults to "no": stat's nanosecond field is a bit non-portable + //config:config FEATURE_DATE_NANO + //config: bool "Support %[num]N nanosecond format specifier" +-//config: default n # syscall(__NR_clock_gettime) ++//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) + //config: depends on DATE + //config: select PLATFORM_LINUX + //config: help +@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha + */ + #endif + } else { +-#if ENABLE_FEATURE_DATE_NANO ++#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) + /* libc has incredibly messy way of doing this, + * typically requiring -lrt. We just skip all this mess */ + syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); ++#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 ++ /* Let's only support the 64 suffix syscalls for 64-bit time_t. ++ * This simplifies the code for us as we don't need to convert ++ * between 64-bit and 32-bit. We also don't have a way to ++ * report overflow errors here. ++ */ ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); + #else + time(&ts.tv_sec); + #endif diff --git a/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..58a6c0d8a0 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-time-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,43 @@ +From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Sep 2019 09:28:50 -0700 +Subject: [PATCH] time: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] +Signed-off-by: Alistair Francis +Signed-off-by: Denys Vlasenko +--- + libbb/time.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/libbb/time.c ++++ b/libbb/time.c +@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( + * typically requiring -lrt. We just skip all this mess */ + static void get_mono(struct timespec *ts) + { +- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#if defined(__NR_clock_gettime) ++ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) ++#elif __TIMESIZE == 64 ++ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); + } + unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch new file mode 100644 index 0000000000..4760570441 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch @@ -0,0 +1,46 @@ +From 8c7419649d6e6fda8fa7d0e863084c78ac728628 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 28 Aug 2019 10:54:15 -0700 +Subject: [PATCH 3/3] runsv: Use 64 prefix syscall if we have to + +Some 32-bit architectures no longer have the 32-bit time_t syscalls. +Instead they have suffixed syscalls that returns a 64-bit time_t. If +the architecture doesn't have the non-suffixed syscall and is using a +64-bit time_t let's use the suffixed syscall instead. + +This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel +headers. + +If an architecture only supports the suffixed syscalls, but is still +using a 32-bit time_t report a compilation error. This avoids us have to +deal with converting between 64-bit and 32-bit values. There are +currently no architectures where this is the case. + +Signed-off-by: Alistair Francis +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=ad27d44ebe950335616f37e36863469dc181b455] +--- + runit/runsv.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/runit/runsv.c b/runit/runsv.c +index ccc762d78..737909b0e 100644 +--- a/runit/runsv.c ++++ b/runit/runsv.c +@@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * typically requiring -lrt. We just skip all this mess */ + static void gettimeofday_ns(struct timespec *ts) + { ++#if defined(__NR_clock_gettime) + syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); ++#elif __TIMESIZE == 64 ++ syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); ++#else ++# error "We currently don't support architectures without " \ ++ "the __NR_clock_gettime syscall and 32-bit time_t" ++#endif + } + #else + static void gettimeofday_ns(struct timespec *ts) +-- +2.22.0 + diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index 1d0102eb2b..ec5b580442 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb @@ -42,6 +42,10 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-check-uudecode-before-using-it.patch \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ + file://0001-date-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-time-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch \ + file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ file://0001-Remove-stime-function-calls.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- 2.25.0 From richard.purdie at linuxfoundation.org Fri Feb 14 18:09:31 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 14 Feb 2020 18:09:31 +0000 Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs In-Reply-To: References: <20200214035737.9975-1-zhe.he@windriver.com> Message-ID: On Fri, 2020-02-14 at 08:18 -0500, Bruce Ashfield wrote: > On Thu, Feb 13, 2020 at 10:58 PM wrote: > > From: He Zhe > > > > To make the native python3 is always used, > > > > - Use sed one-liner instead > > - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the > > following warning. > > > > File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix > > _temp = __import__(name, globals(), locals(), ['build_time_vars'], > > 0) > > ModuleNotFoundError: No module named '_sysconfigdata' > > > > This issue is first reported by Joel Stanley > > The sed one-liner is credited to Anuj Mittal > > > > Thanks! > > This looks good to me. I'm not sure how but with this applied we see breaking kernel module tests: https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1555 https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/275 https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1559 (mips/sysvinit, mips/systemd and mips64) I'll remove this patch from -next and retest see if I can confirm it is this change somehow. Cheers, Richard From alejandro at enedino.org Fri Feb 14 18:13:49 2020 From: alejandro at enedino.org (Alejandro Enedino Hernandez Samaniego) Date: Fri, 14 Feb 2020 10:13:49 -0800 Subject: [OE-core] [PATCH 2/2] tclibc-newlib: Include qemu on the SDK In-Reply-To: <1581704029-1573-1-git-send-email-alejandro@enedino.org> References: <1581704029-1573-1-git-send-email-alejandro@enedino.org> Message-ID: <1581704029-1573-2-git-send-email-alejandro@enedino.org> Since we now have an example recipe on meta-skeleton to build baremetal applications using OpenEmbedded, a user produced SDK should be able to run such application. Include nativesdk-qemu on TOOLCHAIN_HOST_TASK so its built inside the newlib based SDK. Signed-off-by: Alejandro Enedino Hernandez Samaniego --- meta/conf/distro/include/tclibc-newlib.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tclibc-newlib.inc b/meta/conf/distro/include/tclibc-newlib.inc index 8338003..bf89b11 100644 --- a/meta/conf/distro/include/tclibc-newlib.inc +++ b/meta/conf/distro/include/tclibc-newlib.inc @@ -38,7 +38,7 @@ BASE_DEFAULT_DEPS_append_class-target = " ${NEWLIB_EXTENDED}" TARGET_OS = "elf" TARGET_OS_arm = "eabi" -TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE} nativesdk-qemu" TOOLCHAIN_TARGET_TASK ?= "${LIBC_DEPENDENCIES}" TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = "zlib ncurses" -- 2.7.4 From alejandro at enedino.org Fri Feb 14 18:13:48 2020 From: alejandro at enedino.org (Alejandro Enedino Hernandez Samaniego) Date: Fri, 14 Feb 2020 10:13:48 -0800 Subject: [OE-core] [PATCH 1/2] tclibc-baremetal: Include qemu on the SDK Message-ID: <1581704029-1573-1-git-send-email-alejandro@enedino.org> Since we now have an example recipe on meta-skeleton to build baremetal applications using OpenEmbedded, a user produced SDK should be able to run such application. Include nativesdk-qemu on TOOLCHAIN_HOST_TASK so its built inside the baremetal based SDK. Signed-off-by: Alejandro Enedino Hernandez Samaniego --- meta/conf/distro/include/tclibc-baremetal.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tclibc-baremetal.inc b/meta/conf/distro/include/tclibc-baremetal.inc index e04f8c8..31d132e 100644 --- a/meta/conf/distro/include/tclibc-baremetal.inc +++ b/meta/conf/distro/include/tclibc-baremetal.inc @@ -27,7 +27,7 @@ BASEDEPENDS_remove_class-target = "virtual/${TARGET_PREFIX}compilerlibs" TARGET_OS = "elf" TARGET_OS_arm = "eabi" -TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_HOST_TASK ?= "packagegroup-cross-canadian-${MACHINE} nativesdk-qemu" TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" TOOLCHAIN_TARGET_TASK ?= "libgcc-dev" TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = "virtual/${MLPREFIX}libc zlib ncurses" -- 2.7.4 From andrew at avilution.com Fri Feb 14 18:30:50 2020 From: andrew at avilution.com (Andrew Boos) Date: Fri, 14 Feb 2020 12:30:50 -0600 Subject: [OE-core] Unknown Postinstall Scriptlet Failing to Defer Boot In-Reply-To: <1b01b37f-ba3b-da34-8e04-81e3f2dd72fb@mvista.com> References: <1b01b37f-ba3b-da34-8e04-81e3f2dd72fb@mvista.com> Message-ID: Thanks Jeremy for the hint about update-alternatives. It turns out that lmbench was installing a binary called "stream" that conflicts with ImageMagick's own stream. All we had to do was remove lmbench from our IMAGE_INSTALL and the problem went away. I'm posting the original error for anyone that is having the same issue. ERROR: imx8-image-3.0b3-r0 do_rootfs: Postinstall scriptlets of ['imagemagick'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget_${PN} (). Deferring to first boot via 'exit 1' is no longer supported. Andrew On Thu, Feb 13, 2020 at 8:02 PM Jeremy A. Puhlman wrote: > In these kind of cases, by providing the actual error message, people can > provide more help. > > The recipe inherits update-alternatives and sets a large number of > alternatives. The alternatives are done in the automatically added post > install scripts. In all likelihood one of the listed links is wrong, or > already a symlink or something similar. > On 2/13/2020 4:49 PM, Andrew Boos wrote: > > Hi, > > I am working on a bitbake build and I am running into an issue where a > postinst scriptlet is failing via "exit 1" to defer to first boot and I > cannot figure out which recipe is causing the issue. Does anybody have any > tips on identifying which recipe is actually exiting with a failure? The > error log says that it is in imagemagick but the recipe does not have any > postinst scripts defined. Also, there are no imagemagick .bbappend files in > my layers. ( > https://github.com/openembedded/meta-openembedded/blob/sumo/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb > ) > > Thanks, > Andrew > > > Virus-free. > www.avg.com > > <#m_-7702559278781328841_DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2> > > > -- > Jeremy A. Puhlmanjpuhlman at mvista.com > > -- *Andrew Boos* | Avilution, LLC (c) 251-895-5509 -------------- next part -------------- An HTML attachment was scrubbed... URL: From mark.hatle at kernel.crashing.org Fri Feb 14 18:34:14 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Fri, 14 Feb 2020 12:34:14 -0600 Subject: [OE-core] [RFC PATCH 1/1] newlib: Move syscalls from newlib to libgloss In-Reply-To: <20200214183414.141058-1-mark.hatle@kernel.crashing.org> References: <20200214183414.141058-1-mark.hatle@kernel.crashing.org> Message-ID: <20200214183414.141058-2-mark.hatle@kernel.crashing.org> By passing --disabled-newlib-supplied-syscalls, newlib will disable the generation of builtin syscalls and move this to libgloss. (This also affects the generation of crt0.o.) libgloss SHOULD then provide the syscalls, crt0.o and other functions that are no longer part of newlib itself. This now means that you must link with both newlib and libgloss, whereas before newlib would run in many configurations by itself. Signed-off-by: Mark Hatle --- meta/recipes-core/newlib/newlib.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index d7ac8bff17..5edea8aba1 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc @@ -42,6 +42,7 @@ EXTRA_OECONF = " \ --with-gnu-as \ --with-gnu-ld \ --disable-multilib \ + --disable-newlib-supplied-syscalls \ " do_configure[cleandirs] = "${B}" -- 2.17.1 From mark.hatle at kernel.crashing.org Fri Feb 14 18:34:13 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Fri, 14 Feb 2020 12:34:13 -0600 Subject: [OE-core] [RFC PATCH 0/1] Change newlib configuration to require libgloss Message-ID: <20200214183414.141058-1-mark.hatle@kernel.crashing.org> This is an RFC, because I only know of my particular use-case. So I'm not sure how generic of a change this really is. In my own use-case, we want to build a generic newlib and then customize our equivalent to libgloss when linking baremetal applications. I found that if we don't pass --disable-newlib-supplied-syscalls, even if libgloss was linked in, the syscalls -always- came from newlib (on 32-bit arm) and would not permit my implementations to override the built-in newlib versions. By setting the disable in BOTH newlib an libgloss, newlib syscalls are disabled, while libgloss syscalls are enabled. This results in a newlib that will now require to be linked against a 'BSP' implementation, such as libgloss, in order to build baremetal applications. Alternatively to this I'd suggest we add pkgconfigs (or even distro flags) to be able to change this behavior as well as flip some other newlib switches if desired. Mark Hatle (1): newlib: Move syscalls from newlib to libgloss meta/recipes-core/newlib/newlib.inc | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 From raj.khem at gmail.com Fri Feb 14 18:58:58 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 10:58:58 -0800 Subject: [OE-core] [PATCH] busybox: Fix typo in patch Message-ID: <20200214185858.500028-1-raj.khem@gmail.com> Signed-off-by: Khem Raj --- ...1-Remove-syscall-wrappers-around-clock_gettime-closes-.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch index 1217daa108..0c7f9b8132 100644 --- a/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch +++ b/meta/recipes-core/busybox/busybox/0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch @@ -63,7 +63,7 @@ Signed-off-by: Denys Vlasenko - * typically requiring -lrt. We just skip all this mess */ - syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); -#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 -- /* Let's only suppor the 64 suffix syscalls for 64-bit time_t. +- /* Let's only support the 64 suffix syscalls for 64-bit time_t. - * This simplifies the code for us as we don't need to convert - * between 64-bit and 32-bit. We also don't have a way to - * report overflow errors here. -- 2.25.0 From patchwork at patchwork.openembedded.org Fri Feb 14 19:02:45 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 14 Feb 2020 19:02:45 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_busybox=3A?= =?utf-8?q?_Fix_typo_in_patch?= In-Reply-To: <20200214185858.500028-1-raj.khem@gmail.com> References: <20200214185858.500028-1-raj.khem@gmail.com> Message-ID: <20200214190245.2276.20963@do> == Series Details == Series: busybox: Fix typo in patch Revision: 1 URL : https://patchwork.openembedded.org/series/22636/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 7331062f82) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From alex.kanavin at gmail.com Fri Feb 14 19:21:12 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 14 Feb 2020 20:21:12 +0100 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: I got to it finally. Normally /var/lib/rpm is absent when opkg is in use, but when /usr/bin/rpm is present, python3's ptest involves distutils test creating rpm packages (and presumably installing them too), which creates a database in /var/lib/rpm, which then triggers rpm tests to run and fail. So a check for /var/lib/rpm in rpm tests isn't always sufficient to determine which packaging system is in use, and there should be a stronger one. I'm fine with adjusting libsolv to not pull in rpm, but please use EXCLUDE_FROM_WORLD instead of PNBLACKLIST, so that just that specific problem is solved, rather than banning libdnf/dnf altogether from builds. Making libdnf to not require rpm-enabled libsolv is not feasible sadly, it's basically built around that assumption. Alex On Fri, 14 Feb 2020 at 13:19, Alexander Kanavin wrote: > On Fri, 14 Feb 2020 at 08:15, Khem Raj wrote: > >> local.conf I have >> >> DISTRO_FEATURES_append = " largefile opengl ptest multiarch wayland pam >> polkit " >> IMAGE_CLASSES += "testimage testsdk" >> > > Right, I'm running this now, it's a bit tricky because I have to do it on > the Yocto AB. Big company's bureaucracy is causing delays in getting me a > build machine :( > > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From rbilovol at cisco.com Fri Feb 14 19:24:56 2020 From: rbilovol at cisco.com (Ruslan Bilovol) Date: Fri, 14 Feb 2020 21:24:56 +0200 Subject: [OE-core] [PATCH] kernel-devsrc: support 4.4+ ARM/ARM64 kernels Message-ID: <20200214192456.2944-1-rbilovol@cisco.com> Linux Kernel 4.4 is an LTS kernel so people may still build it with OE. Thus make copying of some files optional: - arm64 module.lds file first appeared with kernel v4.6 commit fd045f6cd98e arm64: add support for module PLTs" - arm32 *.tbl files first appeared in kernel v4.10 in commit 96a8fae0fe09 "ARM: convert to generated system call tables" Signed-off-by: Ruslan Bilovol --- meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 2fa4be67cc..2ac679e204 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -147,7 +147,7 @@ do_install() { cp -a --parents arch/arm64/kernel/vdso/note.S $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ - cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ + cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ 2>/dev/null || : fi if [ "${ARCH}" = "powerpc" ]; then @@ -187,7 +187,7 @@ do_install() { # required for generate missing syscalls prepare phase cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build - cp -a --parents $(find arch/arm -type f -name "*.tbl") $kerneldir/build + cp -a --parents $(find arch/arm -type f -name "*.tbl") $kerneldir/build 2>/dev/null || : if [ "${ARCH}" = "x86" ]; then # files for 'make prepare' to succeed with kernel-devel -- 2.17.1 From raj.khem at gmail.com Fri Feb 14 19:42:01 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 11:42:01 -0800 Subject: [OE-core] [PATCH 0/9] recipe updates, testing fixes In-Reply-To: References: Message-ID: On Fri, Feb 14, 2020 at 11:21 AM Alexander Kanavin wrote: > I got to it finally. Normally /var/lib/rpm is absent when opkg is in use, > but when /usr/bin/rpm is present, python3's ptest involves distutils test > creating rpm packages (and presumably installing them too), which creates a > database in /var/lib/rpm, which then triggers rpm tests to run and fail. So > a check for /var/lib/rpm in rpm tests isn't always sufficient to determine > which packaging system is in use, and there should be a stronger one. > > I'm fine with adjusting libsolv to not pull in rpm, but please use > EXCLUDE_FROM_WORLD instead of PNBLACKLIST, so that just that specific > problem is solved, rather than banning libdnf/dnf altogether from builds. > Blacklisting is superior since this will also catch accidental inclusion of these packages when not using rpm backend where as EXCLUDE_FROM_WORLD will only be effective on word target > Making libdnf to not require rpm-enabled libsolv is not feasible sadly, > it's basically built around that assumption. > Exactly > > Alex > > On Fri, 14 Feb 2020 at 13:19, Alexander Kanavin > wrote: > >> On Fri, 14 Feb 2020 at 08:15, Khem Raj wrote: >> >>> local.conf I have >>> >>> DISTRO_FEATURES_append = " largefile opengl ptest multiarch wayland pam >>> polkit " >>> IMAGE_CLASSES += "testimage testsdk" >>> >> >> Right, I'm running this now, it's a bit tricky because I have to do it on >> the Yocto AB. Big company's bureaucracy is causing delays in getting me a >> build machine :( >> >> Alex >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alistair.francis at wdc.com Fri Feb 14 19:42:30 2020 From: alistair.francis at wdc.com (Alistair Francis) Date: Fri, 14 Feb 2020 11:42:30 -0800 Subject: [OE-core] [PATCH] qemuriscv64: Set the Xvisor platform Message-ID: <20200214194230.2361-1-alistair.francis@wdc.com> Set the platform information required to build Xvisor. https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/recipes-extended/xvisor Signed-off-by: Alistair Francis --- meta/conf/machine/qemuriscv64.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/machine/qemuriscv64.conf b/meta/conf/machine/qemuriscv64.conf index b45fdd556d..a753af0576 100644 --- a/meta/conf/machine/qemuriscv64.conf +++ b/meta/conf/machine/qemuriscv64.conf @@ -4,6 +4,8 @@ require conf/machine/include/riscv/qemuriscv.inc +XVISOR_PLAT = "riscv/virt64" + EXTRA_IMAGEDEPENDS += "u-boot" UBOOT_MACHINE = "qemu-riscv64_smode_defconfig" UBOOT_ELF = "u-boot" -- 2.25.0 From jpuhlman at mvista.com Fri Feb 14 20:07:38 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 14 Feb 2020 12:07:38 -0800 Subject: [OE-core] Unknown Postinstall Scriptlet Failing to Defer Boot In-Reply-To: References: <1b01b37f-ba3b-da34-8e04-81e3f2dd72fb@mvista.com> Message-ID: <21c80513-3588-3f62-4ee1-55dd5cb58759@mvista.com> If you look at the log.do_rootfs it will give you more or less the exact failure(using the message below as a guide), the error message below is basically the final catchall that says "at least one of them failed, please go fix it" kind of message. On 2/14/2020 10:30 AM, Andrew Boos wrote: > Thanks Jeremy for the hint about update-alternatives. It turns out > that lmbench was installing a binary called "stream" that conflicts > with ImageMagick's own stream. All we had to do was remove lmbench > from our IMAGE_INSTALL and the problem went away. I'm posting the > original error for anyone that is having the same?issue. > > ERROR: imx8-image-3.0b3-r0 do_rootfs: Postinstall scriptlets of > ['imagemagick'] have failed. If the intention is to defer them to > first boot, > then please place them into pkg_postinst_ontarget_${PN} (). > Deferring to first boot via 'exit 1' is no longer supported. > > Andrew > > > On Thu, Feb 13, 2020 at 8:02 PM Jeremy A. Puhlman > wrote: > > In these kind of cases, by providing the actual error message, > people can provide more help. > > The recipe inherits update-alternatives and sets a large number of > alternatives. The alternatives are done in the automatically added > post install scripts. In all likelihood one of the listed links is > wrong, or already a symlink or something similar. > On 2/13/2020 4:49 PM, Andrew Boos wrote: >> Hi, >> >> I am working on a bitbake build and I am running into an issue >> where a postinst scriptlet is failing via "exit 1" to defer to >> first boot and I cannot figure out which recipe is causing the >> issue. Does anybody have any tips on identifying which recipe is >> actually exiting with a failure? The error log says that it is in >> imagemagick but the recipe does not have any postinst scripts >> defined. Also, there are no imagemagick .bbappend files in my >> layers. >> (https://github.com/openembedded/meta-openembedded/blob/sumo/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb) >> >> Thanks, >> Andrew >> >> >> Virus-free. www.avg.com >> >> >> >> <#m_-7702559278781328841_DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2> >> > > -- > Jeremy A. Puhlman > jpuhlman at mvista.com > > > > -- > *Andrew Boos*?| Avilution, LLC > (c) 251-895-5509 -- Jeremy A. Puhlman jpuhlman at mvista.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Fri Feb 14 22:33:34 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 14:33:34 -0800 Subject: [OE-core] [PATCH] db: Fix timespec length assumptions Message-ID: <20200214223334.2473195-1-raj.khem@gmail.com> This should fix the vdso crashes seen with kernel 5.0+ python3[11312] general protection fault ip:b7e966b0 sp:bf8175cc error:0 in libc.so[b7e8b000+6b000] Signed-off-by: Khem Raj Cc: Bruce Ashfield --- ...001-clock-Do-not-define-own-timespec.patch | 45 +++++++++++++++++++ meta/recipes-support/db/db_5.3.28.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch diff --git a/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch new file mode 100644 index 0000000000..9d51a44a26 --- /dev/null +++ b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch @@ -0,0 +1,45 @@ +From 96b303caf70a7635953c36e5bfb9ad6e75cb7637 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Feb 2020 14:12:59 -0800 +Subject: [PATCH] clock: Do not define own timespec + +timespec is provided by libc and its best left to libc +os_gettime takes a db_timespec and passed its address to clock_gettime +which assumes that db_timespec and timespec are same but actually +its 12-bytes here and libc has 16-bytes + +This can cause problems especially with 64bit time_t + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/dbinc/clock.h | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +--- a/src/dbinc/clock.h ++++ b/src/dbinc/clock.h +@@ -44,22 +44,8 @@ + extern "C" { + #endif + +-/* +- * This declaration is POSIX-compatible. Because there are lots of different +- * time.h include file patterns out there, it's easier to declare our own name +- * in all cases than to try and discover if a system has a struct timespec. +- * For the same reason, and because we'd have to #include in db.h, +- * we don't export any timespec structures in the DB API, even in places where +- * it would make sense, like the replication statistics information. +- */ +-typedef struct { +- time_t tv_sec; /* seconds */ +-#ifdef HAVE_MIXED_SIZE_ADDRESSING +- int32_t tv_nsec; +-#else +- long tv_nsec; /* nanoseconds */ +-#endif +-} db_timespec; ++#include ++#define db_timespec struct timespec + + /* Operations on timespecs */ + #undef timespecclear diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index a2969055a6..badb79f9ea 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb @@ -26,6 +26,7 @@ SRC_URI += "file://fix-parallel-build.patch \ file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ file://sequence-type.patch \ file://0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch \ + file://0001-clock-Do-not-define-own-timespec.patch \ " # We are not interested in official latest 6.x versions; # let's track what debian is using. -- 2.25.0 From raj.khem at gmail.com Fri Feb 14 23:29:01 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 15:29:01 -0800 Subject: [OE-core] [PATCH] image.bbclass, package-index.bb: Delete do_populate_lic task Message-ID: <20200214232901.3344491-1-raj.khem@gmail.com> These are meta packages Signed-off-by: Khem Raj --- meta/classes/image.bbclass | 1 + meta/recipes-core/meta/package-index.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c2824395c9..07aa1f1fa5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -609,6 +609,7 @@ do_patch[noexec] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" +deltask do_populate_lic deltask do_populate_sysroot do_package[noexec] = "1" deltask do_package_qa diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb index a4123b7622..98c5bcb372 100644 --- a/meta/recipes-core/meta/package-index.bb +++ b/meta/recipes-core/meta/package-index.bb @@ -12,6 +12,7 @@ deltask do_patch deltask do_configure deltask do_compile deltask do_install +deltask do_populate_lic deltask do_populate_sysroot do_package_index[nostamp] = "1" -- 2.25.0 From randy.macleod at windriver.com Sat Feb 15 00:31:43 2020 From: randy.macleod at windriver.com (Randy MacLeod) Date: Fri, 14 Feb 2020 19:31:43 -0500 Subject: [OE-core] [PATCH v2 1/1] gnupg: Read GNUPG_BINDIR from environment variables for nativesdk In-Reply-To: <281727c8444cda2b543f94e43f947e1cdc018be0.1578306533.git.liezhi.yang@windriver.com> References: <281727c8444cda2b543f94e43f947e1cdc018be0.1578306533.git.liezhi.yang@windriver.com> Message-ID: On 1/6/20 5:30 AM, Robert Yang wrote: > There is already a relocate.patch for native which is used for reading > GNUPG_BINDIR from environment variables, now also enable it for nativesdk. > Otherwise, command like the following one doesn't work for nativesdk: > > $ gpg-connect-agent --homedir ../keys/ reloadagent /bye > gpg-connect-agent: no running gpg-agent - starting '/opt/path/to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent' > gpg-connect-agent: failed to start agent '/opt/path/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent': No such file or directory > > Signed-off-by: Robert Yang This seems to have been missed. Are there any comments? Robert, Please rebase and resend ../Randy > --- > meta/recipes-support/gnupg/gnupg_2.2.17.bb | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-support/gnupg/gnupg_2.2.17.bb b/meta/recipes-support/gnupg/gnupg_2.2.17.bb > index bb8885f..0a939cf 100644 > --- a/meta/recipes-support/gnupg/gnupg_2.2.17.bb > +++ b/meta/recipes-support/gnupg/gnupg_2.2.17.bb > @@ -19,6 +19,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ > SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ > file://relocate.patch" > > +SRC_URI_append_class-nativesdk = " file://relocate.patch" > + > SRC_URI[md5sum] = "1ba2d9b70c377f8e967742064c27a19c" > SRC_URI[sha256sum] = "afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514" > > @@ -60,10 +62,17 @@ do_install_append() { > } > > do_install_append_class-native() { > - create_wrapper ${D}${bindir}/gpg2 GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} > - create_wrapper ${D}${bindir}/gpgconf GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} > - create_wrapper ${D}${bindir}/gpg-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} > - create_wrapper ${D}${bindir}/gpg-connect-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} > + create_wrappers ${STAGING_BINDIR_NATIVE} > +} > + > +do_install_append_class-nativesdk() { > + create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} > +} > + > +create_wrappers() { > + for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do > + create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 > + done > } > > PACKAGECONFIG ??= "gnutls" > -- # Randy MacLeod # Wind River Linux From chee.yang.lee at intel.com Sat Feb 15 00:37:56 2020 From: chee.yang.lee at intel.com (chee.yang.lee at intel.com) Date: Sat, 15 Feb 2020 08:37:56 +0800 Subject: [OE-core] [PATCH v3] libxml2: Fix CVE-2019-20388 Message-ID: <1581727076-7713-1-git-send-email-chee.yang.lee@intel.com> From: Lee Chee Yang see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 Signed-off-by: Lee Chee Yang --- .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.10.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000..88eb65a --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,37 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +CVE: CVE-2019-20388 + +Signed-off-by: Zhipeng Xie +Signed-off-by: Lee Chee Yang +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb index 6a4097c..097aceb 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.10.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5" -- 2.7.4 From armccurdy at gmail.com Sat Feb 15 01:02:42 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Fri, 14 Feb 2020 17:02:42 -0800 Subject: [OE-core] [PATCH 1/3] musl: Update to latest tip In-Reply-To: <20200214154240.2222810-1-raj.khem@gmail.com> References: <20200214154240.2222810-1-raj.khem@gmail.com> Message-ID: On Fri, Feb 14, 2020 at 7:42 AM Khem Raj wrote: > > Detailed changelog is here [1] > > [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 Up to now, musl version updates have basically always just made things better and there's never been a good reason not to switch to a new musl release (in my own forks of oe-core I've updated both OE 2.7 and OE 3.0 to the musl 1.1.24 release, etc). However, after 1.1.24, musl switches 32bit targets to a 64bit time_t (in preparation for 2038) and from my initial testing that seems to be a change which is going to cause a lot of problems (both build time and run time) for proprietary components and BSPs etc which are only ever used on a 32bit target. Anything open source is likely to have been well tested on a 64bit target and so any assumptions about the size of time_t will have been fixed long ago, but even then there's a chance of problems (see recent fixes in oe-core for build time issues in strace, systemd, busybox, etc. I guess that run time issues are likely to emerge too as the latest musl snapshot gets more testing on 32bit targets). Updating musl beyond 1.1.24 in oe-core probably needs some careful consideration, especially just before OE 3.1 LTS. (Note that the version of musl in oe-core master is already beyond 1.1.24, so these comments don't apply specifically to this commit). > Signed-off-by: Khem Raj > Signed-off-by: Richard Purdie > --- > meta/recipes-core/musl/musl_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb > index f4853b4f2e..b6ec6fe9af 100644 > --- a/meta/recipes-core/musl/musl_git.bb > +++ b/meta/recipes-core/musl/musl_git.bb > @@ -4,7 +4,7 @@ > require musl.inc > inherit linuxloader > > -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" > +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" > > BASEVER = "1.1.24" > > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Sat Feb 15 01:21:16 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 14 Feb 2020 17:21:16 -0800 Subject: [OE-core] [PATCH 1/3] musl: Update to latest tip In-Reply-To: References: <20200214154240.2222810-1-raj.khem@gmail.com> Message-ID: On Fri, Feb 14, 2020 at 5:02 PM Andre McCurdy wrote: > > On Fri, Feb 14, 2020 at 7:42 AM Khem Raj wrote: > > > > Detailed changelog is here [1] > > > > [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 > > Up to now, musl version updates have basically always just made things > better and there's never been a good reason not to switch to a new > musl release (in my own forks of oe-core I've updated both OE 2.7 and > OE 3.0 to the musl 1.1.24 release, etc). > > However, after 1.1.24, musl switches 32bit targets to a 64bit time_t > (in preparation for 2038) and from my initial testing that seems to be > a change which is going to cause a lot of problems (both build time > and run time) for proprietary components and BSPs etc which are only > ever used on a 32bit target. Anything open source is likely to have > been well tested on a 64bit target and so any assumptions about the > size of time_t will have been fixed long ago, but even then there's a > chance of problems (see recent fixes in oe-core for build time issues > in strace, systemd, busybox, etc. I guess that run time issues are > likely to emerge too as the latest musl snapshot gets more testing on > 32bit targets). > > Updating musl beyond 1.1.24 in oe-core probably needs some careful > consideration, especially just before OE 3.1 LTS. > yes I am well aware of 64bit time_t changes, 1.25 should release well before 3.1 cut-off, musl maintainers are aware of it and we have been fixing buggy apps which have assumptions about the length of time_t, we would like to ship with 1.25 for 3.1 so please report isssues if you find and we can work along with them > (Note that the version of musl in oe-core master is already beyond > 1.1.24, so these comments don't apply specifically to this commit). > > > > Signed-off-by: Khem Raj > Signed-off-by: Richard Purdie > > --- > > meta/recipes-core/musl/musl_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb > > index f4853b4f2e..b6ec6fe9af 100644 > > --- a/meta/recipes-core/musl/musl_git.bb > > +++ b/meta/recipes-core/musl/musl_git.bb > > @@ -4,7 +4,7 @@ > > require musl.inc > > inherit linuxloader > > > > -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" > > +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" > > > > BASEVER = "1.1.24" > > > > -- > > 2.25.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core From bruce.ashfield at gmail.com Sat Feb 15 04:10:35 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Fri, 14 Feb 2020 23:10:35 -0500 Subject: [OE-core] [PATCH] db: Fix timespec length assumptions In-Reply-To: <20200214223334.2473195-1-raj.khem@gmail.com> References: <20200214223334.2473195-1-raj.khem@gmail.com> Message-ID: On Fri, Feb 14, 2020 at 5:33 PM Khem Raj wrote: > > This should fix the vdso crashes seen with kernel 5.0+ cool. I'll test this locally and follow up over the weekend. Bruce > > python3[11312] general protection fault ip:b7e966b0 sp:bf8175cc error:0 in libc.so[b7e8b000+6b000] > > Signed-off-by: Khem Raj > Cc: Bruce Ashfield > --- > ...001-clock-Do-not-define-own-timespec.patch | 45 +++++++++++++++++++ > meta/recipes-support/db/db_5.3.28.bb | 1 + > 2 files changed, 46 insertions(+) > create mode 100644 meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch > > diff --git a/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch > new file mode 100644 > index 0000000000..9d51a44a26 > --- /dev/null > +++ b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch > @@ -0,0 +1,45 @@ > +From 96b303caf70a7635953c36e5bfb9ad6e75cb7637 Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Fri, 14 Feb 2020 14:12:59 -0800 > +Subject: [PATCH] clock: Do not define own timespec > + > +timespec is provided by libc and its best left to libc > +os_gettime takes a db_timespec and passed its address to clock_gettime > +which assumes that db_timespec and timespec are same but actually > +its 12-bytes here and libc has 16-bytes > + > +This can cause problems especially with 64bit time_t > + > +Upstream-Status: Pending > +Signed-off-by: Khem Raj > +--- > + src/dbinc/clock.h | 17 +---------------- > + 1 file changed, 1 insertion(+), 16 deletions(-) > + > +--- a/src/dbinc/clock.h > ++++ b/src/dbinc/clock.h > +@@ -44,22 +44,8 @@ > + extern "C" { > + #endif > + > +-/* > +- * This declaration is POSIX-compatible. Because there are lots of different > +- * time.h include file patterns out there, it's easier to declare our own name > +- * in all cases than to try and discover if a system has a struct timespec. > +- * For the same reason, and because we'd have to #include in db.h, > +- * we don't export any timespec structures in the DB API, even in places where > +- * it would make sense, like the replication statistics information. > +- */ > +-typedef struct { > +- time_t tv_sec; /* seconds */ > +-#ifdef HAVE_MIXED_SIZE_ADDRESSING > +- int32_t tv_nsec; > +-#else > +- long tv_nsec; /* nanoseconds */ > +-#endif > +-} db_timespec; > ++#include > ++#define db_timespec struct timespec > + > + /* Operations on timespecs */ > + #undef timespecclear > diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb > index a2969055a6..badb79f9ea 100644 > --- a/meta/recipes-support/db/db_5.3.28.bb > +++ b/meta/recipes-support/db/db_5.3.28.bb > @@ -26,6 +26,7 @@ SRC_URI += "file://fix-parallel-build.patch \ > file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ > file://sequence-type.patch \ > file://0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch \ > + file://0001-clock-Do-not-define-own-timespec.patch \ > " > # We are not interested in official latest 6.x versions; > # let's track what debian is using. > -- > 2.25.0 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From jpuhlman at mvista.com Sat Feb 15 04:42:48 2020 From: jpuhlman at mvista.com (Jeremy Puhlman) Date: Fri, 14 Feb 2020 20:42:48 -0800 Subject: [OE-core] [PATCH 1/6] bind: add mulitlib_header for platform.h Message-ID: <20200215044253.5596-1-jpuhlman@mvista.com> From: "Jeremy A. Puhlman" Signed-off-by: Jeremy A. Puhlman --- meta/recipes-connectivity/bind/bind_9.11.13.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bind/bind_9.11.13.bb b/meta/recipes-connectivity/bind/bind_9.11.13.bb index 338d6c717a..4e64171cc1 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.13.bb +++ b/meta/recipes-connectivity/bind/bind_9.11.13.bb @@ -31,7 +31,7 @@ UPSTREAM_CHECK_REGEX = "(?P9.(11|16|20|24|28)(\.\d+)+(-P\d+)*)/" # don't report it here since dhcpd is already recent enough. CVE_CHECK_WHITELIST += "CVE-2019-6470" -inherit autotools update-rc.d systemd useradd pkgconfig multilib_script +inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh" @@ -105,6 +105,8 @@ do_install_append() { install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf fi + + oe_multilib_header isc/platform.h } CONFFILES_${PN} = " \ -- 2.13.3 From jpuhlman at mvista.com Sat Feb 15 04:42:49 2020 From: jpuhlman at mvista.com (Jeremy Puhlman) Date: Fri, 14 Feb 2020 20:42:49 -0800 Subject: [OE-core] [PATCH 2/6] libxslt: multilib_header xsltconfig.h In-Reply-To: <20200215044253.5596-1-jpuhlman@mvista.com> References: <20200215044253.5596-1-jpuhlman@mvista.com> Message-ID: <20200215044253.5596-2-jpuhlman@mvista.com> From: "Jeremy A. Puhlman" xsltconfig.h is generated and can be different between multilibs Signed-off-by: Jeremy Puhlman --- meta/recipes-support/libxslt/libxslt_1.1.34.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libxslt/libxslt_1.1.34.bb b/meta/recipes-support/libxslt/libxslt_1.1.34.bb index ad37b5a44a..1961bb5b31 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.34.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.34.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" -inherit autotools pkgconfig binconfig-disabled lib_package +inherit autotools pkgconfig binconfig-disabled lib_package multilib_header do_configure_prepend () { # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. @@ -43,6 +43,10 @@ do_install_append_class-native () { create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog } +do_install_append () { + oe_multilib_header libxslt/xsltconfig.h +} + FILES_${PN} += "${libdir}/libxslt-plugins" FILES_${PN}-dev += "${libdir}/xsltConf.sh" -- 2.13.3 From jpuhlman at mvista.com Sat Feb 15 04:42:51 2020 From: jpuhlman at mvista.com (Jeremy Puhlman) Date: Fri, 14 Feb 2020 20:42:51 -0800 Subject: [OE-core] [PATCH 4/6] libassuan: multilib header for assuan.h In-Reply-To: <20200215044253.5596-1-jpuhlman@mvista.com> References: <20200215044253.5596-1-jpuhlman@mvista.com> Message-ID: <20200215044253.5596-4-jpuhlman@mvista.com> From: "Jeremy A. Puhlman" assuan.h is generated and can differ between mutlilibs. Signed-off-by: Jeremy Puhlman --- meta/recipes-support/libassuan/libassuan_2.5.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libassuan/libassuan_2.5.3.bb b/meta/recipes-support/libassuan/libassuan_2.5.3.bb index 6fb3d2f3a4..52b4c0f1b9 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.3.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.3.bb @@ -22,11 +22,15 @@ SRC_URI[sha256sum] = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f7 BINCONFIG = "${bindir}/libassuan-config" -inherit autotools texinfo binconfig-disabled pkgconfig +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/*.m4 } +do_install_append () { + oe_multilib_header assuan.h +} + BBCLASSEXTEND = "native nativesdk" -- 2.13.3 From jpuhlman at mvista.com Sat Feb 15 04:42:50 2020 From: jpuhlman at mvista.com (Jeremy Puhlman) Date: Fri, 14 Feb 2020 20:42:50 -0800 Subject: [OE-core] [PATCH 3/6] libsndfile1: mutlilibize sndfile.h In-Reply-To: <20200215044253.5596-1-jpuhlman@mvista.com> References: <20200215044253.5596-1-jpuhlman@mvista.com> Message-ID: <20200215044253.5596-3-jpuhlman@mvista.com> From: "Jeremy A. Puhlman" sndfile.h can differ depending on the combined architectures. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index 7855008f3d..b100108766 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -32,7 +32,11 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[regtest] = "--enable-sqlite,--disable-sqlite,sqlite3" -inherit autotools lib_package pkgconfig +inherit autotools lib_package pkgconfig multilib_header + +do_install_append() { + oe_multilib_header sndfile.h +} # This can't be replicated and is just a memory leak. # https://github.com/erikd/libsndfile/issues/398 -- 2.13.3 From jpuhlman at mvista.com Sat Feb 15 04:42:52 2020 From: jpuhlman at mvista.com (Jeremy Puhlman) Date: Fri, 14 Feb 2020 20:42:52 -0800 Subject: [OE-core] [PATCH 5/6] subversion: move pkgconfig files in to libdir In-Reply-To: <20200215044253.5596-1-jpuhlman@mvista.com> References: <20200215044253.5596-1-jpuhlman@mvista.com> Message-ID: <20200215044253.5596-5-jpuhlman@mvista.com> From: "Jeremy A. Puhlman" All of the .pc files contain the path to ${libdir} which fails in a multilib rpm image. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-devtools/subversion/subversion_1.13.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/subversion/subversion_1.13.0.bb b/meta/recipes-devtools/subversion/subversion_1.13.0.bb index 9c1281a63e..6879f1249f 100644 --- a/meta/recipes-devtools/subversion/subversion_1.13.0.bb +++ b/meta/recipes-devtools/subversion/subversion_1.13.0.bb @@ -37,6 +37,8 @@ EXTRA_OECONF = " \ ac_cv_path_RUBY=none \ " +EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig" + acpaths = "-I build/ -I build/ac-macros/" CPPFLAGS += "-P" -- 2.13.3 From jpuhlman at mvista.com Sat Feb 15 04:42:53 2020 From: jpuhlman at mvista.com (Jeremy Puhlman) Date: Fri, 14 Feb 2020 20:42:53 -0800 Subject: [OE-core] [PATCH 6/6] x11perf: make x11perfcomp a mulitlib script In-Reply-To: <20200215044253.5596-1-jpuhlman@mvista.com> References: <20200215044253.5596-1-jpuhlman@mvista.com> Message-ID: <20200215044253.5596-6-jpuhlman@mvista.com> From: "Jeremy A. Puhlman" x11perfcomp encodes the library paths in the script. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb index 33c0c8a95c..c4d443bfb9 100644 --- a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb +++ b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb @@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ PE = "1" +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}:${bindir}/x11perfcomp" + do_install_append_class-target () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${bindir}/x11perfcomp } -- 2.13.3 From jpuhlman at mvista.com Sat Feb 15 04:44:16 2020 From: jpuhlman at mvista.com (Jeremy Puhlman) Date: Fri, 14 Feb 2020 20:44:16 -0800 Subject: [OE-core] [PATCH] tcf-agent: Mangle arch for armeb Message-ID: <20200215044416.5782-1-jpuhlman@mvista.com> From: "Jeremy A. Puhlman" Signed-off-by: Jeremy A. Puhlman --- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index e0a07a9375..ed14fe66b1 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -29,7 +29,7 @@ INITSCRIPT_NAME = "tcf-agent" INITSCRIPT_PARAMS = "start 99 3 5 . stop 20 0 1 2 6 ." # mangling needed for make -MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64,`" +MAKE_ARCH = "`echo ${TARGET_ARCH} | sed s,i.86,i686, | sed s,aarch64.*,a64, | sed s,armeb,arm,`" MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" -- 2.13.3 From alex.kiernan at gmail.com Sat Feb 15 05:15:13 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sat, 15 Feb 2020 05:15:13 +0000 Subject: [OE-core] [OE-Core][PATCH v3 1/2] meson.bbclass: Parameterise meson.cross Message-ID: <20200215051514.58365-1-alex.kiernan@gmail.com> Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated list of meson properties which are exported into meson.cross. Signed-off-by: Alex Kiernan --- Changes in v3: None Changes in v2: None meta/classes/meson.bbclass | 161 ++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 75 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 06034e8b4731..e778e37d7f69 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -34,88 +34,99 @@ MESON_CROSS_FILE = "" MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" -def meson_array(var, d): - items = d.getVar(var).split() - return repr(items[0] if len(items) == 1 else items) - -# Map our ARCH values to what Meson expects: -# http://mesonbuild.com/Reference-tables.html#cpu-families -def meson_cpu_family(var, d): - import re - arch = d.getVar(var) - if arch == 'powerpc': - return 'ppc' - elif arch == 'powerpc64' or arch == 'powerpc64le': - return 'ppc64' - elif arch == 'armeb': - return 'arm' - elif arch == 'aarch64_be': - return 'aarch64' - elif arch == 'mipsel': - return 'mips' - elif arch == 'mips64el': - return 'mips64' - elif re.match(r"i[3-6]86", arch): - return "x86" - elif arch == "microblazeel": - return "microblaze" - else: - return arch - -# Map our OS values to what Meson expects: -# https://mesonbuild.com/Reference-tables.html#operating-system-names -def meson_operating_system(var, d): - os = d.getVar(var) - if "mingw" in os: - return "windows" - else: - return os - -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) +MESON_CROSS_BINARIES ??= "c:CC \ + cpp:CXX \ + ar:AR \ + nm:NM \ + strip:STRIP \ + readelf:READELF" + +MESON_CROSS_PROPERTIES ??= "c_args:CFLAGS \ + c_link_args:LDFLAGS \ + cpp_args:CXXFLAGS \ + cpp_link_args:LDFLAGS" addtask write_config before do_configure -do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" -do_write_config() { - # This needs to be Py to split the args into single-element lists - cat >${WORKDIR}/meson.cross < v244.3 In-Reply-To: <20200215051514.58365-1-alex.kiernan@gmail.com> References: <20200215051514.58365-1-alex.kiernan@gmail.com> Message-ID: <20200215051514.58365-2-alex.kiernan@gmail.com> Drop all systemd-boot patches and use MESON_CROSS_... configuration instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan --- Changes in v3: - use MESON_CROSS_... for systemd-boot Changes in v2: - fix SRC_URI now v244.3 tag exists on v244-stable ...md-boot_244.1.bb => systemd-boot_244.3.bb} | 19 ++--- ...md-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...c-and-efi_ld-correctly-when-cross-co.patch | 62 --------------- ...on-print-EFI-CC-configuration-nicely.patch | 33 -------- ...meson-use-an-array-option-for-efi-cc.patch | 77 ------------------- ...fi-objcopy-option-to-specify-objcopy.patch | 48 ------------ .../{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 7 insertions(+), 234 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (71%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc289bef..815d5b87b1b8 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,20 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +EFI_LDFLAGS = "${@ d.getVar('LD').split(" ")[1:]} ${LDFLAGS}" +MESON_CROSS_BINARIES_append = " efi_cc:CC objcopy:OBJCOPY" +MESON_CROSS_PROPERTIES_remove = "c_link_args:LDFLAGS" +MESON_CROSS_PROPERTIES_append = " c_link_args:EFI_LDFLAGS" + EXTRA_OEMESON += "-Defi=true \ -Dgnu-efi=true \ -Defi-includedir=${STAGING_INCDIR}/efi \ - -Defi-ldsdir=${STAGING_LIBDIR} \ -Defi-libdir=${STAGING_LIBDIR} \ + -Defi-ld=${@ d.getVar('LD').split(" ")[0]} \ -Dman=false \ - -Defi-cc='${EFI_CC}' \ - -Defi-ld='${LD}' \ - -Defi-objcopy='${OBJCOPY}' \ " # install to the image as boot*.efi if its the EFI_PROVIDER, diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96ecc4f..e73b397b5d64 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch deleted file mode 100644 index e2e19ba06810..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25bce66..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf62bd1f..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4115eb..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- 2.17.1 From richard.purdie at linuxfoundation.org Sat Feb 15 08:03:39 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 15 Feb 2020 08:03:39 +0000 Subject: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <1581723869-21232-3-git-send-email-wangmy@cn.fujitsu.com> References: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> <1581723869-21232-3-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <155c3162bea87286fa7197de2de0ba66dfc8c1e6.camel@linuxfoundation.org> On Fri, 2020-02-14 at 15:44 -0800, Wang Mingyu wrote: > libgpg-error-1.36-gawk5-support.patch > Removed since it is included in 1.37. > > Signed-off-by: Wang Mingyu Fails on x32: https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/1547 Cheers, Richard From richard.purdie at linuxfoundation.org Sat Feb 15 08:07:34 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 15 Feb 2020 08:07:34 +0000 Subject: [OE-core] [PATCH] wic: Honor APPEND In-Reply-To: <20200213023141.1657-1-kexin.hao@windriver.com> References: <20200213023141.1657-1-kexin.hao@windriver.com> Message-ID: <5cb5c42022e1032c871c13222e1279df6d6c46f0.camel@linuxfoundation.org> On Thu, 2020-02-13 at 10:31 +0800, Kevin Hao wrote: > APPEND is used to add additional parameters to kernel by features, > such > as read-only-rootfs. So we should honor this variable when we compose > the kernel parameter in wic. I know we also can resolve this kind of > issue by using the .wks.in template introduced by commit 42e870c5ed4b > ("image_types.bbclass: support template .wks.in files for wic"), but > the > APPEND is needed by all the wks, it would seems pretty ridiculous to > me > to change all the .wks to .wks.in and then foist the APPEND into > them. > So the APPEND is definitely deserved to export to the wic directly. > > [Yocto #12809] > > Signed-off-by: Kevin Hao > --- > meta/classes/image_types_wic.bbclass | 2 +- > scripts/lib/wic/ksparser.py | 5 +++++ > 2 files changed, 6 insertions(+), 1 deletion(-) This seems to cause a selftest failure: https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/688 oe-selftest -r wic.Wic2.test_image_env Cheers, Richard From alex.kiernan at gmail.com Sat Feb 15 09:44:48 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sat, 15 Feb 2020 09:44:48 +0000 Subject: [OE-core] [OE-Core][PATCH v4 1/2] meson.bbclass: Parameterise meson.cross Message-ID: <20200215094450.19705-1-alex.kiernan@gmail.com> Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated list of meson properties which are exported into meson.cross. Signed-off-by: Alex Kiernan --- Changes in v4: None Changes in v3: - new Changes in v2: None meta/classes/meson.bbclass | 161 ++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 75 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 06034e8b4731..e778e37d7f69 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -34,88 +34,99 @@ MESON_CROSS_FILE = "" MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" -def meson_array(var, d): - items = d.getVar(var).split() - return repr(items[0] if len(items) == 1 else items) - -# Map our ARCH values to what Meson expects: -# http://mesonbuild.com/Reference-tables.html#cpu-families -def meson_cpu_family(var, d): - import re - arch = d.getVar(var) - if arch == 'powerpc': - return 'ppc' - elif arch == 'powerpc64' or arch == 'powerpc64le': - return 'ppc64' - elif arch == 'armeb': - return 'arm' - elif arch == 'aarch64_be': - return 'aarch64' - elif arch == 'mipsel': - return 'mips' - elif arch == 'mips64el': - return 'mips64' - elif re.match(r"i[3-6]86", arch): - return "x86" - elif arch == "microblazeel": - return "microblaze" - else: - return arch - -# Map our OS values to what Meson expects: -# https://mesonbuild.com/Reference-tables.html#operating-system-names -def meson_operating_system(var, d): - os = d.getVar(var) - if "mingw" in os: - return "windows" - else: - return os - -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) +MESON_CROSS_BINARIES ??= "c:CC \ + cpp:CXX \ + ar:AR \ + nm:NM \ + strip:STRIP \ + readelf:READELF" + +MESON_CROSS_PROPERTIES ??= "c_args:CFLAGS \ + c_link_args:LDFLAGS \ + cpp_args:CXXFLAGS \ + cpp_link_args:LDFLAGS" addtask write_config before do_configure -do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" -do_write_config() { - # This needs to be Py to split the args into single-element lists - cat >${WORKDIR}/meson.cross < v244.3 In-Reply-To: <20200215094450.19705-1-alex.kiernan@gmail.com> References: <20200215094450.19705-1-alex.kiernan@gmail.com> Message-ID: <20200215094450.19705-2-alex.kiernan@gmail.com> Drop all systemd-boot patches and use MESON_CROSS_... configuration instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan --- Changes in v4: - add missed commit to join EFI ldflags after stripping command Changes in v3: - use MESON_CROSS_... for systemd-boot Changes in v2: - fix SRC_URI now v244.3 tag exists on v244-stable ...md-boot_244.1.bb => systemd-boot_244.3.bb} | 19 ++--- ...md-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...c-and-efi_ld-correctly-when-cross-co.patch | 62 --------------- ...on-print-EFI-CC-configuration-nicely.patch | 33 -------- ...meson-use-an-array-option-for-efi-cc.patch | 77 ------------------- ...fi-objcopy-option-to-specify-objcopy.patch | 48 ------------ .../{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 7 insertions(+), 234 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (71%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc289bef..a77f6fb73d23 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,20 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +EFI_LDFLAGS = "${@ " ".join(d.getVar('LD').split()[1:])} ${LDFLAGS}" +MESON_CROSS_BINARIES_append = " efi_cc:CC objcopy:OBJCOPY" +MESON_CROSS_PROPERTIES_remove = "c_link_args:LDFLAGS" +MESON_CROSS_PROPERTIES_append = " c_link_args:EFI_LDFLAGS" + EXTRA_OEMESON += "-Defi=true \ -Dgnu-efi=true \ -Defi-includedir=${STAGING_INCDIR}/efi \ - -Defi-ldsdir=${STAGING_LIBDIR} \ -Defi-libdir=${STAGING_LIBDIR} \ + -Defi-ld=${@ d.getVar('LD').split()[0]} \ -Dman=false \ - -Defi-cc='${EFI_CC}' \ - -Defi-ld='${LD}' \ - -Defi-objcopy='${OBJCOPY}' \ " # install to the image as boot*.efi if its the EFI_PROVIDER, diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-conf_244.1.bb rename to meta/recipes-core/systemd/systemd-conf_244.3.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8c05a96ecc4f..e73b397b5d64 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" SRCBRANCH = "v244-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch deleted file mode 100644 index e2e19ba06810..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25bce66..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf62bd1f..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4115eb..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- 2.17.1 From rpjday at crashcourse.ca Sat Feb 15 09:52:48 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sat, 15 Feb 2020 04:52:48 -0500 (EST) Subject: [OE-core] curious about proper use of "REALPV" re: versioning pre-release recipes Message-ID: digging through YP dev tasks manual, section 3.3.18, "Properly Versioning Pre-Release Recipes", and the admittedly minimal usage of that feature in oe-core doesn't really seem to bolster the description. in YP manual, example for irssi recipe: REALPV = "0.8.16-rc1" PV = "0.8.15+${REALPV}" first, there's nothing magic about the variable "REALPV", is there? it could just as easily be, say, RDAY, or one could simply forego the use of a variable entirely and write: PV = "0.8.15+0.8.16-rc1" correct? second, the only example of that feature in all of oe-core is cdrtools-native_3.01.bb, which contains: PV = "3.01a31+really3.01" REALPV = "3.01" but that doesn't seem to match what is in the YP manual, as the recipe filename version contains just "3.01", so this doesn't seem like a situation where that feature is necessary. indeed, it seems like cdrtools-3.01 has been out since 2015: https://sourceforge.net/projects/cdrtools/files/ so it's unclear why this recipe doesn't just use 3.01. finally, there are two recipes under meta-oe that *do* incorporate the "-rc" qualifier in their recipe filename: recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb recipes-connectivity/libnet/libnet_1.2-rc3.bb but, oddly, neither uses the feature described above. i'm just pointing out that what one reads in that YP manual doesn't match its actual usage in the current code base. rday From rpjday at crashcourse.ca Sat Feb 15 10:00:15 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sat, 15 Feb 2020 05:00:15 -0500 (EST) Subject: [OE-core] curious about proper use of "REALPV" re: versioning pre-release recipes In-Reply-To: References: Message-ID: On Sat, 15 Feb 2020, Robert P. J. Day wrote: ... snip ... > second, the only example of that feature in all of oe-core is > cdrtools-native_3.01.bb, which contains: > > PV = "3.01a31+really3.01" > REALPV = "3.01" > > but that doesn't seem to match what is in the YP manual, as the recipe > filename version contains just "3.01", so this doesn't seem like a > situation where that feature is necessary. indeed, it seems like > cdrtools-3.01 has been out since 2015: > > https://sourceforge.net/projects/cdrtools/files/ > > so it's unclear why this recipe doesn't just use 3.01. ack, should have mentioned that if one really wanted to update cdrtools, there *is* a cdrtools-3.0.2a09.tar.gz, which really *would* be a decent (instructional) example of that feature. https://sourceforge.net/projects/cdrtools/files/alpha/cdrtools-3.02a09.tar.gz rday From richard.purdie at linuxfoundation.org Sat Feb 15 10:19:28 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 15 Feb 2020 10:19:28 +0000 Subject: [OE-core] [PATCH] icu: upgrade 64.2 -> 65.1 In-Reply-To: <1581723869-21232-2-git-send-email-wangmy@cn.fujitsu.com> References: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> <1581723869-21232-2-git-send-email-wangmy@cn.fujitsu.com> Message-ID: On Fri, 2020-02-14 at 15:44 -0800, Wang Mingyu wrote: > Signed-off-by: Wang Mingyu > --- > meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-support/icu/{icu_64.2.bb => icu_65.1.bb} (88%) > > diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_65.1.bb > similarity index 88% > rename from meta/recipes-support/icu/icu_64.2.bb > rename to meta/recipes-support/icu/icu_65.1.bb > index 44caa43..bd932d7 100644 > --- a/meta/recipes-support/icu/icu_64.2.bb > +++ b/meta/recipes-support/icu/icu_65.1.bb > @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \ > SRC_URI_append_class-target = "\ > file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ > " > -SRC_URI[md5sum] = "a3d18213beec454e3cdec9a3116d6b05" > -SRC_URI[sha256sum] = "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c" > +SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339" > +SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948" > > UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" > UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" This breaks webkitgtk: https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/1548 https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/272 https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1563 https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1567 Cheers, Richard From richard.purdie at linuxfoundation.org Sat Feb 15 10:26:35 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 15 Feb 2020 10:26:35 +0000 Subject: [OE-core] [PATCH] populate_sdk_ext: We now require python3, not python Message-ID: <20200215102635.27436-1-richard.purdie@linuxfoundation.org> We no longer expect a "python" binary in PATH so update the eSDK's expectations to match. This was the only failure on autobuilder test systems with python missing. Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9511e553f56..57fd29b1bbd 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -613,8 +613,8 @@ sdk_ext_preinst() { exit 1 fi # The relocation script used by buildtools installer requires python - if ! command -v python > /dev/null; then - echo "ERROR: The installer requires python, please install it first" + if ! command -v python3 > /dev/null; then + echo "ERROR: The installer requires python3, please install it first" exit 1 fi missing_utils="" -- 2.20.1 From patchwork at patchwork.openembedded.org Sat Feb 15 10:32:13 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sat, 15 Feb 2020 10:32:13 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_populate?= =?utf-8?q?=5Fsdk=5Fext=3A_We_now_require_python3=2C_not_python?= In-Reply-To: <20200215102635.27436-1-richard.purdie@linuxfoundation.org> References: <20200215102635.27436-1-richard.purdie@linuxfoundation.org> Message-ID: <20200215103213.2275.71569@do> == Series Details == Series: populate_sdk_ext: We now require python3, not python Revision: 1 URL : https://patchwork.openembedded.org/series/22674/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 946ce21b10) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From richard.purdie at linuxfoundation.org Sat Feb 15 11:07:23 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 15 Feb 2020 11:07:23 +0000 Subject: [OE-core] [PATCH 0/4] oeqa: Run diffoscop on saved output In-Reply-To: <20200212031435.792802-1-JPEWhacker@gmail.com> References: <20200212031435.792802-1-JPEWhacker@gmail.com> Message-ID: On Tue, 2020-02-11 at 21:14 -0600, Joshua Watt wrote: > Adds recipes to build the diffoscope tool and run it when the OEQA > reproducible build test saves output to a local path. This should > make > it much easier to debug reproducible build issues from the > autobuilder, > since the published output can be easily viewed on the website. > > Joshua Watt (4): > python: Add libarchive-c recipe > python: Add magic recipe > recipes-support: Add diffoscope recipe > oeqa: reproducible: Run diffoscope on saved output Thanks! The first production use: https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200215-t1s21q9r/packages/diff-html/ :) I am a bit puzzled/concerned about how this hasn't been removed from the system yet as it should have been, unless its the hashequiv problem with timestamps continuing to cause problems. Need to fix my patch... Cheers, Richard From kexin.hao at windriver.com Sat Feb 15 11:44:50 2020 From: kexin.hao at windriver.com (Kevin Hao) Date: Sat, 15 Feb 2020 19:44:50 +0800 Subject: [OE-core] [PATCH] wic: Honor APPEND In-Reply-To: <5cb5c42022e1032c871c13222e1279df6d6c46f0.camel@linuxfoundation.org> References: <20200213023141.1657-1-kexin.hao@windriver.com> <5cb5c42022e1032c871c13222e1279df6d6c46f0.camel@linuxfoundation.org> Message-ID: <20200215114450.GE499724@pek-khao-d2.corp.ad.wrs.com> On Sat, Feb 15, 2020 at 08:07:34AM +0000, Richard Purdie wrote: > On Thu, 2020-02-13 at 10:31 +0800, Kevin Hao wrote: > > APPEND is used to add additional parameters to kernel by features, > > such > > as read-only-rootfs. So we should honor this variable when we compose > > the kernel parameter in wic. I know we also can resolve this kind of > > issue by using the .wks.in template introduced by commit 42e870c5ed4b > > ("image_types.bbclass: support template .wks.in files for wic"), but > > the > > APPEND is needed by all the wks, it would seems pretty ridiculous to > > me > > to change all the .wks to .wks.in and then foist the APPEND into > > them. > > So the APPEND is definitely deserved to export to the wic directly. > > > > [Yocto #12809] > > > > Signed-off-by: Kevin Hao > > --- > > meta/classes/image_types_wic.bbclass | 2 +- > > scripts/lib/wic/ksparser.py | 5 +++++ > > 2 files changed, 6 insertions(+), 1 deletion(-) > > This seems to cause a selftest failure: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/688 > > oe-selftest -r wic.Wic2.test_image_env The APPEND is optional, so I should add it in the optional variables list in wic.Wic2.test_image_env. The fix is coming soon. Thanks, Kevin > > Cheers, > > Richard > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: From kexin.hao at windriver.com Sat Feb 15 11:41:44 2020 From: kexin.hao at windriver.com (Kevin Hao) Date: Sat, 15 Feb 2020 19:41:44 +0800 Subject: [OE-core] [PATCH] selftest: wic: Add APPEND to the optional variables list Message-ID: <20200215114144.14715-1-kexin.hao@windriver.com> The APPEND is an optional variable, so add it to the optional variables list to make the wic selftest happy. Signed-off-by: Kevin Hao --- meta/lib/oeqa/selftest/cases/wic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 46cd98b1934d..626a217e69fa 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -537,7 +537,8 @@ class Wic2(WicTestCase): # filter out optional variables wicvars = wicvars.difference(('DEPLOY_DIR_IMAGE', 'IMAGE_BOOT_FILES', 'INITRD', 'INITRD_LIVE', 'ISODIR','INITRAMFS_IMAGE', - 'INITRAMFS_IMAGE_BUNDLE', 'INITRAMFS_LINK_NAME')) + 'INITRAMFS_IMAGE_BUNDLE', 'INITRAMFS_LINK_NAME', + 'APPEND')) with open(path) as envfile: content = dict(line.split("=", 1) for line in envfile) # test if variables used by wic present in the .env file -- 2.25.0.389.gbfdd66e72fff From alex.kiernan at gmail.com Sat Feb 15 15:30:06 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sat, 15 Feb 2020 15:30:06 +0000 Subject: [OE-core] [OE-Core][PATCH] openssh: Upgrade 8.1p1 -> 8.2p1 Message-ID: <20200215153006.50240-1-alex.kiernan@gmail.com> Drop backports from upstream: 0001-Manually-applied-upstream-fix-for-openssh-test.patch 0001-seccomp-Allow-clock_gettime64-in-sandbox.patch openssh-8.1p1-seccomp-nanosleep.patch Signed-off-by: Alex Kiernan --- ...pplied-upstream-fix-for-openssh-test.patch | 60 ------------------- ...omp-Allow-clock_gettime64-in-sandbox.patch | 31 ---------- .../openssh-8.1p1-seccomp-nanosleep.patch | 27 --------- .../{openssh_8.1p1.bb => openssh_8.2p1.bb} | 7 +-- 4 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch delete mode 100644 meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch rename meta/recipes-connectivity/openssh/{openssh_8.1p1.bb => openssh_8.2p1.bb} (95%) diff --git a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch b/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch deleted file mode 100644 index 7171ec0834e8..000000000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0a68d6cfe255f8bcdd5f9db0d008a8f0a60b237a Mon Sep 17 00:00:00 2001 -From: "Mingde (Matthew) Zeng" -Date: Wed, 15 Jan 2020 15:51:42 -0500 -Subject: [PATCH] Manually applied upstream fix for openssh test - -Upstream Status: Backport: - https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381 - -Signed-off-by: Mingde (Matthew) Zeng ---- - regress/cert-hostkey.sh | 4 ++-- - regress/cert-userkey.sh | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh -index 86ea6250..60e3ec02 100644 ---- a/regress/cert-hostkey.sh -+++ b/regress/cert-hostkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-hostkey.sh,v 1.23 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified host keys" -@@ -252,7 +252,7 @@ test_one() { - test_one "user-certificate" failure "-n $HOSTS" - test_one "empty principals" success "-h" - test_one "wrong principals" failure "-h -n foo" --test_one "cert not yet valid" failure "-h -V20200101:20300101" -+test_one "cert not yet valid" failure "-h -V20300101:20320101" - test_one "cert expired" failure "-h -V19800101:19900101" - test_one "cert valid interval" success "-h -V-1w:+2w" - test_one "cert has constraints" failure "-h -Oforce-command=false" -diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh -index 38c14a69..f0e30945 100644 ---- a/regress/cert-userkey.sh -+++ b/regress/cert-userkey.sh -@@ -1,4 +1,4 @@ --# $OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $ -+# $OpenBSD: cert-userkey.sh,v 1.25 2020/01/03 03:02:26 djm Exp $ - # Placed in the Public Domain. - - tid="certified user keys" -@@ -338,7 +338,7 @@ test_one() { - test_one "correct principal" success "-n ${USER}" - test_one "host-certificate" failure "-n ${USER} -h" - test_one "wrong principals" failure "-n foo" --test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" -+test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" - test_one "cert expired" failure "-n ${USER} -V19800101:19900101" - test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" - test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" -@@ -399,4 +399,3 @@ done - - rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key* - rm -f $OBJ/authorized_principals_$USER -- --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch b/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch deleted file mode 100644 index 78c493de8663..000000000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-seccomp-Allow-clock_gettime64-in-sandbox.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eae3e85322fa7c869f5822db4eda6348f2beb09e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 7 Jan 2020 16:26:45 -0800 -Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox. - -This helps sshd accept connections on mips platforms with -upcoming glibc ( 2.31 ) - -Upstream-Status: Accepted [https://github.com/openssh/openssh-portable/pull/161] -Signed-off-by: Khem Raj ---- - sandbox-seccomp-filter.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 3ef30c9..999c46c 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -248,6 +248,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_clock_nanosleep_time64 - SC_ALLOW(__NR_clock_nanosleep_time64), - #endif -+#ifdef __NR_clock_gettime64 -+ SC_ALLOW(__NR_clock_gettime64), -+#endif - #ifdef __NR__newselect - SC_ALLOW(__NR__newselect), - #endif --- -2.24.1 - diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch b/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch deleted file mode 100644 index 7c9d61c26dec..000000000000 --- a/meta/recipes-connectivity/openssh/openssh/openssh-8.1p1-seccomp-nanosleep.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 7e929163ed40f9ce90060a3ca6df558c3d901379 -Author: Jakub Jelen -Date: Wed Nov 13 12:57:05 2019 +0100 - -seccomp: Allow clock_nanosleep() to make OpenSSH working with latest glibc -sandbox-seccomp: Allow clock_nanosleep on ARM - -Upstream-Status: Backport [https://github.com/tcely/openssh-portable/pull/258] - [https://github.com/bobby0809/openssh-portable/pull/138] - -Signed-off-by: Khem Raj Signed-off-by: Khem Raj --- .../webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-sato/webkit/{webkitgtk_2.26.2.bb => webkitgtk_2.26.4.bb} (97%) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb similarity index 97% rename from meta/recipes-sato/webkit/webkitgtk_2.26.2.bb rename to meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a184d833c4..c7f0d5e983 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -21,9 +21,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ " - -SRC_URI[md5sum] = "65e06fe73ee166447894aaea95038e3b" -SRC_URI[sha256sum] = "6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512" +SRC_URI[md5sum] = "60f881729f3b71244b7f6e58790073e0" +SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -- 2.25.0 From alex.kanavin at gmail.com Sat Feb 15 16:10:27 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 15 Feb 2020 17:10:27 +0100 Subject: [OE-core] [PATCH] icu: upgrade 64.2 -> 65.1 In-Reply-To: References: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> <1581723869-21232-2-git-send-email-wangmy@cn.fujitsu.com> Message-ID: On Sat, 15 Feb 2020 at 11:19, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > > This breaks webkitgtk: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/1548 > https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/272 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1563 > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1567 > This should be addressed by the webkit update Khem just posted. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Sat Feb 15 17:25:48 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 15 Feb 2020 17:25:48 +0000 Subject: [OE-core] [PATCH] resulttool/resultutils: Fix unicode error handling Message-ID: <20200215172548.7931-1-richard.purdie@linuxfoundation.org> This error handling didn't work as expected since upon failure it would inject bytestreams back into the code leading to tracebacks. Instead, ignore the decode errors. Fixes: Traceback (most recent call last): File "/home/pokybuild/yocto-worker/a-full/build/scripts/resulttool", line 78, in sys.exit(main()) File "/home/pokybuild/yocto-worker/a-full/build/scripts/resulttool", line 72, in main ret = args.func(args, logger) File "/home/pokybuild/yocto-worker/a-full/build/scripts/lib/resulttool/store.py", line 70, in store resultutils.save_resultsdata(results, tempdir, ptestlogs=True) File "/home/pokybuild/yocto-worker/a-full/build/scripts/lib/resulttool/resultutils.py", line 178, in save_resultsdata f.write(sectionlog) TypeError: write() argument must be str, not bytes Signed-off-by: Richard Purdie --- scripts/lib/resulttool/resultutils.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/lib/resulttool/resultutils.py b/scripts/lib/resulttool/resultutils.py index f0ae8ec1c5c..5fec01f6f34 100644 --- a/scripts/lib/resulttool/resultutils.py +++ b/scripts/lib/resulttool/resultutils.py @@ -127,10 +127,7 @@ def decode_log(logdata): data = logdata.get("compressed") data = base64.b64decode(data.encode("utf-8")) data = zlib.decompress(data) - try: - return data.decode("utf-8") - except UnicodeDecodeError: - return data + return data.decode("utf-8", errors='ignore') return None def ptestresult_get_log(results, section): -- 2.20.1 From patchwork at patchwork.openembedded.org Sat Feb 15 17:32:01 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sat, 15 Feb 2020 17:32:01 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_resulttool?= =?utf-8?q?/resultutils=3A_Fix_unicode_error_handling?= In-Reply-To: <20200215172548.7931-1-richard.purdie@linuxfoundation.org> References: <20200215172548.7931-1-richard.purdie@linuxfoundation.org> Message-ID: <20200215173201.2276.47134@do> == Series Details == Series: resulttool/resultutils: Fix unicode error handling Revision: 1 URL : https://patchwork.openembedded.org/series/22680/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 3aa0d0fd0b) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From raj.khem at gmail.com Sat Feb 15 21:18:08 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 15 Feb 2020 13:18:08 -0800 Subject: [OE-core] [OE-Core][PATCH v4 1/2] meson.bbclass: Parameterise meson.cross In-Reply-To: <20200215094450.19705-1-alex.kiernan@gmail.com> References: <20200215094450.19705-1-alex.kiernan@gmail.com> Message-ID: <41bb4973-dc7b-27d2-aee8-7d9e2627018e@gmail.com> On 2/15/20 1:44 AM, Alex Kiernan wrote: > Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated > list of meson properties which are exported into meson.cross. > I am seeing errors 13:14:54 File "/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/classes/meson.bbclass", line 130 13:14:54 echo "[properties]" > ${WORKDIR}/meson-tracker.cross 13:14:54 ^ 13:14:54 SyntaxError: invalid syntax > Signed-off-by: Alex Kiernan > --- > > Changes in v4: None > Changes in v3: > - new > > Changes in v2: None > > meta/classes/meson.bbclass | 161 ++++++++++++++++++++----------------- > 1 file changed, 86 insertions(+), 75 deletions(-) > > diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass > index 06034e8b4731..e778e37d7f69 100644 > --- a/meta/classes/meson.bbclass > +++ b/meta/classes/meson.bbclass > @@ -34,88 +34,99 @@ MESON_CROSS_FILE = "" > MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" > MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" > > -def meson_array(var, d): > - items = d.getVar(var).split() > - return repr(items[0] if len(items) == 1 else items) > - > -# Map our ARCH values to what Meson expects: > -# http://mesonbuild.com/Reference-tables.html#cpu-families > -def meson_cpu_family(var, d): > - import re > - arch = d.getVar(var) > - if arch == 'powerpc': > - return 'ppc' > - elif arch == 'powerpc64' or arch == 'powerpc64le': > - return 'ppc64' > - elif arch == 'armeb': > - return 'arm' > - elif arch == 'aarch64_be': > - return 'aarch64' > - elif arch == 'mipsel': > - return 'mips' > - elif arch == 'mips64el': > - return 'mips64' > - elif re.match(r"i[3-6]86", arch): > - return "x86" > - elif arch == "microblazeel": > - return "microblaze" > - else: > - return arch > - > -# Map our OS values to what Meson expects: > -# https://mesonbuild.com/Reference-tables.html#operating-system-names > -def meson_operating_system(var, d): > - os = d.getVar(var) > - if "mingw" in os: > - return "windows" > - else: > - return os > - > -def meson_endian(prefix, d): > - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") > - sitedata = siteinfo_data_for_machine(arch, os, d) > - if "endian-little" in sitedata: > - return "little" > - elif "endian-big" in sitedata: > - return "big" > - else: > - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) > +MESON_CROSS_BINARIES ??= "c:CC \ > + cpp:CXX \ > + ar:AR \ > + nm:NM \ > + strip:STRIP \ > + readelf:READELF" > + > +MESON_CROSS_PROPERTIES ??= "c_args:CFLAGS \ > + c_link_args:LDFLAGS \ > + cpp_args:CXXFLAGS \ > + cpp_link_args:LDFLAGS" > > addtask write_config before do_configure > -do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" > -do_write_config() { > - # This needs to be Py to split the args into single-element lists > - cat >${WORKDIR}/meson.cross < +python do_write_config() { > + def meson_array(var): > + items = d.getVar(var).split() > + return repr(items[0] if len(items) == 1 else items) > + > + # Map our ARCH values to what Meson expects: > + # http://mesonbuild.com/Reference-tables.html#cpu-families > + def meson_cpu_family(var): > + import re > + arch = d.getVar(var) > + if arch == 'powerpc': > + return 'ppc' > + elif arch == 'powerpc64' or arch == 'powerpc64le': > + return 'ppc64' > + elif arch == 'armeb': > + return 'arm' > + elif arch == 'aarch64_be': > + return 'aarch64' > + elif arch == 'mipsel': > + return 'mips' > + elif arch == 'mips64el': > + return 'mips64' > + elif re.match(r"i[3-6]86", arch): > + return "x86" > + elif arch == "microblazeel": > + return "microblaze" > + else: > + return arch > + > + # Map our OS values to what Meson expects: > + # https://mesonbuild.com/Reference-tables.html#operating-system-names > + def meson_operating_system(var): > + os = d.getVar(var) > + if "mingw" in os: > + return "windows" > + else: > + return os > + > + def meson_endian(prefix): > + arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") > + sitedata = siteinfo_data_for_machine(arch, os, d) > + if "endian-little" in sitedata: > + return "little" > + elif "endian-big" in sitedata: > + return "big" > + else: > + bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) > + > + def meson_write_props(var, f): > + for property in d.getVar(var).split(): > + (k, v) = property.split(':') > + print("{} = {}".format(k, meson_array(v)), file=f) > + d.appendVarFlag("do_write_config", "vardeps", v) > + > + with open(oe.path.join(d.getVar('WORKDIR'), "meson.cross"), "w") as f: > + print("""\ > [binaries] > -c = ${@meson_array('CC', d)} > -cpp = ${@meson_array('CXX', d)} > -ar = ${@meson_array('AR', d)} > -nm = ${@meson_array('NM', d)} > -strip = ${@meson_array('STRIP', d)} > -readelf = ${@meson_array('READELF', d)} > pkgconfig = 'pkg-config' > -llvm-config = 'llvm-config${LLVMVERSION}' > +llvm-config = 'llvm-config{}'""".format(d.getVar("LLVMVERSION")), file=f) > + > + meson_write_props('MESON_CROSS_BINARIES', f) > > + print("""\ > [properties] > needs_exe_wrapper = true > -c_args = ${@meson_array('CFLAGS', d)} > -c_link_args = ${@meson_array('LDFLAGS', d)} > -cpp_args = ${@meson_array('CXXFLAGS', d)} > -cpp_link_args = ${@meson_array('LDFLAGS', d)} > -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' > - > -[host_machine] > -system = '${@meson_operating_system('HOST_OS', d)}' > -cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}' > -cpu = '${HOST_ARCH}' > -endian = '${@meson_endian('HOST', d)}' > - > -[target_machine] > -system = '${@meson_operating_system('TARGET_OS', d)}' > -cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}' > -cpu = '${TARGET_ARCH}' > -endian = '${@meson_endian('TARGET', d)}' > -EOF > +gtkdoc_exe_wrapper = '{}/gtkdoc-qemuwrapper'""".format(d.getVar('B')), file=f) > + > + meson_write_props('MESON_CROSS_PROPERTIES', f) > + > + print("[host_machine]", file=f) > + print("system = '{}'".format(meson_operating_system('HOST_OS')), file=f) > + print("cpu_family = '{}'".format(meson_cpu_family('HOST_ARCH')), file=f) > + print("cpu = '{}'".format(d.getVar('HOST_ARCH')), file=f) > + print("endian = '{}'".format(meson_endian('HOST')), file=f) > + > + print("[target_machine]", file=f) > + print("system = '{}'".format(meson_operating_system('TARGET_OS')), file=f) > + print("cpu_family = '{}'".format(meson_cpu_family('TARGET_ARCH')), file=f) > + print("cpu = '{}'".format(d.getVar('TARGET_ARCH')), file=f) > + print("endian = '{}'".format(meson_endian('TARGET')), file=f) > } > > CONFIGURE_FILES = "meson.build" > From alex.kiernan at gmail.com Sat Feb 15 21:39:38 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sat, 15 Feb 2020 21:39:38 +0000 Subject: [OE-core] [OE-Core][PATCH v4 1/2] meson.bbclass: Parameterise meson.cross In-Reply-To: <41bb4973-dc7b-27d2-aee8-7d9e2627018e@gmail.com> References: <20200215094450.19705-1-alex.kiernan@gmail.com> <41bb4973-dc7b-27d2-aee8-7d9e2627018e@gmail.com> Message-ID: On Sat, Feb 15, 2020 at 9:18 PM Khem Raj wrote: > > On 2/15/20 1:44 AM, Alex Kiernan wrote: > > Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated > > list of meson properties which are exported into meson.cross. > > > > I am seeing errors > > 13:14:54 File > "/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/classes/meson.bbclass", > line 130 > 13:14:54 echo "[properties]" > ${WORKDIR}/meson-tracker.cross > 13:14:54 ^ > 13:14:54 SyntaxError: invalid syntax > Is that tracker from meta-gnome? -- Alex Kiernan From raj.khem at gmail.com Sat Feb 15 23:06:02 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 15 Feb 2020 15:06:02 -0800 Subject: [OE-core] [OE-Core][PATCH v4 1/2] meson.bbclass: Parameterise meson.cross In-Reply-To: References: <20200215094450.19705-1-alex.kiernan@gmail.com> <41bb4973-dc7b-27d2-aee8-7d9e2627018e@gmail.com> Message-ID: On Sat, Feb 15, 2020 at 1:39 PM Alex Kiernan wrote: > > On Sat, Feb 15, 2020 at 9:18 PM Khem Raj wrote: > > > > On 2/15/20 1:44 AM, Alex Kiernan wrote: > > > Add MESON_CROSS_BINARIES, MESON_CROSS_PROPERTIES as a colon separated > > > list of meson properties which are exported into meson.cross. > > > > > > > I am seeing errors > > > > 13:14:54 File > > "/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/classes/meson.bbclass", > > line 130 > > 13:14:54 echo "[properties]" > ${WORKDIR}/meson-tracker.cross > > 13:14:54 ^ > > 13:14:54 SyntaxError: invalid syntax > > > > Is that tracker from meta-gnome? yes. > > > -- > Alex Kiernan From raj.khem at gmail.com Sat Feb 15 23:23:38 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 15 Feb 2020 15:23:38 -0800 Subject: [OE-core] [PATCH] insane.bbclass: Correct typo inhert->inherit Message-ID: <20200215232339.1859-1-raj.khem@gmail.com> Signed-off-by: Khem Raj --- meta/classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 7425b8cbd5..478240fa57 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -194,7 +194,7 @@ def package_qa_check_mime(path, name, d, elf, messages): """ if d.getVar("datadir") + "/mime/packages" in path and path.endswith('.xml') and not bb.data.inherits_class("mime", d): - package_qa_add_message(messages, "mime", "package contains mime types but does not inhert mime: %s path '%s'" % \ + package_qa_add_message(messages, "mime", "package contains mime types but does not inherit mime: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) QAPATHTEST[mime-xdg] = "package_qa_check_mime_xdg" -- 2.25.0 From peter.kjellerstedt at axis.com Sun Feb 16 03:51:24 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Sun, 16 Feb 2020 03:51:24 +0000 Subject: [OE-core] [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0 In-Reply-To: <1581723869-21232-4-git-send-email-wangmy@cn.fujitsu.com> References: <1581723869-21232-1-git-send-email-wangmy@cn.fujitsu.com> <1581723869-21232-4-git-send-email-wangmy@cn.fujitsu.com> Message-ID: > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Wang Mingyu > Sent: den 15 februari 2020 00:44 > To: openembedded-core at lists.openembedded.org > Subject: [OE-core] [PATCH] python3-pycairo: upgrade 1.18.2 -> 1.19.0 > > -License-Update: "PDX-License-Identifier: LGPL-2.1-only OR MPL-1.1" > is added If the SPDX-License-Identifier is "LGPL-2.1-only OR MPL-1.1", why is the LICENSE set to "LGPLv2.1 & MPLv1.1"? Shouldn't it be "LGPLv2.1 | MPLv1.1"? //Peter > Signed-off-by: Wang Mingyu > --- > ...{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > rename meta/recipes-devtools/python/{python3-pycairo_1.18.2.bb => python3-pycairo_1.19.0.bb} (77%) > > diff --git a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb > similarity index 77% > rename from meta/recipes-devtools/python/python3-pycairo_1.18.2.bb > rename to meta/recipes-devtools/python/python3-pycairo_1.19.0.bb > index 3aedf3d142..8f60834c17 100644 > --- a/meta/recipes-devtools/python/python3-pycairo_1.18.2.bb > +++ b/meta/recipes-devtools/python/python3-pycairo_1.19.0.bb > @@ -3,7 +3,7 @@ HOMEPAGE = "http://cairographics.org/pycairo" > BUGTRACKER = "http://bugs.freedesktop.org" > SECTION = "python-devel" > LICENSE = "LGPLv2.1 & MPLv1.1" > -LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \ > +LIC_FILES_CHKSUM = "file://COPYING;md5=f3713ca2c28d9312ad718520b6dc3eee \ > file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \ > file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325" > > @@ -13,8 +13,8 @@ DEPENDS = "cairo python3" > SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz" > UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/" > > -SRC_URI[md5sum] = "be2ba51f234270dec340f28f1695a95e" > -SRC_URI[sha256sum] = "dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531" > +SRC_URI[md5sum] = "38b84416021640b01250c8f8ec4c52d4" > +SRC_URI[sha256sum] = "4f5ba9374a46c98729dd3727d993f5e17ed0286fd6738ed464fe4efa0612d19c" > > S = "${WORKDIR}/pycairo-${PV}" > > -- > 2.17.1 From tanuk at iki.fi Sun Feb 16 06:26:29 2020 From: tanuk at iki.fi (Tanu Kaskinen) Date: Sun, 16 Feb 2020 08:26:29 +0200 Subject: [OE-core] [PATCH] pulseaudio: remove unnecessary libltdl copying Message-ID: <20200216062629.36132-1-tanuk@iki.fi> This was added in 5df6deaa32e4f6d0a8985403970a137270491991. I don't know what problem it solved at that time (2009-04-21), but it seems that nowadays PulseAudio builds fine without copying the libltdl stuff. Signed-off-by: Tanu Kaskinen --- meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb index 7f8ebc2090..1bd4d9083e 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb @@ -7,8 +7,3 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ " SRC_URI[md5sum] = "e41d606f90254ed45c90520faf83d95c" SRC_URI[sha256sum] = "961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057" - -do_compile_prepend() { - mkdir -p ${S}/libltdl - cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl -} -- 2.20.1 From rpjday at crashcourse.ca Sun Feb 16 07:50:04 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sun, 16 Feb 2020 02:50:04 -0500 (EST) Subject: [OE-core] [PATCH] fix various, innocuous typos Message-ID: Corrections: - environment - variable - accommodate - conversion - compatible Signed-off-by: Robert P. J. Day --- diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 75f0f2c3e3..359f240b0b 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -243,7 +243,7 @@ def testimage_main(d): if d.getVar("TEST_TARGET") == "qemu": fstypes = [fs for fs in fstypes if fs in supported_fstypes] if not fstypes: - bb.fatal('Unsupported image type built. Add a comptible image to ' + bb.fatal('Unsupported image type built. Add a compatible image to ' 'IMAGE_FSTYPES. Supported types: %s' % ', '.join(supported_fstypes)) qfstype = fstypes[0] diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 1c586a3bc6..751424d1b6 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -1,7 +1,7 @@ # Standards are great! Everyone has their own. In an effort to standardize licensing # names, common-licenses will use the SPDX standard license names. In order to not # break the non-standardized license names that we find in LICENSE, we'll set -# up a bunch of VarFlags to accomodate non-SPDX license names. +# up a bunch of VarFlags to accommodate non-SPDX license names. # # We should really discuss standardizing this field, but that's a longer term goal. # For now, we can do this and it should grab the most common LICENSE naming variations. diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json index 9869150dcf..d77d0e673b 100644 --- a/meta/lib/oeqa/manual/eclipse-plugin.json +++ b/meta/lib/oeqa/manual/eclipse-plugin.json @@ -82,7 +82,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -164,7 +164,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -319,4 +319,4 @@ "summary": "Eclipse_Poky_installation_and_setup" } } -] \ No newline at end of file +] diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 09e77c19fe..01c38c24e6 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor): sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir) if not sdk_envs: raise argparse_oe.ArgumentUsageError("No available SDK "\ - "enviroments found at %s" % args.sdk_dir, self.name) + "environments found at %s" % args.sdk_dir, self.name) if args.list_sdk_env: self._display_sdk_envs(logger.info, args, sdk_envs) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index e2f91bcb6c..5886862d6c 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase): when building the kernel. """ kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') - # Clean up the enviroment + # Clean up the environment bitbake('%s -c clean' % kernel_provider) tempdir = tempfile.mkdtemp(prefix='devtoolqa') tempdir_cfg = tempfile.mkdtemp(prefix='config_qa') diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py index 6d80827652..d4664bd0df 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py @@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase): def test_blob_to_dict(self): """ - Test convertion of git blobs to dictionary + Test conversion of git blobs to dictionary """ from oe.buildhistory_analysis import blob_to_dict valuesmap = { "foo" : "1", "bar" : "2" } diff --git a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch b/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch index a09e2a257e..1823dfee3f 100644 --- a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch +++ b/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch @@ -985,7 +985,7 @@ index 7d9a34a..12f8fb8 100644 } /**************************************************************************** -@@ -259,38 +263,39 @@ cpu-state-varible M.x86.mode. There are several potential states: +@@ -259,38 +263,39 @@ cpu-state-variable M.x86.mode. There are several potential states: Each of the above 7 items are handled with a bit in the mode field. ****************************************************************************/ diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch index eda5565371..14d0548b81 100644 --- a/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch +++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch @@ -533,7 +533,7 @@ index 0000000000..b67b468466 + Here, 'my-wrapper' must ensure that the value it sees for + 'GCONV_PATH' will be seen by the dynamic linker, and thus 'tst-foo' + itself. (The wrapper supplied with GLIBC simply preserves the -+ values of *all* enviroment variables, with a fixed set of ++ values of *all* environment variables, with a fixed set of + exceptions.) + + If your wrapper is a shell script, take care to correctly propagate diff --git a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch index e6998f6e68..e59144a13c 100644 --- a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch +++ b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch @@ -148,7 +148,7 @@ index 2d7a6f5..1c53585 100644 - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); - printf("*** correct copy of xml2-config. (In this case, you will have to\n"); -- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); +- printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - return 1; diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py index add5c53882..53324b9f8b 100644 --- a/scripts/pybootchartgui/pybootchartgui/draw.py +++ b/scripts/pybootchartgui/pybootchartgui/draw.py @@ -308,7 +308,7 @@ sec_w_base = 1 # the width of a second proc_h = 16 # the height of a process leg_s = 10 MIN_IMG_W = 800 -CUML_HEIGHT = 2000 # Increased value to accomodate CPU and I/O Graphs +CUML_HEIGHT = 2000 # Increased value to accommodate CPU and I/O Graphs OPTIONS = None def extents(options, xscale, trace): -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== From patchwork at patchwork.openembedded.org Sun Feb 16 08:02:23 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sun, 16 Feb 2020 08:02:23 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_fix_variou?= =?utf-8?q?s=2C_innocuous_typos?= In-Reply-To: References: Message-ID: <20200216080223.2273.40973@do> == Series Details == Series: fix various, innocuous typos Revision: 1 URL : https://patchwork.openembedded.org/series/22690/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at c9b5802bbe) * Patch fix various, innocuous typos Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fix Commit shortlog (first line of commit message) should follow the format ": " If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From rpjday at crashcourse.ca Sun Feb 16 08:20:21 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sun, 16 Feb 2020 03:20:21 -0500 (EST) Subject: [OE-core] value of individual (override) settings of COMPATIBLE_MACHINE? Message-ID: i remember wondering about this a looooong time ago, then forgot about it, but in some of the poky linux-yocto kernel .bbappend files, there are sets of individual COMPATIBLE_MACHINE settings: COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" given that, in the above, the override matches *exactly* the machine name being assigned, how is this functionally different from simply: COMPATIBLE_MACHINE = "genericx86|edgerouter|beaglebone-yocto|mpc8315e-rdb" as i read it, an override of the form COMPATIBLE_MACHINE_genericx86 = "genericx86" says simply, "if this machine is a genericx86, then i am compatible with a genericx86". am i missing some subtlety here? is there an actual difference? rday p.s. while on the subject of COMPATIBLE_MACHINE, i remember noting some time back the two aesthetic forms of assignments in use: ... linux-yocto-rt_5.2.bb:COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" linux-yocto_5.2.bb:COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" linux-yocto-dev.bb:COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" ... as in, some use parentheses, some not. just a coding style thing. From alex.kiernan at gmail.com Sun Feb 16 09:07:20 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sun, 16 Feb 2020 09:07:20 +0000 Subject: [OE-core] [OE-Core][PATCH v5] systemd: upgrade v244.1 -> v244.3 Message-ID: <20200216090720.48895-1-alex.kiernan@gmail.com> Drop all systemd-boot patches and use MESON_CROSS_... configuration instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan --- Changes in v5: - use multiple cross-file support to inject the necessary binaries into meson Changes in v4: - add missed commit to join EFI ldflags after stripping command Changes in v3: - use MESON_CROSS_... for systemd-boot Changes in v2: - fix SRC_URI now v244.3 tag exists on v244-stable ...md-boot_244.1.bb => systemd-boot_244.3.bb} | 26 +++---- ...md-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...c-and-efi_ld-correctly-when-cross-co.patch | 62 --------------- ...on-print-EFI-CC-configuration-nicely.patch | 33 -------- ...meson-use-an-array-option-for-efi-cc.patch | 77 ------------------- ...fi-objcopy-option-to-specify-objcopy.patch | 48 ------------ .../{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 14 insertions(+), 234 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (71%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc289bef..f92c63981043 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,27 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " + +do_write_config[vardeps] += "CC OBJCOPY" +do_write_config_append() { + cat >${WORKDIR}/meson-${PN}.cross < -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25bce66..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf62bd1f..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4115eb..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- 2.17.1 From alex.kiernan at gmail.com Sun Feb 16 09:21:49 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sun, 16 Feb 2020 09:21:49 +0000 Subject: [OE-core] [OE-Core][PATCH v5] systemd: upgrade v244.1 -> v244.3 In-Reply-To: <20200216090720.48895-1-alex.kiernan@gmail.com> References: <20200216090720.48895-1-alex.kiernan@gmail.com> Message-ID: Please ignore. I need to fix the commit message On Sun, 16 Feb 2020, 09:07 Alex Kiernan, wrote: > Drop all systemd-boot patches and use MESON_CROSS_... configuration > instead to pick up EFI cc and objcopy. For EFI ld, we can use the > command line efi-ld option, but have to ensure it's something which can > be exec'd directly. > > Commits from v244-stable: > > c4280c342bbf Revert "Support Plugable UD-PRO8 dock" > bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the > resume device > 77c04ce5c270 hwdb: update to v245-rc1 > b4eb8848240c Fix typo in function name > e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve > callback/userdata instead of caching it > 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages > 5926f9f1723f polkit: use structured initialization > 0697d0d972c8 polkit: on async pk requests, re-validate action/details > 2589995acdb2 polkit: reuse some common bus message appending code > 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error > 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? > bus-polkit.c > 1325dfb5778d test: adapt to the new capsh format > 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 > 3034855a5b62 presets: "disable" all passive targets by default > c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a > single value > 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the > lease > 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 > f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf > ddc5dca8a73b sd-boot: fix typo > 2bbbe9ae41ab test: Synchronize journal before reading from it > 072485d661d7 sd-bus: fix introspection bug in signal parameter names > 80af3cf5e36b efi: fix build. > d7ede1ade564 generator: order growfs for the root fs after > systemd-remount-fs > e9904998213d loginctl: use /org/freedesktop/login1/session/auto when > "lock-session" is called without argument > 82dd4caf014c Documentation update for x-systemd.{before,after} > a60459764d9d man: fix typo in systemd.netdev Xfrm example > fc053e2dfb3f timesyncd: log louder when we refuse a server due to root > distance > af0e630693fa resolved: drop DNSSEC root key that is not valid anymore > ae59f1666ca6 journal: don't use startswith() on something that is not a > NUL-terminated string > 536ef6d72bc6 test: add test for > https://github.com/systemd/systemd/issues/14560 > b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to > stdout/stderr by default > a1561a08f2d5 pkgconf: add full generator paths > e5f2d11489ec tree-wide: we forgot to destroy some bus errors > ea67fd42067b mount: make checks on perpetual mount units more lax > 2f23c648bce4 core: never allow perpetual units to be masked > 9ba11dffb09a typo: "May modify to" -> "May modify" > 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot > mode > 4c2d72b53091 sysctl: downgrade message when we have no permission > c001a285a3a2 Clarify journald.conf MaxLevelStore documentation > 45d52c7615fd logind: refuse overriding idle hint on tty sessions > b1a0be45b4ee cgroup: update only siblings that got realized once > e6d694254fe1 mount: mark an existing "mounting" unit from > /proc/self/mountinfo as "just_mounted" > d8fd38769c36 journalctl: Correctly handle combination of --reverse and > --lines (fixes #1596) > cd19bd31d808 journalctl: Correctly handle --show-cursor in combination > with --until or --since and --reverse > 1320aa92dc0a core: fix re-realization of cgroup siblings > 14164ec6bc77 core: propagate service state to socket in more load states > c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in > UNIT FILE LOAD PATH > 26f3a534f1ab core: be more restrictive on the dependency types we allow > to be created transiently > 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions > 7d5060d53994 man: fix option name > 98c03090274a Support Plugable UD-PRO8 dock > e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat > 7057fe863007 man: fix documentation of IBM VIO device naming > f8d1df1045be man: slightly extend documentation on difference between > ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD > 1faf5dde4d4a boot: fix osrel parser > 65d247af1786 udev: do not use exact match of file permission > 6da978f89b48 network: lower the log-level of harmless message > 5d8a614f926c hwdb: ignore keys added in kernel 5.5 > 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb > b2f342f92b54 systemd.exec: document the file system for EnvironmentFile > paths > 945f3a231f6f systemd-analyze: fixed typo in documentation > 2c8ae283b0ee test-condition: fix group check condition > 6b48479f4582 umount: show correct error message > faba5b2ba8c9 Revert "Drop dbus activation stub service" > 3dd98f1998f9 man: add section about user manager units > 1c80a8ced006 man: add remote-*.targets to the bootup sequence > 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW > 561923291383 [man] note which UID ranges will get user journals > 588a23ef2684 [man] fix URL > 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory > exists > 93074c962e3a network: introduce AddPrefixRoute= and deprecate > PrefixRoute= > a8ad020ea0ba shared/dropin: fix assert for invalid drop-in > 946cdba156dd initrd: make udev cleanup service confict trigger and > settle too > c0a8a92e6027 man: we support growing xfs too these days > 608d88273494 time-util: deal with systems where userspace has 64bit > time_t but kernel does not > cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export > tar/raw > 73435b219553 systemctl: show what verbs support --dry-run in the help > page > dc56b94e1308 cryptsetup-generator: unconfuse writing of the device > timeout > 0757ad565573 shared/install: log syntax error for invalid > DefaultInstance= > d2471109d999 shared/install: provide a nicer error message for invalid > WantedBy=/Required= values > > Signed-off-by: Alex Kiernan > --- > > Changes in v5: > - use multiple cross-file support to inject the necessary binaries into > meson > > Changes in v4: > - add missed commit to join EFI ldflags after stripping command > > Changes in v3: > - use MESON_CROSS_... for systemd-boot > > Changes in v2: > - fix SRC_URI now v244.3 tag exists on v244-stable > > ...md-boot_244.1.bb => systemd-boot_244.3.bb} | 26 +++---- > ...md-conf_244.1.bb => systemd-conf_244.3.bb} | 0 > meta/recipes-core/systemd/systemd.inc | 2 +- > ...c-and-efi_ld-correctly-when-cross-co.patch | 62 --------------- > ...on-print-EFI-CC-configuration-nicely.patch | 33 -------- > ...meson-use-an-array-option-for-efi-cc.patch | 77 ------------------- > ...fi-objcopy-option-to-specify-objcopy.patch | 48 ------------ > .../{systemd_244.1.bb => systemd_244.3.bb} | 0 > 8 files changed, 14 insertions(+), 234 deletions(-) > rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => > systemd-boot_244.3.bb} (71%) > rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => > systemd-conf_244.3.bb} (100%) > delete mode 100644 > meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch > delete mode 100644 > meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch > delete mode 100644 > meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch > delete mode 100644 > meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch > rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} > (100%) > > diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb > b/meta/recipes-core/systemd/systemd-boot_244.3.bb > similarity index 71% > rename from meta/recipes-core/systemd/systemd-boot_244.1.bb > rename to meta/recipes-core/systemd/systemd-boot_244.3.bb > index 515abc289bef..f92c63981043 100644 > --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb > +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb > @@ -5,27 +5,27 @@ require conf/image-uefi.conf > > DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" > > -# NOTE: These three patches are in theory not needed, but we haven't > -# figured out how to correctly pass efi-cc parameter if it's an > array. > -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch > \ > - > file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ > - > file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ > - > file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ > - " > - > inherit meson pkgconfig gettext > inherit deploy > > -EFI_CC ?= "${CC}" > +LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " > + > +do_write_config[vardeps] += "CC OBJCOPY" > +do_write_config_append() { > + cat >${WORKDIR}/meson-${PN}.cross < +[binaries] > +efi_cc = ${@meson_array('CC', d)} > +objcopy = ${@meson_array('OBJCOPY', d)} > +EOF > +} > + > EXTRA_OEMESON += "-Defi=true \ > -Dgnu-efi=true \ > -Defi-includedir=${STAGING_INCDIR}/efi \ > - -Defi-ldsdir=${STAGING_LIBDIR} \ > -Defi-libdir=${STAGING_LIBDIR} \ > + -Defi-ld=${@ d.getVar('LD').split()[0]} \ > -Dman=false \ > - -Defi-cc='${EFI_CC}' \ > - -Defi-ld='${LD}' \ > - -Defi-objcopy='${OBJCOPY}' \ > + --cross-file ${WORKDIR}/meson-${PN}.cross \ > " > > # install to the image as boot*.efi if its the EFI_PROVIDER, > diff --git a/meta/recipes-core/systemd/systemd-conf_244.1.bb > b/meta/recipes-core/systemd/systemd-conf_244.3.bb > similarity index 100% > rename from meta/recipes-core/systemd/systemd-conf_244.1.bb > rename to meta/recipes-core/systemd/systemd-conf_244.3.bb > diff --git a/meta/recipes-core/systemd/systemd.inc > b/meta/recipes-core/systemd/systemd.inc > index 8c05a96ecc4f..e73b397b5d64 100644 > --- a/meta/recipes-core/systemd/systemd.inc > +++ b/meta/recipes-core/systemd/systemd.inc > @@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" > LIC_FILES_CHKSUM = > "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ > > file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" > > -SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66" > +SRCREV = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" > SRCBRANCH = "v244-stable" > SRC_URI = "git:// > github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} > > " > > diff --git > a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch > b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch > deleted file mode 100644 > index e2e19ba06810..000000000000 > --- > a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch > +++ /dev/null > @@ -1,62 +0,0 @@ > -From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001 > -From: Chen Qi > -Date: Tue, 27 Feb 2018 21:42:23 -0800 > -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when > cross-compiling > - > -When cross-compiling, efi_cc and efi_ld may take the form of > -'xxx-gcc --sysroot=xxx', and this would cause run_command and > -the alike fail. > - > -Fix to split them to make commands run correctly. > - > -Upstream-Status: Pending > - > -Signed-off-by: Chen Qi > ---- > - src/boot/efi/meson.build | 16 +++++++++++++--- > - 1 file changed, 13 insertions(+), 3 deletions(-) > - > -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build > -index 992a3ba4c..9f9ec4911 100644 > ---- a/src/boot/efi/meson.build > -+++ b/src/boot/efi/meson.build > -@@ -157,7 +157,7 @@ if have_gnu_efi > - o_file = custom_target(file + '.o', > - input : file, > - output : file + '.o', > -- command : [efi_cc, '-c', '@INPUT@', > '-o', '@OUTPUT@'] > -+ command : efi_cc.split() + ['-c', > '@INPUT@', '-o', '@OUTPUT@'] > - + compile_args, > - depend_files : efi_headers) > - if (common_sources + systemd_boot_sources).contains(file) > -@@ -168,7 +168,17 @@ if have_gnu_efi > - endif > - endforeach > - > -- libgcc_file_name = run_command(efi_cc, > '-print-libgcc-file-name').stdout().strip() > -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' > -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] > -+ find_libgcc_args = [] > -+ cmd_args_all = find_libgcc_cmd_all.split() > -+ foreach arg : cmd_args_all > -+ if arg != find_libgcc_cmd > -+ find_libgcc_args += arg > -+ endif > -+ endforeach > -+ > -+ libgcc_file_name = run_command(find_libgcc_cmd, > find_libgcc_args).stdout().strip() > - systemd_boot_efi_name = 'systemd-boot at 0 > @.efi'.format(EFI_MACHINE_TYPE_NAME) > - stub_efi_name = 'linux at 0 > @.efi.stub'.format(EFI_MACHINE_TYPE_NAME) > - no_undefined_symbols = find_program('no-undefined-symbols.sh') > -@@ -179,7 +189,7 @@ if have_gnu_efi > - tuple[0], > - input : tuple[2], > - output : tuple[0], > -- command : [efi_ld, '-o', '@OUTPUT@'] + > -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + > - efi_ldflags + tuple[2] + > - ['-lefi', '-lgnuefi', > libgcc_file_name]) > - > --- > -2.13.0 > - > diff --git > a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch > b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch > deleted file mode 100644 > index ed14e25bce66..000000000000 > --- > a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 > -From: Chen Qi > -Date: Tue, 26 Feb 2019 14:27:49 +0800 > -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" > - > -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. > - > -This patch is here because we haven't figured out how to pass > -parameter to efi-cc if it's an array in systemd-boot recipe. > - > -Upstream-Status: Inappropriate [OE specific] > - > -Signed-off-by: Chen Qi > ---- > - meson.build | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index 70fb218..30df834 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 > - if have_gnu_efi > - status += [ > - 'EFI machine type: @0@ > '.format(EFI_MACHINE_TYPE_NAME), > -- 'EFI CC @0@'.format(' > '.join(efi_cc)), > -+ 'EFI CC @0@ > '.format(efi_cc), > - 'EFI lib directory: @0@ > '.format(efi_libdir), > - 'EFI lds directory: @0@ > '.format(efi_ldsdir), > - 'EFI include directory: @0@ > '.format(efi_incdir)] > --- > -2.7.4 > - > diff --git > a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch > b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch > deleted file mode 100644 > index 0d2ebf62bd1f..000000000000 > --- > a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch > +++ /dev/null > @@ -1,77 +0,0 @@ > -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 > -From: Chen Qi > -Date: Tue, 26 Feb 2019 14:17:25 +0800 > -Subject: [PATCH] Revert "meson: use an array option for efi-cc" > - > -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. > - > -This patch is here because we haven't figured out how to pass > -parameter to efi-cc if it's an array in systemd-boot recipe. > - > -Upstream-Status: Inappropriate [OE specific] > - > -Signed-off-by: Chen Qi > ---- > - meson_options.txt | 2 +- > - src/boot/efi/meson.build | 11 ++++++----- > - 2 files changed, 7 insertions(+), 6 deletions(-) > - > -diff --git a/meson_options.txt b/meson_options.txt > -index 044bb79..3d28bfd 100644 > ---- a/meson_options.txt > -+++ b/meson_options.txt > -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', > 'true', 'false'], > - > - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], > - description : 'gnu-efi support for sd-boot') > --option('efi-cc', type : 'array', > -+option('efi-cc', type : 'string', > - description : 'the compiler to use for EFI modules') > - option('efi-ld', type : 'string', > - description : 'the linker to use for EFI modules') > -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build > -index 2140151..d8db3a1 100644 > ---- a/src/boot/efi/meson.build > -+++ b/src/boot/efi/meson.build > -@@ -34,8 +34,8 @@ stub_sources = ''' > - > - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' > - efi_cc = get_option('efi-cc') > -- if efi_cc.length() == 0 > -- efi_cc = cc.cmd_array() > -+ if efi_cc == '' > -+ efi_cc = ' '.join(cc.cmd_array()) > - endif > - efi_ld = get_option('efi-ld') > - if efi_ld == '' > -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and > get_option('gnu-efi') != 'false' > - > - efi_libdir = get_option('efi-libdir') > - if efi_libdir == '' > -- ret = run_command(efi_cc + ['-print-multi-os-directory']) > -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && > pwd'.format(efi_cc) > -+ ret = run_command('sh', '-c', cmd) > - if ret.returncode() == 0 > - path = join_paths('/usr/lib', > ret.stdout().strip()) > - ret = run_command('realpath', '-e', path) > -@@ -152,7 +153,7 @@ if have_gnu_efi > - o_file = custom_target(file + '.o', > - input : file, > - output : file + '.o', > -- command : efi_cc + ['-c', '@INPUT@', > '-o', '@OUTPUT@'] > -+ command : [efi_cc, '-c', '@INPUT@', > '-o', '@OUTPUT@'] > - + compile_args, > - depend_files : efi_headers) > - if (common_sources + systemd_boot_sources).contains(file) > -@@ -163,7 +164,7 @@ if have_gnu_efi > - endif > - endforeach > - > -- libgcc_file_name = run_command(efi_cc + > ['-print-libgcc-file-name']).stdout().strip() > -+ libgcc_file_name = run_command(efi_cc, > '-print-libgcc-file-name').stdout().strip() > - systemd_boot_efi_name = 'systemd-boot at 0 > @.efi'.format(EFI_MACHINE_TYPE_NAME) > - stub_efi_name = 'linux at 0 > @.efi.stub'.format(EFI_MACHINE_TYPE_NAME) > - no_undefined_symbols = find_program('no-undefined-symbols.sh') > --- > -2.7.4 > - > diff --git > a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch > b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch > deleted file mode 100644 > index 7d764b4115eb..000000000000 > --- > a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 > -From: Khem Raj > -Date: Tue, 6 Aug 2019 03:10:20 +0000 > -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy > - > -This helps in cross compiling for x86 target on a aarch64 host e.g. > -Fixes > -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid > bfd target > - > -Upstream-Status: Pending > -Signed-off-by: Khem Raj > ---- > - meson_options.txt | 2 ++ > - src/boot/efi/meson.build | 5 ++++- > - 2 files changed, 6 insertions(+), 1 deletion(-) > - > -diff --git a/meson_options.txt b/meson_options.txt > -index d4ec37dda2..dc1c96e112 100644 > ---- a/meson_options.txt > -+++ b/meson_options.txt > -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', > - description : 'the compiler to use for EFI modules') > - option('efi-ld', type : 'string', > - description : 'the linker to use for EFI modules') > -+option('efi-objcopy', type : 'string', > -+ description : 'the objcopy to use for EFI') > - option('efi-libdir', type : 'string', > - description : 'path to the EFI lib directory') > - option('efi-ldsdir', type : 'string', > -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build > -index 0ae3191635..5a7137bc84 100644 > ---- a/src/boot/efi/meson.build > -+++ b/src/boot/efi/meson.build > -@@ -88,7 +88,10 @@ if have_gnu_efi > - output : 'efi_config.h', > - configuration : efi_conf) > - > -- objcopy = find_program('objcopy') > -+ objcopy = get_option('efi-objcopy') > -+ if objcopy == '' > -+ objcopy = find_program('objcopy', required: true) > -+ endif > - > - efi_ldsdir = get_option('efi-ldsdir') > - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) > --- > -2.17.1 > - > diff --git a/meta/recipes-core/systemd/systemd_244.1.bb > b/meta/recipes-core/systemd/systemd_244.3.bb > similarity index 100% > rename from meta/recipes-core/systemd/systemd_244.1.bb > rename to meta/recipes-core/systemd/systemd_244.3.bb > -- > 2.17.1 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From rpjday at crashcourse.ca Sun Feb 16 09:37:37 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sun, 16 Feb 2020 04:37:37 -0500 (EST) Subject: [OE-core] task i was asked about: "Fix java build to not use host java" Message-ID: (NOTE: while this was asked in the context of the latest wind river linux, i'm guessing it applies to stock OE/YP.) regarding a WRL project that i haven't actually seen yet, one of the items on a TO DO list reads, "Fix java build to not use host java", and i'm trying to clarify what that might mean without yet seeing the project. as i read that brief item, i'm assuming that this is a java-based project wherein some java recipes must be compiled and added to the image and, currently, it's the host java compiler that is being used, whereas they want a java compiler to be compiled, added to the native sysroot, and used for all java compilation. i'm aware of bitbake.conf's ASSUME_PROVIDED variable which says nothing about java, and i've never worked on a java-flavoured OE project before, so i'm curious as to whether the host java would be used by default, and how to override that. does this make sense? a pointer to some reasonable example of a java-infused YP project would probably suffice, and i'm aware of the meta-java layer, which i assume will be dragged in. i have no details beyond this at the moment, just trying to figure out what that task might mean. rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== From alex.kiernan at gmail.com Sun Feb 16 11:42:24 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sun, 16 Feb 2020 11:42:24 +0000 Subject: [OE-core] [OE-Core][PATCH v6] systemd: upgrade v244.1 -> v244.3 Message-ID: <20200216114224.85934-1-alex.kiernan@gmail.com> Drop all systemd-boot patches and use an additional cross-file instead to pick up EFI cc and objcopy. For EFI ld, we can use the command line efi-ld option, but have to ensure it's something which can be exec'd directly. Commits from v244-stable: c4280c342bbf Revert "Support Plugable UD-PRO8 dock" bb598b56eb3c hibernate-resume-generator: wait "infinitely" for the resume device 77c04ce5c270 hwdb: update to v245-rc1 b4eb8848240c Fix typo in function name e2d4cb9843c5 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 83bfc0d8dd02 sd-bus: introduce API for re-enqueuing incoming messages 5926f9f1723f polkit: use structured initialization 0697d0d972c8 polkit: on async pk requests, re-validate action/details 2589995acdb2 polkit: reuse some common bus message appending code 5b2442d5c3ec bus-polkit: rename return error parameter to ret_error 0a19ff7004e4 shared: split out polkit stuff from bus-util.c ? bus-polkit.c 1325dfb5778d test: adapt to the new capsh format 3538fafb4714 meson: update efi path detection to gnu-efi-3.0.11 3034855a5b62 presets: "disable" all passive targets by default c2e304681929 shared/sysctl-util: normalize repeated slashes or dots to a single value 6f4364046f90 dhcp6: do not use T1 and T2 longer than one provided by the lease 0ed6cda28dff network: fix implicit type conversion warning by GCC-10 f6a5c02d26b1 bootspec: parse random-seed-mode line in loader.conf ddc5dca8a73b sd-boot: fix typo 2bbbe9ae41ab test: Synchronize journal before reading from it 072485d661d7 sd-bus: fix introspection bug in signal parameter names 80af3cf5e36b efi: fix build. d7ede1ade564 generator: order growfs for the root fs after systemd-remount-fs e9904998213d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 82dd4caf014c Documentation update for x-systemd.{before,after} a60459764d9d man: fix typo in systemd.netdev Xfrm example fc053e2dfb3f timesyncd: log louder when we refuse a server due to root distance af0e630693fa resolved: drop DNSSEC root key that is not valid anymore ae59f1666ca6 journal: don't use startswith() on something that is not a NUL-terminated string 536ef6d72bc6 test: add test for https://github.com/systemd/systemd/issues/14560 b78fe3c1b1a8 core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default a1561a08f2d5 pkgconf: add full generator paths e5f2d11489ec tree-wide: we forgot to destroy some bus errors ea67fd42067b mount: make checks on perpetual mount units more lax 2f23c648bce4 core: never allow perpetual units to be masked 9ba11dffb09a typo: "May modify to" -> "May modify" 84c048799a78 Disable reading SystemdOptions EFI Var when in SecureBoot mode 4c2d72b53091 sysctl: downgrade message when we have no permission c001a285a3a2 Clarify journald.conf MaxLevelStore documentation 45d52c7615fd logind: refuse overriding idle hint on tty sessions b1a0be45b4ee cgroup: update only siblings that got realized once e6d694254fe1 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" d8fd38769c36 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) cd19bd31d808 journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 1320aa92dc0a core: fix re-realization of cgroup siblings 14164ec6bc77 core: propagate service state to socket in more load states c22bf6b31a45 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH 26f3a534f1ab core: be more restrictive on the dependency types we allow to be created transiently 377cc5d91ea5 udev: don't import parent ID_FS_ data on partitions 7d5060d53994 man: fix option name 98c03090274a Support Plugable UD-PRO8 dock e9687d09dccf gpt-auto: don't assume XBOOTLDR is vfat 7057fe863007 man: fix documentation of IBM VIO device naming f8d1df1045be man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 1faf5dde4d4a boot: fix osrel parser 65d247af1786 udev: do not use exact match of file permission 6da978f89b48 network: lower the log-level of harmless message 5d8a614f926c hwdb: ignore keys added in kernel 5.5 8b1bd1746989 systemctl: skip non-existent units in the 'cat' verb b2f342f92b54 systemd.exec: document the file system for EnvironmentFile paths 945f3a231f6f systemd-analyze: fixed typo in documentation 2c8ae283b0ee test-condition: fix group check condition 6b48479f4582 umount: show correct error message faba5b2ba8c9 Revert "Drop dbus activation stub service" 3dd98f1998f9 man: add section about user manager units 1c80a8ced006 man: add remote-*.targets to the bootup sequence 9afd65f15e93 time-util: also use 32bit hack on EOVERFLOW 561923291383 [man] note which UID ranges will get user journals 588a23ef2684 [man] fix URL 0130a03179f6 analyze: badness if neither of RootImage and RootDirectory exists 93074c962e3a network: introduce AddPrefixRoute= and deprecate PrefixRoute= a8ad020ea0ba shared/dropin: fix assert for invalid drop-in 946cdba156dd initrd: make udev cleanup service confict trigger and settle too c0a8a92e6027 man: we support growing xfs too these days 608d88273494 time-util: deal with systems where userspace has 64bit time_t but kernel does not cfced59a4bd8 [import] fix stdin/stdout pipe behavior in import/export tar/raw 73435b219553 systemctl: show what verbs support --dry-run in the help page dc56b94e1308 cryptsetup-generator: unconfuse writing of the device timeout 0757ad565573 shared/install: log syntax error for invalid DefaultInstance= d2471109d999 shared/install: provide a nicer error message for invalid WantedBy=/Required= values Signed-off-by: Alex Kiernan --- Changes in v6: - fix commit message Changes in v5: - use multiple cross-file support to inject the necessary binaries into meson Changes in v4: - add missed commit to join EFI ldflags after stripping command Changes in v3: - use MESON_CROSS_... for systemd-boot Changes in v2: - fix SRC_URI now v244.3 tag exists on v244-stable ...md-boot_244.1.bb => systemd-boot_244.3.bb} | 26 +++---- ...md-conf_244.1.bb => systemd-conf_244.3.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...c-and-efi_ld-correctly-when-cross-co.patch | 62 --------------- ...on-print-EFI-CC-configuration-nicely.patch | 33 -------- ...meson-use-an-array-option-for-efi-cc.patch | 77 ------------------- ...fi-objcopy-option-to-specify-objcopy.patch | 48 ------------ .../{systemd_244.1.bb => systemd_244.3.bb} | 0 8 files changed, 14 insertions(+), 234 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_244.1.bb => systemd-boot_244.3.bb} (71%) rename meta/recipes-core/systemd/{systemd-conf_244.1.bb => systemd-conf_244.3.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch rename meta/recipes-core/systemd/{systemd_244.1.bb => systemd_244.3.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot_244.1.bb b/meta/recipes-core/systemd/systemd-boot_244.3.bb similarity index 71% rename from meta/recipes-core/systemd/systemd-boot_244.1.bb rename to meta/recipes-core/systemd/systemd-boot_244.3.bb index 515abc289bef..f92c63981043 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_244.3.bb @@ -5,27 +5,27 @@ require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" -# NOTE: These three patches are in theory not needed, but we haven't -# figured out how to correctly pass efi-cc parameter if it's an array. -SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ - file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ - file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ - file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ - " - inherit meson pkgconfig gettext inherit deploy -EFI_CC ?= "${CC}" +LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " + +do_write_config[vardeps] += "CC OBJCOPY" +do_write_config_append() { + cat >${WORKDIR}/meson-${PN}.cross < -Date: Tue, 27 Feb 2018 21:42:23 -0800 -Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling - -When cross-compiling, efi_cc and efi_ld may take the form of -'xxx-gcc --sysroot=xxx', and this would cause run_command and -the alike fail. - -Fix to split them to make commands run correctly. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi ---- - src/boot/efi/meson.build | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 992a3ba4c..9f9ec4911 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -157,7 +157,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -168,7 +168,17 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() -+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name' -+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0] -+ find_libgcc_args = [] -+ cmd_args_all = find_libgcc_cmd_all.split() -+ foreach arg : cmd_args_all -+ if arg != find_libgcc_cmd -+ find_libgcc_args += arg -+ endif -+ endforeach -+ -+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') -@@ -179,7 +189,7 @@ if have_gnu_efi - tuple[0], - input : tuple[2], - output : tuple[0], -- command : [efi_ld, '-o', '@OUTPUT@'] + -+ command : efi_ld.split() + ['-o', '@OUTPUT@'] + - efi_ldflags + tuple[2] + - ['-lefi', '-lgnuefi', libgcc_file_name]) - --- -2.13.0 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch deleted file mode 100644 index ed14e25bce66..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:27:49 +0800 -Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" - -This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 70fb218..30df834 100644 ---- a/meson.build -+++ b/meson.build -@@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 - if have_gnu_efi - status += [ - 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), -- 'EFI CC @0@'.format(' '.join(efi_cc)), -+ 'EFI CC @0@'.format(efi_cc), - 'EFI lib directory: @0@'.format(efi_libdir), - 'EFI lds directory: @0@'.format(efi_ldsdir), - 'EFI include directory: @0@'.format(efi_incdir)] --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch deleted file mode 100644 index 0d2ebf62bd1f..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0030dcbac1a9177ef7a28af209ac67149b899f5f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 26 Feb 2019 14:17:25 +0800 -Subject: [PATCH] Revert "meson: use an array option for efi-cc" - -This reverts commit 595343fb4c99c2679d347ef7c19debfbfed6342e. - -This patch is here because we haven't figured out how to pass -parameter to efi-cc if it's an array in systemd-boot recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi ---- - meson_options.txt | 2 +- - src/boot/efi/meson.build | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 044bb79..3d28bfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -292,7 +292,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], - - option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') --option('efi-cc', type : 'array', -+option('efi-cc', type : 'string', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 2140151..d8db3a1 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -34,8 +34,8 @@ stub_sources = ''' - - if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - efi_cc = get_option('efi-cc') -- if efi_cc.length() == 0 -- efi_cc = cc.cmd_array() -+ if efi_cc == '' -+ efi_cc = ' '.join(cc.cmd_array()) - endif - efi_ld = get_option('efi-ld') - if efi_ld == '' -@@ -57,7 +57,8 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' - - efi_libdir = get_option('efi-libdir') - if efi_libdir == '' -- ret = run_command(efi_cc + ['-print-multi-os-directory']) -+ cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) -+ ret = run_command('sh', '-c', cmd) - if ret.returncode() == 0 - path = join_paths('/usr/lib', ret.stdout().strip()) - ret = run_command('realpath', '-e', path) -@@ -152,7 +153,7 @@ if have_gnu_efi - o_file = custom_target(file + '.o', - input : file, - output : file + '.o', -- command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@'] -+ command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] - + compile_args, - depend_files : efi_headers) - if (common_sources + systemd_boot_sources).contains(file) -@@ -163,7 +164,7 @@ if have_gnu_efi - endif - endforeach - -- libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() -+ libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() - systemd_boot_efi_name = 'systemd-boot at 0@.efi'.format(EFI_MACHINE_TYPE_NAME) - stub_efi_name = 'linux at 0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) - no_undefined_symbols = find_program('no-undefined-symbols.sh') --- -2.7.4 - diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch deleted file mode 100644 index 7d764b4115eb..000000000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Aug 2019 03:10:20 +0000 -Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy - -This helps in cross compiling for x86 target on a aarch64 host e.g. -Fixes -TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - meson_options.txt | 2 ++ - src/boot/efi/meson.build | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index d4ec37dda2..dc1c96e112 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', - description : 'the compiler to use for EFI modules') - option('efi-ld', type : 'string', - description : 'the linker to use for EFI modules') -+option('efi-objcopy', type : 'string', -+ description : 'the objcopy to use for EFI') - option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') - option('efi-ldsdir', type : 'string', -diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build -index 0ae3191635..5a7137bc84 100644 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -88,7 +88,10 @@ if have_gnu_efi - output : 'efi_config.h', - configuration : efi_conf) - -- objcopy = find_program('objcopy') -+ objcopy = get_option('efi-objcopy') -+ if objcopy == '' -+ objcopy = find_program('objcopy', required: true) -+ endif - - efi_ldsdir = get_option('efi-ldsdir') - arch_lds = 'elf_ at 0@_efi.lds'.format(gnu_efi_path_arch) --- -2.17.1 - diff --git a/meta/recipes-core/systemd/systemd_244.1.bb b/meta/recipes-core/systemd/systemd_244.3.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_244.1.bb rename to meta/recipes-core/systemd/systemd_244.3.bb -- 2.17.1 From alex.kiernan at gmail.com Sun Feb 16 11:42:39 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Sun, 16 Feb 2020 11:42:39 +0000 Subject: [OE-core] task i was asked about: "Fix java build to not use host java" In-Reply-To: References: Message-ID: On Sun, Feb 16, 2020 at 9:37 AM Robert P. J. Day wrote: > > > (NOTE: while this was asked in the context of the latest wind river > linux, i'm guessing it applies to stock OE/YP.) > > regarding a WRL project that i haven't actually seen yet, one of the > items on a TO DO list reads, "Fix java build to not use host java", > and i'm trying to clarify what that might mean without yet seeing the > project. > > as i read that brief item, i'm assuming that this is a java-based > project wherein some java recipes must be compiled and added to the > image and, currently, it's the host java compiler that is being used, > whereas they want a java compiler to be compiled, added to the native > sysroot, and used for all java compilation. > > i'm aware of bitbake.conf's ASSUME_PROVIDED variable which says > nothing about java, and i've never worked on a java-flavoured OE > project before, so i'm curious as to whether the host java would be > used by default, and how to override that. > > does this make sense? a pointer to some reasonable example of a > java-infused YP project would probably suffice, and i'm aware of the > meta-java layer, which i assume will be dragged in. i have no details > beyond this at the moment, just trying to figure out what that task > might mean. > We run java in our builds, but we're pulling in embedded Zulu rather than building from scratch, but I doubt that's anything more than a detail. We just have a recipe that can build java for both target and native and have a native bbclassextend in there, with symlinks across to the java components from /usr/bin. At that point it pretty much just works. Relevant bits from a recipe consuming it then look like: inherit java DEPENDS = "virtual/javac-native" export JAVA_HOME = "${STAGING_LIBDIR_JVM_NATIVE}/java" RDEPENDS_${PN} = " \ java2-runtime \ " We've certainly tripped over a number of places where the host java leaks in, which is annoying. The only thing we're really using out of the inherit java is the paths it defines. One problem we've found is that building both JNI and java components at the same time is tricky because most things don't distinguish between native and target JAVA_HOME. -- Alex Kiernan From peter.kjellerstedt at axis.com Sun Feb 16 12:52:27 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Sun, 16 Feb 2020 12:52:27 +0000 Subject: [OE-core] [PATCH] fix various, innocuous typos In-Reply-To: References: Message-ID: <0e84f991adc74cbc9de3abcbb8dc3cfc@XBOX03.axis.com> > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org On Behalf Of Robert P. J. Day > Sent: den 16 februari 2020 08:50 > To: OE Core mailing list > Subject: [OE-core] [PATCH] fix various, innocuous typos > > Corrections: > > - environment > - variable > - accommodate > - conversion > - compatible > > Signed-off-by: Robert P. J. Day > > --- > > diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass > index 75f0f2c3e3..359f240b0b 100644 > --- a/meta/classes/testimage.bbclass > +++ b/meta/classes/testimage.bbclass > @@ -243,7 +243,7 @@ def testimage_main(d): > if d.getVar("TEST_TARGET") == "qemu": > fstypes = [fs for fs in fstypes if fs in supported_fstypes] > if not fstypes: > - bb.fatal('Unsupported image type built. Add a comptible image to ' > + bb.fatal('Unsupported image type built. Add a compatible image to ' > 'IMAGE_FSTYPES. Supported types: %s' % > ', '.join(supported_fstypes)) > qfstype = fstypes[0] > diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf > index 1c586a3bc6..751424d1b6 100644 > --- a/meta/conf/licenses.conf > +++ b/meta/conf/licenses.conf > @@ -1,7 +1,7 @@ > # Standards are great! Everyone has their own. In an effort to standardize licensing > # names, common-licenses will use the SPDX standard license names. In order to not > # break the non-standardized license names that we find in LICENSE, we'll set > -# up a bunch of VarFlags to accomodate non-SPDX license names. > +# up a bunch of VarFlags to accommodate non-SPDX license names. > # > # We should really discuss standardizing this field, but that's a longer term goal. > # For now, we can do this and it should grab the most common LICENSE > naming variations. > diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json > index 9869150dcf..d77d0e673b 100644 > --- a/meta/lib/oeqa/manual/eclipse-plugin.json > +++ b/meta/lib/oeqa/manual/eclipse-plugin.json > @@ -82,7 +82,7 @@ > ], > "execution": { > "1": { > - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", > + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", > "expected_results": "" > }, > "2": { > @@ -164,7 +164,7 @@ > ], > "execution": { > "1": { > - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", > + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", > "expected_results": "" > }, > "2": { > @@ -319,4 +319,4 @@ > "summary": "Eclipse_Poky_installation_and_setup" > } > } > -] > \ No newline at end of file > +] > diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py > index 09e77c19fe..01c38c24e6 100644 > --- a/meta/lib/oeqa/sdk/context.py > +++ b/meta/lib/oeqa/sdk/context.py > @@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor): > sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir) > if not sdk_envs: > raise argparse_oe.ArgumentUsageError("No available SDK "\ > - "enviroments found at %s" % args.sdk_dir, self.name) > + "environments found at %s" % args.sdk_dir, self.name) > > if args.list_sdk_env: > self._display_sdk_envs(logger.info, args, sdk_envs) > diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py > index e2f91bcb6c..5886862d6c 100644 > --- a/meta/lib/oeqa/selftest/cases/devtool.py > +++ b/meta/lib/oeqa/selftest/cases/devtool.py > @@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase): > when building the kernel. > """ > kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') > - # Clean up the enviroment > + # Clean up the environment > bitbake('%s -c clean' % kernel_provider) > tempdir = tempfile.mkdtemp(prefix='devtoolqa') > tempdir_cfg = tempfile.mkdtemp(prefix='config_qa') > diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py > index 6d80827652..d4664bd0df 100644 > --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py > +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py > @@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase): > > def test_blob_to_dict(self): > """ > - Test convertion of git blobs to dictionary > + Test conversion of git blobs to dictionary > """ > from oe.buildhistory_analysis import blob_to_dict > valuesmap = { "foo" : "1", "bar" : "2" } > diff --git a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch b/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch > index a09e2a257e..1823dfee3f 100644 > --- a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch > +++ b/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch > @@ -985,7 +985,7 @@ index 7d9a34a..12f8fb8 100644 > } > > /**************************************************************************** > -@@ -259,38 +263,39 @@ cpu-state-varible M.x86.mode. There are several potential states: > +@@ -259,38 +263,39 @@ cpu-state-variable M.x86.mode. There are several potential states: Don't change this. It is part of the patch context information. Even if the part after the second @@ is just a comment, it matches information in the existing file and that is no longer true if you change it. Moreover, it will just be reset if someone refreshes the patch. > > Each of the above 7 items are handled with a bit in the mode field. > ****************************************************************************/ > diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch > index eda5565371..14d0548b81 100644 > --- a/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch > +++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch > @@ -533,7 +533,7 @@ index 0000000000..b67b468466 > + Here, 'my-wrapper' must ensure that the value it sees for > + 'GCONV_PATH' will be seen by the dynamic linker, and thus 'tst-foo' > + itself. (The wrapper supplied with GLIBC simply preserves the > -+ values of *all* enviroment variables, with a fixed set of > ++ values of *all* environment variables, with a fixed set of > + exceptions.) > + > + If your wrapper is a shell script, take care to correctly propagate > diff --git a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch > index e6998f6e68..e59144a13c 100644 > --- a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch > +++ b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch > @@ -148,7 +148,7 @@ index 2d7a6f5..1c53585 100644 > - printf("*** being found. The easiest way to fix this is to remove the old version\n"); > - printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); > - printf("*** correct copy of xml2-config. (In this case, you will have to\n"); > -- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); > +- printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); You cannot change this. Then the patch will no longer apply since this part removes stuff from the upstream contents. > - printf("*** so that the correct libraries are found at run-time))\n"); > - } > - return 1; > diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py > index add5c53882..53324b9f8b 100644 > --- a/scripts/pybootchartgui/pybootchartgui/draw.py > +++ b/scripts/pybootchartgui/pybootchartgui/draw.py > @@ -308,7 +308,7 @@ sec_w_base = 1 # the width of a second > proc_h = 16 # the height of a process > leg_s = 10 > MIN_IMG_W = 800 > -CUML_HEIGHT = 2000 # Increased value to accomodate CPU and I/O Graphs > +CUML_HEIGHT = 2000 # Increased value to accommodate CPU and I/O Graphs > OPTIONS = None > > def extents(options, xscale, trace): > > -- > > ======================================================================== > Robert P. J. Day Ottawa, Ontario, CANADA > http://crashcourse.ca > > Twitter: http://twitter.com/rpjday > LinkedIn: http://ca.linkedin.com/in/rpjday > ======================================================================== > -- //Peter From rpjday at crashcourse.ca Sun Feb 16 13:04:18 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sun, 16 Feb 2020 08:04:18 -0500 (EST) Subject: [OE-core] [PATCH] fix various, innocuous typos In-Reply-To: <0e84f991adc74cbc9de3abcbb8dc3cfc@XBOX03.axis.com> References: <0e84f991adc74cbc9de3abcbb8dc3cfc@XBOX03.axis.com> Message-ID: On Sun, 16 Feb 2020, Peter Kjellerstedt wrote: > > > > /**************************************************************************** > > -@@ -259,38 +263,39 @@ cpu-state-varible M.x86.mode. There are several potential states: > > +@@ -259,38 +263,39 @@ cpu-state-variable M.x86.mode. There are several potential states: > > Don't change this. It is part of the patch context information. Even if the > part after the second @@ is just a comment, it matches information in the > existing file and that is no longer true if you change it. Moreover, it will > just be reset if someone refreshes the patch. ah, quite right, i was being sloppy and not paying attention to things like that. will fix (that and others) and re-submit, sorry. rday From rpjday at crashcourse.ca Sun Feb 16 13:23:02 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sun, 16 Feb 2020 08:23:02 -0500 (EST) Subject: [OE-core] [PATCH v2] fix various, innocuous typos Message-ID: Corrections: - environment - accommodate - conversion - compatible Signed-off-by: Robert P. J. Day --- diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 75f0f2c3e3..359f240b0b 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -243,7 +243,7 @@ def testimage_main(d): if d.getVar("TEST_TARGET") == "qemu": fstypes = [fs for fs in fstypes if fs in supported_fstypes] if not fstypes: - bb.fatal('Unsupported image type built. Add a comptible image to ' + bb.fatal('Unsupported image type built. Add a compatible image to ' 'IMAGE_FSTYPES. Supported types: %s' % ', '.join(supported_fstypes)) qfstype = fstypes[0] diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 1c586a3bc6..751424d1b6 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -1,7 +1,7 @@ # Standards are great! Everyone has their own. In an effort to standardize licensing # names, common-licenses will use the SPDX standard license names. In order to not # break the non-standardized license names that we find in LICENSE, we'll set -# up a bunch of VarFlags to accomodate non-SPDX license names. +# up a bunch of VarFlags to accommodate non-SPDX license names. # # We should really discuss standardizing this field, but that's a longer term goal. # For now, we can do this and it should grab the most common LICENSE naming variations. diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json index 9869150dcf..d77d0e673b 100644 --- a/meta/lib/oeqa/manual/eclipse-plugin.json +++ b/meta/lib/oeqa/manual/eclipse-plugin.json @@ -82,7 +82,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -164,7 +164,7 @@ ], "execution": { "1": { - "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ", "expected_results": "" }, "2": { @@ -319,4 +319,4 @@ "summary": "Eclipse_Poky_installation_and_setup" } } -] \ No newline at end of file +] diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 09e77c19fe..01c38c24e6 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor): sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir) if not sdk_envs: raise argparse_oe.ArgumentUsageError("No available SDK "\ - "enviroments found at %s" % args.sdk_dir, self.name) + "environments found at %s" % args.sdk_dir, self.name) if args.list_sdk_env: self._display_sdk_envs(logger.info, args, sdk_envs) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index e2f91bcb6c..5886862d6c 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase): when building the kernel. """ kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') - # Clean up the enviroment + # Clean up the environment bitbake('%s -c clean' % kernel_provider) tempdir = tempfile.mkdtemp(prefix='devtoolqa') tempdir_cfg = tempfile.mkdtemp(prefix='config_qa') diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py index 6d80827652..d4664bd0df 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py @@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase): def test_blob_to_dict(self): """ - Test convertion of git blobs to dictionary + Test conversion of git blobs to dictionary """ from oe.buildhistory_analysis import blob_to_dict valuesmap = { "foo" : "1", "bar" : "2" } diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py index add5c53882..53324b9f8b 100644 --- a/scripts/pybootchartgui/pybootchartgui/draw.py +++ b/scripts/pybootchartgui/pybootchartgui/draw.py @@ -308,7 +308,7 @@ sec_w_base = 1 # the width of a second proc_h = 16 # the height of a process leg_s = 10 MIN_IMG_W = 800 -CUML_HEIGHT = 2000 # Increased value to accomodate CPU and I/O Graphs +CUML_HEIGHT = 2000 # Increased value to accommodate CPU and I/O Graphs OPTIONS = None def extents(options, xscale, trace): -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== From patchwork at patchwork.openembedded.org Sun Feb 16 13:31:57 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sun, 16 Feb 2020 13:31:57 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_fix_variou?= =?utf-8?q?s=2C_innocuous_typos_=28rev2=29?= In-Reply-To: References: Message-ID: <20200216133157.2273.61457@do> == Series Details == Series: fix various, innocuous typos (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22690/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [v2] fix various, innocuous typos Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fix Commit shortlog (first line of commit message) should follow the format ": " If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From alex.kanavin at gmail.com Sun Feb 16 15:50:05 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:05 +0100 Subject: [OE-core] [PATCH 01/10] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Message-ID: <20200216155015.21738-1-alex.kanavin@gmail.com> The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW; specifying 'ptests-pkgs' also pulls in additional ptests that are specifically excluded from those lists due to causing issues with ptesting. (particularly bash-ptest is one such item) Signed-off-by: Alexander Kanavin --- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 85b5adbc69..58c257c49f 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc DESCRIPTION += "Also includes ptest packages." -IMAGE_FEATURES += "ptest-pkgs" - PROVIDES += "core-image-sato-ptest" # Also include ptests which may not otherwise be included in a sato image -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:06 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:06 +0100 Subject: [OE-core] [PATCH 02/10] procps: upstream has switched to gitlab In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-2-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- meta/recipes-extended/procps/procps_3.3.16.bb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/procps/procps_3.3.16.bb b/meta/recipes-extended/procps/procps_3.3.16.bb index 60f90976bb..2810ebd285 100644 --- a/meta/recipes-extended/procps/procps_3.3.16.bb +++ b/meta/recipes-extended/procps/procps_3.3.16.bb @@ -12,14 +12,19 @@ DEPENDS = "ncurses" inherit autotools gettext pkgconfig update-alternatives -SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ +SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \ file://sysctl.conf \ " +SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" -SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" -SRC_URI[sha256sum] = "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" +S = "${WORKDIR}/git" -S = "${WORKDIR}/procps-ng-${PV}" +# Upstream has a custom autogen.sh which invokes po/update-potfiles as they +# don't ship a po/POTFILES.in (which is silly). Without that file gettext +# doesn't believe po/ is a gettext directory and won't generate po/Makefile. +do_configure_prepend() { + ( cd ${S} && po/update-potfiles ) +} EXTRA_OECONF = "--enable-skill --disable-modern-top" -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:07 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:07 +0100 Subject: [OE-core] [PATCH 03/10] qemux86: do not add vga=0 to kernel parameters In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-3-alex.kanavin@gmail.com> This was added ages ago to enable GL passthrough with vmware driver, and is no longer relevant, as std or virgl is used instead nowadays. Original commit: commit 072545b1111c5efb66289a4866897429f5fcd969 Author: Richard Purdie Date: Wed Jan 21 17:40:51 2009 +0000 scripts/poky-qemu-internal: Add support for GL passthrough in qemux86 images Signed-off-by: Alexander Kanavin --- meta/conf/machine/include/qemuboot-x86.inc | 2 +- scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 495418fa04..049681b27d 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -8,7 +8,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" -QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks index c8d9f121b5..22b45217f1 100644 --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks @@ -4,5 +4,5 @@ include common.wks.inc -bootloader --timeout=0 --append="vga=0 rw oprofile.timer=1 rootfstype=ext4 " +bootloader --timeout=0 --append="rw oprofile.timer=1 rootfstype=ext4 " -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:08 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:08 +0100 Subject: [OE-core] [PATCH 04/10] qemux86: drop resolution setting via uvesafb In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-4-alex.kanavin@gmail.com> I am not sure if this has ever worked, but uvesafb is a really outdated (VBE from the 1990s), awkward (needs v86d) and limited (no support for high resolutions) way to do it. The specific reason 640x480-32 was introduced (ages ago) was to force 32 bit mode with vmware driver, as 16bit had rendering issues. The modern, supported option is video=... kernel parameter documented here: https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst which can be passed directly to runqemu and doesn't require special kernel modules. Sato under X will continue to use 640x480 as that is hardcoded into xorg.conf under qemu. Signed-off-by: Alexander Kanavin --- meta/conf/machine/include/qemuboot-x86.inc | 3 +-- meta/conf/machine/qemux86-64.conf | 4 ---- meta/conf/machine/qemux86.conf | 4 ---- meta/lib/oeqa/runtime/cases/parselogs.py | 4 ---- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 049681b27d..5dcc8b6f6b 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" -QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -UVESA_MODE ?= "640x480-32" diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 648cf2fe8f..db9004ee32 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -KERNEL_MODULE_AUTOLOAD += "uvesafb" -KERNEL_MODULE_PROBECONF += "uvesafb" -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" - WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 8e0da82076..7e6723b880 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -KERNEL_MODULE_AUTOLOAD += "uvesafb" -KERNEL_MODULE_PROBECONF += "uvesafb" -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" - WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 9dafb89b03..3cad0709a1 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -60,7 +60,6 @@ common_errors = [ ] video_related = [ - "uvesafb", ] x86_common = [ @@ -82,11 +81,8 @@ qemux86_common = [ "fail to add MMCONFIG information, can't access extended PCI configuration space under this bridge.", "can't claim BAR ", 'amd_nb: Cannot enumerate AMD northbridges', - 'uvesafb: 5000 ms task timeout, infinitely waiting', 'tsc: HPET/PMTIMER calibration failed', "modeset(0): Failed to initialize the DRI2 extension", - "uvesafb: cannot reserve video memory at", - "uvesafb: probe of uvesafb.0 failed with error", "glamor initialization failed", ] + common_errors -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:09 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:09 +0100 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-5-alex.kanavin@gmail.com> The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users. Note that 3D acceleration is not required; the backend renders fine via the software driver in mesa. Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini diff --git a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini deleted file mode 100644 index 17ebd7fdab..0000000000 --- a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini +++ /dev/null @@ -1,2 +0,0 @@ -[core] -backend=fbdev-backend.so -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:10 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:10 +0100 Subject: [OE-core] [PATCH 06/10] webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-6-alex.kanavin@gmail.com> Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index c7f0d5e983..4aa8533b42 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:11 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:11 +0100 Subject: [OE-core] [PATCH 07/10] weston: add a basic runtime test In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-7-alex.kanavin@gmail.com> The test is checking that weston is able to start. Signed-off-by: Alexander Kanavin --- meta/classes/testimage.bbclass | 2 +- meta/lib/oeqa/runtime/cases/weston.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 meta/lib/oeqa/runtime/cases/weston.py diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 75f0f2c3e3..9588f2c4f8 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -57,7 +57,7 @@ BASICTESTSUITE = "\ ping date df ssh scp python perl gi ptest parselogs \ logrotate connman systemd oe_syslog pam stap ldd xorg \ kernelmodule gcc buildcpio buildlzip buildgalculator \ - dnf rpm opkg apt" + dnf rpm opkg apt weston" DEFAULT_TEST_SUITES = "${BASICTESTSUITE}" diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py new file mode 100644 index 0000000000..f32599afc3 --- /dev/null +++ b/meta/lib/oeqa/runtime/cases/weston.py @@ -0,0 +1,19 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.data import skipIfNotFeature +from oeqa.runtime.decorator.package import OEHasPackage + +class WestonTest(OERuntimeTestCase): + + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['weston']) + def test_weston_running(self): + cmd ='%s | grep [w]eston-desktop-shell' % self.tc.target_cmds['ps'] + status, output = self.target.run(cmd) + msg = ('Weston does not appear to be running %s' % + self.target.run(self.tc.target_cmds['ps'])[1]) + self.assertEqual(status, 0, msg=msg) -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:12 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:12 +0100 Subject: [OE-core] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-8-alex.kanavin@gmail.com> webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble). Signed-off-by: Alexander Kanavin --- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 19 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- .../webkit/wpebackend-fdo_1.4.1.bb | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000000..b9c71f9dc5 --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" +SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060" +SRC_URI[sha384sum] = "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0" +SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 4aa8533b42..8d87ad49a3 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000000..84df0c2535 --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" +SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c" +SRC_URI[sha384sum] = "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d" +SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4" + -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:13 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:13 +0100 Subject: [OE-core] [PATCH 09/10] wayland: convert to meson build In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-9-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...-the-native-wayland-scanner-directly.patch | 27 +++++++++++++++++++ .../wayland/wayland_1.18.0.bb | 9 ++++--- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file mode 100644 index 0000000000..f98037a850 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -0,0 +1,27 @@ +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 16:29:53 +0100 +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH + +Otherwise, meson attempts to use the target pkg-config and fails. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..294aee0 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075552..21a848ff5a 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -14,19 +14,20 @@ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://fixpathinpcfiles.patch \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OECONF_class-native = "-Ddocumentation=false -Dlibraries=false" # Wayland installs a M4 macro for other projects to use, which uses the target # pkg-config to find files. Replace pkg-config with pkg-config-native. -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 15:50:14 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 16:50:14 +0100 Subject: [OE-core] [PATCH 10/10] ptest-packagelists: mention ifupdown ptest in a comment In-Reply-To: <20200216155015.21738-1-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <20200216155015.21738-10-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 0a13bf0a6c..23865ac3e1 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -57,6 +57,7 @@ PTESTS_FAST = "\ # lz4-ptest \ # Needs a rewrite # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design +# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py #" PTESTS_SLOW = "\ -- 2.25.0 From martin.jansa at gmail.com Sun Feb 16 16:01:35 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Sun, 16 Feb 2020 17:01:35 +0100 Subject: [OE-core] [PATCH 04/10] qemux86: drop resolution setting via uvesafb In-Reply-To: <20200216155015.21738-4-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-4-alex.kanavin@gmail.com> Message-ID: Why you think it doesn't support higher resolution? We were using it with fullHD in VirtualBox until recently. On Sun, Feb 16, 2020 at 4:52 PM Alexander Kanavin wrote: > I am not sure if this has ever worked, but uvesafb is a really > outdated (VBE from the 1990s), awkward (needs v86d) and limited > (no support for high resolutions) way to do it. > > The specific reason 640x480-32 was introduced (ages ago) was > to force 32 bit mode with vmware driver, as 16bit had rendering issues. > > The modern, supported option is video=... kernel parameter documented here: > > https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID > https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst > which can be passed directly to runqemu and doesn't require special > kernel modules. > > Sato under X will continue to use 640x480 as that is hardcoded into > xorg.conf under qemu. > > Signed-off-by: Alexander Kanavin > --- > meta/conf/machine/include/qemuboot-x86.inc | 3 +-- > meta/conf/machine/qemux86-64.conf | 4 ---- > meta/conf/machine/qemux86.conf | 4 ---- > meta/lib/oeqa/runtime/cases/parselogs.py | 4 ---- > 4 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/meta/conf/machine/include/qemuboot-x86.inc > b/meta/conf/machine/include/qemuboot-x86.inc > index 049681b27d..5dcc8b6f6b 100644 > --- a/meta/conf/machine/include/qemuboot-x86.inc > +++ b/meta/conf/machine/include/qemuboot-x86.inc > @@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" > > QB_AUDIO_DRV = "alsa" > QB_AUDIO_OPT = "-soundhw ac97,es1370" > -QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} > oprofile.timer=1 uvesafb.task_timeout=-1" > +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" > QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" > # Add the 'virtio-rng-pci' device otherwise the guest may run out of > entropy > QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 > -device virtio-rng-pci,rng=rng0" > > -UVESA_MODE ?= "640x480-32" > diff --git a/meta/conf/machine/qemux86-64.conf > b/meta/conf/machine/qemux86-64.conf > index 648cf2fe8f..db9004ee32 100644 > --- a/meta/conf/machine/qemux86-64.conf > +++ b/meta/conf/machine/qemux86-64.conf > @@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" > > MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 > kernel-module-snd-rawmidi" > > -KERNEL_MODULE_AUTOLOAD += "uvesafb" > -KERNEL_MODULE_PROBECONF += "uvesafb" > -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" > - > WKS_FILE ?= "qemux86-directdisk.wks" > do_image_wic[depends] += "syslinux:do_populate_sysroot > syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot > dosfstools-native:do_populate_sysroot" > > diff --git a/meta/conf/machine/qemux86.conf > b/meta/conf/machine/qemux86.conf > index 8e0da82076..7e6723b880 100644 > --- a/meta/conf/machine/qemux86.conf > +++ b/meta/conf/machine/qemux86.conf > @@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" > > MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 > kernel-module-snd-rawmidi" > > -KERNEL_MODULE_AUTOLOAD += "uvesafb" > -KERNEL_MODULE_PROBECONF += "uvesafb" > -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" > - > WKS_FILE ?= "qemux86-directdisk.wks" > do_image_wic[depends] += "syslinux:do_populate_sysroot > syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot > dosfstools-native:do_populate_sysroot" > > diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py > b/meta/lib/oeqa/runtime/cases/parselogs.py > index 9dafb89b03..3cad0709a1 100644 > --- a/meta/lib/oeqa/runtime/cases/parselogs.py > +++ b/meta/lib/oeqa/runtime/cases/parselogs.py > @@ -60,7 +60,6 @@ common_errors = [ > ] > > video_related = [ > - "uvesafb", > ] > > x86_common = [ > @@ -82,11 +81,8 @@ qemux86_common = [ > "fail to add MMCONFIG information, can't access extended PCI > configuration space under this bridge.", > "can't claim BAR ", > 'amd_nb: Cannot enumerate AMD northbridges', > - 'uvesafb: 5000 ms task timeout, infinitely waiting', > 'tsc: HPET/PMTIMER calibration failed', > "modeset(0): Failed to initialize the DRI2 extension", > - "uvesafb: cannot reserve video memory at", > - "uvesafb: probe of uvesafb.0 failed with error", > "glamor initialization failed", > ] + common_errors > > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From martin.jansa at gmail.com Sun Feb 16 16:09:02 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Sun, 16 Feb 2020 17:09:02 +0100 Subject: [OE-core] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: <20200216155015.21738-8-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-8-alex.kanavin@gmail.com> Message-ID: Do we need sha384sum, sha512sum, sha1sum checksums for these 2 for whatever reason? On Sun, Feb 16, 2020 at 4:52 PM Alexander Kanavin wrote: > webkit nowadays requires a couple of supplementary libraries for this, > so bring them in (courtesy of meta-browser, which will hopefully > adjust without a lot of trouble). > > Signed-off-by: Alexander Kanavin > --- > meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 19 +++++++++++++++++++ > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- > .../webkit/wpebackend-fdo_1.4.1.bb | 19 +++++++++++++++++++ > 3 files changed, 39 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > > diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > new file mode 100644 > index 0000000000..b9c71f9dc5 > --- /dev/null > +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > @@ -0,0 +1,19 @@ > +SUMMARY = "General-purpose library specifically developed for the > WPE-flavored port of WebKit." > +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" > +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" > + > +LICENSE = "BSD" > +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" > +DEPENDS = "virtual/egl libxkbcommon" > + > +# Workaround build issue with RPi userland EGL libraries. > +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', > 'vc4graphics', '', '-D_GNU_SOURCE', d)}" > + > +inherit cmake > + > +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" > +SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f" > +SRC_URI[sha256sum] = > "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" > +SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060" > +SRC_URI[sha384sum] = > "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0" > +SRC_URI[sha512sum] = > "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670" > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > index 4aa8533b42..8d87ad49a3 100644 > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', > 'wayland x11', d)} \ > libsecret \ > " > > -PACKAGECONFIG[wayland] = > "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" > +PACKAGECONFIG[wayland] = > "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe > wpebackend-fdo wayland-native" > PACKAGECONFIG[x11] = > "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" > PACKAGECONFIG[geoclue] = > "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" > PACKAGECONFIG[enchant] = > "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" > diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > new file mode 100644 > index 0000000000..84df0c2535 > --- /dev/null > +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > @@ -0,0 +1,19 @@ > +SUMMARY = "WPE's backend based on a freedesktop.org stack." > +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" > +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" > + > +LICENSE = "BSD" > +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" > +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" > + > +DEPENDS_append_class-target = " wayland-native" > + > +inherit cmake > + > +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" > +SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2" > +SRC_URI[sha256sum] = > "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" > +SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c" > +SRC_URI[sha384sum] = > "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d" > +SRC_URI[sha512sum] = > "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4" > + > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sun Feb 16 16:10:52 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 17:10:52 +0100 Subject: [OE-core] [PATCH 04/10] qemux86: drop resolution setting via uvesafb In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-4-alex.kanavin@gmail.com> Message-ID: What about higher than fullHD? Alex On Sun, 16 Feb 2020 at 17:01, Martin Jansa wrote: > Why you think it doesn't support higher resolution? We were using it with > fullHD in VirtualBox until recently. > > On Sun, Feb 16, 2020 at 4:52 PM Alexander Kanavin > wrote: > >> I am not sure if this has ever worked, but uvesafb is a really >> outdated (VBE from the 1990s), awkward (needs v86d) and limited >> (no support for high resolutions) way to do it. >> >> The specific reason 640x480-32 was introduced (ages ago) was >> to force 32 bit mode with vmware driver, as 16bit had rendering issues. >> >> The modern, supported option is video=... kernel parameter documented >> here: >> >> https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID >> https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst >> which can be passed directly to runqemu and doesn't require special >> kernel modules. >> >> Sato under X will continue to use 640x480 as that is hardcoded into >> xorg.conf under qemu. >> >> Signed-off-by: Alexander Kanavin >> --- >> meta/conf/machine/include/qemuboot-x86.inc | 3 +-- >> meta/conf/machine/qemux86-64.conf | 4 ---- >> meta/conf/machine/qemux86.conf | 4 ---- >> meta/lib/oeqa/runtime/cases/parselogs.py | 4 ---- >> 4 files changed, 1 insertion(+), 14 deletions(-) >> >> diff --git a/meta/conf/machine/include/qemuboot-x86.inc >> b/meta/conf/machine/include/qemuboot-x86.inc >> index 049681b27d..5dcc8b6f6b 100644 >> --- a/meta/conf/machine/include/qemuboot-x86.inc >> +++ b/meta/conf/machine/include/qemuboot-x86.inc >> @@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" >> >> QB_AUDIO_DRV = "alsa" >> QB_AUDIO_OPT = "-soundhw ac97,es1370" >> -QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} >> oprofile.timer=1 uvesafb.task_timeout=-1" >> +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" >> QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" >> # Add the 'virtio-rng-pci' device otherwise the guest may run out of >> entropy >> QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 >> -device virtio-rng-pci,rng=rng0" >> >> -UVESA_MODE ?= "640x480-32" >> diff --git a/meta/conf/machine/qemux86-64.conf >> b/meta/conf/machine/qemux86-64.conf >> index 648cf2fe8f..db9004ee32 100644 >> --- a/meta/conf/machine/qemux86-64.conf >> +++ b/meta/conf/machine/qemux86-64.conf >> @@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" >> >> MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 >> kernel-module-snd-rawmidi" >> >> -KERNEL_MODULE_AUTOLOAD += "uvesafb" >> -KERNEL_MODULE_PROBECONF += "uvesafb" >> -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" >> - >> WKS_FILE ?= "qemux86-directdisk.wks" >> do_image_wic[depends] += "syslinux:do_populate_sysroot >> syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot >> dosfstools-native:do_populate_sysroot" >> >> diff --git a/meta/conf/machine/qemux86.conf >> b/meta/conf/machine/qemux86.conf >> index 8e0da82076..7e6723b880 100644 >> --- a/meta/conf/machine/qemux86.conf >> +++ b/meta/conf/machine/qemux86.conf >> @@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" >> >> MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 >> kernel-module-snd-rawmidi" >> >> -KERNEL_MODULE_AUTOLOAD += "uvesafb" >> -KERNEL_MODULE_PROBECONF += "uvesafb" >> -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" >> - >> WKS_FILE ?= "qemux86-directdisk.wks" >> do_image_wic[depends] += "syslinux:do_populate_sysroot >> syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot >> dosfstools-native:do_populate_sysroot" >> >> diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py >> b/meta/lib/oeqa/runtime/cases/parselogs.py >> index 9dafb89b03..3cad0709a1 100644 >> --- a/meta/lib/oeqa/runtime/cases/parselogs.py >> +++ b/meta/lib/oeqa/runtime/cases/parselogs.py >> @@ -60,7 +60,6 @@ common_errors = [ >> ] >> >> video_related = [ >> - "uvesafb", >> ] >> >> x86_common = [ >> @@ -82,11 +81,8 @@ qemux86_common = [ >> "fail to add MMCONFIG information, can't access extended PCI >> configuration space under this bridge.", >> "can't claim BAR ", >> 'amd_nb: Cannot enumerate AMD northbridges', >> - 'uvesafb: 5000 ms task timeout, infinitely waiting', >> 'tsc: HPET/PMTIMER calibration failed', >> "modeset(0): Failed to initialize the DRI2 extension", >> - "uvesafb: cannot reserve video memory at", >> - "uvesafb: probe of uvesafb.0 failed with error", >> "glamor initialization failed", >> ] + common_errors >> >> -- >> 2.25.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sun Feb 16 16:14:09 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 17:14:09 +0100 Subject: [OE-core] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-8-alex.kanavin@gmail.com> Message-ID: bitbake told me to add them (when the existing md5/sha256 checksums were deemed incorrect), and so I did. Alex On Sun, 16 Feb 2020 at 17:09, Martin Jansa wrote: > Do we need sha384sum, sha512sum, sha1sum checksums for these 2 for > whatever reason? > > On Sun, Feb 16, 2020 at 4:52 PM Alexander Kanavin > wrote: > >> webkit nowadays requires a couple of supplementary libraries for this, >> so bring them in (courtesy of meta-browser, which will hopefully >> adjust without a lot of trouble). >> >> Signed-off-by: Alexander Kanavin >> --- >> meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 19 +++++++++++++++++++ >> meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- >> .../webkit/wpebackend-fdo_1.4.1.bb | 19 +++++++++++++++++++ >> 3 files changed, 39 insertions(+), 1 deletion(-) >> create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb >> create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb >> >> diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb >> b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb >> new file mode 100644 >> index 0000000000..b9c71f9dc5 >> --- /dev/null >> +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb >> @@ -0,0 +1,19 @@ >> +SUMMARY = "General-purpose library specifically developed for the >> WPE-flavored port of WebKit." >> +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" >> +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" >> + >> +LICENSE = "BSD" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" >> +DEPENDS = "virtual/egl libxkbcommon" >> + >> +# Workaround build issue with RPi userland EGL libraries. >> +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', >> 'vc4graphics', '', '-D_GNU_SOURCE', d)}" >> + >> +inherit cmake >> + >> +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" >> +SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f" >> +SRC_URI[sha256sum] = >> "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" >> +SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060" >> +SRC_URI[sha384sum] = >> "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0" >> +SRC_URI[sha512sum] = >> "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670" >> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> index 4aa8533b42..8d87ad49a3 100644 >> --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> @@ -44,7 +44,7 @@ PACKAGECONFIG ??= >> "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ >> libsecret \ >> " >> >> -PACKAGECONFIG[wayland] = >> "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" >> +PACKAGECONFIG[wayland] = >> "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe >> wpebackend-fdo wayland-native" >> PACKAGECONFIG[x11] = >> "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" >> PACKAGECONFIG[geoclue] = >> "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" >> PACKAGECONFIG[enchant] = >> "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" >> diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb >> b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb >> new file mode 100644 >> index 0000000000..84df0c2535 >> --- /dev/null >> +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb >> @@ -0,0 +1,19 @@ >> +SUMMARY = "WPE's backend based on a freedesktop.org stack." >> +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" >> +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" >> + >> +LICENSE = "BSD" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" >> +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" >> + >> +DEPENDS_append_class-target = " wayland-native" >> + >> +inherit cmake >> + >> +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" >> +SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2" >> +SRC_URI[sha256sum] = >> "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" >> +SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c" >> +SRC_URI[sha384sum] = >> "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d" >> +SRC_URI[sha512sum] = >> "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4" >> + >> -- >> 2.25.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sun Feb 16 16:15:08 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 17:15:08 +0100 Subject: [OE-core] [PATCH 04/10] qemux86: drop resolution setting via uvesafb In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-4-alex.kanavin@gmail.com> Message-ID: Specifically, this page does indicate that Linux kernel stops at 1920x1200, and even that is entirely non-standard. VBE is a 90s relic. https://en.wikipedia.org/wiki/VESA_BIOS_Extensions#Linux_video_mode_numbers Alex On Sun, 16 Feb 2020 at 17:10, Alexander Kanavin wrote: > What about higher than fullHD? > > Alex > > On Sun, 16 Feb 2020 at 17:01, Martin Jansa wrote: > >> Why you think it doesn't support higher resolution? We were using it with >> fullHD in VirtualBox until recently. >> >> On Sun, Feb 16, 2020 at 4:52 PM Alexander Kanavin >> wrote: >> >>> I am not sure if this has ever worked, but uvesafb is a really >>> outdated (VBE from the 1990s), awkward (needs v86d) and limited >>> (no support for high resolutions) way to do it. >>> >>> The specific reason 640x480-32 was introduced (ages ago) was >>> to force 32 bit mode with vmware driver, as 16bit had rendering issues. >>> >>> The modern, supported option is video=... kernel parameter documented >>> here: >>> >>> https://wiki.archlinux.org/index.php/kernel_mode_setting#Forcing_modes_and_EDID >>> https://github.com/torvalds/linux/blob/master/Documentation/fb/modedb.rst >>> which can be passed directly to runqemu and doesn't require special >>> kernel modules. >>> >>> Sato under X will continue to use 640x480 as that is hardcoded into >>> xorg.conf under qemu. >>> >>> Signed-off-by: Alexander Kanavin >>> --- >>> meta/conf/machine/include/qemuboot-x86.inc | 3 +-- >>> meta/conf/machine/qemux86-64.conf | 4 ---- >>> meta/conf/machine/qemux86.conf | 4 ---- >>> meta/lib/oeqa/runtime/cases/parselogs.py | 4 ---- >>> 4 files changed, 1 insertion(+), 14 deletions(-) >>> >>> diff --git a/meta/conf/machine/include/qemuboot-x86.inc >>> b/meta/conf/machine/include/qemuboot-x86.inc >>> index 049681b27d..5dcc8b6f6b 100644 >>> --- a/meta/conf/machine/include/qemuboot-x86.inc >>> +++ b/meta/conf/machine/include/qemuboot-x86.inc >>> @@ -8,9 +8,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" >>> >>> QB_AUDIO_DRV = "alsa" >>> QB_AUDIO_OPT = "-soundhw ac97,es1370" >>> -QB_KERNEL_CMDLINE_APPEND = "uvesafb.mode_option=${UVESA_MODE} >>> oprofile.timer=1 uvesafb.task_timeout=-1" >>> +QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" >>> QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" >>> # Add the 'virtio-rng-pci' device otherwise the guest may run out of >>> entropy >>> QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 >>> -device virtio-rng-pci,rng=rng0" >>> >>> -UVESA_MODE ?= "640x480-32" >>> diff --git a/meta/conf/machine/qemux86-64.conf >>> b/meta/conf/machine/qemux86-64.conf >>> index 648cf2fe8f..db9004ee32 100644 >>> --- a/meta/conf/machine/qemux86-64.conf >>> +++ b/meta/conf/machine/qemux86-64.conf >>> @@ -37,10 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" >>> >>> MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 >>> kernel-module-snd-rawmidi" >>> >>> -KERNEL_MODULE_AUTOLOAD += "uvesafb" >>> -KERNEL_MODULE_PROBECONF += "uvesafb" >>> -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" >>> - >>> WKS_FILE ?= "qemux86-directdisk.wks" >>> do_image_wic[depends] += "syslinux:do_populate_sysroot >>> syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot >>> dosfstools-native:do_populate_sysroot" >>> >>> diff --git a/meta/conf/machine/qemux86.conf >>> b/meta/conf/machine/qemux86.conf >>> index 8e0da82076..7e6723b880 100644 >>> --- a/meta/conf/machine/qemux86.conf >>> +++ b/meta/conf/machine/qemux86.conf >>> @@ -34,10 +34,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" >>> >>> MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 >>> kernel-module-snd-rawmidi" >>> >>> -KERNEL_MODULE_AUTOLOAD += "uvesafb" >>> -KERNEL_MODULE_PROBECONF += "uvesafb" >>> -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" >>> - >>> WKS_FILE ?= "qemux86-directdisk.wks" >>> do_image_wic[depends] += "syslinux:do_populate_sysroot >>> syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot >>> dosfstools-native:do_populate_sysroot" >>> >>> diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py >>> b/meta/lib/oeqa/runtime/cases/parselogs.py >>> index 9dafb89b03..3cad0709a1 100644 >>> --- a/meta/lib/oeqa/runtime/cases/parselogs.py >>> +++ b/meta/lib/oeqa/runtime/cases/parselogs.py >>> @@ -60,7 +60,6 @@ common_errors = [ >>> ] >>> >>> video_related = [ >>> - "uvesafb", >>> ] >>> >>> x86_common = [ >>> @@ -82,11 +81,8 @@ qemux86_common = [ >>> "fail to add MMCONFIG information, can't access extended PCI >>> configuration space under this bridge.", >>> "can't claim BAR ", >>> 'amd_nb: Cannot enumerate AMD northbridges', >>> - 'uvesafb: 5000 ms task timeout, infinitely waiting', >>> 'tsc: HPET/PMTIMER calibration failed', >>> "modeset(0): Failed to initialize the DRI2 extension", >>> - "uvesafb: cannot reserve video memory at", >>> - "uvesafb: probe of uvesafb.0 failed with error", >>> "glamor initialization failed", >>> ] + common_errors >>> >>> -- >>> 2.25.0 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sun Feb 16 16:38:07 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 17:38:07 +0100 Subject: [OE-core] [Openembedded-architecture] Future of sato and X in oe-core In-Reply-To: References: <20200211135323.GA3234@localhost> <20200211141347.GB3234@localhost> <8b9de58b-7d65-dc89-69ec-4b5d40667184@kernel.crashing.org> Message-ID: On Tue, 11 Feb 2020 at 18:46, Alexander Kanavin wrote: > On Tue, 11 Feb 2020 at 16:58, Mark Hatle > wrote: > >> >> I also don't think oe-core itself needs a 'real' UI, and as my previous >> response >> said -- we do need something though to test that the graphical framework >> is >> working properly. >> >> In the past this often comes back to needing a LOT of a UI in order to >> adequately test all of the components of the system. If wayland/weston >> has a >> proper test suite that exercises all of the various parts of and pieces >> of the >> systems -- then the need for a UI drops considerably. >> >> (but we still have the need for some sort of example/demostration...) >> > > Wayland/weston do have test suites, neither of which we currently use. I > don't know how much they exercise all the moving parts, but the tests do > exist. > I have now ran these tests on my host system to see what they do. Both wayland and weston tests are fast (a few seconds each), and here's the outputs for both. I think once these are packaged as ptests and ran on the AB, all that's left is a reasonable demo UI (which as I said could be simply epiphany with working HW acceleration). libwayland: 1/23 wayland-egl symbols check OK 0.08 s 2/23 cpp-compile-test OK 0.02 s 3/23 scanner-test OK 0.18 s 4/23 array-test OK 0.02 s 5/23 client-test OK 0.01 s 6/23 display-test OK 0.57 s 7/23 connection-test OK 0.17 s 8/23 event-loop-test OK 0.17 s 9/23 fixed-test OK 0.01 s 10/23 interface-test OK 0.01 s 11/23 list-test OK 0.01 s 12/23 map-test OK 0.01 s 13/23 sanity-test OK 4.44 s 14/23 socket-test OK 0.02 s 15/23 queue-test OK 0.02 s 16/23 signal-test OK 0.01 s 17/23 newsignal-test OK 0.01 s 18/23 resources-test OK 0.01 s 19/23 message-test OK 0.01 s 20/23 compositor-introspection-test OK 0.01 s 21/23 protocol-logger-test OK 0.01 s 22/23 headers-test OK 0.00 s 23/23 os-wrappers-test OK 0.02 s weston: 1/26 config-parser OK 0.05 s 2/26 string OK 0.02 s 3/26 vertex-clip OK 0.03 s 4/26 timespec OK 0.05 s 5/26 zuc OK 0.22 s 6/26 bad-buffer OK 0.12 s 7/26 devices OK 2.53 s 8/26 event OK 0.42 s 9/26 keyboard OK 0.23 s 10/26 linux-explicit-synchronization OK 0.63 s 11/26 internal-screenshot OK 0.19 s 12/26 presentation OK 0.19 s 13/26 pointer OK 0.53 s 14/26 roles OK 0.18 s 15/26 subsurface OK 2.08 s 16/26 subsurface-shot OK 0.28 s 17/26 text OK 0.13 s 18/26 touch OK 0.18 s 19/26 viewporter OK 2.03 s 20/26 xwayland OK 0.48 s 21/26 ivi-shell-app FAIL 0.68 s (killed by signal 6 SIGABRT) (needs some image resources in /usr which I didn't install) 22/26 plugin-registry OK 0.04 s 23/26 surface OK 0.04 s 24/26 surface-global OK 0.07 s 25/26 ivi-layout-internal OK 0.14 s 26/26 ivi-layout OK 0.18 s Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Sun Feb 16 16:53:57 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 08:53:57 -0800 Subject: [OE-core] [PATCH 02/10] procps: upstream has switched to gitlab In-Reply-To: <20200216155015.21738-2-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-2-alex.kanavin@gmail.com> Message-ID: On Sun, Feb 16, 2020 at 7:51 AM Alexander Kanavin wrote: > Signed-off-by: Alexander Kanavin > --- > meta/recipes-extended/procps/procps_3.3.16.bb | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-extended/procps/procps_3.3.16.bb > b/meta/recipes-extended/procps/procps_3.3.16.bb > index 60f90976bb..2810ebd285 100644 > --- a/meta/recipes-extended/procps/procps_3.3.16.bb > +++ b/meta/recipes-extended/procps/procps_3.3.16.bb > @@ -12,14 +12,19 @@ DEPENDS = "ncurses" > > inherit autotools gettext pkgconfig update-alternatives > > -SRC_URI = " > http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz > \ > +SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \ > file://sysctl.conf \ > " > +SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" > > -SRC_URI[md5sum] = "e8dc8455e573bdc40b8381d572bbb89b" > -SRC_URI[sha256sum] = > "925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af" > +S = "${WORKDIR}/git" > > -S = "${WORKDIR}/procps-ng-${PV}" > +# Upstream has a custom autogen.sh which invokes po/update-potfiles as > they > +# don't ship a po/POTFILES.in (which is silly). Without that file gettext > +# doesn't believe po/ is a gettext directory and won't generate > po/Makefile. Do we miss .in file from tarball ? Or is it missing in a git checkout This is expected when building in a maintainer mode Tarballs are produced by maintainers for users Who wants to build from source > > +do_configure_prepend() { > + ( cd ${S} && po/update-potfiles ) > +} > > EXTRA_OECONF = "--enable-skill --disable-modern-top" > > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sun Feb 16 16:56:20 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 17:56:20 +0100 Subject: [OE-core] [PATCH 02/10] procps: upstream has switched to gitlab In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-2-alex.kanavin@gmail.com> Message-ID: On Sun, 16 Feb 2020 at 17:54, Khem Raj wrote: > > -S = "${WORKDIR}/procps-ng-${PV}" >> +# Upstream has a custom autogen.sh which invokes po/update-potfiles as >> they >> +# don't ship a po/POTFILES.in (which is silly). Without that file >> gettext >> +# doesn't believe po/ is a gettext directory and won't generate >> po/Makefile. > > Do we miss .in file from tarball ? Or is it missing in a git checkout > This is expected when building in a maintainer mode > Tarballs are produced by maintainers for users > Who wants to build from source > The .in is available in tarballs, but not in git repo. It's generated as explained above. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Sun Feb 16 17:00:02 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 09:00:02 -0800 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: <20200216155015.21738-5-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Sun, Feb 16, 2020 at 7:52 AM Alexander Kanavin wrote: > > The fbdev backend is not documented, and not the default; > as the emulated hardware in qemu now supports DRM/KMS > (both std and virtio), we should align with upstream default > and vast majority of users. > > Note that 3D acceleration is not required; the backend > renders fine via the software driver in mesa. > Please specify what all qemu machines have been tested, since we do not test weston images runtime, this will silently break untested qemu machines. > Signed-off-by: Alexander Kanavin > --- > meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 -- > 1 file changed, 2 deletions(-) > delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini > > diff --git a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini > deleted file mode 100644 > index 17ebd7fdab..0000000000 > --- a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini > +++ /dev/null > @@ -1,2 +0,0 @@ > -[core] > -backend=fbdev-backend.so > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kanavin at gmail.com Sun Feb 16 17:07:21 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 18:07:21 +0100 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Sun, 16 Feb 2020 at 18:00, Khem Raj wrote: > Please specify what all qemu machines have been tested, since we do > not test weston images > runtime, this will silently break untested qemu machines. > Autobuilder does test core-image-weston on qemux86_64 and that's where I verified the change. Alex > > Signed-off-by: Alexander Kanavin > > --- > > meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 -- > > 1 file changed, 2 deletions(-) > > delete mode 100644 > meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini > > > > diff --git > a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini > b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini > > deleted file mode 100644 > > index 17ebd7fdab..0000000000 > > --- a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini > > +++ /dev/null > > @@ -1,2 +0,0 @@ > > -[core] > > -backend=fbdev-backend.so > > -- > > 2.25.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Sun Feb 16 18:06:09 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sun, 16 Feb 2020 18:06:09 +0000 Subject: [OE-core] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-8-alex.kanavin@gmail.com> Message-ID: <3b6ebed41aa11e66ebd104b70884d2d41b191dca.camel@linuxfoundation.org> On Sun, 2020-02-16 at 17:14 +0100, Alexander Kanavin wrote: > bitbake told me to add them (when the existing md5/sha256 checksums > were deemed incorrect), and so I did. I think that is an unintended side effect of some new changes to bitbake to support the other forms. I think at this point we should fix it to print the sha256 and not anything else? We can then slowly drop the md5sums. Cheers, Richard From jpewhacker at gmail.com Sun Feb 16 18:27:18 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Sun, 16 Feb 2020 12:27:18 -0600 Subject: [OE-core] [PATCH 0/4] oeqa: Run diffoscop on saved output In-Reply-To: References: <20200212031435.792802-1-JPEWhacker@gmail.com> Message-ID: On Sat, Feb 15, 2020, 5:07 AM Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > On Tue, 2020-02-11 at 21:14 -0600, Joshua Watt wrote: > > Adds recipes to build the diffoscope tool and run it when the OEQA > > reproducible build test saves output to a local path. This should > > make > > it much easier to debug reproducible build issues from the > > autobuilder, > > since the published output can be easily viewed on the website. > > > > Joshua Watt (4): > > python: Add libarchive-c recipe > > python: Add magic recipe > > recipes-support: Add diffoscope recipe > > oeqa: reproducible: Run diffoscope on saved output > > Thanks! > > The first production use: > > > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200215-t1s21q9r/packages/diff-html/ > > :) > That's great! > I am a bit puzzled/concerned about how this hasn't been removed from > the system yet as it should have been, unless its the hashequiv problem > with timestamps continuing to cause problems. Need to fix my patch... > It looks like a directory ordering issue to me, since the timestamps are the same. One way to really flush these out would be to use disorderfs ( https://salsa.debian.org/reproducible-builds/disorderfs) which permutates the order in which entries are listed in a directory, but I think we should try to get "wider" coverage (more recipes) before we try that. > Cheers, > > Richard > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sun Feb 16 19:16:05 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 20:16:05 +0100 Subject: [OE-core] [PATCH] python3: resolve ncurses host contamination Message-ID: <20200216191605.25665-1-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...fig-append-STAGING_LIBDIR-python-sys.patch | 2 +- ...up.py-do-not-add-a-curses-include-pa.patch | 48 +++++++++++++++++++ ...tutils-prefix-is-inside-staging-area.patch | 2 +- meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch index 03f60088fe..e7af3c6f5c 100644 --- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch @@ -1,4 +1,4 @@ -From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001 +From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch new file mode 100644 index 0000000000..e04a91605c --- /dev/null +++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch @@ -0,0 +1,48 @@ +From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 17:50:25 +0100 +Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from + the host + +This leads to host contamination, and particularly can cause +curses modules to fail at runtime if the host curses is configured +differently to native curses (observed on current OpenSuse Tumbleweed +as dnf failures). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + configure.ac | 6 ------ + setup.py | 2 -- + 2 files changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 915f475..c911011 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4828,12 +4828,6 @@ then + [Define if you have struct stat.st_mtimensec]) + fi + +-# first curses header check +-ac_save_cppflags="$CPPFLAGS" +-if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" +-fi +- + AC_CHECK_HEADERS(curses.h ncurses.h) + + # On Solaris, term.h requires curses.h +diff --git a/setup.py b/setup.py +index b0f1541..7208cd0 100644 +--- a/setup.py ++++ b/setup.py +@@ -973,8 +973,6 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- if not CROSS_COMPILING: +- curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 6fe9839f77..61ac3e71dc 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001 +From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index c836066215..77968528c7 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-configure.ac-fix-LIBPL.patch \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ + file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ " SRC_URI_append_class-native = " \ -- 2.25.0 From robert.joslyn at redrectangle.org Sun Feb 16 18:59:09 2020 From: robert.joslyn at redrectangle.org (Robert Joslyn) Date: Sun, 16 Feb 2020 10:59:09 -0800 Subject: [OE-core] [PATCH] ell: Update to 0.28 Message-ID: <20200216185909.1566175-1-robert.joslyn@redrectangle.org> ChangeLog: - Fix issue with NULL check of D-Bus proxy for method calls. - Add support for emitting D-Bus property changes on demand. - Add support for reporting file attribute changes. Signed-off-by: Robert Joslyn --- meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/ell/{ell_0.27.bb => ell_0.28.bb} (83%) diff --git a/meta/recipes-core/ell/ell_0.27.bb b/meta/recipes-core/ell/ell_0.28.bb similarity index 83% rename from meta/recipes-core/ell/ell_0.27.bb rename to meta/recipes-core/ell/ell_0.28.bb index 503f1e22a3..464bf631e3 100644 --- a/meta/recipes-core/ell/ell_0.27.bb +++ b/meta/recipes-core/ell/ell_0.28.bb @@ -14,8 +14,8 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "e090d6a910a43c2a32114ba1cdc9f1f2" -SRC_URI[sha256sum] = "afc5441d6f6ece512a188b1e6aeabd7153de4f38989c897a2197ae50fc46da96" +SRC_URI[md5sum] = "e38089e54d4b41e508bbb7f37a4a59d9" +SRC_URI[sha256sum] = "6254fcb98d681cb2c3078dde462ba20bf90e6c10919204c6878a4381adcdb74b" do_configure_prepend () { mkdir -p ${S}/build-aux -- 2.24.1 From patchwork at patchwork.openembedded.org Sun Feb 16 20:01:57 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sun, 16 Feb 2020 20:01:57 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_ell=3A_Upd?= =?utf-8?q?ate_to_0=2E28?= In-Reply-To: <20200216185909.1566175-1-robert.joslyn@redrectangle.org> References: <20200216185909.1566175-1-robert.joslyn@redrectangle.org> Message-ID: <20200216200157.2273.54440@do> == Series Details == Series: ell: Update to 0.28 Revision: 1 URL : https://patchwork.openembedded.org/series/22697/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at c9b5802bbe) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From raj.khem at gmail.com Sun Feb 16 20:06:56 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:06:56 -0800 Subject: [OE-core] [PATCH 02/10] procps: upstream has switched to gitlab In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-2-alex.kanavin@gmail.com> Message-ID: On Sun, Feb 16, 2020 at 8:56 AM Alexander Kanavin wrote: > > On Sun, 16 Feb 2020 at 17:54, Khem Raj wrote: >> >> >>> -S = "${WORKDIR}/procps-ng-${PV}" >>> +# Upstream has a custom autogen.sh which invokes po/update-potfiles as they >>> +# don't ship a po/POTFILES.in (which is silly). Without that file gettext >>> +# doesn't believe po/ is a gettext directory and won't generate po/Makefile. >> >> Do we miss .in file from tarball ? Or is it missing in a git checkout >> This is expected when building in a maintainer mode >> Tarballs are produced by maintainers for users >> Who wants to build from source > > > The .in is available in tarballs, but not in git repo. It's generated as explained above. right. Then revise the comment, since its expected to be absent when we are building from git sources. > > Alex From raj.khem at gmail.com Sun Feb 16 20:09:41 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:09:41 -0800 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Sun, Feb 16, 2020 at 9:07 AM Alexander Kanavin wrote: > > On Sun, 16 Feb 2020 at 18:00, Khem Raj wrote: >> >> Please specify what all qemu machines have been tested, since we do >> not test weston images >> runtime, this will silently break untested qemu machines. > > > Autobuilder does test core-image-weston on qemux86_64 and that's where I verified the change. > qemuall, applies to other qemu machines for arm/aarch64/mips/ppc/riscv as well, in recent past I knew this change was needed for qemumips and qemuarm to boot core-image-weston, I am not sure if anything has changed since then. I think this change would need some more testing. > Alex > >> >> > Signed-off-by: Alexander Kanavin >> > --- >> > meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 -- >> > 1 file changed, 2 deletions(-) >> > delete mode 100644 meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini >> > >> > diff --git a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini >> > deleted file mode 100644 >> > index 17ebd7fdab..0000000000 >> > --- a/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini >> > +++ /dev/null >> > @@ -1,2 +0,0 @@ >> > -[core] >> > -backend=fbdev-backend.so >> > -- >> > 2.25.0 >> > >> > -- >> > _______________________________________________ >> > Openembedded-core mailing list >> > Openembedded-core at lists.openembedded.org >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Sun Feb 16 20:14:35 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:14:35 -0800 Subject: [OE-core] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: <20200216155015.21738-8-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-8-alex.kanavin@gmail.com> Message-ID: On Sun, Feb 16, 2020 at 7:52 AM Alexander Kanavin wrote: > > webkit nowadays requires a couple of supplementary libraries for this, > so bring them in (courtesy of meta-browser, which will hopefully > adjust without a lot of trouble). its not meta-browser, I guess you should credit meta-wpe here [1] and perhaps Cc the meta-wpe maintainer as a courtesy. [1] https://github.com/WebPlatformForEmbedded/meta-wpe/tree/master/recipes-wpe/libwpe > > Signed-off-by: Alexander Kanavin > --- > meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 19 +++++++++++++++++++ > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- > .../webkit/wpebackend-fdo_1.4.1.bb | 19 +++++++++++++++++++ > 3 files changed, 39 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > > diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > new file mode 100644 > index 0000000000..b9c71f9dc5 > --- /dev/null > +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > @@ -0,0 +1,19 @@ > +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." > +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" > +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" > + > +LICENSE = "BSD" > +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" > +DEPENDS = "virtual/egl libxkbcommon" > + > +# Workaround build issue with RPi userland EGL libraries. > +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" > + > +inherit cmake > + > +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" > +SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f" > +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" > +SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060" > +SRC_URI[sha384sum] = "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0" > +SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670" > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > index 4aa8533b42..8d87ad49a3 100644 > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ > libsecret \ > " > > -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" > +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" > PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" > PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" > PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" > diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > new file mode 100644 > index 0000000000..84df0c2535 > --- /dev/null > +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > @@ -0,0 +1,19 @@ > +SUMMARY = "WPE's backend based on a freedesktop.org stack." > +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" > +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" > + > +LICENSE = "BSD" > +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" > +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" > + > +DEPENDS_append_class-target = " wayland-native" > + > +inherit cmake > + > +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" > +SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2" > +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" > +SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c" > +SRC_URI[sha384sum] = "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d" > +SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4" > + > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kanavin at gmail.com Sun Feb 16 20:45:28 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 21:45:28 +0100 Subject: [OE-core] [PATCH 02/10] procps: upstream has switched to gitlab In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-2-alex.kanavin@gmail.com> Message-ID: On Sun, 16 Feb 2020 at 21:07, Khem Raj wrote: > >>> -S = "${WORKDIR}/procps-ng-${PV}" > >>> +# Upstream has a custom autogen.sh which invokes po/update-potfiles > as they > >>> +# don't ship a po/POTFILES.in (which is silly). Without that file > gettext > >>> +# doesn't believe po/ is a gettext directory and won't generate > po/Makefile. > >> > >> Do we miss .in file from tarball ? Or is it missing in a git checkout > >> This is expected when building in a maintainer mode > >> Tarballs are produced by maintainers for users > >> Who wants to build from source > > > > > > The .in is available in tarballs, but not in git repo. It's generated as > explained above. > > right. Then revise the comment, since its expected to be absent when > we are building from > git sources. > The fix and the comment were copied wholesale and were originally written by Ross. How is POTFILES.in normally generated (i.e. without involving custom autogen.sh)? Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Sun Feb 16 20:47:02 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:47:02 -0800 Subject: [OE-core] [meta-oe][PATCH 1/7] sigrok-cli: Inherit mime-xdg Message-ID: <20200216204708.7179-1-raj.khem@gmail.com> Fixes WARNING: sigrok-cli-0.7.1-r0 do_package_qa: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg Signed-off-by: Khem Raj --- meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb index 2293f142b3..369e2f6f4a 100644 --- a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb +++ b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.1.bb @@ -10,7 +10,7 @@ PACKAGECONFIG[decode] = "--with-libsigrokdecode,--without-libsigrokdecode,libsig PACKAGECONFIG ??= "decode" -inherit autotools pkgconfig +inherit autotools pkgconfig mime-xdg SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz" SRC_URI[md5sum] = "3f45ce664bad529d8b3f78a61b017d75" -- 2.25.0 From raj.khem at gmail.com Sun Feb 16 20:47:04 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:47:04 -0800 Subject: [OE-core] [meta-oe][PATCH 3/7] joe: Inherit mime-xdg In-Reply-To: <20200216204708.7179-1-raj.khem@gmail.com> References: <20200216204708.7179-1-raj.khem@gmail.com> Message-ID: <20200216204708.7179-3-raj.khem@gmail.com> Fixes joe-4.6: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: joe path '/work/aarch64-yoe-linux/joe/4.6-r0/packages-split/joe/usr/share/applications/jpico.desktop' Signed-off-by: Khem Raj --- meta-oe/recipes-support/joe/joe_4.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/joe/joe_4.6.bb b/meta-oe/recipes-support/joe/joe_4.6.bb index b79e028f30..674736a68a 100644 --- a/meta-oe/recipes-support/joe/joe_4.6.bb +++ b/meta-oe/recipes-support/joe/joe_4.6.bb @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" PACKAGECONFIG ??= "curses" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo" -inherit autotools-brokensep +inherit autotools-brokensep mime-xdg SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43" SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de" -- 2.25.0 From raj.khem at gmail.com Sun Feb 16 20:47:03 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:47:03 -0800 Subject: [OE-core] [meta-oe][PATCH 2/7] libsigrok: inherit mime In-Reply-To: <20200216204708.7179-1-raj.khem@gmail.com> References: <20200216204708.7179-1-raj.khem@gmail.com> Message-ID: <20200216204708.7179-2-raj.khem@gmail.com> Fixes libsigrok-0.5.2: package contains mime types but does not inhert mime: libsigrok path '/work/aarch64-yoe-linux/libsigrok/0.5.2-r0/packages-split/libsigrok/usr/share/mime/packages/vnd.sigrok.session.xml' [mime] Signed-off-by: Khem Raj --- meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb index 35e59d6d7d..e8c36a81d7 100644 --- a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb +++ b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb @@ -15,7 +15,7 @@ PACKAGECONFIG[hidapi] = "--with-libhidapi,--without-libhidapi,hidapi" PACKAGECONFIG ??= "serialport ftdi usb" -inherit autotools pkgconfig +inherit autotools pkgconfig mime SRC_URI = "http://sigrok.org/download/source/libsigrok/libsigrok-${PV}.tar.gz" -- 2.25.0 From raj.khem at gmail.com Sun Feb 16 20:47:05 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:47:05 -0800 Subject: [OE-core] [meta-oe][PATCH 4/7] remmina: Inherit mime-xdg In-Reply-To: <20200216204708.7179-1-raj.khem@gmail.com> References: <20200216204708.7179-1-raj.khem@gmail.com> Message-ID: <20200216204708.7179-4-raj.khem@gmail.com> Fixes remmina-1.3.6: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: remmina path '/work/aarch64-yoe-linux/remmina/1.3.6-r0/packages-split/remmina/usr/share/applications/remmina-file.desktop' Signed-off-by: Khem Raj --- meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 14fbc94b21..f9963ff65e 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea5 S = "${WORKDIR}/Remmina-v${PV}" -inherit cmake features_check +inherit cmake features_check mime-xdg # depends on avahi-ui with this restriction ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -- 2.25.0 From raj.khem at gmail.com Sun Feb 16 20:47:06 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:47:06 -0800 Subject: [OE-core] [meta-gnome][PATCH 5/7] sysprof: Inherit mime and mime-xdg In-Reply-To: <20200216204708.7179-1-raj.khem@gmail.com> References: <20200216204708.7179-1-raj.khem@gmail.com> Message-ID: <20200216204708.7179-5-raj.khem@gmail.com> Use += for depends to not override prior ones Fixes sysprof-3.34.1: package contains mime types but does not inhert mime: sysprof path '/work/aarch64-yoe-linux/sysprof/3.34.1-r0/packages-split/sysprof/usr/share/mime/packages/sysprof-mime.xml' [mime] sysprof-3.34.1: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: sysprof path '/work/aarch64-yoe-linux/sysprof/3.34.1-r0/packages-split/sysprof/usr/share/applications/org.gnome.Sysprof3.desktop' [mime-xdg] Signed-off-by: Khem Raj Cc: Andreas M?ller --- meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb index 1e530efb17..ad69ab68c3 100644 --- a/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext systemd upstream-version-is-even gsettings +inherit gnomebase gettext systemd upstream-version-is-even gsettings mime mime-xdg -DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" +DEPENDS += "glib-2.0 libxml2-native glib-2.0-native" SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629" SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0" -- 2.25.0 From raj.khem at gmail.com Sun Feb 16 20:47:07 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:47:07 -0800 Subject: [OE-core] [meta-oe][PATCH 6/7] gtkwave: Inherit mime and mime-xdg In-Reply-To: <20200216204708.7179-1-raj.khem@gmail.com> References: <20200216204708.7179-1-raj.khem@gmail.com> Message-ID: <20200216204708.7179-6-raj.khem@gmail.com> Use += for depends to not override prior ones Fixes gtkwave-3.3.103: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: gtkwave path '/work/aarch64-yoe-linux/gtkwave/3.3.103-r0/packages-split/gtkwave/usr/share/applications/gtkwave.desktop' [mime-xdg] Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb index 286d9aa6a1..fec3c7ce1a 100644 --- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb @@ -10,9 +10,9 @@ SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" SRC_URI[md5sum] = "5a9a5913f9a02a333b2b23626f153fd7" SRC_URI[sha256sum] = "c325abf7cf26c53309a67c0ecaaf196774fa982a717a102c599ac8a516eeeaf7" -inherit pkgconfig autotools gettext texinfo -DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" -RDEPENDS_${PN} = "tk-lib" +inherit pkgconfig autotools gettext texinfo mime mime-xdg +DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" +RDEPENDS_${PN} += "tk-lib" # depends on gtk+ which has this restriction inherit features_check -- 2.25.0 From raj.khem at gmail.com Sun Feb 16 20:47:08 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 12:47:08 -0800 Subject: [OE-core] [meta-gnome][PATCH 7/7] gimp: Depend on libexecinfo for musl In-Reply-To: <20200216204708.7179-1-raj.khem@gmail.com> References: <20200216204708.7179-1-raj.khem@gmail.com> Message-ID: <20200216204708.7179-7-raj.khem@gmail.com> musl does not have internal backtrace implementation like glibc but we can use external library Signed-off-by: Khem Raj Cc: Andreas M?ller --- meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb index 045958d0a6..30f0579e2d 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb @@ -29,6 +29,7 @@ DEPENDS = " \ libmng \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \ " +DEPENDS_append_libc-musl = " libexecinfo" inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 16 20:51:50 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 21:51:50 +0100 Subject: [OE-core] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-8-alex.kanavin@gmail.com> Message-ID: On Sun, 16 Feb 2020 at 21:15, Khem Raj wrote: > On Sun, Feb 16, 2020 at 7:52 AM Alexander Kanavin > wrote: > > > > webkit nowadays requires a couple of supplementary libraries for this, > > so bring them in (courtesy of meta-browser, which will hopefully > > adjust without a lot of trouble). > > its not meta-browser, I guess you should credit meta-wpe here [1] > and perhaps Cc the meta-wpe maintainer as a courtesy. > Actually, it's copied from meta-webkit https://github.com/Igalia/meta-webkit/ which does not say in the readme who the maintainer is, so I am not sure whom to CC. I can adjust the commit msg though. Alex > > [1] > https://github.com/WebPlatformForEmbedded/meta-wpe/tree/master/recipes-wpe/libwpe > > > > Signed-off-by: Alexander Kanavin > > --- > > meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 19 +++++++++++++++++++ > > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- > > .../webkit/wpebackend-fdo_1.4.1.bb | 19 +++++++++++++++++++ > > 3 files changed, 39 insertions(+), 1 deletion(-) > > create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > > create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > > > > diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > > new file mode 100644 > > index 0000000000..b9c71f9dc5 > > --- /dev/null > > +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb > > @@ -0,0 +1,19 @@ > > +SUMMARY = "General-purpose library specifically developed for the > WPE-flavored port of WebKit." > > +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" > > +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" > > + > > +LICENSE = "BSD" > > +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" > > +DEPENDS = "virtual/egl libxkbcommon" > > + > > +# Workaround build issue with RPi userland EGL libraries. > > +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', > 'vc4graphics', '', '-D_GNU_SOURCE', d)}" > > + > > +inherit cmake > > + > > +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" > > +SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f" > > +SRC_URI[sha256sum] = > "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" > > +SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060" > > +SRC_URI[sha384sum] = > "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0" > > +SRC_URI[sha512sum] = > "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670" > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > index 4aa8533b42..8d87ad49a3 100644 > > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > @@ -44,7 +44,7 @@ PACKAGECONFIG ??= > "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ > > libsecret \ > > " > > > > -PACKAGECONFIG[wayland] = > "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" > > +PACKAGECONFIG[wayland] = > "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe > wpebackend-fdo wayland-native" > > PACKAGECONFIG[x11] = > "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" > > PACKAGECONFIG[geoclue] = > "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" > > PACKAGECONFIG[enchant] = > "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" > > diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > > new file mode 100644 > > index 0000000000..84df0c2535 > > --- /dev/null > > +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb > > @@ -0,0 +1,19 @@ > > +SUMMARY = "WPE's backend based on a freedesktop.org stack." > > +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" > > +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" > > + > > +LICENSE = "BSD" > > +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" > > +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" > > + > > +DEPENDS_append_class-target = " wayland-native" > > + > > +inherit cmake > > + > > +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" > > +SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2" > > +SRC_URI[sha256sum] = > "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" > > +SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c" > > +SRC_URI[sha384sum] = > "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d" > > +SRC_URI[sha512sum] = > "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4" > > + > > -- > > 2.25.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From patchwork at patchwork.openembedded.org Sun Feb 16 21:01:49 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sun, 16 Feb 2020 21:01:49 -0000 Subject: [OE-core] =?utf-8?b?4pyXIHBhdGNodGVzdDogZmFpbHVyZSBmb3IgIlttZXRh?= =?utf-8?q?-oe=5D_sigrok-cli=3A_Inherit_=2E=2E=2E=22_and_6_more?= In-Reply-To: <20200216204708.7179-1-raj.khem@gmail.com> References: <20200216204708.7179-1-raj.khem@gmail.com> Message-ID: <20200216210149.2277.21624@do> == Series Details == Series: "[meta-oe] sigrok-cli: Inherit ..." and 6 more Revision: 1 URL : https://patchwork.openembedded.org/series/22700/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [meta-oe,1/7] sigrok-cli: Inherit mime-xdg Issue Series sent to the wrong mailing list [test_target_mailing_list] Suggested fix Check the project's README (meta-oe,1/7) and send the patch to the indicated list * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at c9b5802bbe) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From alex.kanavin at gmail.com Sun Feb 16 21:03:47 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 22:03:47 +0100 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Sun, 16 Feb 2020 at 21:10, Khem Raj wrote: > qemuall, applies to other qemu machines for arm/aarch64/mips/ppc/riscv > as well, in recent past I knew > this change was needed for qemumips and qemuarm to boot > core-image-weston, I am not sure if > anything has changed since then. I think this change would need some > more testing. > Sure, but the testing should be done by people who need those other machines to be able to boot weston; I would want to draw the line at what is currently covered by the autobuilder (which is just qemux86_64). We can then use the fallback in a more targeted way, although the proper fix would be to look into why the default backend isn't working. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From lewis.muhlenkamp at stryker.com Sun Feb 16 21:21:20 2020 From: lewis.muhlenkamp at stryker.com (Muhlenkamp, Lewis) Date: Sun, 16 Feb 2020 21:21:20 +0000 Subject: [OE-core] Fail to upgrade RPMs when IMA enabled Message-ID: Hello, I've been trying to get the security stuff in meta-secure-core working so I can upgrade from one version of the OS I'm creating, right now called LewisOS, to a new version, just by being able to run "rpm -U" or "dnf upgrade" commands. I can run "dnf upgrade" successfully against non kernel related packages, but the kernel, initramfs and systemd-boot RPMs always fail with the same error, no matter what I try. I am using Zeus for my builds. I am using an older commit for LewisOS version X, 8a518a2054bdd349d7661ee4872590fc8750313f, dated 2019 Dec 30, of the meta-secure-core GIT repo. I am using 8302e3c479154157667e22e9d7c5461c966b4586, dated 2020 Jan 19, of the meta-secure-core GIT repo for LewisOS version Y. My machine is intel-corei7-64. I'll just stick with systemd-boot RPM for this email. LewisOS version X installs systemd-boot-243+0+efb536d0cb-r0.corei7_64_intell_common. LewisOS version Y contains systemd-boot-243.2-r0.corei7_64_intel_common. When I try to upgrade systemd-boot, I get the following error message: === Start upgrade messages === root at intel-corei7-64:/var/opt/repos/os# rpm -q systemd-boot systemd-boot-243+0+efb536d0cb-r0.corei7_64_intel_common root at intel-corei7-64:/var/opt/repos/os# rpm -qp systemd-boot-243.2-r0.corei7_64_intel_common.rpm systemd-boot-243.2-r0.corei7_64_intel_common root at intel-corei7-64:/var/opt/repos/os# rpm -Uhv systemd-boot-243.2-r0.corei7_64_intel_common.rpm Verifying... ######################################## [100%] Preparing... ######################################## [100%] Updating / installing... 1:systemd-boot-243.2-r0 ######################################## [ 50%] error: ima: could not apply signature on '/boot/EFI/BOOT/bootx64.efi;5e49ad05': Operation not supported error: Plugin ima: hook fsm_file_prepare failed error: unpacking of archive failed on file /boot/EFI/BOOT/bootx64.efi;5e49ad05: cpio: (error 0x2) error: systemd-boot-243.2-r0.corei7_64_intel_common: install failed error: systemd-boot-243+0+efb536d0cb-r0.corei7_64_intel_common: erase skipped === End upgrade messages === The above error messages also appear when I try updating kernel-image-bzimage, kernel-initramfs and systemd-bootconf. I have the following in my bblayers.conf file: === Start bblayers.conf === # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" BBLAYERS ?= " \ ${HOME}/meta-stryker/meta-lewisos-distro \ ${HOME}/meta-stryker/meta-lewisos-common \ ${HOME}/meta-stryker/meta-lewisos-edge \ ${HOME}/oe-core/meta \ ${HOME}/meta-openembedded/meta-python \ ${HOME}/meta-openembedded/meta-perl \ ${HOME}/meta-openembedded/meta-filesystems \ ${HOME}/meta-openembedded/meta-oe \ ${HOME}/meta-openembedded/meta-networking \ ${HOME}/meta-openembedded/meta-webserver \ ${HOME}/meta-intel \ ${HOME}/meta-virtualization \ ${HOME}/meta-cloud-services \ ${HOME}/meta-cloud-services/meta-openstack \ ${HOME}/meta-secure-core/meta \ ${HOME}/meta-secure-core/meta-signing-key \ ${HOME}/meta-secure-core/meta-tpm \ ${HOME}/meta-secure-core/meta-tpm2 \ ${HOME}/meta-secure-core/meta-efi-secure-boot \ ${HOME}/meta-secure-core/meta-integrity \ ${HOME}/meta-secure-core/meta-encrypted-storage \ ${HOME}/meta-secure-core/meta-ids \ ${HOME}/meta-secure-core/meta-intel-sgx \ " === End bblayers.conf === Here is my local.conf file === Start local.conf === MACHINE ?= "intel-corei7-64" DL_DIR ?= "/var/opt/openembedded-linux/downloads" SSTATE_DIR ?= "/var/opt/openembedded-linux/sstate-cache" PACKAGE_CLASSES ?= "package_rpm" # Extra image configuration defaults # # The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated # images. # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats image-mklibs image-prelink" PATCHRESOLVE = "noop" BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ STOPTASKS,/tmp,100M,100K \ ABORT,${TMPDIR},100M,1K \ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" PACKAGECONFIG_append_pn-qemu-native = " sdl" PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" CONF_VERSION = "1" DISTRO = "lewisos" # The following 2 lines are to generate an ISO. IMAGE_FSTYPES += "live" NOISO = "0" # The following line is needed to help address issues with updating the OS. # It prevents a lot of messages regarding file/directory ownership issues. DIRFILES = "1" # The BBMASK directive below is to prevent the kernel-initramfs.bbappend # from meta-secure-core from being used. We have customized the bb file. # So, don't want any changes to it. BBMASK += "meta-secure-core/meta-efi-secure-boot/recipes-core/images/kernel-initramfs.bbappend" # INITRAMFS_IMAGE must be defined here. It cannot be defined in an image # recipe. If it is only defined in an image recipe, the build fails to # sign packages. INITRAMFS_IMAGE = "secure-core-image-initramfs" # Similarly, the kernel-image-bzimage must be defined here. When it was # set in the image recipe, got complaints about no buildable providers. # Weird. IMAGE_INSTALL += "kernel-image-bzimage" # These DISTRO_FEATURES must remain here. When I tried to put them into # the lewisos.conf distro configuration file, the build of the stryker-edge # image failed. Got old errors. Apparently some of the bbappends were # not picked up properly when these were defined in the distro config # file. Not sure why. DISTRO_FEATURES_NATIVE_append += "systemd ima tpm tpm2 efi-secure-boot luks" DISTRO_FEATURES_append += "systemd ima tpm tpm2 efi-secure-boot luks modsign pam intel-sgx" MACHINE_FEATURES_NATIVE_append += "efi" MACHINE_FEATURES_append += "efi" DEBUG_FLAGS_forcevariable = "" USER_CLASSES_remove = "image-prelink" === End local.conf === Here is my lewisos.conf distro configuration file. === Start lewisos.conf === # Lewisos distribution configuration file DISTRO = "lewisos" DISTRO_NAME = "Lewis test distribution" DISTRO_VERSION = "0.1.3-ou" MAINTAINER = "mako.device at stryker.com" IMAGE_VERSION_SUFFIX = "-${DISTRO_VERSION}" # Want to use systemd as the init manager DISTRO_FEATURES_append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" # Need virtualization DISTRO_FEATURES_append = " virtualization" # Add support for wireless DISTRO_FEATURES_append = " wifi" # Add support for disk encryption, secure boot and access to TPM # Needed for both the product build, and for native # From the meta-secure-core layer # DISTRO_FEATURES_append = " ima tpm tpm2 efi-secure-boot luks modsign pam intel-sgx" # DISTRO_FEATURES_NATIVE_append = " ima tpm tpm2 efi-secure-boot luks" # Remove undesirable features DISTRO_FEATURES_BACKFILL_CONSIDERED += "nfs" DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" DISTRO_FEATURES_BACKFILL_CONSIDERED += "zeroconf" # Set up for signing RPMs # Inherit the sign_rpm_ext and user-key-store classes from the meta-secure-core # layer. They provide some additional functionality. # If not using the meta-secure-core layer, uncomment the sign_rpm line and # comment out the sign_rpm_ext and user-key-store lines. # INHERIT += "sign_rpm" INHERIT += "sign_rpm_ext" INHERIT += "user-key-store" # NOTE: The two RPM_GPG lines cannot have spaces in their values. It causes # the build to fail since the scripts cannot handle the space. RPM_GPG_NAME = "xxxxxxxx" RPM_GPG_PASSPHRASE = "yyyyyyyy" === End lewisos.conf === And here is my bbappend for linux-intel === Start linux-intel_%.bbappend === FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://kernel_baseline.scc" KERNEL_IMAGEDEST = "boot/${DISTRO}-${DISTRO_VERSION}" FILES_kernel-image-bzimage = "/boot/${PV}/bzImage-${KERNEL_VERSION_NAME}" python do_package_prepend () { os.remove(d.getVar('D') + '/' + d.getVar('KERNEL_IMAGEDEST') + '/bzImage') } require recipes-kernel/linux/linux-yocto-integrity.inc === End linux-intel_%.bbappend === I'm removing symbolic links and putting the kernel and initramfs in version specific directories because the /boot partition is vfat, which doesn't support symbolic links, and if I kept the names as something like bzImage, then "dnf upgrade" would complain about multiple RPMs trying to own the same file. What am I missing? Where did I make a mistake? Does the meta-secure-core, or Openembedded/Yocto in general support upgrading from version X to version Y of an OS using just some command like "dnf upgrade"? If you need more information, please let me know. As one last piece of info, if I remove "ima" from DISTRO_FEATURES, the build hangs when trying to sign the RPMs. Thank you Lewis Muhlenkamp Follow this link to read our Privacy Statement -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sun Feb 16 21:42:10 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 16 Feb 2020 22:42:10 +0100 Subject: [OE-core] Fail to upgrade RPMs when IMA enabled In-Reply-To: References: Message-ID: This should be addressed to the maintainers of meta-secure-core, this is, Jia. Openembedded/Yocto in general does not define or test OS upgrades. You can also start looking into the failure you're getting from here: https://github.com/rpm-software-management/rpm/blob/master/plugins/ima.c Alex On Sun, 16 Feb 2020 at 22:21, Muhlenkamp, Lewis < lewis.muhlenkamp at stryker.com> wrote: > Hello, > > > > I?ve been trying to get the security stuff in meta-secure-core working so > I can upgrade from one version of the OS I?m creating, right now called > LewisOS, to a new version, just by being able to run ?rpm -U? or ?dnf > upgrade? commands. I can run ?dnf upgrade? successfully against non kernel > related packages, but the kernel, initramfs and systemd-boot RPMs always > fail with the same error, no matter what I try. > > > > I am using Zeus for my builds. I am using an older commit for LewisOS > version X, 8a518a2054bdd349d7661ee4872590fc8750313f, dated 2019 Dec 30, of > the meta-secure-core GIT repo. I am using > 8302e3c479154157667e22e9d7c5461c966b4586, dated 2020 Jan 19, of the > meta-secure-core GIT repo for LewisOS version Y. > > > > My machine is intel-corei7-64. > > > > I?ll just stick with systemd-boot RPM for this email. LewisOS version X > installs systemd-boot-243+0+efb536d0cb-r0.corei7_64_intell_common. LewisOS > version Y contains systemd-boot-243.2-r0.corei7_64_intel_common. When I > try to upgrade systemd-boot, I get the following error message: > > > > === Start upgrade messages === > > root at intel-corei7-64:/var/opt/repos/os# rpm -q systemd-boot > > systemd-boot-243+0+efb536d0cb-r0.corei7_64_intel_common > > root at intel-corei7-64:/var/opt/repos/os# rpm -qp > systemd-boot-243.2-r0.corei7_64_intel_common.rpm > > systemd-boot-243.2-r0.corei7_64_intel_common > > root at intel-corei7-64:/var/opt/repos/os# rpm -Uhv > systemd-boot-243.2-r0.corei7_64_intel_common.rpm > > Verifying? > ######################################## [100%] > > Preparing? > ######################################## [100%] > > Updating / installing? > > 1:systemd-boot-243.2-r0 > ######################################## [ 50%] > > error: ima: could not apply signature on > ?/boot/EFI/BOOT/bootx64.efi;5e49ad05?: Operation not supported > > error: Plugin ima: hook fsm_file_prepare failed > > error: unpacking of archive failed on file > /boot/EFI/BOOT/bootx64.efi;5e49ad05: cpio: (error 0x2) > > error: systemd-boot-243.2-r0.corei7_64_intel_common: install failed > > error: systemd-boot-243+0+efb536d0cb-r0.corei7_64_intel_common: erase > skipped > > === End upgrade messages === > > > > > > The above error messages also appear when I try updating > kernel-image-bzimage, kernel-initramfs and systemd-bootconf. > > > > I have the following in my bblayers.conf file: > > > > === Start bblayers.conf === > > # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf > > # changes incompatibly > > LCONF_VERSION = "7" > > > > BBPATH = "${TOPDIR}" > > BBFILES ?= "" > > > > BBLAYERS ?= " \ > > ${HOME}/meta-stryker/meta-lewisos-distro \ > > ${HOME}/meta-stryker/meta-lewisos-common \ > > ${HOME}/meta-stryker/meta-lewisos-edge \ > > ${HOME}/oe-core/meta \ > > ${HOME}/meta-openembedded/meta-python \ > > ${HOME}/meta-openembedded/meta-perl \ > > ${HOME}/meta-openembedded/meta-filesystems \ > > ${HOME}/meta-openembedded/meta-oe \ > > ${HOME}/meta-openembedded/meta-networking \ > > ${HOME}/meta-openembedded/meta-webserver \ > > ${HOME}/meta-intel \ > > ${HOME}/meta-virtualization \ > > ${HOME}/meta-cloud-services \ > > ${HOME}/meta-cloud-services/meta-openstack \ > > ${HOME}/meta-secure-core/meta \ > > ${HOME}/meta-secure-core/meta-signing-key \ > > ${HOME}/meta-secure-core/meta-tpm \ > > ${HOME}/meta-secure-core/meta-tpm2 \ > > ${HOME}/meta-secure-core/meta-efi-secure-boot \ > > ${HOME}/meta-secure-core/meta-integrity \ > > ${HOME}/meta-secure-core/meta-encrypted-storage \ > > ${HOME}/meta-secure-core/meta-ids \ > > ${HOME}/meta-secure-core/meta-intel-sgx \ > > " > > === End bblayers.conf === > > > > > > Here is my local.conf file > > > > === Start local.conf === > > MACHINE ?= "intel-corei7-64" > > DL_DIR ?= "/var/opt/openembedded-linux/downloads" > > SSTATE_DIR ?= "/var/opt/openembedded-linux/sstate-cache" > > PACKAGE_CLASSES ?= "package_rpm" > > > > # Extra image configuration defaults > > # > > # The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to > the generated > > # images. > > # There are other application targets that can be used here too, see > > # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more > details. > > # We default to enabling the debugging tweaks. > > EXTRA_IMAGE_FEATURES ?= "debug-tweaks" > > > > USER_CLASSES ?= "buildstats image-mklibs image-prelink" > > PATCHRESOLVE = "noop" > > BB_DISKMON_DIRS ??= "\ > > STOPTASKS,${TMPDIR},1G,100K \ > > STOPTASKS,${DL_DIR},1G,100K \ > > STOPTASKS,${SSTATE_DIR},1G,100K \ > > STOPTASKS,/tmp,100M,100K \ > > ABORT,${TMPDIR},100M,1K \ > > ABORT,${DL_DIR},100M,1K \ > > ABORT,${SSTATE_DIR},100M,1K \ > > ABORT,/tmp,10M,1K" > > > > PACKAGECONFIG_append_pn-qemu-native = " sdl" > > PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" > > CONF_VERSION = "1" > > > > DISTRO = "lewisos" > > > > # The following 2 lines are to generate an ISO. > > IMAGE_FSTYPES += "live" > > NOISO = "0" > > > > # The following line is needed to help address issues with updating the OS. > > # It prevents a lot of messages regarding file/directory ownership issues. > > DIRFILES = "1" > > > > # The BBMASK directive below is to prevent the kernel-initramfs.bbappend > > # from meta-secure-core from being used. We have customized the bb file. > > # So, don't want any changes to it. > > BBMASK += > "meta-secure-core/meta-efi-secure-boot/recipes-core/images/kernel-initramfs.bbappend" > > > > # INITRAMFS_IMAGE must be defined here. It cannot be defined in an image > > # recipe. If it is only defined in an image recipe, the build fails to > > # sign packages. > > INITRAMFS_IMAGE = "secure-core-image-initramfs" > > > > # Similarly, the kernel-image-bzimage must be defined here. When it was > > # set in the image recipe, got complaints about no buildable providers. > > # Weird. > > IMAGE_INSTALL += "kernel-image-bzimage" > > > > # These DISTRO_FEATURES must remain here. When I tried to put them into > > # the lewisos.conf distro configuration file, the build of the stryker-edge > > # image failed. Got old errors. Apparently some of the bbappends were > > # not picked up properly when these were defined in the distro config > > # file. Not sure why. > > DISTRO_FEATURES_NATIVE_append += "systemd ima tpm tpm2 efi-secure-boot > luks" > > DISTRO_FEATURES_append += "systemd ima tpm tpm2 efi-secure-boot luks > modsign pam intel-sgx" > > > > MACHINE_FEATURES_NATIVE_append += "efi" > > MACHINE_FEATURES_append += "efi" > > DEBUG_FLAGS_forcevariable = "" > > USER_CLASSES_remove = "image-prelink" > > === End local.conf === > > > > > > Here is my lewisos.conf distro configuration file. > > > > === Start lewisos.conf === > > # Lewisos distribution configuration file > > DISTRO = "lewisos" > > DISTRO_NAME = "Lewis test distribution" > > DISTRO_VERSION = "0.1.3-ou" > > MAINTAINER = "mako.device at stryker.com" > > > > IMAGE_VERSION_SUFFIX = "-${DISTRO_VERSION}" > > > > # Want to use systemd as the init manager > > DISTRO_FEATURES_append = " systemd" > > VIRTUAL-RUNTIME_init_manager = "systemd" > > VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" > > > > # Need virtualization > > DISTRO_FEATURES_append = " virtualization" > > > > # Add support for wireless > > DISTRO_FEATURES_append = " wifi" > > > > # Add support for disk encryption, secure boot and access to TPM > > # Needed for both the product build, and for native > > # From the meta-secure-core layer > > # DISTRO_FEATURES_append = " ima tpm tpm2 efi-secure-boot luks modsign pam > intel-sgx" > > # DISTRO_FEATURES_NATIVE_append = " ima tpm tpm2 efi-secure-boot luks" > > > > # Remove undesirable features > > DISTRO_FEATURES_BACKFILL_CONSIDERED += "nfs" > > DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" > > DISTRO_FEATURES_BACKFILL_CONSIDERED += "zeroconf" > > > > # Set up for signing RPMs > > # Inherit the sign_rpm_ext and user-key-store classes from the > meta-secure-core > > # layer. They provide some additional functionality. > > # If not using the meta-secure-core layer, uncomment the sign_rpm line and > > # comment out the sign_rpm_ext and user-key-store lines. > > # INHERIT += "sign_rpm" > > INHERIT += "sign_rpm_ext" > > INHERIT += "user-key-store" > > > > # NOTE: The two RPM_GPG lines cannot have spaces in their values. It > causes > > # the build to fail since the scripts cannot handle the space. > > RPM_GPG_NAME = "xxxxxxxx" > > RPM_GPG_PASSPHRASE = "yyyyyyyy" > > === End lewisos.conf === > > > > > > And here is my bbappend for linux-intel > > > > === Start linux-intel_%.bbappend === > > FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > SRC_URI += "file://kernel_baseline.scc" > > KERNEL_IMAGEDEST = "boot/${DISTRO}-${DISTRO_VERSION}" > > > > FILES_kernel-image-bzimage = "/boot/${PV}/bzImage-${KERNEL_VERSION_NAME}" > > > > python do_package_prepend () { > > os.remove(d.getVar('D') + '/' + d.getVar('KERNEL_IMAGEDEST') + > '/bzImage') > > } > > > > require recipes-kernel/linux/linux-yocto-integrity.inc > > === End linux-intel_%.bbappend === > > > > > > I?m removing symbolic links and putting the kernel and initramfs in > version specific directories because the /boot partition is vfat, which > doesn?t support symbolic links, and if I kept the names as something like > bzImage, then ?dnf upgrade? would complain about multiple RPMs trying to > own the same file. > > > > What am I missing? Where did I make a mistake? Does the > meta-secure-core, or Openembedded/Yocto in general support upgrading from > version X to version Y of an OS using just some command like ?dnf upgrade?? > > > > If you need more information, please let me know. > > > > As one last piece of info, if I remove ?ima? from DISTRO_FEATURES, the > build hangs when trying to sign the RPMs. > > > > Thank you > > > > Lewis Muhlenkamp > > > Follow this link to read our Privacy Statement > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Mon Feb 17 02:30:21 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 18:30:21 -0800 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Sun, Feb 16, 2020 at 1:03 PM Alexander Kanavin wrote: > > On Sun, 16 Feb 2020 at 21:10, Khem Raj wrote: >> >> qemuall, applies to other qemu machines for arm/aarch64/mips/ppc/riscv >> as well, in recent past I knew >> this change was needed for qemumips and qemuarm to boot >> core-image-weston, I am not sure if >> anything has changed since then. I think this change would need some >> more testing. > > > Sure, but the testing should be done by people who need those other machines to be able to boot weston; I would want to draw the line at what is currently covered by the autobuilder (which is just qemux86_64). > perhaps then make this chage such thst it only affects the architecture you have tested. > We can then use the fallback in a more targeted way, although the proper fix would be to look into why the default backend isn't working. > > Alex From raj.khem at gmail.com Mon Feb 17 02:35:44 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 16 Feb 2020 18:35:44 -0800 Subject: [OE-core] [PATCH 02/10] procps: upstream has switched to gitlab In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-2-alex.kanavin@gmail.com> Message-ID: On Sun, Feb 16, 2020 at 12:45 PM Alexander Kanavin wrote: > > On Sun, 16 Feb 2020 at 21:07, Khem Raj wrote: >> >> >>> -S = "${WORKDIR}/procps-ng-${PV}" >> >>> +# Upstream has a custom autogen.sh which invokes po/update-potfiles as they >> >>> +# don't ship a po/POTFILES.in (which is silly). Without that file gettext >> >>> +# doesn't believe po/ is a gettext directory and won't generate po/Makefile. >> >> >> >> Do we miss .in file from tarball ? Or is it missing in a git checkout >> >> This is expected when building in a maintainer mode >> >> Tarballs are produced by maintainers for users >> >> Who wants to build from source >> > >> > >> > The .in is available in tarballs, but not in git repo. It's generated as explained above. >> >> right. Then revise the comment, since its expected to be absent when >> we are building from >> git sources. > > > The fix and the comment were copied wholesale and were originally written by Ross. How is POTFILES.in normally generated (i.e. without involving custom autogen.sh)? any .in file is usually generated by maintainer into source tarball since the build is not consuming source tar anymore this comment perhaps should be deleted. > > Alex From zhe.he at windriver.com Mon Feb 17 03:02:03 2020 From: zhe.he at windriver.com (He Zhe) Date: Mon, 17 Feb 2020 11:02:03 +0800 Subject: [OE-core] [PATCH] cryptodev-module: Fix build failure with kernel v5.5 In-Reply-To: <20200210131128.28390-1-zhe.he@windriver.com> References: <20200210131128.28390-1-zhe.he@windriver.com> Message-ID: <736eaf22-3981-44d9-84f5-ee6f6d162c3e@windriver.com> Ping. Zhe On 2/10/20 9:11 PM, zhe.he at windriver.com wrote: > From: He Zhe > > Backport from upstream to fix the following build failure. > > cryptlib.c:162:37: error: 'crypto_ablkcipher_type' undeclared > (first use in this function); did you mean 'crypto_skcipher_tfm'? > 162 | if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) > | ^~~~~~~~~~~~~~~~~~~~~~ > | crypto_skcipher_tfm > cryptlib.c:169:25: error: 'struct crypto_alg' has no member named > 'cra_ablkcipher' > 169 | alg = &tfm->__crt_alg->cra_ablkcipher; > | ^~ > cryptlib.c:170:21: error: dereferencing pointer to incomplete type > 'struct ablkcipher_alg' > 170 | min_keysize = alg->min_keysize; > | ^~ > > Signed-off-by: He Zhe > --- > .../cryptodev/cryptodev-module_1.10.bb | 1 + > ...-cryptlib.c-fix-build-on-kernel-v5.5.patch | 49 +++++++++++++++++++ > 2 files changed, 50 insertions(+) > create mode 100644 meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch > > diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb > index 552eb6abaa..89b52d8d95 100644 > --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb > +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb > @@ -9,6 +9,7 @@ DEPENDS += "cryptodev-linux" > > SRC_URI += " \ > file://0001-Disable-installing-header-file-provided-by-another-p.patch \ > +file://0001-cryptlib.c-fix-build-on-kernel-v5.5.patch \ > " > > EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' > diff --git a/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch b/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch > new file mode 100644 > index 0000000000..1af9aed8d8 > --- /dev/null > +++ b/meta/recipes-kernel/cryptodev/files/0001-cryptlib.c-fix-build-on-kernel-v5.5.patch > @@ -0,0 +1,49 @@ > +From 98b163a23f6b9fbdc18c3644cf94a75cdcd0cc80 Mon Sep 17 00:00:00 2001 > +From: Andrei Botila > +Date: Wed, 27 Nov 2019 09:53:37 +0200 > +Subject: [PATCH] cryptlib.c: fix build on kernel v5.5+ > + > +Starting with kernel v5.5-rc1 ablkcipher and blkcipher are removed and > +symmetric key operations will rely solely on skcipher: > +commit d63007eb954 ("crypto: ablkcipher - remove deprecated and unused ablkcipher support"). > + > +When cryptodev will use higher kernel versions > 5.4 will need to use the > +skcipher interface instead. > + > +Signed-off-by: Andrei Botila > + > +Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/ > +commit/98b163a23f6b9fbdc18c3644cf94a75cdcd0cc80] > + > +Signed-off-by: He Zhe > + > +--- > + cryptlib.c | 5 ++++- > + 1 file changed, 4 insertions(+), 1 deletion(-) > + > +diff --git a/cryptlib.c b/cryptlib.c > +index 4a87037..e2a4198 100644 > +--- a/cryptlib.c > ++++ b/cryptlib.c > +@@ -159,6 +159,7 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, > + > + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) > + tfm = crypto_skcipher_tfm(out->async.s); > ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 4, 0)) > + if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) > + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) > + || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) > +@@ -169,7 +170,9 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, > + alg = &tfm->__crt_alg->cra_ablkcipher; > + min_keysize = alg->min_keysize; > + max_keysize = alg->max_keysize; > +- } else { > ++ } else > ++#endif > ++ { > + struct skcipher_alg *alg; > + > + alg = crypto_skcipher_alg(out->async.s); > +-- > +2.7.4 > + From robert.joslyn at redrectangle.org Mon Feb 17 03:19:39 2020 From: robert.joslyn at redrectangle.org (Robert Joslyn) Date: Sun, 16 Feb 2020 19:19:39 -0800 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_ell=3A_Upd?= =?utf-8?q?ate_to_0=2E28?= In-Reply-To: <20200216200157.2273.54440@do> References: <20200216185909.1566175-1-robert.joslyn@redrectangle.org> <20200216200157.2273.54440@do> Message-ID: <8b82b87ae99aa9baa433ea74d38ace84a9124f36.camel@redrectangle.org> On Sun, 2020-02-16 at 20:01 +0000, Patchwork wrote: > == Series Details == > > Series: ell: Update to 0.28 > Revision: 1 > URL : https://patchwork.openembedded.org/series/22697/ > State : failure > > == Summary == > > > Thank you for submitting this patch series to OpenEmbedded Core. This is > an automated response. Several tests have been executed on the proposed > series by patchtest resulting in the following failures: > > > > * Issue Series does not apply on top of target branch > [test_series_merge_on_head] > Suggested fix Rebase your series on top of targeted branch > Targeted branch master (currently at c9b5802bbe) > > > > If you believe any of these test results are incorrect, please reply to > the > mailing list (openembedded-core at lists.openembedded.org) raising your > concerns. > Otherwise we would appreciate you correcting the issues and submitting a > new > version of the patchset if applicable. Please ensure you add/increment > the > version number when sending the new version (i.e. [PATCH] -> [PATCH v2] > -> > [PATCH v3] -> ...). > > --- > Guidelines: > https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest > Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe > Sorry for the noise, someone already sent in this update. Thanks, Robert From preid at electromag.com.au Mon Feb 17 03:26:14 2020 From: preid at electromag.com.au (Phil Reid) Date: Mon, 17 Feb 2020 11:26:14 +0800 Subject: [OE-core] bash: Fix CVE-2019-18276 Message-ID: Hi All, I recently started get the following failure with bash after "b348e31c93f0 bash: Fix CVE-2019-18276" was applied to zeus. Any thoughts? NOTE: Applying patch 'bash50-001' (downloads/bash50-001) NOTE: Applying patch 'bash50-002' (downloads/bash50-002) NOTE: Applying patch 'bash50-003' (downloads/bash50-003) NOTE: Applying patch 'bash50-004' (downloads/bash50-004) NOTE: Applying patch 'bash50-005' (downloads/bash50-005) NOTE: Applying patch 'bash50-006' (downloads/bash50-006) NOTE: Applying patch 'bash50-007' (downloads/bash50-007) NOTE: Applying patch 'execute_cmd.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/execute_cmd.patch) NOTE: Applying patch 'mkbuiltins_have_stringize.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch) NOTE: Applying patch 'build-tests.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/build-tests.patch) NOTE: Applying patch 'test-output.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/test-output.patch) NOTE: Applying patch 'fix-run-builtins.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/fix-run-builtins.patch) NOTE: Applying patch 'bash-CVE-2019-18276.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch) ERROR: Command Error: 'quilt --quiltrc /home/preid/dev/linux/v2019.11/tmp-glibc/work/cortexa9t2hf-neon-emit-linux-gnueabi/bash/5.0-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch bash-CVE-2019-18276.patch patching file MANIFEST patching file bashline.c patching file builtins/help.def patching file config.h.in patching file configure Hunk #1 FAILED at 10281. 1 out of 1 hunk FAILED -- rejects in file configure patching file configure.ac patching file doc/bash.1 patching file doc/bashref.texi patching file lib/glob/glob.c patching file pathexp.c patching file shell.c patching file tests/glob.tests patching file tests/glob6.sub patching file tests/glob7.sub Patch bash-CVE-2019-18276.patch does not apply (enforce with -f) DEBUG: Python function patch_do_patch finished DEBUG: Python function do_patch finished -- Regards Phil Reid ElectroMagnetic Imaging Technology Pty Ltd Development of Geophysical Instrumentation & Software www.electromag.com.au 3 The Avenue, Midland WA 6056, AUSTRALIA Ph: +61 8 9250 8100 Fax: +61 8 9250 7100 Email: preid at electromag.com.au From zhe.he at windriver.com Mon Feb 17 04:08:25 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Mon, 17 Feb 2020 12:08:25 +0800 Subject: [OE-core] [PATCH] lttng-modules: Work around yocto bug 13424 Message-ID: <1581912505-213892-1-git-send-email-zhe.he@windriver.com> From: He Zhe Before Yocto bug 13424 is fixed, devupstream cannot work with multilib. To provide git based lttng-modules recipe for latest source code, let's just include tarball based recipe and overwrite related variables. Signed-off-by: He Zhe --- meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb | 12 ------------ meta/recipes-kernel/lttng/lttng-modules_git.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 meta/recipes-kernel/lttng/lttng-modules_git.bb diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb index c833ff7..4e75c6e 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb @@ -29,15 +29,3 @@ python do_package_prepend() { if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')): bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) } - -BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" -DEFAULT_PREFERENCE_class-devupstream = "-1" -SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ - file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ - file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ - " -SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" -PV_class-devupstream = "2.11.1+git${SRCPV}" -S_class-devupstream = "${WORKDIR}/git" -SRCREV_FORMAT ?= "lttng_git" diff --git a/meta/recipes-kernel/lttng/lttng-modules_git.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb new file mode 100644 index 0000000..c6d1924 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules_git.bb @@ -0,0 +1,11 @@ +require lttng-modules_2.11.1.bb + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128" +DEFAULT_PREFERENCE = "-1" +SRC_URI = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ + file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ + file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ + " +SRCREV = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" +PV = "2.11.1+git${SRCPV}" +S = "${WORKDIR}/git" -- 2.7.4 From andrey.z at gmail.com Mon Feb 17 06:44:06 2020 From: andrey.z at gmail.com (Andrey Zhizhikin) Date: Mon, 17 Feb 2020 07:44:06 +0100 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: References: Message-ID: On Mon, Feb 17, 2020 at 4:26 AM Phil Reid wrote: > > Hi All, > > I recently started get the following failure with bash after "b348e31c93f0 bash: Fix CVE-2019-18276" > was applied to zeus. > > Any thoughts? > > > NOTE: Applying patch 'bash50-001' (downloads/bash50-001) > NOTE: Applying patch 'bash50-002' (downloads/bash50-002) > NOTE: Applying patch 'bash50-003' (downloads/bash50-003) > NOTE: Applying patch 'bash50-004' (downloads/bash50-004) > NOTE: Applying patch 'bash50-005' (downloads/bash50-005) > NOTE: Applying patch 'bash50-006' (downloads/bash50-006) > NOTE: Applying patch 'bash50-007' (downloads/bash50-007) > NOTE: Applying patch 'execute_cmd.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/execute_cmd.patch) > NOTE: Applying patch 'mkbuiltins_have_stringize.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch) > NOTE: Applying patch 'build-tests.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/build-tests.patch) > NOTE: Applying patch 'test-output.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/test-output.patch) > NOTE: Applying patch 'fix-run-builtins.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/fix-run-builtins.patch) > NOTE: Applying patch 'bash-CVE-2019-18276.patch' (layers/openembedded-core/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch) > ERROR: Command Error: 'quilt --quiltrc > /home/preid/dev/linux/v2019.11/tmp-glibc/work/cortexa9t2hf-neon-emit-linux-gnueabi/bash/5.0-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: > Applying patch bash-CVE-2019-18276.patch > patching file MANIFEST > patching file bashline.c > patching file builtins/help.def > patching file config.h.in > patching file configure > Hunk #1 FAILED at 10281. > 1 out of 1 hunk FAILED -- rejects in file configure > patching file configure.ac > patching file doc/bash.1 > patching file doc/bashref.texi > patching file lib/glob/glob.c > patching file pathexp.c > patching file shell.c > patching file tests/glob.tests > patching file tests/glob6.sub > patching file tests/glob7.sub > Patch bash-CVE-2019-18276.patch does not apply (enforce with -f) > DEBUG: Python function patch_do_patch finished > DEBUG: Python function do_patch finished Had the same issue the day before, re-building bash clean solved it. At first I wanted to report it as well, but then after I tried "-c cleanall" - the issue was gone. Try to do a clean build of bash and see if it is still reproducible. > > -- > Regards > Phil Reid > > ElectroMagnetic Imaging Technology Pty Ltd > Development of Geophysical Instrumentation & Software > www.electromag.com.au > > 3 The Avenue, Midland WA 6056, AUSTRALIA > Ph: +61 8 9250 8100 > Fax: +61 8 9250 7100 > Email: preid at electromag.com.au > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Regards, Andrey. From jupiter.hce at gmail.com Mon Feb 17 07:19:31 2020 From: jupiter.hce at gmail.com (JH) Date: Mon, 17 Feb 2020 18:19:31 +1100 Subject: [OE-core] Which parameters are shared by kernel and u-boot? Message-ID: Hi, Does kernel and u-boot both need be compiled by u-boot configure files to include bootargs, mtdpars etc? Thank you. Kind regards, - jh From alex.kanavin at gmail.com Mon Feb 17 08:12:42 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 17 Feb 2020 09:12:42 +0100 Subject: [OE-core] [PATCH 02/10] procps: upstream has switched to gitlab In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-2-alex.kanavin@gmail.com> Message-ID: I looked it up. Actually, potfiles.in is typically not a generated file, and should be placed under version control. The comment is valid. Alex On Mon 17. Feb 2020 at 3.36, Khem Raj wrote: > On Sun, Feb 16, 2020 at 12:45 PM Alexander Kanavin > wrote: > > > > On Sun, 16 Feb 2020 at 21:07, Khem Raj wrote: > >> > >> >>> -S = "${WORKDIR}/procps-ng-${PV}" > >> >>> +# Upstream has a custom autogen.sh which invokes > po/update-potfiles as they > >> >>> +# don't ship a po/POTFILES.in (which is silly). Without that file > gettext > >> >>> +# doesn't believe po/ is a gettext directory and won't generate > po/Makefile. > >> >> > >> >> Do we miss .in file from tarball ? Or is it missing in a git checkout > >> >> This is expected when building in a maintainer mode > >> >> Tarballs are produced by maintainers for users > >> >> Who wants to build from source > >> > > >> > > >> > The .in is available in tarballs, but not in git repo. It's generated > as explained above. > >> > >> right. Then revise the comment, since its expected to be absent when > >> we are building from > >> git sources. > > > > > > The fix and the comment were copied wholesale and were originally > written by Ross. How is POTFILES.in normally generated (i.e. without > involving custom autogen.sh)? > > any .in file is usually generated by maintainer into source tarball > since the build is not consuming source tar anymore > this comment perhaps should be deleted. > > > > > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Mon Feb 17 08:22:04 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 17 Feb 2020 09:22:04 +0100 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Mon 17. Feb 2020 at 3.30, Khem Raj wrote: > > > Sure, but the testing should be done by people who need those other > machines to be able to boot weston; I would want to draw the line at what > is currently covered by the autobuilder (which is just qemux86_64). > > > > perhaps then make this chage such thst it only affects the > architecture you have tested. Fbdev backend is not documented, and there is no guarantee by upstream that it will work. You wouldn?t want to use it on actual targets either as it has no hw acceleration support. I think the change should apply to all, we should test standard drm/kms code paths everywhere and fix/report issues as needed. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From quentin.schulz at streamunlimited.com Mon Feb 17 09:51:15 2020 From: quentin.schulz at streamunlimited.com (Quentin Schulz) Date: Mon, 17 Feb 2020 10:51:15 +0100 Subject: [OE-core] [yocto] Support UBI u-boot In-Reply-To: References: Message-ID: <20200217095115.uyhdpgk6x2homrxs@qschulz> Hi JH, On Sun, Feb 09, 2020 at 08:01:15PM +1100, JH wrote: > Changed to https://source.codeaurora.org/external/imx/uboot-imx.git > branch imx_v2018.03_4.14.98_2.0.0_ga, it can now support > CONFIG_CMD_MTDPARTS ind defconfg, all MTDPARTS error gone, but then > 2018.03-r0/git/cmd/ubi.c missed dependencies of del_mtd_partitions, > add_mtd_partitions, mtd_get_device_size all in mtdpart.c which can > only be enabled by CONFIG_MTD_PARTITIONS: > > obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o > > But that CONFIG_MTD_PARTITIONS is not supported in defconfig. > > Could anyone advise which branch works for UBI? > FYI, U-boot was still slowly migrating to Kconfig only back then (maybe still is). There was for a long time a mix between Kconfig options and options in what I call board header files (include/configs/.h). Most likely CONFIG_MTD_PARTITIONS had to be defined there. Biased recommendation: https://www.youtube.com/watch?v=5E0sdYkvq-Q BR, Quentin From richard.purdie at linuxfoundation.org Mon Feb 17 09:55:06 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 17 Feb 2020 09:55:06 +0000 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: References: Message-ID: <981f9211365c2dfc6da70b737f43f3e89d87f7d4.camel@linuxfoundation.org> On Mon, 2020-02-17 at 07:44 +0100, Andrey Zhizhikin wrote: > On Mon, Feb 17, 2020 at 4:26 AM Phil Reid > wrote: > > Hi All, > > > > I recently started get the following failure with bash after > > "b348e31c93f0 bash: Fix CVE-2019-18276" > > was applied to zeus. > > > > Any thoughts? > > > > > > NOTE: Applying patch 'bash50-001' (downloads/bash50-001) > > NOTE: Applying patch 'bash50-002' (downloads/bash50-002) > > NOTE: Applying patch 'bash50-003' (downloads/bash50-003) > > NOTE: Applying patch 'bash50-004' (downloads/bash50-004) > > NOTE: Applying patch 'bash50-005' (downloads/bash50-005) > > NOTE: Applying patch 'bash50-006' (downloads/bash50-006) > > NOTE: Applying patch 'bash50-007' (downloads/bash50-007) > > NOTE: Applying patch 'execute_cmd.patch' (layers/openembedded- > > core/meta/recipes-extended/bash/bash/execute_cmd.patch) > > NOTE: Applying patch 'mkbuiltins_have_stringize.patch' > > (layers/openembedded-core/meta/recipes- > > extended/bash/bash/mkbuiltins_have_stringize.patch) > > NOTE: Applying patch 'build-tests.patch' (layers/openembedded- > > core/meta/recipes-extended/bash/bash/build-tests.patch) > > NOTE: Applying patch 'test-output.patch' (layers/openembedded- > > core/meta/recipes-extended/bash/bash/test-output.patch) > > NOTE: Applying patch 'fix-run-builtins.patch' (layers/openembedded- > > core/meta/recipes-extended/bash/bash/fix-run-builtins.patch) > > NOTE: Applying patch 'bash-CVE-2019-18276.patch' > > (layers/openembedded-core/meta/recipes-extended/bash/bash/bash-CVE- > > 2019-18276.patch) > > ERROR: Command Error: 'quilt --quiltrc > > /home/preid/dev/linux/v2019.11/tmp-glibc/work/cortexa9t2hf-neon- > > emit-linux-gnueabi/bash/5.0-r0/recipe-sysroot-native/etc/quiltrc > > push' exited with 0 Output: > > Applying patch bash-CVE-2019-18276.patch > > patching file MANIFEST > > patching file bashline.c > > patching file builtins/help.def > > patching file config.h.in > > patching file configure > > Hunk #1 FAILED at 10281. > > 1 out of 1 hunk FAILED -- rejects in file configure > > patching file configure.ac > > patching file doc/bash.1 > > patching file doc/bashref.texi > > patching file lib/glob/glob.c > > patching file pathexp.c > > patching file shell.c > > patching file tests/glob.tests > > patching file tests/glob6.sub > > patching file tests/glob7.sub > > Patch bash-CVE-2019-18276.patch does not apply (enforce with -f) > > DEBUG: Python function patch_do_patch finished > > DEBUG: Python function do_patch finished > > Had the same issue the day before, re-building bash clean solved it. > At first I wanted to report it as well, but then after I tried "-c > cleanall" - the issue was gone. > > Try to do a clean build of bash and see if it is still reproducible. I think I understand what happens here. When you do a rebuild, bitbake tries to pop off all the old patches, then apply the new ones. In this case its patching configure which we rebuild. It therefore can't apply the new patch to configure since its changed by the do_configure task. The fix is to remove the configure change from the patch since we just need the configure.ac piece. Cheers, Richard From wallinux at gmail.com Mon Feb 17 10:59:30 2020 From: wallinux at gmail.com (Anders Wallin) Date: Mon, 17 Feb 2020 11:59:30 +0100 Subject: [OE-core] [PATCH] babeltrace: update to 1.5.8 Message-ID: <20200217105930.902-1-wallinux@gmail.com> updated HOMEPAGE to http://babeltrace.org/ updated LICENSE to include LGPLv2.1 Signed-off-by: Anders Wallin --- meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 meta/recipes-kernel/lttng/babeltrace_1.5.8.bb diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb new file mode 100644 index 0000000000..b6b7653037 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -0,0 +1,20 @@ +SUMMARY = "Babeltrace - Trace Format Babel Tower" +DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." +HOMEPAGE = "http://babeltrace.org/" +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" +LICENSE = "MIT & GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" + +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" + +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" +SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-debug-info" + +ASNEEDED = "" -- 2.25.0 From richard.purdie at linuxfoundation.org Mon Feb 17 11:02:18 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 17 Feb 2020 11:02:18 +0000 Subject: [OE-core] [PATCH 0/4] oeqa: Run diffoscop on saved output In-Reply-To: References: <20200212031435.792802-1-JPEWhacker@gmail.com> Message-ID: <27b8a3c9ab5911804cdb2a8c1cc64b8073c6b1d9.camel@linuxfoundation.org> On Sun, 2020-02-16 at 12:27 -0600, Joshua Watt wrote: > On Sat, Feb 15, 2020, 5:07 AM Richard Purdie < > richard.purdie at linuxfoundation.org> wrote: > > On Tue, 2020-02-11 at 21:14 -0600, Joshua Watt wrote: > > > Adds recipes to build the diffoscope tool and run it when the OEQA > > > reproducible build test saves output to a local path. This should > > > make > > > it much easier to debug reproducible build issues from the > > > autobuilder, > > > since the published output can be easily viewed on the website. > > > > > > Joshua Watt (4): > > > python: Add libarchive-c recipe > > > python: Add magic recipe > > > recipes-support: Add diffoscope recipe > > > oeqa: reproducible: Run diffoscope on saved output > > > > Thanks! > > > > The first production use: > > > > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200215-t1s21q9r/packages/diff-html/ > > > > :) > > That's great! > > > I am a bit puzzled/concerned about how this hasn't been removed > > from > > the system yet as it should have been, unless its the hashequiv > > problem > > with timestamps continuing to cause problems. Need to fix my > > patch... > > It looks like a directory ordering issue to me, since the timestamps > are the same. One way to really flush these out would be to use > disorderfs (https://salsa.debian.org/reproducible-builds/disorderfs) > which permutates the order in which entries are listed in a > directory, but I think we should try to get "wider" coverage (more > recipes) before we try that. Its more complicated unfortunately. We should have fixed the directory order issue with: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=09c6a41b751d080f0c12fc4172a31d1dbe760b0b However issues which shows signs of that bug still persisted in the reproducibility test results. I theorised that since opkg-utils is in ABISAFE, the change wasn't accounted for. I therefore merged: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=5fd3eb4bda651bddf4e4dc76d456333c70df4ddc However with current master, we're seeing the above reproducible build failure. I checked in a build and its using this sstate object for comparison: pub/sstate/b0/ca/sstate\:matchbox-config-gtk\:core2-64-poky-linux\:0.2\:r0\:core2-64\:3\:b0ca3b3559d37ba8de8ade8b282baa5082e612ef6590d3ff94fcebe38e9f17b9_package_write_ipk.tgz.siginfo which is interesting in that its from 2nd Feb (predating both commits above) and doesn't show the above change to package_ipk.bbclass. The change to package_ipk means the task's own basehash has to have changed which means it *has* to have rerun. Somehow hashequiv has then marked it as equivalent. I guess the issue may be that in some builds, this did generate output that was equivalent and things have then raced so this "broken" sstate object has persisted. The question then becomes, how to we get this out the cache?! I'm not entirely sure how we can :( (obviously I can cleansstate a few things which I'll do now but its not good this can't recover even through metadata changes) Cheers, Richard From jacob.kroon at gmail.com Mon Feb 17 11:03:18 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Mon, 17 Feb 2020 12:03:18 +0100 Subject: [OE-core] [PATCH] babeltrace: update to 1.5.8 In-Reply-To: <20200217105930.902-1-wallinux@gmail.com> References: <20200217105930.902-1-wallinux@gmail.com> Message-ID: On 2/17/20 11:59 AM, Anders Wallin wrote: > updated HOMEPAGE to http://babeltrace.org/ > updated LICENSE to include LGPLv2.1 > > Signed-off-by: Anders Wallin > --- > meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 20 +++++++++++++++++++ > 1 file changed, 20 insertions(+) > create mode 100644 meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > > diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > new file mode 100644 > index 0000000000..b6b7653037 > --- /dev/null > +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > @@ -0,0 +1,20 @@ > +SUMMARY = "Babeltrace - Trace Format Babel Tower" > +DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." > +HOMEPAGE = "http://babeltrace.org/" > +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" > +LICENSE = "MIT & GPLv2 & LGPLv2.1" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" > + > +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" > + > +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" > +SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" > +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" > + > +S = "${WORKDIR}/git" > + > +inherit autotools pkgconfig > + > +EXTRA_OECONF = "--disable-debug-info" > + > +ASNEEDED = "" > Looks like this patch adds a new recipe for 1.5.8, and keeps the 1.5.7 recipe. Was that intentional ? From alex.kanavin at gmail.com Mon Feb 17 11:43:43 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 17 Feb 2020 12:43:43 +0100 Subject: [OE-core] [PATCH] babeltrace: update to 1.5.8 In-Reply-To: References: <20200217105930.902-1-wallinux@gmail.com> Message-ID: Also, there?s now a babeltrace 2, so we should update to that rather ? Alex On Mon 17. Feb 2020 at 12.03, Jacob Kroon wrote: > On 2/17/20 11:59 AM, Anders Wallin wrote: > > updated HOMEPAGE to http://babeltrace.org/ > > updated LICENSE to include LGPLv2.1 > > > > Signed-off-by: Anders Wallin > > --- > > meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 20 +++++++++++++++++++ > > 1 file changed, 20 insertions(+) > > create mode 100644 meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > > > > diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > > new file mode 100644 > > index 0000000000..b6b7653037 > > --- /dev/null > > +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > > @@ -0,0 +1,20 @@ > > +SUMMARY = "Babeltrace - Trace Format Babel Tower" > > +DESCRIPTION = "Babeltrace provides trace read and write libraries in > host side, as well as a trace converter, which used to convert LTTng 2.0 > traces into human-readable log." > > +HOMEPAGE = "http://babeltrace.org/" > > +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" > > +LICENSE = "MIT & GPLv2 & LGPLv2.1" > > +LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" > > + > > +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" > > + > > +SRC_URI = "git:// > git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" > > +SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" > > +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" > > + > > +S = "${WORKDIR}/git" > > + > > +inherit autotools pkgconfig > > + > > +EXTRA_OECONF = "--disable-debug-info" > > + > > +ASNEEDED = "" > > > > Looks like this patch adds a new recipe for 1.5.8, and keeps the 1.5.7 > recipe. Was that intentional ? > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From rpjday at crashcourse.ca Mon Feb 17 12:01:34 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Mon, 17 Feb 2020 07:01:34 -0500 (EST) Subject: [OE-core] how does "PREFERRED_PROVIDER" interact with layer priorities? Message-ID: (note: when i finally learn python, i'll be able to RTFS and figure out stuff like this without assistance. until then ...) was going to enhance the explanation of PREFERRED_PROVIDER in the docs, until i realized i don't understand it completely. first, if there is a recipe named, say, "foo", then even if there are other recipes (with different names) that include: PROVIDES = "foo" by default (and ignoring layer priority complications), if there is a dependency on "foo", it is the "foo" recipe that will be selected as the provider, correct? that is, if there is a recipe that *exactly* matches the name requested, that's the selected provider? conversely, if one wants to override that default selection, one would need to: PREFERRED_PROVIDER_foo = "foo_experimental" in short, if the above is true, then there would seem to be no value in ever stating: PREFERRED_PROVIDER_foo = "foo" but i just noticed that that's done a fair bit in oe-core's default-providers.inc, as in (just a few examples): PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig" PREFERRED_PROVIDER_openssl ?= "openssl" that puzzled me until i saw this snippet from the same file: # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb PREFERRED_PROVIDER_ltp ?= "ltp" which inspired the conclusion that if there is a higher priority layer that provides that recipe name, *that* recipe would be used instead. and since prio of oe-core is 5 and prio of meta-oe is 6, if you want the *regular* oe-core recipe of "ltp", you need to explicitly ask for it. is that what's going on here? because if it isn't, then i'm unclear on the purpose of lines like the above. rday p.s. ironically, i was just going to see what meta-oe's recipe of "ltp-ddt" was doing, but that recipe was deleted so, at the very least, that comment should be removed. From alex.kanavin at gmail.com Mon Feb 17 13:16:05 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 17 Feb 2020 14:16:05 +0100 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Mon, 17 Feb 2020 at 09:22, Alexander Kanavin wrote: > \perhaps then make this chage such thst it only affects the >> architecture you have tested. > > > Fbdev backend is not documented, and there is no guarantee by upstream > that it will work. You wouldn?t want to use it on actual targets either as > it has no hw acceleration support. I think the change should apply to all, > we should test standard drm/kms code paths everywhere and fix/report issues > as needed. > The issue with qemumips in particular is that it is still using cirrus for the graphics card, which has been superseded by '-vga std' for a long time: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ If that is switched, then fbdev backend should be no longer necessary just like in qemux86_64. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From wallinux at gmail.com Mon Feb 17 13:32:19 2020 From: wallinux at gmail.com (Anders Wallin) Date: Mon, 17 Feb 2020 14:32:19 +0100 Subject: [OE-core] [PATCH] babeltrace: update to 1.5.8 Message-ID: 1. I will create a new version with 1.5.7 removed 2. Babeltrace and Babeltrace2 are different and can coexist. I have a recipe for babeltrace 2.0.1 ready to be submitted, but I wanted to make one more test. Regards Anders Wallin -------------- next part -------------- An HTML attachment was scrubbed... URL: From wallinux at gmail.com Mon Feb 17 13:34:05 2020 From: wallinux at gmail.com (Anders Wallin) Date: Mon, 17 Feb 2020 14:34:05 +0100 Subject: [OE-core] [PATCH v2] babeltrace: update to 1.5.8 Message-ID: <20200217133405.9914-1-wallinux@gmail.com> updated HOMEPAGE to http://babeltrace.org/ updated LICENSE to include LGPLv2.1 Signed-off-by: Anders Wallin --- .../lttng/{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-kernel/lttng/{babeltrace_1.5.7.bb => babeltrace_1.5.8.bb} (84%) diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.7.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb similarity index 84% rename from meta/recipes-kernel/lttng/babeltrace_1.5.7.bb rename to meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index 05ef6d099c..b6b7653037 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.7.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -1,14 +1,14 @@ SUMMARY = "Babeltrace - Trace Format Babel Tower" DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." -HOMEPAGE = "http://www.efficios.com/babeltrace/" +HOMEPAGE = "http://babeltrace.org/" BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" -LICENSE = "MIT & GPLv2" +LICENSE = "MIT & GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" -SRCREV = "d4014aeef4b89a4aaab1af42d7b0d143d62da0ff" +SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -- 2.25.0 From richard.purdie at linuxfoundation.org Mon Feb 17 14:35:50 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 17 Feb 2020 14:35:50 +0000 Subject: [OE-core] [PATCH 09/10] wayland: convert to meson build In-Reply-To: <20200216155015.21738-9-alex.kanavin@gmail.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-9-alex.kanavin@gmail.com> Message-ID: On Sun, 2020-02-16 at 16:50 +0100, Alexander Kanavin wrote: > Signed-off-by: Alexander Kanavin > --- > ...-the-native-wayland-scanner-directly.patch | 27 > +++++++++++++++++++ > .../wayland/wayland_1.18.0.bb | 9 ++++--- > 2 files changed, 32 insertions(+), 4 deletions(-) > create mode 100644 meta/recipes-graphics/wayland/wayland/0002- > meson.build-find-the-native-wayland-scanner-directly.patch I pulled some of your patches into -next: https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/718 I think the failures are related to this patch? Cheers, Richard From alex.kanavin at gmail.com Mon Feb 17 14:50:56 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 17 Feb 2020 15:50:56 +0100 Subject: [OE-core] [PATCH 09/10] wayland: convert to meson build In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-9-alex.kanavin@gmail.com> Message-ID: On Mon, 17 Feb 2020 at 15:35, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > On Sun, 2020-02-16 at 16:50 +0100, Alexander Kanavin wrote: > > Signed-off-by: Alexander Kanavin > > --- > > ...-the-native-wayland-scanner-directly.patch | 27 > > +++++++++++++++++++ > > .../wayland/wayland_1.18.0.bb | 9 ++++--- > > 2 files changed, 32 insertions(+), 4 deletions(-) > > create mode 100644 meta/recipes-graphics/wayland/wayland/0002- > > meson.build-find-the-native-wayland-scanner-directly.patch > > I pulled some of your patches into -next: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/718 > > I think the failures are related to this patch? > Going slightly mad here: https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1581/steps/8/logs/step1b libxkbcommon and mesa have failed in do_configure, but I am not seeing the tasks being run? Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Mon Feb 17 14:52:36 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 17 Feb 2020 14:52:36 +0000 Subject: [OE-core] [PATCH 09/10] wayland: convert to meson build In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-9-alex.kanavin@gmail.com> Message-ID: <115c4464591f20859c7800b2116b8c692d8fd537.camel@linuxfoundation.org> On Mon, 2020-02-17 at 15:50 +0100, Alexander Kanavin wrote: > On Mon, 17 Feb 2020 at 15:35, Richard Purdie < > richard.purdie at linuxfoundation.org> wrote: > > On Sun, 2020-02-16 at 16:50 +0100, Alexander Kanavin wrote: > > > Signed-off-by: Alexander Kanavin > > > --- > > > ...-the-native-wayland-scanner-directly.patch | 27 > > > +++++++++++++++++++ > > > .../wayland/wayland_1.18.0.bb | 9 ++++--- > > > 2 files changed, 32 insertions(+), 4 deletions(-) > > > create mode 100644 meta/recipes-graphics/wayland/wayland/0002- > > > meson.build-find-the-native-wayland-scanner-directly.patch > > > > I pulled some of your patches into -next: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/718 > > > > I think the failures are related to this patch? > > Going slightly mad here: > https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1581/steps/8/logs/step1b > libxkbcommon and mesa have failed in do_configure, but I am not > seeing the tasks being run? If I click the "download log" button there and download them I do see the failing tasks in the log? Cheers, Richard From alex.kanavin at gmail.com Mon Feb 17 14:53:19 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 17 Feb 2020 15:53:19 +0100 Subject: [OE-core] [PATCH 09/10] wayland: convert to meson build In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-9-alex.kanavin@gmail.com> Message-ID: Nevermind, found it. Forgot to click on the magnifying glass, before starting a search. Alex On Mon, 17 Feb 2020 at 15:50, Alexander Kanavin wrote: > On Mon, 17 Feb 2020 at 15:35, Richard Purdie < > richard.purdie at linuxfoundation.org> wrote: > >> On Sun, 2020-02-16 at 16:50 +0100, Alexander Kanavin wrote: >> > Signed-off-by: Alexander Kanavin >> > --- >> > ...-the-native-wayland-scanner-directly.patch | 27 >> > +++++++++++++++++++ >> > .../wayland/wayland_1.18.0.bb | 9 ++++--- >> > 2 files changed, 32 insertions(+), 4 deletions(-) >> > create mode 100644 meta/recipes-graphics/wayland/wayland/0002- >> > meson.build-find-the-native-wayland-scanner-directly.patch >> >> I pulled some of your patches into -next: >> >> https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/718 >> >> I think the failures are related to this patch? >> > > Going slightly mad here: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1581/steps/8/logs/step1b > > libxkbcommon > and mesa have failed in do_configure, but I am not seeing the tasks being > run? > > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Mon Feb 17 15:38:06 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 17 Feb 2020 16:38:06 +0100 Subject: [OE-core] [PATCH] babeltrace: update to 1.5.8 In-Reply-To: References: Message-ID: Thanks, please send the babeltrace2 recipe when it is ready. Alex On Mon, 17 Feb 2020 at 14:32, Anders Wallin wrote: > 1. I will create a new version with 1.5.7 removed > > 2. Babeltrace and Babeltrace2 are different and can coexist. I have a > recipe for babeltrace 2.0.1 ready to be submitted, but I wanted to make one > more test. > > Regards > Anders Wallin > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From akuster808 at gmail.com Mon Feb 17 16:00:38 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:38 -0800 Subject: [OE-core] [warrior 00/14] Patch review Message-ID: A few more for the 2.7.3 release. Please have comments back by Wednesday Passed A-full The following changes since commit a63d59f64a2d1f450a7639426cae8e0373a2d764: sanity.bbclass: Move sanity_info from conf to cache (2020-01-25 08:37:48 -0800) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib stable/warrior-nut http://cgit.openembedded.org//log/?h=stable/warrior-nut Anuj Mittal (1): cpio: fix CVE-2019-14866 Armin Kuster (2): python2: add ntpath timezone: update to 2019b Bruce Ashfield (4): linux-yocto/4.19: update to v4.19.72 linux-yocto/4.19: update to v4.19.78 linux-yocto/4.19: update to v4.19.84 linux-yocto/4.19: update to v4.19.87 Lee Chee Yang (1): rsync: whitelist CVE-2017-16548 Oleksandr Kravchuk (2): linux-firmware: bump to 20190618 linux-firmware: add PE back Otavio Salvador (1): linux-firmware: Upgrade 20190618 -> 20190815 Rahul Chauhan (1): libxml2: Fix CVE-2019-19956 Samuli Piippo (1): linux-firmware: update packaging for brcm files Zang Ruochen (1): timezone:upgrade 2019b -> 2019c .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 +++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + .../python/python/python2-manifest.json | 1 + meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + meta/recipes-extended/timezone/timezone.inc | 10 +- ...ware_git.bb => linux-firmware_20190815.bb} | 26 +- .../linux/linux-yocto-rt_4.19.bb | 6 +- .../linux/linux-yocto-tiny_4.19.bb | 8 +- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +- 11 files changed, 397 insertions(+), 33 deletions(-) create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch rename meta/recipes-kernel/linux-firmware/{linux-firmware_git.bb => linux-firmware_20190815.bb} (98%) -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:39 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:39 -0800 Subject: [OE-core] [warrior 01/14] libxml2: Fix CVE-2019-19956 In-Reply-To: References: Message-ID: <2be6ab4249c4f49c9ffcd9bb8fea964c8c5d449c.1581955142.git.akuster808@gmail.com> From: Rahul Chauhan Signed-off-by: Rahul Chauhan Signed-off-by: Armin Kuster --- .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch new file mode 100644 index 0000000000..43c3589d2c --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch @@ -0,0 +1,38 @@ +From 3cd2b25ddb04740be2880cfd78d60038452228b1 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Wed, 7 Aug 2019 17:39:17 +0800 +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover + +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to +NULL and free newDoc will cause a memory leak. + +Found with libFuzzer. + +Closes #82. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549] +CVE: CVE-2019-19956 + +Signed-off-by: Rahul Chauhan +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index b7ecd65..491f5c9 100644 +--- a/parser.c ++++ b/parser.c +@@ -13899,7 +13899,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, + xmlFreeParserCtxt(ctxt); + newDoc->intSubset = NULL; + newDoc->extSubset = NULL; +- newDoc->oldNs = NULL; ++ if(doc != NULL) ++ newDoc->oldNs = NULL; + xmlFreeDoc(newDoc); + + return(ret); +-- +2.7.4 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 62643bc764..67c2d4fafb 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb @@ -23,6 +23,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-CVE-2017-8872.patch \ file://fix-CVE-2018-14404.patch \ file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ + file://fix-CVE-2019-19956.patch \ " SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:40 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:40 -0800 Subject: [OE-core] [warrior 02/14] rsync: whitelist CVE-2017-16548 In-Reply-To: References: Message-ID: <0a88a86d92b294175c14c7c5a2533d4e418fec6a.1581955142.git.akuster808@gmail.com> From: Lee Chee Yang patch for this CVE applies to v3.1.3pre1 not for v3.1.3. patch already in v3.1.3. see https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce (From OE-Core rev: 1e2739c821312527010fb0afbde5a20cd3f03d24) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie (cherry picked from commit 842bd7ca21efc6378ba24a8d0bf065c4d0f54f1d) Signed-off-by: Armin Kuster --- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb index ffb1d061c0..152ff02a25 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb @@ -20,6 +20,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +# -16548 required for v3.1.3pre1. Already in v3.1.3. +CVE_CHECK_WHITELIST += " CVE-2017-16548 " + inherit autotools PACKAGECONFIG ??= "acl attr \ -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:41 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:41 -0800 Subject: [OE-core] [warrior 03/14] cpio: fix CVE-2019-14866 In-Reply-To: References: Message-ID: From: Anuj Mittal Signed-off-by: Anuj Mittal (cherry picked from commit 3a9872c664cdc5c5a6ac712142ce1d28d6fcd6d1) Signed-off-by: Armin Kuster --- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + 2 files changed, 317 insertions(+) create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch diff --git a/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch new file mode 100644 index 0000000000..5d587fc832 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch @@ -0,0 +1,316 @@ +CVE: CVE-2019-14866 +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=7554e3e42cd72f6f8304410c47fe6f8918e9bfd7] +Signed-off-by: Anuj Mittal + +From a052401293e45a13cded5959b258204dae6d0af5 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sun, 3 Nov 2019 23:59:39 +0200 +Subject: [PATCH] Fix CVE-2019-14866 + +* src/copyout.c (to_ascii): Additional argument nul controls whether +to add the terminating nul character. +(field_width_error): Improve diagnostics: print the actual and the +maximum allowed field value. +* src/extern.h (to_ascii, field_width_error): New prototypes. +* src/tar.c (to_oct): Remove. +(to_oct_or_error): New function. +(TO_OCT): New macro. +(write_out_tar_header): Use TO_OCT and to_ascii. Return 0 on +success, 1 on error. +--- + src/copyout.c | 49 ++++++++++++++++++++++-------------- + src/extern.h | 15 +++++++++-- + src/tar.c | 69 ++++++++++++++++++++++++--------------------------- + 3 files changed, 75 insertions(+), 58 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 1f0987a..1ae5477 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -269,26 +269,32 @@ writeout_final_defers (int out_des) + so it should be moved to paxutils too. + Allowed values for logbase are: 1 (binary), 2, 3 (octal), 4 (hex) */ + int +-to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase) ++to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, bool nul) + { + static char codetab[] = "0123456789ABCDEF"; +- int i = digits; +- +- do ++ ++ if (nul) ++ where[--digits] = 0; ++ while (digits > 0) + { +- where[--i] = codetab[(v & ((1 << logbase) - 1))]; ++ where[--digits] = codetab[(v & ((1 << logbase) - 1))]; + v >>= logbase; + } +- while (i); + + return v != 0; + } + +-static void +-field_width_error (const char *filename, const char *fieldname) ++void ++field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul) + { +- error (0, 0, _("%s: field width not sufficient for storing %s"), +- filename, fieldname); ++ char valbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%s"), ++ filename, fieldname, ++ STRINGIFY_BIGINT (value, valbuf), ++ STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8), ++ maxbuf)); + } + + static void +@@ -303,7 +309,7 @@ to_ascii_or_warn (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + field_width_warning (filename, fieldname); + } + +@@ -312,9 +318,9 @@ to_ascii_or_error (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + { +- field_width_error (filename, fieldname); ++ field_width_error (filename, fieldname, n, digits, false); + return 1; + } + return 0; +@@ -371,7 +377,7 @@ write_out_new_ascii_header (const char *magic_string, + _("name size"))) + return 1; + p += 8; +- to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16); ++ to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16, false); + + tape_buffered_write (ascii_header, out_des, sizeof ascii_header); + +@@ -388,7 +394,7 @@ write_out_old_ascii_header (dev_t dev, dev_t rdev, + char ascii_header[76]; + char *p = ascii_header; + +- to_ascii (p, file_hdr->c_magic, 6, LG_8); ++ to_ascii (p, file_hdr->c_magic, 6, LG_8, false); + p += 6; + to_ascii_or_warn (p, dev, 6, LG_8, file_hdr->c_name, _("device number")); + p += 6; +@@ -492,7 +498,10 @@ write_out_binary_header (dev_t rdev, + short_hdr.c_namesize = file_hdr->c_namesize & 0xFFFF; + if (short_hdr.c_namesize != file_hdr->c_namesize) + { +- field_width_error (file_hdr->c_name, _("name size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%u"), ++ file_hdr->c_name, _("name size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFu); + return 1; + } + +@@ -502,7 +511,10 @@ write_out_binary_header (dev_t rdev, + if (((off_t)short_hdr.c_filesizes[0] << 16) + short_hdr.c_filesizes[1] + != file_hdr->c_filesize) + { +- field_width_error (file_hdr->c_name, _("file size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%lu"), ++ file_hdr->c_name, _("file size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFFFFFlu); + return 1; + } + +@@ -552,8 +564,7 @@ write_out_header (struct cpio_file_stat *file_hdr, int out_des) + error (0, 0, _("%s: file name too long"), file_hdr->c_name); + return 1; + } +- write_out_tar_header (file_hdr, out_des); /* FIXME: No error checking */ +- return 0; ++ return write_out_tar_header (file_hdr, out_des); + + case arf_binary: + return write_out_binary_header (makedev (file_hdr->c_rdev_maj, +diff --git a/src/extern.h b/src/extern.h +index e27d662..f9ef56a 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -117,6 +117,10 @@ void print_name_with_quoting (char *p); + /* copyout.c */ + int write_out_header (struct cpio_file_stat *file_hdr, int out_des); + void process_copy_out (void); ++int to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, ++ bool nul); ++void field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul); + + /* copypass.c */ + void process_copy_pass (void); +@@ -145,7 +149,7 @@ int make_path (char *argpath, uid_t owner, gid_t group, + const char *verbose_fmt_string); + + /* tar.c */ +-void write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); ++int write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); + int null_block (long *block, int size); + void read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des); + int otoa (char *s, unsigned long *n); +@@ -204,9 +208,16 @@ void cpio_safer_name_suffix (char *name, bool link_target, + int cpio_create_dir (struct cpio_file_stat *file_hdr, int existing_dir); + void change_dir (void); + +-/* FIXME: These two defines should be defined in paxutils */ ++/* FIXME: The following three should be defined in paxutils */ + #define LG_8 3 + #define LG_16 4 ++/* The maximum uintmax_t value that can be represented with DIGITS digits, ++ assuming that each digit is BITS_PER_DIGIT wide. */ ++#define MAX_VAL_WITH_DIGITS(digits, bits_per_digit) \ ++ ((digits) * (bits_per_digit) < sizeof (uintmax_t) * CHAR_BIT \ ++ ? ((uintmax_t) 1 << ((digits) * (bits_per_digit))) - 1 \ ++ : (uintmax_t) -1) ++ + + uintmax_t from_ascii (char const *where, size_t digs, unsigned logbase); + +diff --git a/src/tar.c b/src/tar.c +index a2ce171..ef58027 100644 +--- a/src/tar.c ++++ b/src/tar.c +@@ -79,36 +79,17 @@ stash_tar_filename (char *prefix, char *filename) + return hold_tar_filename; + } + +-/* Convert a number into a string of octal digits. +- Convert long VALUE into a DIGITS-digit field at WHERE, +- including a trailing space and room for a NUL. DIGITS==3 means +- 1 digit, a space, and room for a NUL. +- +- We assume the trailing NUL is already there and don't fill it in. +- This fact is used by start_header and finish_header, so don't change it! +- +- This is be equivalent to: +- sprintf (where, "%*lo ", digits - 2, value); +- except that sprintf fills in the trailing NUL and we don't. */ +- +-static void +-to_oct (register long value, register int digits, register char *where) ++static int ++to_oct_or_error (uintmax_t value, size_t digits, char *where, char const *field, ++ char const *file) + { +- --digits; /* Leave the trailing NUL slot alone. */ +- +- /* Produce the digits -- at least one. */ +- do ++ if (to_ascii (where, value, digits, LG_8, true)) + { +- where[--digits] = '0' + (char) (value & 7); /* One octal digit. */ +- value >>= 3; ++ field_width_error (file, field, value, digits, true); ++ return 1; + } +- while (digits > 0 && value != 0); +- +- /* Add leading zeroes, if necessary. */ +- while (digits > 0) +- where[--digits] = '0'; ++ return 0; + } +- + + + /* Compute and return a checksum for TAR_HDR, +@@ -134,10 +115,22 @@ tar_checksum (struct tar_header *tar_hdr) + return sum; + } + ++#define TO_OCT(file_hdr, c_fld, digits, tar_hdr, tar_field) \ ++ do \ ++ { \ ++ if (to_oct_or_error (file_hdr -> c_fld, \ ++ digits, \ ++ tar_hdr -> tar_field, \ ++ #tar_field, \ ++ file_hdr->c_name)) \ ++ return 1; \ ++ } \ ++ while (0) ++ + /* Write out header FILE_HDR, including the file name, to file + descriptor OUT_DES. */ + +-void ++int + write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + { + int name_len; +@@ -166,11 +159,11 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + + /* Ustar standard (POSIX.1-1988) requires the mode to contain only 3 octal + digits */ +- to_oct (file_hdr->c_mode & MODE_ALL, 8, tar_hdr->mode); +- to_oct (file_hdr->c_uid, 8, tar_hdr->uid); +- to_oct (file_hdr->c_gid, 8, tar_hdr->gid); +- to_oct (file_hdr->c_filesize, 12, tar_hdr->size); +- to_oct (file_hdr->c_mtime, 12, tar_hdr->mtime); ++ TO_OCT (file_hdr, c_mode & MODE_ALL, 8, tar_hdr, mode); ++ TO_OCT (file_hdr, c_uid, 8, tar_hdr, uid); ++ TO_OCT (file_hdr, c_gid, 8, tar_hdr, gid); ++ TO_OCT (file_hdr, c_filesize, 12, tar_hdr, size); ++ TO_OCT (file_hdr, c_mtime, 12, tar_hdr, mtime); + + switch (file_hdr->c_mode & CP_IFMT) + { +@@ -182,7 +175,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); + tar_hdr->typeflag = LNKTYPE; +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + } + else + tar_hdr->typeflag = REGTYPE; +@@ -208,7 +201,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + than TARLINKNAMESIZE. */ + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + break; + #endif /* CP_IFLNK */ + } +@@ -227,13 +220,15 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + if (name) + strcpy (tar_hdr->gname, name); + +- to_oct (file_hdr->c_rdev_maj, 8, tar_hdr->devmajor); +- to_oct (file_hdr->c_rdev_min, 8, tar_hdr->devminor); ++ TO_OCT (file_hdr, c_rdev_maj, 8, tar_hdr, devmajor); ++ TO_OCT (file_hdr, c_rdev_min, 8, tar_hdr, devminor); + } + +- to_oct (tar_checksum (tar_hdr), 8, tar_hdr->chksum); ++ to_ascii (tar_hdr->chksum, tar_checksum (tar_hdr), 8, LG_8, true); + + tape_buffered_write ((char *) &tar_rec, out_des, TARRECORDSIZE); ++ ++ return 0; + } + + /* Return nonzero iff all the bytes in BLOCK are NUL. +-- +2.24.1 + diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb index 3713bf0b1f..5abe494ebc 100644 --- a/meta/recipes-extended/cpio/cpio_2.12.bb +++ b/meta/recipes-extended/cpio/cpio_2.12.bb @@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Fix-CVE-2015-1197.patch \ file://0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch \ file://0001-Fix-segfault-with-append.patch \ + file://CVE-2019-14866.patch \ " SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:42 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:42 -0800 Subject: [OE-core] [warrior 04/14] linux-yocto/4.19: update to v4.19.72 In-Reply-To: References: Message-ID: <71edff03db1a508ab9e1a919b5a5b90ee7316609.1581955142.git.akuster808@gmail.com> From: Bruce Ashfield Updating to the latest -korg -stable relase. A summary of the changes follows: ee809c7e0895 Linux 4.19.72 991467a47cf2 Revert "x86/apic: Include the LDR when clearing out APIC registers" 0f134f6e722c libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer 5049632bc958 x86/boot/compressed/64: Fix missing initialization in find_trampoline_placement() b8727dff55f0 KVM: arm/arm64: VGIC: Properly initialise private IRQ affinity 1a31b0d0ddfa afs: Fix leak in afs_lookup_cell_rcu() 111d36b6fb7e KVM: arm/arm64: Only skip MMIO insn once b84817d96e0f ceph: fix buffer free while holding i_ceph_lock in fill_inode() 5cd1e3552f0e ceph: fix buffer free while holding i_ceph_lock in __ceph_build_xattrs_blob() dfb8712c7acc ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr() ddb55cc39c70 selftests/kvm: make platform_info_test pass on AMD 6cb9f8d60f8f selftests: kvm: fix state save/load on processors without XSAVE 08c2052815e3 infiniband: hfi1: fix memory leaks d1b7f3252d56 infiniband: hfi1: fix a memory leak bug adb87027b5ff IB/mlx4: Fix memory leaks 5e416b11b4a9 nvme-multipath: fix possible I/O hang when paths are updated 5bbebceec61d Tools: hv: kvp: eliminate 'may be used uninitialized' warning 1d42e40fe3c5 Input: hyperv-keyboard: Use in-place iterator API in the channel callback e02aac3edb46 x86/boot/compressed/64: Fix boot on machines with broken E820 table 05d611c4ffb7 HID: cp2112: prevent sleeping function called from invalid context 5e1d50a3eafe kprobes: Fix potential deadlock in kprobe_optimizer() a5839b6b3a79 ravb: Fix use-after-free ravb_tstamp_skb 54eac3997ee4 wimax/i2400m: fix a memory leak bug 7506e8c4bec8 net: cavium: fix driver name ea78dc8b5e66 ibmvnic: Unmap DMA address of TX descriptor buffers after use 4fcb9b3f263e net: kalmia: fix memory leaks 1ad45d0f69d2 cx82310_eth: fix a memory leak bug ac3cc25f380b vfs: fix page locking deadlocks when deduping files 9ea1feadf5e0 lan78xx: Fix memory leaks 375ab446ec76 net: myri10ge: fix memory leaks f13b7ec5e1c5 liquidio: add cleanup in octeon_setup_iq() 2c3dd20f852a cxgb4: fix a memory leak bug b8cd0b7b09ed scsi: target: tcmu: avoid use-after-free after command timeout 6c9a1e17d063 scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure b3496367d9cb drm/mediatek: set DMA max segment size c9f595453bc3 drm/mediatek: use correct device to import PRIME buffers a54fa5dff8cd netfilter: nft_flow_offload: skip tcp rst and fin packets 6052090280b8 gpio: Fix build error of function redefinition cc8aa6155611 ibmveth: Convert multicast list size for little-endian system 32e912b91b5d Bluetooth: btqca: Add a short delay before downloading the NVM 7b7a11549dc1 net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx 752832f2e8c9 hv_netvsc: Fix a warning of suspicious RCU usage 463d87bc13ff tools: bpftool: fix error message (prog -> object) 5776970fb4ec netfilter: nf_tables: use-after-free in failing rule with bound set d22ed7b72acf net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context 3ddda4f3114b spi: bcm2835aux: fix corruptions for longer spi transfers fe49c3de7372 spi: bcm2835aux: remove dangerous uncontrolled read of fifo a4a9ee79036b spi: bcm2835aux: unifying code between polling and interrupt driven code ee271ead3b61 x86/boot: Preserve boot_params.secure_boot from sanitizing 9484203d254d net/rds: Fix info leak in rds6_inc_info_copy() 5977bc19ce7f tcp: remove empty skb from write queue in error cases 6f3126379879 tcp: inherit timestamp on mtu probe 6f8348f63706 net: stmmac: dwmac-rk: Don't fail if phy regulator is absent 38166934f89c net_sched: fix a NULL pointer deref in ipt action 5ff0ab0c668b net: sched: act_sample: fix psample group handling on overwrite 6a2bd8261630 net: fix skb use after free in netpoll 8a5d27eaba68 mld: fix memory leak in mld_del_delrec() e7d2672c66e4 Linux 4.19.71 72168ae78629 Revert "Input: elantech - enable SMBus on new (2018+) systems" 0fed55c248d9 Linux 4.19.70 9854d089f790 Revert "ASoC: Fail card instantiation if DAI format setup fails" e064466cb614 mt76: mt76x0u: do not reset radio on resume b307f99dca5a x86/ptrace: fix up botched merge of spectrev1 fix 3b26fa9e3ec3 i2c: piix4: Fix port selection for AMD Family 16h Model 30h 4f4be79c9ee7 NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0 b5891b624b9a NFS: Pass error information to the pgio error cleanup routine 812de6dee596 NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend() 57c491fd844d NFS: Clean up list moves of struct nfs_page 79f1b33c53a0 KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI ab8ecc278dc8 KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long db1841a2dd4c KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling 938e383738d9 mac80211: Correctly set noencrypt for PAE frames 4f139c0376fb mac80211: Don't memset RXCB prior to PAE intercept 58f91aac4dfe mac80211: fix possible sta leak 945b35972803 Revert "cfg80211: fix processing world regdomain when non modular" 690a424838ca crypto: ccp - Ignore unconfigured CCP device on suspend/resume 4e77b2ea941b VMCI: Release resource if the work is already queued 2a964875def7 bus: hisi_lpc: Add .remove method to avoid driver unbind crash 649532efef46 bus: hisi_lpc: Unregister logical PIO range to avoid potential use-after-free 68b58d392464 drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe() c7615333645d drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest 6d3003f56449 drm/amdgpu: Add APTX quirk for Dell Latitude 5495 c4616a9b3d3f lib: logic_pio: Add logic_pio_unregister_range() 7faef13e6f68 lib: logic_pio: Avoid possible overlap for unregistering regions b865c2c6e3f2 lib: logic_pio: Fix RCU usage 79829fc4ff33 fsi: scom: Don't abort operations for minor errors e44840b7320c typec: tcpm: fix a typo in the comparison of pdo_max_voltage e91c9c119dba intel_th: pci: Add Tiger Lake support ce1c894e1e89 intel_th: pci: Add support for another Lewisburg PCH cad1d3bfdd5d stm class: Fix a double free of stm_source_device abc42341b6c4 mmc: core: Fix init of SD cards reporting an invalid VDD range 1ecc65e1418b mmc: sdhci-of-at91: add quirk for broken HS200 be8e9fa67ea7 mei: me: add Tiger Lake point LP device ID 5ed36421af24 USB: storage: ums-realtek: Whitelist auto-delink support f79d1598968b USB: storage: ums-realtek: Update module parameter description for auto_delink_en f46fd68a541f usb: host: xhci: rcar: Fix typo in compatible string matching 7af7737491ce usb: host: ohci: fix a race condition between shutdown and irq a209827549da usb: chipidea: udc: don't do hardware access if gadget has stopped 97bec7afb98f usb: hcd: use managed device resources ebad9fd106da USB: cdc-wdm: fix race between write and disconnect due to flag abuse cbf5a279a22d usb-storage: Add new JMS567 revision to unusual_devs 8ea639525db6 ftrace: Check for empty hash and comment the race with registering probes 9d98e0f4859d ftrace: Check for successful allocation of hash f184b16748f4 ftrace: Fix NULL pointer dereference in t_probe_next() edc454cd5a04 x86/apic: Include the LDR when clearing out APIC registers 959832657c03 x86/apic: Do not initialize LDR and DFR for bigsmp 941d875cd44a uprobes/x86: Fix detection of 32-bit user mode 3c2b4827798e KVM: x86: Don't update RIP or do single-step on faulting emulation 3ec35109c80a kvm: x86: skip populating logical dest map if apic is not sw enabled cbd905dac535 ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604 b5d1f31d97af ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate() 98a2017c4a17 ALSA: seq: Fix potential concurrent access to the deleted pool 842317de9797 ALSA: hda - Fixes inverted Conexant GPIO mic mute led 5ef43bdc7321 ALSA: line6: Fix memory leak at line6_init_pcm() error path c94c0bf878bf ALSA: usb-audio: Check mixer unit bitmap yet more strictly 5dd2db1ab006 mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n 9febfd30aede ipv4/icmp: fix rt dst dev null pointer dereference 0a6a9c473080 tcp: make sure EPOLLOUT wont be missed 3e79bd1e4f9a net/smc: make sure EPOLLOUT is raised ff129837a5f6 ipv6: Default fib6_type to RTN_UNICAST when not set 02127bdfee97 ipv6/addrconf: allow adding multicast addr if IFA_F_MCAUTOJOIN is set a1407b26a6ed net: tls, fix sk_write_space NULL write when tx disabled fdc4400e9628 net/tls: swap sk_write_space on close f7009bbaff54 net/tls: Fixed return value when tls_complete_pending_work() fails dc066fd0d073 drm/tilcdc: Register cpufreq notifier after we have initialized crtc eba86f0a909f scsi: ufs: Fix RX_TERMINATION_FORCE_ENABLE define value edd40f54736d drm/bridge: tfp410: fix memleak in get_modes() 2fa7c944e11f watchdog: bcm2835_wdt: Fix module autoload a3eb2eba2f79 drm/i915: fix broadwell EU computation c61c7246dc1f tools: hv: fix KVP and VSS daemons exit code 0c39d818aae4 tools: hv: fixed Python pep8/flake8 warnings for lsvmbus 39ad18a042ab usb: host: fotg2: restart hcd after port reset 37654abed26f drm/ast: Fixed reboot test may cause system hanged 1cc2ef1cfbd8 i2c: emev2: avoid race when unregistering slave client 7048cd814f4e i2c: rcar: avoid race when unregistering slave client 8bd5426889c2 arm64: cpufeature: Don't treat granule sizes as strict eb535aaf3cd7 xen/blkback: fix memory leaks 339c1572a266 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt 122ab8ea641c usb: gadget: composite: Clear "suspended" on reset/disconnect 21ec20f62fae iommu/dma: Handle SG length overflow better 7f4b81365e83 omap-dma/omap_vout_vrfb: fix off-by-one fi value 71d24f45f905 dmaengine: stm32-mdma: Fix a possible null-pointer dereference in stm32_mdma_irq_handler() 377ebe613ed8 auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach 2f87eb895ebd soundwire: cadence_master: fix definitions for INTSTAT0/1 29b064d300a2 soundwire: cadence_master: fix register definition for SLAVE_STATE 4a9829195d9e nvme-pci: Fix async probe remove race 431f579a5349 nvme: fix a possible deadlock when passthru commands sent to a multipath device 32c0b8f10351 nvmet-loop: Flush nvme_delete_wq when removing the port 9c55dc85d890 afs: Only update d_fsdata if different in afs_d_revalidate() 24e093b96905 fs: afs: Fix a possible null-pointer dereference in afs_put_read() 8e5179f982f9 afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u() dfc438c0bc6d afs: Fix the CB.ProbeUuid service handler to reply correctly 7436dc2adeff nvme-multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns 2013d6ec0bc0 dmaengine: ste_dma40: fix unneeded variable warning 97ab07e11fbf Linux 4.19.69 6d47174198ac rxrpc: Fix local refcounting ce3f9e194d25 rxrpc: Fix local endpoint replacement a05354cbb822 rxrpc: Fix read-after-free in rxrpc_queue_local() f28023c4eedc rxrpc: Fix local endpoint refcounting 32df8a30b734 powerpc: Allow flush_(inval_)dcache_range to work across ranges >4GB 0d5e34c1e263 dm zoned: fix potential NULL dereference in dmz_do_reclaim() 655bb2c4ace4 xfs: always rejoin held resources during defer roll 83a8e6b2f2e3 xfs: Add attibute remove and helper functions b21ff6cfcc24 xfs: Add attibute set and helper functions b3a248f2307c xfs: Add helper function xfs_attr_try_sf_addname a9912f346bdc xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h 17c2b7af71f2 xfs: don't trip over uninitialized buffer on extent read of corrupted inode 11f85d4d77af xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT ed11e6003314 mm/zsmalloc.c: fix race condition in zs_destroy_pool b30a2f608e94 mm/zsmalloc.c: migration can leave pages in ZS_EMPTY indefinitely db67ac031655 mm, page_owner: handle THP splits correctly 42731deff2ea genirq: Properly pair kobject_del() with kobject_add() c14fe4e8fd01 dm zoned: properly handle backing device failure 4530f2f1a79a dm zoned: improve error handling in i/o map code 8b7c17bb2753 dm zoned: improve error handling in reclaim ded8e524cfa6 dm table: fix invalid memory accesses with too high sector number 53e73d1079d7 dm space map metadata: fix missing store of apply_bops() return value 2cff6c87a0dc dm raid: add missing cleanup in raid_ctr() 795b0572729b dm integrity: fix a crash due to BUG_ON in __journal_read_write() 8114012de6c1 dm btree: fix order of block initialization in btree_split_beneath e0fb8135de9e dm kcopyd: always complete failed jobs f7d157f33001 x86/boot: Fix boot regression caused by bootparam sanitizing d955601166f8 x86/boot: Save fields explicitly, zero out everything else e063b03b451a x86/CPU/AMD: Clear RDRAND CPUID bit on AMD family 15h/16h 685e598e447e x86/apic: Handle missing global clockevent gracefully f9747104a5c8 x86/retpoline: Don't clobber RFLAGS during CALL_NOSPEC on i386 cf13e30c58d4 userfaultfd_release: always remove uffd flags and clear vm_userfaultfd_ctx a6f236e1bd97 Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE 3783c7ee9920 gpiolib: never report open-drain/source lines as 'input' to user-space f88c31b43bab drm/nouveau: Don't retry infinitely when receiving no data on i2c over AUX 51f6afddb147 libceph: fix PG split vs OSD (re)connect race f2951720629e ceph: don't try fill file_lock on unsuccessful GETFILELOCK reply 7bed2889cd18 ceph: clear page dirty before invalidate page a8f7703f2213 clk: socfpga: stratix10: fix rate caclulationg for cnt_clks b608a5a238d5 Revert "dm bufio: fix deadlock with loop device" 375c6c72f56c HID: wacom: Correct distance scale for 2nd-gen Intuos devices 8317fe4a3906 HID: wacom: correct misreported EKR ring values 3c4b283a0deb selftests: kvm: Adding config fragments ef61b79017ff KVM: arm: Don't write junk to CP15 registers on reset d5cb5b493030 KVM: arm64: Don't write junk to sysregs on reset 590549487679 perf pmu-events: Fix missing "cpu_clk_unhalted.core" event 06ed429b9018 perf cpumap: Fix writing to illegal memory in handling cpumap mask e49cfed0a8cb perf ftrace: Fix failure to set cpumask when only one cpu is present 7aa8dfa450b4 block, bfq: handle NULL return value by bfq_init_rq() fa6f4687805a drm/vmwgfx: fix memory leak when too many retries have occurred 923de016dc88 x86/lib/cpu: Address missing prototypes warning 3ca013cd63be libata: add SG safety checks in SFF pio transfers 3b84bbef51c4 libata: have ata_scsi_rw_xlat() fail invalid passthrough requests e0c030221b1f net: hisilicon: Fix dma_map_single failed on arm64 4ab3052568e5 net: hisilicon: fix hip04-xmit never return TX_BUSY 09ec5bf10749 net: hisilicon: make hip04_tx_reclaim non-reentrant b8d03c79e403 net: stmmac: tc: Do not return a fragment entry b6cd6d18423e net: stmmac: Fix issues when number of Queues >= 4 45e7e4e66b08 net: cxgb3_main: Fix a resource leak in a error path in 'init_one()' db106f695414 s390: put _stext and _etext into .text section 33bdea175df0 SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL fab5a1fd17a6 SMB3: Fix potential memory leak when processing compound chain 6cb4997861c8 drm/rockchip: Suspend DP late 1c6ca0921705 HID: input: fix a4tech horizontal wheel custom usage f6f9c4491ec5 HID: quirks: Set the INCREMENT_USAGE_ON_DUPLICATE quirk on Saitek X52 b6fb2f5b33f2 NFS: Fix regression whereby fscache errors are appearing on 'nofsc' mounts 66daeec347f0 NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim() d1ba0b81e709 net/ethernet/qlogic/qed: force the string buffer NULL-terminated 35d9e9211baf can: peak_usb: force the string buffer NULL-terminated 895c8fcfedad can: sja1000: force the string buffer NULL-terminated a3d1263c9b03 perf bench numa: Fix cpu0 binding 4533d08b6528 net: phy: phy_led_triggers: Fix a possible null-pointer dereference in phy_led_trigger_change_speed() 07efe13b95ab isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack 4db2043eec46 rxrpc: Fix the lack of notification when sendmsg() fails on a DATA packet 0d68fbc2d07b rxrpc: Fix potential deadlock 63dd147e7af0 netfilter: ipset: Fix rename concurrency with listing ea08214d8cd0 netfilter: ipset: Copy the right MAC address in bitmap:ip,mac and hash:ip,mac sets 5a072ef6a296 netfilter: ipset: Actually allow destination MAC address for hash:ip,mac sets too ba42212ac0a0 mac80211_hwsim: Fix possible null-pointer dereferences in hwsim_dump_radio_nl() 32cbe03539ac isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences in start_isoc_chain() 8a24df575c97 qed: RDMA - Fix the hw_ver returned in device attributes cb64e86ee0d1 net: usb: qmi_wwan: Add the BroadMobi BM818 card bfa713f5cec5 ASoC: ti: davinci-mcasp: Correct slot_width posed constraint dd0ff288e344 ASoC: rockchip: Fix mono capture c5cb10632c0f st_nci_hci_connectivity_event_received: null check the allocation 0d73ba88f466 st21nfca_connectivity_event_received: null check the allocation 714a8438fc8a ASoC: Fail card instantiation if DAI format setup fails bd2f4c7c2d6a can: gw: Fix error path of cgw_module_init 3257103502cf can: mcp251x: add error check when wq alloc failed dbf790dcb8a9 can: dev: call netif_carrier_off() in register_candev() 43d31fd9a8f2 selftests: forwarding: gre_multipath: Fix flower filters ef52e2b9a621 selftests: forwarding: gre_multipath: Enable IPv4 forwarding 192bbe9d57ed net: mvpp2: Don't check for 3 consecutive Idle frames for 10G links a1e5a76db8dd bonding: Force slave speed check after link state recovery for 802.3ad b7038c195fd1 selftests/bpf: fix sendmsg6_prog on s390 e6dc6409f474 ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks 71305e8ee503 netfilter: ebtables: fix a memory leak bug in compat 70b4edd74b6d mips: fix cacheinfo 326175aa28fd MIPS: kernel: only use i8253 clocksource with periodic clockevent a6067c6e630f HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT def4c11b3131 Linux 4.19.68 7c13983a2860 mmc: sdhci-of-arasan: Do now show error message in case of deffered probe 447f5f48f4fa net/mlx5e: Use flow keys dissector to parse packets for ARFS fbd8ab680675 net/mlx5e: Only support tx/rx pause setting for port owner b3410f0f8505 xen/netback: Reset nr_frags before freeing skb cc4ff0f4f564 tipc: initialise addr_trail_end when setting node addresses e89bb758c030 team: Add vlan tx offload to hw_enc_features eeb148d20819 sctp: fix the transport error_count check 227f204ad197 sctp: fix memleak in sctp_send_reset_streams 154e6bc497c9 net/packet: fix race in tpacket_snd() f588dccfc137 net/mlx4_en: fix a memory leak bug 8905a249448c net: dsa: Check existence of .port_mdb_add callback before calling it d61d8ea9ca12 bonding: Add vlan tx offload to hw_enc_features 40933af400c5 bnx2x: Fix VF's VLAN reconfiguration in reload. 03d54393e3d7 iommu/amd: Move iommu_init_pci() to .init section 62e023ddd01a Input: psmouse - fix build error of multiple definition 28ff7d3b3fda netfilter: conntrack: Use consistent ct id hash calculation 30b9da0ec2a2 arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side a1cd2f7015bd dm: disable DISCARD if the underlying storage no longer supports it 4af28b2f19b0 drm/i915/cfl: Add a new CFL PCI ID. 3ca5b7b4afee USB: serial: option: Add Motorola modem UARTs e480d6cf6f79 USB: serial: option: add the BroadMobi BM818 card 8175fa2987a6 USB: serial: option: Add support for ZTE MF871A afb677b29995 USB: serial: option: add D-Link DWM-222 device ID 487d66ae8f45 USB: CDC: fix sanity checks in CDC union parser c02c0249ce55 usb: cdc-acm: make sure a refcount is taken early enough f417f9715f4c usb: gadget: udc: renesas_usb3: Fix sysfs interface of "role" 7f52d6d2a82d USB: core: Fix races in character device registration and deregistraion 367d103a4a93 iio: adc: max9611: Fix temperature reading in probe dac96992f00a staging: comedi: dt3000: Fix rounding up of timer divisor 2e394bcfdcf3 staging: comedi: dt3000: Fix signed integer overflow 'divider * base' 8c7053d162d9 KVM: arm/arm64: Sync ICH_VMCR_EL2 back when about to block c8d95668c4ca arm64: KVM: regmap: Fix unexpected switch fall-through 0755b6b152cb asm-generic: fix -Wtype-limits compiler warnings 7113a1bc19fa ocfs2: remove set but not used variable 'last_hash' 01d8d08f4cd4 Revert "kmemleak: allow to coexist with fault injection" cf9a18d7bcd0 drm/exynos: fix missing decrement of retry counter c256729f2695 drm: msm: Fix add_gpu_components b4f0fee7f77c IB/mad: Fix use-after-free in ib mad completion handling a0258ff4993f IB/mlx5: Fix MR registration flow to use UMR properly efb742ce4e27 IB/core: Add mitigation for Spectre V1 4a0d2eeea27a arm64/mm: fix variable 'pud' set but not used 6af9263f685d arm64: unwind: Prohibit probing on return_address() ffb1a76d1c29 arm64/efi: fix variable 'si' set but not used 48522289bf50 kbuild: Check for unknown options with cc-option usage in Kconfig and clang b3aebdd46d63 kbuild: modpost: handle KBUILD_EXTRA_SYMBOLS only for external modules 23bc01f0d955 ata: libahci: do not complain in case of deferred probe 68340db992f6 drm/amdgpu: fix a potential information leaking bug 02d4fe0193d5 scsi: qla2xxx: Fix possible fcport null-pointer dereferences 3435e025ed71 scsi: hpsa: correct scsi command status issue after reset f833deae2a06 Btrfs: fix deadlock between fiemap and transaction commits 202aa96f052a drm/bridge: lvds-encoder: Fix build error while CONFIG_DRM_KMS_HELPER=m f69fd790edf7 libata: zpodd: Fix small read overflow in zpodd_get_mech_type() 0a19fff567a0 perf header: Fix use of unitialized value warning ab5aa579ca82 perf header: Fix divide by zero error if f_header.attr_size==0 a5e40452c916 irqchip/irq-imx-gpcv2: Forward irq type to parent dcb73180de61 irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail e72e6ba17ab4 xen/pciback: remove set but not used variable 'old_state' ca5b26a8f1d8 clk: renesas: cpg-mssr: Fix reset control race condition af2ed1a05a7a clk: sprd: Select REGMAP_MMIO to avoid compile errors 3e5f29b66675 clk: at91: generated: Truncate divisor to GENERATED_MAX_DIV + 1 28fd9b37b6bb riscv: Make __fstate_clean() work correctly. cef0e9eb2231 netfilter: ebtables: also count base chain policies 07d92caeb945 net: usb: pegasus: fix improper read if get_registers() fail f13de3d677d1 Input: iforce - add sanity checks 08b3af00a161 Input: kbtab - sanity check for endpoint type b545dc9debe6 HID: hiddev: do cleanup in failure of opening a device 0aab1a4653a6 HID: hiddev: avoid opening a disconnected device 537d957b144f HID: holtek: test for sanity of intfdata 9585f4440cec ALSA: hda - Let all conexant codec enter D3 when rebooting e58ba88d6c60 ALSA: hda - Add a generic reboot_notify 6c4a536ca97b ALSA: hda - Fix a memory leak bug 1bf5f827564c ALSA: hda - Apply workaround for another AMD chip 1022:1487 58b9f19ee438 ALSA: usb-audio: Fix an OOB bug in parse_audio_mixer_unit 46f9a1bc60a4 ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term d5bb12402805 ALSA: hda/realtek - Add quirk for HP Envy x360 61f6ecb75845 xtensa: add missing isync to the cpu_reset TLB code 7c001e5aab6d cpufreq: schedutil: Don't skip freq update when limits change 7f68aa2e3e1b Revert "pwm: Set class for exported channels in sysfs" 056368fc3ef7 mm/usercopy: use memory range to be accessed for wraparound check c8282f1b5653 mm/memcontrol.c: fix use after free in mem_cgroup_iter() 3c0cb90e9212 mm: mempolicy: handle vma with unmovable pages mapped correctly in mbind cd825d87140d mm: mempolicy: make the behavior consistent when MPOL_MF_MOVE* and MPOL_MF_STRICT were specified f0fed8283deb mm/hmm: fix bad subpage pointer in try_to_unmap_one 3858cca150c6 seq_file: fix problem when seeking mid-record 50d15197254a sh: kernel: hw_breakpoint: Fix missing break in switch statement a5aa80588fcd Linux 4.19.67 ac2951114955 iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support 6a81677a2e65 iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT on version < 41 80bac45e3ad8 iwlwifi: mvm: fix an out-of-bound access 7626b510fc77 iwlwifi: don't unmap as page memory that was mapped as single b38c56b76dcc mwifiex: fix 802.11n/WPA detection 2bc73d914114 KVM: Fix leak vCPU's VMCS value into other pCPU d1489f0b4de7 NFSv4: Fix an Oops in nfs4_do_setattr 898c19f1b4c8 smb3: send CAP_DFS capability during session setup 50831f1a2f57 SMB3: Fix deadlock in validate negotiate hits reconnect 2afa6c13e498 dax: dax_layout_busy_page() should not unmap cow pages a566750c3a78 mac80211: don't WARN on short WMM parameters from AP af9d64f871cf ALSA: hda - Workaround for crackled sound on AMD controller (1022:1457) 06f0bcaceb8c ALSA: hda - Don't override global PCM hw info flag 1c286e4e13f2 ALSA: hiface: fix multiple memory leak bugs bc972b6b52e2 ALSA: firewire: fix a memory leak bug edc388566a1d drm/i915: Fix wrong escape clock divisor init for GLK a73027204ac5 hwmon: (nct7802) Fix wrong detection of in4 presence 9ce1b3eb5489 can: peak_usb: pcan_usb_fd: Fix info-leaks to USB devices cab569a44a52 can: peak_usb: pcan_usb_pro: Fix info-leaks to USB devices d4d904e4e258 ALSA: usb-audio: fix a memory leak bug e0d262a57fc7 x86/purgatory: Do not use __builtin_memcpy and __builtin_memset 118293070096 HID: sony: Fix race condition between rumble and device remove. 5c4689cbe95a s390/dma: provide proper ARCH_ZONE_DMA_BITS value d768173982ec perf/core: Fix creating kernel counters for PMUs that override event->cpu 06dc92142b5e tty/ldsem, locking/rwsem: Add missing ACQUIRE to read_failed sleep loop 0ba69e96cc62 test_firmware: fix a memory leak bug cdd92ebe29c2 scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG b620c6d5779a scsi: ibmvfc: fix WARN_ON during event pool release f254faed4153 scsi: megaraid_sas: fix panic on loading firmware crashdump bb41940c89bd ARM: dts: bcm: bcm47094: add missing #cells for mdio-bus-mux 19e7df3e4fe7 ARM: davinci: fix sleep.S build error on ARMv4 bdce5621e6b0 nvme: fix multipath crash when ANA is deactivated b1689742ff4a ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id() 38c919ec7b30 drbd: dynamically allocate shash descriptor f4e2d182d6a6 perf probe: Avoid calling freeing routine multiple times for same pointer 101a155436fe perf tools: Fix proper buffer size for feature processing b065f404c946 ALSA: compress: Be more restrictive about when a drain is allowed 30dd700da7de ALSA: compress: Don't allow paritial drain operations on capture streams f1ea9a638770 ALSA: compress: Prevent bypasses of set_params b9e2fa1e15b7 ALSA: compress: Fix regression on compressed capture streams 77868c0003cc s390/qdio: add sanity checks to the fast-requeue path 8729fe83b0d5 cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init() 991c4756be69 drm: silence variable 'conn' set but not used ca1b1940a32a hwmon: (nct6775) Fix register address and added missed tolerance for nct6106 56dc57c705ef allocate_flower_entry: should check for null deref f4cfdd46b356 mac80211: don't warn about CW params when not using them f2fd89817212 nl80211: fix NL80211_HE_MAX_CAPABILITY_LEN 492c158ab2c0 iscsi_ibft: make ISCSI_IBFT dependson ACPI instead of ISCSI_IBFT_FIND 8d641499bf96 drm/amd/display: Increase size of audios array f9420bfa29f9 drm/amd/display: Only enable audio if speaker allocation exists 3998e684463a drm/amd/display: Fix dc_create failure handling and 666 color depths e7a8a794109c drm/amd/display: use encoder's engine id to find matched free audio device 2a5e21adc71b drm/amd/display: Wait for backlight programming completion in set backlight level 056af94d6e10 scripts/sphinx-pre-install: fix script for RHEL/CentOS 36b6458d8541 netfilter: nft_hash: fix symhash with modulus one 6f1d7f0d6689 netfilter: conntrack: always store window size un-scaled 307b6e5d90dc netfilter: Fix rpfilter dropping vrf packets by mistake 6f9dff8d1d58 vfio-ccw: Set pa_nr to 0 if memory allocation fails for pa_iova_pfn bb312b4aa8b0 netfilter: nfnetlink: avoid deadlock due to synchronous request_module f61c4d3a1f18 can: peak_usb: fix potential double kfree_skb() 0e9038a26c9b can: rcar_canfd: fix possible IRQ storm on high load 9479a0589923 usb: typec: tcpm: Ignore unsupported/unknown alternate mode requests 3f524b631db7 usb: typec: tcpm: Add NULL check before dereferencing config bbc2e8206012 usb: typec: tcpm: remove tcpm dir if no children 2ec5c9b785f4 usb: typec: tcpm: free log buf memory when remove debug file 33f2240acfa8 usb: yurex: Fix use-after-free in yurex_delete 49888a4f0ebc usb: host: xhci-rcar: Fix timeout in xhci_suspend() 21344f0575f0 gfs2: gfs2_walk_metadata fix b674f7914a64 x86/purgatory: Use CFLAGS_REMOVE rather than reset KBUILD_CFLAGS 0a9e41e27659 perf record: Fix module size on s390 f1f662894361 perf db-export: Fix thread__exec_comm() 532db2b9756a perf annotate: Fix s390 gap between kernel end and module start 46b306f3cd7b mm/vmalloc: Sync unmappings in __purge_vmap_area_lazy() 9935d7ed8406 x86/mm: Sync also unmappings in vmalloc_sync_all() dd524d488f5b x86/mm: Check for pfn instead of page in vmalloc_sync_one() b8a2169bcad8 Input: synaptics - enable RMI mode for HP Spectre X360 3d180fe5cd76 Input: elantech - enable SMBus on new (2018+) systems ce7d4fe4e52b Input: usbtouchscreen - initialize PM mutex before using it c9a1c10487b9 loop: set PF_MEMALLOC_NOIO for the worker thread d79d76f2bbb0 mmc: cavium: Add the missing dma unmap when the dma has finished. fd3f902dd1d5 mmc: cavium: Set the correct dma max segment size for mmc_host 9575ba61ba19 sound: fix a memory leak bug d397091dbac0 usb: iowarrior: fix deadlock on disconnect b43611cd762c usb: usbfs: fix double-free of usb memory upon submiturb error 6dbc3b74daeb crypto: ccp - Ignore tag length when decrypting GCM ciphertext 30692edea30d crypto: ccp - Add support for valid authsize values less than 16 1c4393df3622 crypto: ccp - Fix oops by properly managing allocated structures b9de21575a20 staging: android: ion: Bail out upon SIGKILL when allocating memory. 6b8f93b5a4f7 staging: gasket: apex: fix copy-paste typo fcab37830177 iio: adc: max9611: Fix misuse of GENMASK macro 805bd34ac269 iio: cros_ec_accel_legacy: Fix incorrect channel setting 893af1c79e42 Linux 4.19.66 48fcdaba7b0d spi: bcm2835: Fix 3-wire mode if DMA is enabled ebda41dd170f cgroup: Fix css_task_iter_advance_css_set() cset skip condition 0a9abd277819 cgroup: css_task_iter_skip()'d iterators must be advanced before accessed 4340d175b898 cgroup: Include dying leaders with live threads in PROCS iterations 370b9e6399da cgroup: Implement css_task_iter_skip() 7528e95b7519 cgroup: Call cgroup_release() before __exit_signal() e6e9bcef12ca compat_ioctl: pppoe: fix PPPOEIOCSFWD handling 473430ed6117 r8169: don't use MSI before RTL8168d 0ccf47265e4c net/mlx5e: Prevent encap flow counter update async to user query cd84a10792f0 net/mlx5: Fix modify_cq_in alignment f378724e10ce tun: mark small packets as owned by the tap sock 5295d6515485 tipc: compat: allow tipc commands without arguments eaa34bd4f7b5 ocelot: Cancel delayed work before wq destruction cd7f02fecac1 NFC: nfcmrvl: fix gpio-handling regression ce58a3655121 net/smc: do not schedule tx_work in SMC_CLOSED state 51d240a144a5 net: sched: use temporary variable for actions indexes cb20f74135df net sched: update vlan action for batched events operations d82dc254b967 net: sched: Fix a possible null-pointer dereference in dequeue_func() 44b96a38c2b5 net: qualcomm: rmnet: Fix incorrect UL checksum offload logic c8b05980c4bf net: phylink: Fix flow control for fixed-link 4dddd08b571d net/mlx5: Use reversed order when unregister devices 858f82c63667 net/mlx5e: always initialize frag->last_in_page edb7ad69c439 net: fix ifindex collision during namespace removal a19d4e34f092 net: bridge: mcast: don't delete permanent entries when fast leave is enabled 639239be11ad net: bridge: delete local fdb on device init failure b3645a487373 mvpp2: refactor MTU change code ffab47bf69df mvpp2: fix panic on module removal 3c46905fb182 mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() f186fb5ccf69 ipip: validate header length in ipip_tunnel_xmit 1bb2dd37cb87 ip6_tunnel: fix possible use-after-free on xmit fdcefa46c5c2 ip6_gre: reload ipv6h in prepare_ip6gre_xmit_ipv6 c4c8899376c2 ife: error out when nla attributes are empty 774358df88f7 bnx2x: Disable multi-cos feature. cb4626784f39 atm: iphase: Fix Spectre v1 vulnerability 8440cdc77577 IB: directly cast the sockaddr union to aockaddr 608cfdfa9eb7 HID: Add quirk for HP X1200 PIXART OEM mouse e830c2c3c174 HID: wacom: fix bit shift for Cintiq Companion 2 2364ed0d8ed1 libnvdimm/bus: Fix wait_nvdimm_bus_probe_idle() ABBA deadlock 7f000e7b4490 libnvdimm/bus: Prepare the nd_ioctl() path to be re-entrant 3248536919c1 libnvdimm/region: Register badblocks before namespaces d16bbdbbcb50 libnvdimm/bus: Prevent duplicate device_unregister() calls c23106d4276d drivers/base: Introduce kill_device() 7c43f84efd6d driver core: Establish order of operations for device_add and device_del via bitflag a152a7b411a5 gcc-9: don't warn about uninitialized variable 93d6f0841eef scsi: fcoe: Embed fc_rport_priv in fcoe_rport structure cc4c818b2219 Linux 4.19.65 7634b9cd27e8 Documentation: Add swapgs description to the Spectre v1 documentation b88241aef6f1 x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS 931b6bfe8af1 x86/entry/64: Use JMP instead of JMPQ 23e7a7b3a75f x86/speculation: Enable Spectre v1 swapgs mitigations befb822c062b x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations b5dd7f61fce4 x86/cpufeatures: Combine word 11 and 12 into a new scattered features word 16ad0b63f382 x86/cpufeatures: Carve out CQM features retrieval 9e034c61951a scsi: mpt3sas: Use 63-bit DMA addressing on SAS35 HBA 3732a473be54 x86/vdso: Prevent segfaults due to hoisted vclock reads 8320768d26aa gcc-9: properly declare the {pv,hv}clock_page storage 354887ae3168 objtool: Support GCC 9 cold subfunction naming scheme 89f3896b658b ARC: enable uboot support unconditionally 8dd376273fb4 eeprom: at24: make spd world-readable again a7340d31abac drm/i915/gvt: fix incorrect cache entry for guest page mapping a1c020ce2669 IB/hfi1: Check for error on call to alloc_rsm_map_table e9cd4962a85b IB/mlx5: Fix RSS Toeplitz setup to be aligned with the HW specification 924308d2a6ea IB/mlx5: Fix clean_mr() to work in the expected order 7e5ce9f3943c IB/mlx5: Move MRs to a kernel PD when freeing them to the MR cache 3cfa1087a172 IB/mlx5: Use direct mkey destroy command upon UMR unreg failure 41be1928053a IB/mlx5: Fix unreg_umr to ignore the mkey state 04fdca1f2f65 xen/swiotlb: fix condition for calling xen_destroy_contiguous_region() eb828241b491 nbd: replace kill_bdev() with __invalidate_device() again 8dfef0f442c7 arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG} 2bddc985656a arm64: compat: Allow single-byte watchpoints on all addresses c385cda0e70a drivers/perf: arm_pmu: Fix failure path in PM notifier 5f80ac50b98c parisc: Fix build of compressed kernel even with debug enabled 001f93d95d6c cgroup: kselftest: relax fs_spec checks 6cb9e0d9ad3e s390/dasd: fix endless loop after read unit address configuration beb0cc781b8e mm: vmscan: check if mem cgroup is disabled or not before calling memcg slab shrinker 72651bbdf3d5 ALSA: hda: Fix 1-minute detection delay when i915 module is not available 46650ac2e1d8 selinux: fix memory leak in policydb_init() e7bb4c81b3c7 mtd: rawnand: micron: handle on-die "ECC-off" devices correctly fafaeae4d356 IB/hfi1: Fix Spectre v1 vulnerability fdb0fb56addb gpiolib: fix incorrect IRQ requesting of an active-low lineevent 7e3efb655012 mmc: meson-mx-sdio: Fix misuse of GENMASK macro 29841b5c6ab1 mmc: dw_mmc: Fix occasional hang after tuning on eMMC 50d700408a00 Btrfs: fix race leading to fs corruption after transaction abort 009d7a4eb329 Btrfs: fix incremental send failure after deduplication 4c5a442561e8 kbuild: initialize CLANG_FLAGS correctly in the top Makefile 3736612d2582 kconfig: Clear "written" flag to avoid data loss 4c6500b5328f drm/nouveau: fix memory leak in nouveau_conn_reset() 84ce045222e9 x86, boot: Remove multiple copy of static function sanitize_boot_params() 740e0167a382 x86/paravirt: Fix callee-saved function ELF sizes ba5c072fbf8b x86/kvm: Don't call kvm_spurious_fault() from .fixup 11cb9f8700c9 xen/pv: Fix a boot up hang revealed by int3 self test d3e36788d9be mlxsw: spectrum_dcb: Configure DSCP map as the last rule is removed 48c5c4f0a47f ipc/mqueue.c: only perform resource calculation if user valid f87314225294 drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings 35ee8b844845 uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers dea2ee496a85 coda: fix build using bare-metal toolchain cf3ddc00a47d coda: add error handling for fget 93b83005ea87 lib/test_string.c: avoid masking memset16/32/64 failures 8e087a2abaf8 lib/test_overflow.c: avoid tainting the kernel and fix wrap size 439c79ed7718 mm/cma.c: fail if fixed declaration can't be honored 1b84e67496d3 x86: math-emu: Hide clang warnings for 16-bit overflow 242666b2b7e2 x86/apic: Silence -Wtype-limits compiler warnings ade866ad5aed be2net: Signal that the device cannot transmit during reconfiguration c0cca0e97ce4 ACPI: fix false-positive -Wuninitialized warning 80f58147da0f x86: kvm: avoid constant-conversion warning d60e8c0cbccb perf version: Fix segfault due to missing OPT_END() abfe761a5358 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized d5568763dd1d ACPI: blacklist: fix clang warning for unused DMI table c47e25526071 ceph: return -ERANGE if virtual xattr value didn't fit in buffer b39c377ea08f ceph: fix improper use of smp_mb__before_atomic() d29fbf677963 cifs: Fix a race condition with cifs_echo_request f96c70fa810d btrfs: qgroup: Don't hold qgroup_ioctl_lock in btrfs_qgroup_inherit() d9245dabfce1 btrfs: fix minimum number of chunk errors for DUP e7fcc587e076 clk: sprd: Add check for return value of sprd_clk_regmap_init() a093208b4c73 fs/adfs: super: fix use-after-free bug 85d854b42113 clk: tegra210: fix PLLU and PLLU_OUT1 cf0fcc7fe200 dmaengine: rcar-dmac: Reject zero-length slave DMA requests a3524486535a MIPS: lantiq: Fix bitfield masking cdee3f53510a firmware/psci: psci_checker: Park kthreads before stopping them 09ec6c6783ff kernel/module.c: Only return -EEXIST for modules that have finished loading fd53e45a11e9 arm64: dts: rockchip: fix isp iommu clocks and power domain d8388cbd4327 dmaengine: tegra-apb: Error out if DMA_PREP_INTERRUPT flag is unset f486088d38ec ftrace: Enable trampoline when rec count returns back to one ea26b427cb91 ARM: dts: rockchip: Mark that the rk3288 timer might stop in suspend 22befe671728 ARM: dts: rockchip: Make rk3288-veyron-mickey's emmc work again 8c5a33d34be6 ARM: dts: rockchip: Make rk3288-veyron-minnie run at hs200 3c1d1bad8a57 ARM: riscpc: fix DMA b3060a1a313f Linux 4.19.64 4736bb277744 ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL 475f7781a804 scsi: core: Avoid that a kernel warning appears during system resume c58a6507363b block, scsi: Change the preempt-only flag into a counter 9b17512d9165 ceph: hold i_ceph_lock when removing caps for freeing inode b6c3b6a2c662 Fix allyesconfig output. 135e7737e21f drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl 54695343b491 /proc//cmdline: add back the setproctitle() special case 54ffaa53e785 /proc//cmdline: remove all the special cases a5a3915f17ab sched/fair: Use RCU accessors consistently for ->numa_group 48046e092ad5 sched/fair: Don't free p->numa_faults with concurrent readers 02cdc166128c vhost: scsi: add weight support 239910101c4e vhost: vsock: add weight support 3af3b843aee4 vhost_net: fix possible infinite loop ad5fc8953d61 vhost: introduce vhost_exceeds_weight() 56966212e23f Bluetooth: hci_uart: check for missing tty operations 3a0c22cbc5d0 iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA 4fd0eb60bad1 iommu/vt-d: Don't queue_iova() if there is no flush queue b3836af8560e media: radio-raremono: change devm_k*alloc to k*alloc afb5340f9438 NFS: Cleanup if nfs_match_client is interrupted 8edcabb2c2e9 media: pvrusb2: use a different format for warnings 8b44cc225e60 media: cpia2_usb: first wake up, then free in disconnect 693019ee7d98 ath10k: Change the warning message string 3cf6a0707088 media: au0828: fix null dereference in error path f13ee5ae0b2f ISDN: hfcsusb: checking idx of ep configuration 22068d49d09d binder: fix possible UAF when freeing buffer ba2c247a4515 arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ b544a6855dfb usb: dwc2: Fix disable all EP's on disconnect ec58bfa2d412 usb: dwc2: Disable all EP's on disconnect 9e441c7844a6 NFSv4: Fix lookup revalidate of regular files 24acd93f5995 NFS: Refactor nfs_lookup_revalidate() 01eea1cbba9d NFS: Fix dentry revalidation on NFSv4 lookup 8a474bc4e613 vsock: correct removal of socket from the list 9d3586bcdae3 hv_sock: Add support for delayed close 9a9de33a9dfa Linux 4.19.63 408af82309a7 access: avoid the RCU grace period for the temporary subjective credentials 1a547d24ec8a libnvdimm/bus: Stop holding nvdimm_bus_list_mutex over __nd_ioctl() b993a66d8ddc powerpc/tm: Fix oops on sigreturn on systems without TM b9310c56fcfb powerpc/xive: Fix loop exit-condition in xive_find_target_in_mask() c219444254cf ALSA: hda - Add a conexant codec entry to let mute led work 491483ed70f1 ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1 602744097b2e ALSA: ac97: Fix double free of ac97_codec_device 9845fb5a3f90 hpet: Fix division by zero in hpet_time_div() e4c91583b39c mei: me: add mule creek canyon (EHL) device ids 3d0a6926e610 fpga-manager: altera-ps-spi: Fix build error e907b1314481 binder: prevent transactions to context manager from its own process. 7d20e3ba7072 x86/speculation/mds: Apply more accurate check on hypervisor platform 5e87e8b4dc0c x86/sysfb_efi: Add quirks for some devices with swapped width and height e3dc9ea5464e btrfs: inode: Don't compress if NODATASUM or NODATACOW set 1f37bec82f41 usb: pci-quirks: Correct AMD PLL quirk detection 41d3dbb931c0 usb: wusbcore: fix unbalanced get/put cluster_id 148959cc64e1 locking/lockdep: Hide unused 'class' variable b07687243d4a mm: use down_read_killable for locking mmap_sem in access_remote_vm 4acb04ef5e42 locking/lockdep: Fix lock used or unused stats error af0883f9dcf6 proc: use down_read_killable mmap_sem for /proc/pid/maps 0d72bb853afc cxgb4: reduce kernel stack usage in cudbg_collect_mem_region() 6ecdcbcd3091 proc: use down_read_killable mmap_sem for /proc/pid/map_files 3d617da8a956 proc: use down_read_killable mmap_sem for /proc/pid/clear_refs 42beb7b3d446 proc: use down_read_killable mmap_sem for /proc/pid/pagemap 1b3042d0d32b proc: use down_read_killable mmap_sem for /proc/pid/smaps_rollup a8c568fc4832 mm/mmu_notifier: use hlist_add_head_rcu() 3062448e3ee2 memcg, fsnotify: no oom-kill for remote memcg charging 041b127df733 mm/gup.c: remove some BUG_ONs from get_gate_page() fa099d6ddf68 mm/gup.c: mark undo_dev_pagemap as __maybe_unused 8be4a30e2d34 9p: pass the correct prototype to read_cache_page 071f2135cfec mm/kmemleak.c: fix check for softirq context 7bd5902a1e18 sh: prevent warnings when using iounmap af50d6a1c245 block/bio-integrity: fix a memory leak bug 7f775a67abe4 powerpc/eeh: Handle hugepages in ioremap space e7a41b276974 dlm: check if workqueues are NULL before flushing/destroying 5d59e28c3d1b mailbox: handle failed named mailbox channel request 2140a6b03a61 f2fs: avoid out-of-range memory access 8a1a3d383923 block: init flush rq ref count to 1 4b9dc73a0d4a powerpc/boot: add {get, put}_unaligned_be32 to xz_config.h 549f726fb094 PCI: dwc: pci-dra7xx: Fix compilation when !CONFIG_GPIOLIB 367cc371a8e3 RDMA/rxe: Fill in wc byte_len with IB_WC_RECV_RDMA_WITH_IMM 4fe7ea29e4a6 perf hists browser: Fix potential NULL pointer dereference found by the smatch tool 915945f3bdc2 perf annotate: Fix dereferencing freed memory found by the smatch tool b305dcff1518 perf session: Fix potential NULL pointer dereference found by the smatch tool 19cf571c64b7 perf top: Fix potential NULL pointer dereference detected by the smatch tool 995527db41f6 perf stat: Fix use-after-freed pointer detected by the smatch tool 3b8c4eae5541 perf test mmap-thread-lookup: Initialize variable to suppress memory sanitizer warning dd0a0c72a10f PCI: mobiveil: Use the 1st inbound window for MEM inbound transactions 270972df68fb PCI: mobiveil: Initialize Primary/Secondary/Subordinate bus numbers 9eb4f2886db3 kallsyms: exclude kasan local symbols on s390 4613f46ef472 PCI: mobiveil: Fix the Class Code field 51308ec525cc PCI: mobiveil: Fix PCI base address in MEM/IO outbound windows 05959ed85e34 arm64: assembler: Switch ESB-instruction with a vanilla nop if !ARM64_HAS_RAS 007b01a27d4d IB/ipoib: Add child to parent list only if device initialized d48720bafd90 powerpc/mm: Handle page table allocation failures f14537bb81d1 IB/mlx5: Fixed reporting counters on 2nd port for Dual port RoCE d03aeb8d6b98 serial: sh-sci: Fix TX DMA buffer flushing and workqueue races 48c73b8ee5c9 serial: sh-sci: Terminate TX DMA during buffer flushing ca730bf0cd67 RDMA/i40iw: Set queue pair state when being queried 52373ab6a6c7 powerpc/4xx/uic: clear pending interrupt after irq type/pol change 74520144700d um: Silence lockdep complaint about mmap_sem 30edc7c1fed5 mm/swap: fix release_pages() when releasing devmap pages b4e77006d5a7 mfd: hi655x-pmic: Fix missing return value check for devm_regmap_init_mmio_clk 9b1691c3f660 mfd: arizona: Fix undefined behavior d9c74176c275 mfd: core: Set fwnode for created devices 7b24a4a363a9 mfd: madera: Add missing of table registration e00cf1dac30c recordmcount: Fix spurious mcount entries on powerpc 9fac39480e39 powerpc/xmon: Fix disabling tracing while in xmon a80f67d5560c powerpc/cacheflush: fix variable set but not used b150423e0d5e iio: iio-utils: Fix possible incorrect mask calculation fc9c15c4e3ff PCI: xilinx-nwl: Fix Multi MSI data programming e3e2bb12c8a7 genksyms: Teach parser about 128-bit built-in types 27f2335e1440 kbuild: Add -Werror=unknown-warning-option to CLANG_FLAGS 1fa94381fdeb i2c: stm32f7: fix the get_irq error cases f930727faef2 PCI: sysfs: Ignore lockdep for remove attribute 9d45fbee76af serial: mctrl_gpio: Check if GPIO property exisits before requesting it e7f206f42fb6 drm/msm: Depopulate platform on probe failure 216462fa884f powerpc/pci/of: Fix OF flags parsing for 64bit BARs 5d3ad905af43 mmc: sdhci: sdhci-pci-o2micro: Check if controller supports 8-bit width bf7cf9fb02db usb: gadget: Zero ffs_io_data ac380eb479de tty: serial_core: Set port active bit in uart_port_activate 785e11c06db3 serial: imx: fix locking in set_termios() 741f8b39b6d4 drm/rockchip: Properly adjust to a true clock in adjusted_mode fd0d171c7064 powerpc/pseries/mobility: prevent cpu hotplug during DT update 6a7047471073 drm/amd/display: fix compilation error 709ca46f1d46 phy: renesas: rcar-gen2: Fix memory leak at error paths 725c7b781150 drm/virtio: Add memory barriers for capset cache. 11b4e9f3695c drm/amd/display: Always allocate initial connector state state 1a2425b597fa serial: 8250: Fix TX interrupt handling condition a0e7d6b7fa55 tty: serial: msm_serial: avoid system lockup condition e40f5a873fc7 tty/serial: digicolor: Fix digicolor-usart already registered warning 5c0e54839d48 memstick: Fix error cleanup path of memstick_init 0a50a272389f drm/crc-debugfs: Also sprinkle irqrestore over early exits 26a66454541c drm/crc-debugfs: User irqsafe spinlock in drm_crtc_add_crc_entry 4d14323a2eb5 gpu: host1x: Increase maximum DMA segment size f9bfd6bd8223 drm/bridge: sii902x: pixel clock unit is 10kHz instead of 1kHz 7af9abd7d6bd drm/bridge: tc358767: read display_props in get_modes() 49c7230d8f10 PCI: Return error if cannot probe VF 2a18d76592e0 drm/edid: Fix a missing-check bug in drm_load_edid_firmware() 210dfe630911 drm/amdkfd: Fix sdma queue map issue db64bc139440 drm/amdkfd: Fix a potential memory leak 6b1d2871fe36 drm/amd/display: Disable ABM before destroy ABM struct c242a531bb06 drm/amdgpu/sriov: Need to initialize the HDP_NONSURFACE_BAStE 147137f86b5b drm/amd/display: Fill prescale_params->scale for RGB565 08b0bcc8076b tty: serial: cpm_uart - fix init when SMC is relocated c901780d9294 pinctrl: rockchip: fix leaked of_node references a9dfb6e43677 tty: max310x: Fix invalid baudrate divisors calculator b0084c1b5058 usb: core: hub: Disable hub-initiated U1/U2 19755a124f4c staging: vt6656: use meaningful error code during buffer allocation b59f7650a507 iio: adc: stm32-dfsdm: missing error case during probe 302e4cdca1f4 iio: adc: stm32-dfsdm: manage the get_irq error case 586946ce83e4 drm/panel: simple: Fix panel_simple_dsi_probe 49fb03de361d hvsock: fix epollout hang from race condition 64f4694072aa Linux 4.19.62 60e9babfda94 net: sched: verify that q!=NULL before setting q->flags c1d98b766ebe mm: vmscan: scan anonymous pages on file refaults 7560e33369ed KVM: nVMX: Clear pending KVM_REQ_GET_VMCS12_PAGES when leaving nested 967bc679c596 KVM: nVMX: do not use dangling shadow VMCS after guest reset 3a17ca864baf ext4: allow directory holes caa4e08253eb ext4: use jbd2_inode dirty range scoping af3812b65c37 jbd2: introduce jbd2_inode dirty range scoping 4becd6c11e9a mm: add filemap_fdatawait_range_keep_errors() c9ea4620a37f ext4: enforce the immutable flag on open files 29171e82348c ext4: don't allow any modifications to an immutable file 4a5cc64d8a8a perf/core: Fix race between close() and fork() 75100ec5f079 perf/core: Fix exclusive events' grouping 0e6ef184315d MIPS: lb60: Fix pin mappings dd5994ab1f00 gpio: davinci: silence error prints in case of EPROBE_DEFER c947cf3e9583 dma-buf: Discard old fence_excl on retrying get_fences_rcu for realloc 95ee55cab118 dma-buf: balance refcount inbalance b72fb8dec183 net: bridge: stp: don't cache eth dest pointer before skb pull 78701843ecc4 net: bridge: don't cache ether dest pointer on input 41a8df71809e net: bridge: mcast: fix stale ipv6 hdr pointer when handling v6 query caf4488fc06e net: bridge: mcast: fix stale nsrcs pointer in igmp3/mld2 report handling bc9a2f36a7d6 sctp: not bind the socket in sctp_connect fde351aeff4a net/tls: make sure offload also gets the keys wiped d9571a9f5ec1 net_sched: unset TCQ_F_CAN_BYPASS when adding filters 69cd58454615 netrom: hold sock when setting skb->destructor dc59a2abd33e netrom: fix a memory leak in nr_rx_frame() 0c5cb5a12623 macsec: fix checksumming after decryption 21252f49cddf macsec: fix use-after-free of skb during RX a8ba53da071e net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn a2aa162a6331 vrf: make sure skb->data contains ip header to make routing 1b200acde418 tcp: Reset bytes_acked and bytes_received when disconnecting c60f57dfe995 tcp: fix tcp_set_congestion_control() use from bpf hook 6323c238bb43 tcp: be more careful in tcp_fragment() b640ade07295 sky2: Disable MSI on ASUS P6T d9ee5afd9165 sctp: fix error handling on stream scheduler initialization bfa7913575b7 rxrpc: Fix send on a connected, but unbound socket 3e4e6b71ece0 r8169: fix issue with confused RX unit after PHY power-down on RTL8411b 97739e5c9e73 nfc: fix potential illegal memory access f47f68cc9d33 net: stmmac: Re-work the queue selection for TSO packets 201d7d62a82a net: phy: sfp: hwmon: Fix scaling of RX power c60bce64615d net: openvswitch: fix csum updates for MPLS actions 257441a07201 net: neigh: fix multiple neigh timer scheduling 832d0ea751a8 net: make skb_dst_force return true when dst is refcounted 6ab30a4cc5c6 net: dsa: mv88e6xxx: wait after reset deactivation 5832ef4afd90 net: bcmgenet: use promisc for unsupported filters c0f4a6447977 ipv6: Unlink sibling route in case of failure 0bd84505f16f ipv6: rt6_check should return NULL if 'from' is NULL 47ce442783d7 ipv4: don't set IPv6 only flags to IPv4 addresses aee5dd00341b igmp: fix memory leak in igmpv3_del_delrec() 9770fe1b202f hv_netvsc: Fix extra rcu_read_unlock in netvsc_recv_callback() d7cdac6dc418 caif-hsi: fix possible deadlock in cfhsi_exit_module() 8fb37be12046 bnx2x: Prevent load reordering in tx completion processing 7250956f6eaf Linux 4.19.61 025eb12bb4b0 dm bufio: fix deadlock with loop device 404f59e265ac dt-bindings: allow up to four clocks for orion-mdio 03e6a668ea1f net: mvmdio: allow up to four clocks to be specified for orion-mdio dd87cc633ba5 blkcg: update blkcg_print_stat() to handle larger outputs 73efdc5d7d3b blk-iolatency: clear use_delay when io.latency is set to zero 1ab644bd02ab blk-throttle: fix zero wait time for iops throttled group 91da712ff592 usb: Handle USB3 remote wakeup for LPM enabled devices correctly 152ddf9f0458 Bluetooth: Add SMP workaround Microsoft Surface Precision Mouse bug 98318cd31b95 intel_th: msu: Fix single mode with disabled IOMMU d6328d7c1a71 mtd: spinand: read returns badly if the last page has bitflips 94f1db42a968 mtd: rawnand: mtk: Correct low level time calculation of r/w cycle 30c6b34759f6 eCryptfs: fix a couple type promotion bugs 92e23f5fc049 mmc: sdhci-msm: fix mutex while in spinlock 01982f7bcc9d powerpc/pseries: Fix oops in hotplug memory notifier e725502b8548 powerpc/powernv/npu: Fix reference leak 1e3b61cbc30d powerpc/watchpoint: Restore NV GPRs while returning from exception 237ac0d73b55 powerpc/32s: fix suspend/resume when IBATs 4-7 are used 7961981718d6 parisc: Fix kernel panic due invalid values in IAOQ0 or IAOQ1 a6a0daa775e8 parisc: Ensure userspace privilege for ptraced processes in regset functions ef5c2e165ab0 crypto: caam - limit output IV to CBC to work around CTR mode DMA issue 376b80276d84 gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM ef30c0739439 xfs: abort unaligned nowait directio early 669c867972c0 xfs: serialize unaligned dio writes against all other dio writes d61d885b17b0 xfs: fix reporting supported extra file attributes for statx() f614ef7a34b0 xfs: reserve blocks for ifree transaction during log recovery 424543a53ae0 xfs: don't ever put nlink > 0 inodes on the unlinked list 3a895cc066c0 xfs: rename m_inotbt_nores to m_finobt_nores 2ab62234e823 xfs: don't overflow xattr listent buffer 1dc8b13cc66d xfs: flush removing page cache in xfs_reflink_remap_prep 788920d12b95 xfs: fix pagecache truncation prior to reflink 41f64437f030 include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures afa3e571cde3 coda: pass the host file in vma->vm_file on mmap 2c0222b48e77 libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields 656d06dab4d6 HID: wacom: correct touch resolution x/y typo 1c871b4006b2 HID: wacom: generic: Correct pad syncing 46f71a15abe7 HID: wacom: generic: only switch the mode on devices with LEDs cb4c2b94f629 IB/mlx5: Report correctly tag matching rendezvous capability 4bd953241d81 Btrfs: add missing inode version, ctime and mtime updates when punching hole fffedf5cf67e Btrfs: fix fsync not persisting dentry deletions due to inode evictions 110850fffeb0 Btrfs: fix data loss after inode eviction, renaming it, and fsync it 6b71c62ea9da PCI: qcom: Ensure that PERST is asserted for at least 100 ms 529e71cae929 PCI: Do not poll for PME if the device is in D3cold 4d8504004c86 PCI: hv: Fix a use-after-free bug in hv_eject_device_work() f0ff76a42ef5 intel_th: pci: Add Ice Lake NNPI support 66a13b5e4e9c drm/edid: parse CEA blocks embedded in DisplayID 9854e06842bc perf/x86/amd/uncore: Set the thread mask for F17h L3 PMCs 82c46f7b0918 perf/x86/amd/uncore: Do not set 'ThreadMask' and 'SliceMask' for non-L3 PMCs a847a5225432 perf/x86/intel: Fix spurious NMI on fixed counter 0d4c0bb70665 x86/boot: Fix memory leak in default_get_smp_config() b52807e607f1 9p/virtio: Add cleanup path in p9_virtio_init 1253882d64d0 9p/xen: Add cleanup path in p9_trans_xen_init 007e5aaf287c xen/events: fix binding user event channels to cpus e380170b3b3a dm zoned: fix zone state management race 1e4247d7958b padata: use smp_mb in padata_reorder to avoid orphaned padata jobs 0489d808a5f2 drm/nouveau/i2c: Enable i2c pads & busses during preinit c77cbc873586 kconfig: fix missing choice values in auto.conf 2c7b50c7b1d0 fs/proc/proc_sysctl.c: fix the default values of i_uid/i_gid on /proc/sys inodes. ba271659ad42 arm64: tegra: Fix AGIC register range ba27a25df6df KVM: x86/vPMU: refine kvm_pmu err msg when event creation failed 87bae91a0fe9 media: videobuf2-dma-sg: Prevent size from overflowing cb2e2b0ae554 media: videobuf2-core: Prevent size alignment wrapping buffer size to 0 deb78bd24e0c media: coda: Remove unbalanced and unneeded mutex unlock fc0232e24541 media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom() a4c4c06f1755 ALSA: hda/realtek: apply ALC891 headset fixup to one Dell machine 8ba78e4d564e ALSA: hda/realtek - Fixed Headphone Mic can't record on Dell platform c92212a81617 ALSA: seq: Break too long mutex context in the write loop eb6c84e4b4f2 raid5-cache: Need to do start() part job after adding journal device 3f42c0000b23 ASoC: dapm: Adapt for debugfs API change 677b2aa3be5c lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE 0b174bac4e43 pnfs: Fix a problem where we gratuitously start doing I/O through the MDS f64ff5914f00 pNFS: Fix a typo in pnfs_update_layout 603e7497bf27 pnfs/flexfiles: Fix PTR_ERR() dereferences in ff_layout_track_ds_error 5347e61954fc NFSv4: Handle the special Linux file open access mode 6825ff011c7c iwlwifi: fix RF-Kill interrupt while FW load for gen2 devices a32e2ceca0ef iwlwifi: don't WARN when calling iwl_get_shared_mem_conf with RF-Kill d9ce0788da91 iwlwifi: pcie: fix ALIVE interrupt handling for gen2 devices w/o MSI-X 04c52c105a38 iwlwifi: pcie: don't service an interrupt that was masked 7ebddd5fe217 arm64: tegra: Update Jetson TX1 GPU regulator timings 042451b921b1 regulator: s2mps11: Fix buck7 and buck8 wrong voltages 8da63aa46e26 Input: alps - fix a mismatch between a condition check and its comment 81368a9a98d9 Input: synaptics - whitelist Lenovo T580 SMBus intertouch cfb9250619c8 Input: alps - don't handle ALPS cs19 trackpoint-only device d657077eda7b Input: gtco - bounds check collection indent level f11ba9df8eed bcache: destroy dc->writeback_write_wq if failed to create dc->writeback_thread 2ab14861d2eb bcache: fix mistaken sysfs entry for io_error counter 3c466df8fc59 bcache: ignore read-ahead request failure on backing device 4fc48cd21a31 bcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free" ab966241d59a bcache: Revert "bcache: fix high CPU occupancy during journal" 58169c189bd6 Revert "bcache: set CACHE_SET_IO_DISABLE in bch_cached_dev_error()" c3b7d27f3746 crypto: crypto4xx - fix a potential double free in ppc4xx_trng_probe a9fd1795fee6 crypto: ccp/gcm - use const time tag comparison. 561c4424f1e3 crypto: ccp - memset structure fields to zero before reuse 13805a5df489 crypto: crypto4xx - block ciphers should only accept complete blocks 17e63172d536 crypto: crypto4xx - fix blocksize for cfb and ofb 4598094d24c7 crypto: crypto4xx - fix AES CTR blocksize value 1c9b0a766513 crypto: chacha20poly1305 - fix atomic sleep when using async algorithm eb99c084da28 crypto: arm64/sha2-ce - correct digest for empty data in finup 4230e09e61e6 crypto: arm64/sha1-ce - correct digest for empty data in finup 52f07c1ac70e crypto: ccp - Validate the the error value used to index error messages bed97f646997 crypto: ghash - fix unaligned memory access in ghash_setkey() ce7ec07abaf7 scsi: mac_scsi: Fix pseudo DMA implementation, take 2 de769c762626 scsi: mac_scsi: Increase PIO/PDMA transfer length threshold 3e9534fa5046 scsi: megaraid_sas: Fix calculation of target ID 1334a3e2d6d0 scsi: core: Fix race on creating sense cache 58f59f6072ab Revert "scsi: ncr5380: Increase register polling limit" 7cfded7a705c scsi: NCR5380: Always re-enable reselection interrupt d91baba81a6e scsi: NCR5380: Reduce goto statements in NCR5380_select() e73db096691e xen: let alloc_xenballooned_pages() fail if not enough memory free ff54c44f1038 floppy: fix out-of-bounds read in copy_buffer a9444d9d0f6f floppy: fix invalid pointer dereference in drive_name 5b565f3276f3 floppy: fix out-of-bounds read in next_valid_format 6e34fd07484a floppy: fix div-by-zero in setup_format_params 7c16c5eae41a iavf: fix dereference of null rx_buffer pointer e9896b29d010 net: mvmdio: defer probe of orion-mdio if a clock is not ready 5f6c5f5ae25e gtp: fix use-after-free in gtp_newlink() 141222216438 gtp: fix use-after-free in gtp_encap_destroy() 0a5eca2c949c gtp: fix Illegal context switch in RCU read-side critical section. e117a04133c6 gtp: fix suspicious RCU usage 202de90df2b7 Bluetooth: validate BLE connection interval updates ca33af18b5fc gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable() 0fdb922d0ef0 Bluetooth: Check state in l2cap_disconnect_rsp 3b57b7a3a82a perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64 c814f618b799 Bluetooth: 6lowpan: search for destination address in all peers c82c4910e9e6 Bluetooth: Add new 13d3:3501 QCA_ROME device 1cbce19bd697 Bluetooth: Add new 13d3:3491 QCA_ROME device 578658df21d5 Bluetooth: hci_bcsp: Fix memory leak in rx_skb 9d47bd217539 tools: bpftool: Fix json dump crash on powerpc 2ad04d31bb3e gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants 157d1c7a1a00 bonding: validate ip header before check IPPROTO_IGMP 88f751b066f2 selftests: bpf: fix inlines in test_lwt_seg6local ef5b204336b3 bpf, libbpf, smatch: Fix potential NULL pointer dereference 0f2f2cebe64d rxrpc: Fix oops in tracepoint ca37b9a74689 net: usb: asix: init MAC address buffers 51216937c319 bnx2x: Prevent ptp_task to be rescheduled indefinitely e358d2ab42f8 perf stat: Fix group lookup for metric group a64e018be77a perf stat: Make metric event lookup more robust 7343178ccf7d bpf: fix uapi bpf_prog_info fields alignment af3790a46a55 iwlwifi: mvm: Drop large non sta frames 036184af23e0 igb: clear out skb->tstamp after reading the txtime 0024b12b776c net: mvpp2: prs: Don't override the sign bit in SRAM parser shift 05592b9b7f25 ath10k: destroy sdio workqueue while remove sdio module 26d86b29e806 net: hns3: add some error checking in hclge_tm module ddfdbcccd71a net: hns3: fix a -Wformat-nonliteral compile warning 95d084809495 bcache: fix potential deadlock in cached_def_free() 4b7758e9c4ed bcache: check c->gc_thread by IS_ERR_OR_NULL in cache_set_flush() 81b88c05bc45 bcache: acquire bch_register_lock later in cached_dev_free() d81080a0bcf8 bcache: check CACHE_SET_IO_DISABLE bit in bch_journal() 57cfb755c356 bcache: check CACHE_SET_IO_DISABLE in allocator code e78d1d234469 EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec e54cc89e6f0a wil6210: drop old event after wmi_call timeout 0388597d0627 crypto: asymmetric_keys - select CRYPTO_HASH where needed 1dea395c9e12 crypto: serpent - mark __serpent_setkey_sbox noinline b346070c72cd ixgbe: Check DDM existence in transceiver before access 0340c621eca8 rslib: Fix handling of of caller provided syndrome 8ba93c59441a rslib: Fix decoding of shortened codes dad0b17e4a4e xsk: Properly terminate assignment in xskq_produce_flush_desc e69fac59c493 clocksource/drivers/exynos_mct: Increase priority over ARM arch timer 12e20eca894b libata: don't request sense data on !ZAC ATA devices 6e6bc34f8570 ASoC: Intel: hdac_hdmi: Set ops to NULL on remove 1182ff224847 perf tools: Increase MAX_NR_CPUS and MAX_CACHES 7201cc227d4a ath10k: fix PCIE device wake up failed 8a808fadc9f7 ath10k: add missing error handling fe2ceeb4cffc ipvs: fix tinfo memory leak in start_sync_thread 20de38d282b3 mt7601u: fix possible memory leak when the device is disconnected 033577880135 x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c 3f7952b275c8 mt7601u: do not schedule rx_tasklet when the device has been disconnected 6f6e126e1995 rtlwifi: rtl8192cu: fix error handle when usb probe failed 41864adfee2e net: stmmac: sun8i: force select external PHY when no internal one bce037abc29f media: hdpvr: fix locking and a missing msleep 43b9fdc48377 media: vimc: cap: check v4l2_fill_pixfmt return value d562537dbf0d media: coda: increment sequence offset for the last returned frame 3697c12c4425 media: coda: fix last buffer handling in V4L2_ENC_CMD_STOP 6fd3e9f65db9 media: coda: fix mpeg2 sequence number handling c647c00f28af acpi/arm64: ignore 5.1 FADTs that are reported as 5.0 b9f547b7bdd9 timer_list: Guard procfs specific code d86c0b73f75b ntp: Limit TAI-UTC offset 8d8f0b9009d0 media: i2c: fix warning same module names 6439110fbeee media: s5p-mfc: Make additional clocks optional 57de3c78f0b7 ipvs: defer hook registration to avoid leaks 06a3cd416224 ipsec: select crypto ciphers for xfrm_algo 723ba7938492 arm64: Do not enable IRQs for ct_user_exit 010bfbc93424 lightnvm: pblk: fix freeing of merged pages 762bba1b7ee7 nvme-pci: set the errno on ctrl state change error c876a66553d7 nvme-pci: properly report state change failure in nvme_reset_work f0c83dd15ee1 nvme: fix possible io failures when removing multipathed ns 10cc3a65a55b EDAC/sysfs: Fix memory leak when creating a csrow object f6502ce4f050 ACPICA: Clear status of GPEs on first direct enable 3ae98dc2db1e blk-iolatency: only account submitted bios a952f7c384aa x86/cacheinfo: Fix a -Wtype-limits warning 3252b29ea41b ipoib: correcly show a VF hardware address 0e2af9b06c00 vhost_net: disable zerocopy by default 4c57957ed6c8 perf evsel: Make perf_evsel__name() accept a NULL argument 9e0bcb59b6c0 x86/atomic: Fix smp_mb__{before,after}_atomic() dd0260fd1e3a perf/x86/intel/uncore: Handle invalid event coding for free-running counter 7fc96cd2b0de sched/fair: Fix "runnable_avg_yN_inv" not used warnings d8b7db6c5004 sched/core: Add __sched tag for io_schedule() 930655b01367 xfrm: fix sa selector validation b7d66bbc8ad3 blkcg, writeback: dead memcgs shouldn't contribute to writeback ownership arbitration c8f75e753784 block: null_blk: fix race condition for null_del_dev 1a3706d8f800 net: hns3: fix for skb leak when doing selftest 6a47a42f51cf qed: iWARP - Fix tc for MPA ll2 connection 670fb965da03 x86/cpufeatures: Add FDP_EXCPTN_ONLY and ZERO_FCS_FDS 366ae49ed78c rcu: Force inlining of rcu_read_lock() 1fb3ce14f28d ASoC: meson: axg-tdm: fix sample clock inversion 32df4043aed4 x86/cpu: Add Ice Lake NNPI to Intel family 914026d58100 selinux: fix empty write to keycreate file 10e3788e6575 media: s5p-mfc: fix reading min scratch buffer size on MFC v6/v7 7c10f8941b95 bpf: silence warning messages in core b01bf44c363d regmap: fix bulk writes on paged registers 544cd592ca72 gpio: omap: ensure irq is enabled before wakeup ddeef7a00050 gpio: omap: fix lack of irqstatus_raw0 for OMAP4 79644b600850 iommu: Fix a leak in iommu_insert_resv_region f2a4624be8f3 media: fdp1: Support M3N and E3 platforms 63e53991d791 media: uvcvideo: Fix access to uninitialized fields on probe error c844f4da9b92 irqchip/meson-gpio: Add support for Meson-G12A SoC eac8b39d089a perf report: Fix OOM error in TUI mode on s390 be32a9dc3f62 perf test 6: Fix missing kvm module load for s390 3662d8bca087 perf cs-etm: Properly set the value of 'old' and 'head' in snapshot mode ac510285d40b ipset: Fix memory accounting for hash types on resize c7bf2df45044 net: sfp: add mutex to prevent concurrent state checks fa4059c5497e RAS/CEC: Fix pfn insertion 99dcd701465f s390/qdio: handle PENDING state for QEBSM devices a76f32cbd38c net: axienet: Fix race condition causing TX hang 9d643358386d net: fec: Do not use netdev messages too early 403c43921479 crypto: inside-secure - do not rely on the hardware last bit for result descriptors 50331c64f3dd net: stmmac: modify default value of tx-frames 1a0a837afc41 net: stmmac: dwmac4: fix flow control issue 713737cac327 perf jvmti: Address gcc string overflow warning for strncpy() fb83987cbe6b arm64: mm: make CONFIG_ZONE_DMA32 configurable c360eb592938 cpupower : frequency-set -r option misses the last cpu in related cpu list cac3032062e5 net: hns3: set ops to null when unregister ad_dev 35407917b0bc media: wl128x: Fix some error handling in fm_v4l2_init_video_device() 2fbde2746597 locking/lockdep: Fix merging of hlocks with non-zero references 909034b8ac64 batman-adv: Fix duplicated OGMs on NETDEV_UP aa2ad8b6fb2f tua6100: Avoid build warnings. 9072450736d0 crypto: talitos - Align SEC1 accesses to 32 bits boundaries. 9d25aedef08f crypto: talitos - properly handle split ICV. fc25cfb03ea2 net: phy: Check against net_device being NULL ef10d46d04a5 media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails. e36f25627362 media: saa7164: fix remove_proc_entry warning ea904c9f6a33 media: mc-device.c: don't memset __user pointer contents a6dd4862b98f perf annotate TUI browser: Do not use member from variable within its own initialization 71b029a5d908 fscrypt: clean up some BUG_ON()s in block encryption/decryption 2c6acf7478aa xfrm: Fix xfrm sel prefix length validation 0544b64ceb64 af_key: fix leaks in key_pol_get_resp and dump_sp. b397462a010d signal/pid_namespace: Fix reboot_pid_ns to use send_sig not force_sig 1c8e736115cd qed: Set the doorbell address correctly df6680de7a20 net: stmmac: dwmac4/5: Clear unused address entries d3969670cb5a net: stmmac: dwmac1000: Clear unused address entries 810441651a8a media: media_device_enum_links32: clean a reserved field 6fb470ace862 media: vpss: fix a potential NULL pointer dereference 70da38e80509 media: marvell-ccic: fix DMA s/g desc number calculation add712b63185 media: ov7740: avoid invalid framesize setting b0e199e13495 crypto: talitos - fix skcipher failure due to wrong output IV 6452712f95e3 media: spi: IR LED: add missing of table registration 94f2b518a788 media: dvb: usb: fix use after free in dvb_usb_device_exit 8f855c09e2af batman-adv: fix for leaked TVLV handler. 83d133c96aad regmap: debugfs: Fix memory leak in regmap_debugfs_init 2b5b12c0c1b7 ath: DFS JP domain W56 fixed pulse type 3 RADAR detection da153c0c5746 wil6210: fix spurious interrupts in 3-msi a4bf4fecff16 ath10k: add peer id check in ath10k_peer_find_by_id 83c911f4bd68 ath6kl: add some bounds checking 42dcbf20e182 ath9k: Check for errors when reading SREV register 7e19e658e535 ath10k: Do not send probe response template for mesh 009edc622bba wil6210: fix potential out-of-bounds read 09593c25b975 dmaengine: imx-sdma: fix use-after-free on probe error path 06e15cf5aead scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported 37cb02da44dc arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly 73ebefc814ef MIPS: fix build on non-linux hosts 7202df6be6ec MIPS: ath79: fix ar933x uart parity mode be9b6782a9eb Linux 4.19.60 d173ce091c1a x86/entry/32: Fix ENDPROC of common_spurious 466bdfc6c4d6 drm/udl: move to embedding drm device inside udl device. af48f7d79fae drm/udl: Replace drm_dev_unref with drm_dev_put cfd99eccede5 drm/udl: introduce a macro to convert dev to udl. 8f14cf159e9f regmap-irq: do not write mask register if mask_base is zero 820b010743ee crypto/NX: Set receive window credits to max number of CRBs in RxFIFO b24c6403633d crypto: talitos - fix hash on SEC1. ff1ce8ef1f88 crypto: talitos - move struct talitos_edesc into talitos.h b578b87bcab6 s390/qdio: don't touch the dsci in tiqdio_add_input_queues() b1d52630b12a s390/qdio: (re-)initialize tiqdio list entries 02eb533e940a s390: fix stfle zero padding 9db915738e40 ARC: hide unused function unw_hdr_alloc fc6975ee932b x86/irq: Seperate unused system vectors from spurious entry again 9494cd392885 x86/irq: Handle spurious interrupt after shutdown gracefully 7897f5a443fb x86/ioapic: Implement irq_get_irqchip_state() callback 6074f6043c49 genirq: Add optional hardware synchronization for shutdown 3f10ccc29780 genirq: Fix misleading synchronize_irq() documentation 578db1aa595b genirq: Delay deactivation in free_irq() 2656ee5a5ad5 linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL 9c875e8556d4 pinctrl: mediatek: Update cur_mask in mask/mask ops f6e01328cb0e cpu/hotplug: Fix out-of-bounds read when setting fail state fa99487a43cf pinctrl: mediatek: Ignore interrupts that are wake only during resume cd2646e57ec5 HID: multitouch: Add pointstick support for ALPS Touchpad 9ea3b131441e HID: chicony: add another quirk for PixArt mouse 94968c37b6d3 x86/boot/64: Add missing fixup_pointer() for next_early_pgt access 729d25f43b64 x86/boot/64: Fix crash if kernel image crosses page table boundary 136847140cc8 dm verity: use message limit for data block corruption message 042be78692ae dm table: don't copy from a NULL pointer in realloc_argv() 0fc080bc9a72 pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order 00640eb0eafa ARM: dts: imx6ul: fix PWM[1-4] interrupts a8cc2a2c2841 sis900: fix TX completion 3232bccddeba ppp: mppe: Add softdep to arc4 5ec7753c7c9e be2net: fix link failure after ethtool offline test 2a6ee36917f0 x86/apic: Fix integer overflow on 10 bit left shift of cpu_khz fdfff855cd36 afs: Fix uninitialised spinlock afs_volume::cb_break_lock d47f06ab0c0e ARM: omap2: remove incorrect __init annotation 5d3c45538151 ARM: dts: gemini Fix up DNS-313 compatible string afda29dc5ac6 perf/core: Fix perf_sample_regs_user() mm check 627fdcc9b718 efi/bgrt: Drop BGRT status field reserved bits check cf4deb2d4de6 clk: ti: clkctrl: Fix returning uninitialized data ff232a47567f irqchip/gic-v3-its: Fix command queue pointer comparison bug 244db54441a1 firmware: improve LSM/IMA security behaviour 079d7f16a973 drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT 68048dce650e nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header 86859ef10d25 Input: synaptics - enable SMBUS on T480 thinkpad trackpad 438a3dc6f2c3 e1000e: start network tx queue only when link is up 8020568b404b Revert "e1000e: fix cyclic resets at link up with active tx" 3bd837bfe431 Linux 4.19.59 70bae382b3dc staging: rtl8712: reduce stack usage, again b46475ecd930 staging: bcm2835-camera: Handle empty EOS buffers whilst streaming 0ee144effcc3 staging: bcm2835-camera: Remove check of the number of buffers supplied fcbc6ddcd624 staging: bcm2835-camera: Ensure all buffers are returned on disable 4502c43d7f3b staging: bcm2835-camera: Replace spinlock protecting context_map with mutex 22a20b9f6d9f staging: fsl-dpaa2/ethsw: fix memory leak of switchdev_work cc396afa1959 MIPS: Remove superfluous check for __linux__ d202b5adccfb VMCI: Fix integer overflow in VMCI handle arrays 486c32325caa carl9170: fix misuse of device driver API 524ad00e80b7 binder: fix memory leak in error path 294b893a41cd lkdtm: support llvm-objcopy 5c90a2ecd08a HID: Add another Primax PIXART OEM mouse quirk c04c751bef87 staging: comedi: amplc_pci230: fix null pointer deref on interrupt 4e49c6c91c18 staging: comedi: dt282x: fix a null pointer deref on interrupt 8419fd562a09 drivers/usb/typec/tps6598x.c: fix 4CC cmd write 63b3028cd590 drivers/usb/typec/tps6598x.c: fix portinfo width 57e16e0d8c68 usb: renesas_usbhs: add a workaround for a race condition of workqueue aa9a8038ea8b usb: dwc2: use a longer AHB idle timeout in dwc2_core_reset() cac4a04202fb usb: gadget: ether: Fix race between gether_disconnect and rx_submit 449a8d08a4bc p54usb: Fix race between disconnect and firmware loading 135d9ba3b285 Revert "serial: 8250: Don't service RX FIFO if interrupts are disabled" 0891268f36a2 USB: serial: option: add support for GosunCn ME3630 RNDIS mode 0a1c811bf033 USB: serial: ftdi_sio: add ID for isodebug v1 bb902b6c87ff mwifiex: Don't abort on small, spec-compliant vendor IEs ffbbd626e1ce mwifiex: Abort at too short BSS descriptor element a2a24b57c27a Documentation/admin: Remove the vsyscall=native documentation 8a815007f5fe Documentation: Add section about CPU vulnerabilities for Spectre bd9604022eb3 x86/tls: Fix possible spectre-v1 in do_get_thread_area() 68ff28291a4f x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg() d8e26651ce8d perf pmu: Fix uncore PMU alias list for ARM64 018524b75852 block, bfq: NULL out the bic when it's no longer valid ff75e5f41e88 ALSA: hda/realtek - Headphone Mic can't record after S3 87c3262b00d8 ALSA: usb-audio: Fix parse of UAC2 Extension Units ef374f5a2731 media: stv0297: fix frequency range limit 5db079eb0acd udf: Fix incorrect final NOT_ALLOCATED (hole) extent length 0fc3e9b9b603 fscrypt: don't set policy for a dead directory e9f76b954336 net :sunrpc :clnt :Fix xps refcount imbalance on the error path 810cfc3d9d2e NFS4: Only set creation opendata if O_CREAT 7075654ce7d0 net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge() 606561e16186 quota: fix a problem about transfer quota 5ad566af08c1 scsi: qedi: Check targetname while finding boot target information 37232abb6ea3 net: lio_core: fix potential sign-extension overflow on large shift 740b2ac49518 ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL a02ac12d2d48 drm: return -EFAULT if copy_to_user() fails 4c938a635fc3 bnx2x: Check if transceiver implements DDM before access 270ae00a0346 md: fix for divide error in status_resync 5533d9ed4112 mmc: core: complete HS400 before checking status 2da80536f629 qmi_wwan: extend permitted QMAP mux_id value range dc84e98393f7 qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode dbc6a83cf2bc qmi_wwan: add support for QMAP padding in the RX path 292ba5b1faf4 bpf, x64: fix stack layout of JITed bpf code 4c2ce7addda8 bpf, devmap: Add missing RCU read lock on flush ab44f8bcf2e5 bpf, devmap: Add missing bulk queue free 8d09e862103b bpf, devmap: Fix premature entry free on destroying map ba0afe520ee9 mac80211: do not start any work during reconfigure flow de8cf2c0bc64 mac80211: only warn once on chanctx_conf being NULL 9c2dd6d47131 ARM: davinci: da8xx: specify dma_coherent_mask for lcdc 3bbcc8b9ad37 ARM: davinci: da850-evm: call regulator_has_full_constraints() 443250665388 mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed 512bbb114b99 KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy 41420ac584d7 Input: imx_keypad - make sure keyboard can always wake up system b71f312e9bf7 riscv: Fix udelay in RV32. 122c6a71c08d drm/vmwgfx: fix a warning due to missing dma_parms d3861d4ca94c drm/vmwgfx: Honor the sg list segment size limitation c0b12abd1828 s390/boot: disable address-of-packed-member warning e71daed5176f ARM: dts: am335x phytec boards: Fix cd-gpios active level 822c2ee81c63 ibmvnic: Fix unchecked return codes of memory allocations 0f06004d16be ibmvnic: Refresh device multicast list after reset e65dd528bb8e ibmvnic: Do not close unopened driver during reset 374180b11b29 net: phy: rename Asix Electronics PHY driver 473a75c7fab5 can: af_can: Fix error path of can_init() 486954277fc1 can: m_can: implement errata "Needless activation of MRAF irq" 270149f78b9c can: mcp251x: add support for mcp25625 33672c74b484 dt-bindings: can: mcp251x: add mcp25625 support 07c96e8e8021 soundwire: intel: set dai min and max channels correctly c7e427e28a3a mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies() 8e115a079940 iwlwifi: Fix double-free problems in iwl_req_fw_callback() d4c0f752c1d2 mwifiex: Fix possible buffer overflows at parsing bss descriptor b8588a0981b7 mac80211: free peer keys before vif down in mesh acc42e5c2322 mac80211: mesh: fix RCU warning e3868c1a462f staging:iio:ad7150: fix threshold mode config bit 6b1ce3971e05 soundwire: stream: fix out of boundary access on port properties 6be857082611 bpf: sockmap, fix use after free from sleep in psock backlog workqueue bc84982f977d mac80211: fix rate reporting inside cfg80211_calculate_bitrate_he() 3c24a931e972 samples, bpf: suppress compiler warning e7779115bbd9 samples, bpf: fix to change the buffer size for read() fe01e93c3fd1 Input: elantech - enable middle button support on 2 ThinkPads 2883fc1ece69 soc: bcm: brcmstb: biuctrl: Register writes require a barrier 2f1c962a7416 soc: brcmstb: Fix error path for unsupported CPUs e8250f730410 crypto: talitos - rename alternative AEAD algos. 7a6bfa08b938 Linux 4.19.58 f37de75cb8eb dmaengine: imx-sdma: remove BD_INTR for channel0 018c968de710 dmaengine: qcom: bam_dma: Fix completed descriptors count 870de1499505 MIPS: have "plain" make calls build dtbs for selected platforms 8957895b35de MIPS: Add missing EHB in mtc0 -> mfc0 sequence. 2b8f8a80ca8b MIPS: Fix bounds check virt_addr_valid 80b25628ff26 svcrdma: Ignore source port when computing DRC hash 8129a10ce78f nfsd: Fix overflow causing non-working mounts on 1 TB machines f25c06955f8d KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC f6472f50fbfc KVM: x86: degrade WARN to pr_warn_ratelimited ac0024baf073 netfilter: ipv6: nf_defrag: accept duplicate fragments again 54e8cf41b20b bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K e6c288f7307e net: hns: fix unsigned comparison to less than zero 4f24801ef50b sc16is7xx: move label 'err_spi' to correct section 318244f3641a netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments a8891c5e2251 ip6: fix skb leak in ip6frag_expire_frag_queue() 382bc84da904 rds: Fix warning. 7e6af1fa80b8 ALSA: hda: Initialize power_state field properly c8c88293bf72 net: hns: Fixes the missing put_device in positive leg for roce reset 6bf9677300f3 x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting b91ec6ae14da selftests: fib_rule_tests: Fix icmp proto with ipv6 e2851c3ee0be scsi: tcmu: fix use after free 04096b3beace mac80211: mesh: fix missing unlock on error in table_path_del() e2379b044d67 f2fs: don't access node/meta inode mapping after iput e9fde78c3a4f drm/fb-helper: generic: Don't take module ref for fbcon 7821bcce20aa media: s5p-mfc: fix incorrect bus assignment in virtual child device 3ddc2a100706 net/smc: move unhash before release of clcsock cd54dc4cd37d mlxsw: spectrum: Handle VLAN device unlinking a8a296abee36 tty: rocket: fix incorrect forward declaration of 'rp_init()' fb814f215013 btrfs: Ensure replaced device doesn't have pending chunk allocation 27ce6c2675f6 mm/vmscan.c: prevent useless kswapd loops c854d9b6ef8d ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code() 2e716c3b562d drm/imx: only send event on crtc disable if kept disabled 8ec242fd431b drm/imx: notify drm core before sending event during crtc disable d2d061351d64 drm/etnaviv: add missing failure path to destroy suballoc ec5d99e18d30 drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE ec6d8c9e6687 drm/amd/powerplay: use hardware fan control if no powerplay fan table b6d56f4f6a49 arm64: kaslr: keep modules inside module region when KASAN is enabled 7cab3dfa6d74 ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node c8790d7f76be tracing/snapshot: Resize spare buffer if size changed 052b31810085 fs/userfaultfd.c: disable irqs for fault_pending and event locks ea38007107d6 lib/mpi: Fix karactx leak in mpi_powm 7df1e2f59bde ALSA: hda/realtek - Change front mic location for Lenovo M710q 899377c50e60 ALSA: hda/realtek: Add quirks for several Clevo notebook barebones d9b6936b134e ALSA: usb-audio: fix sign unintended sign extension on left shifts 7f52af5e9baa ALSA: line6: Fix write on zero-sized buffer 3663bf2baa97 ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages 9d2ac58c1ef9 ALSA: seq: fix incorrect order of dest_client/dest_ports arguments ae3fa28f0938 crypto: cryptd - Fix skcipher instance memory leak 015c20532ace crypto: user - prevent operating on larval algorithms 54435b7fff7b ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME 600d3712ae12 drm/i915/dmc: protect against reading random memory 2b39351e3844 ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper() 938044171949 module: Fix livepatch/ftrace module text permissions race 220adcc0e0ca tracing: avoid build warning with HAVE_NOP_MCOUNT 79fccb9815db mm/mlock.c: change count_mm_mlocked_page_nr return type 4fce0a79e985 scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE b7747ecb82be cpuset: restore sanity to cpuset_cpus_allowed_fallback() e33aeb9a7c0a i2c: pca-platform: Fix GPIO lookup code 7cf431edfb71 platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow c241f3fbfa1a platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration f853112772b0 platform/x86: intel-vbtn: Report switch events when event wakes device 2ac96173bee0 platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi 027e043f9c78 drm: panel-orientation-quirks: Add quirk for GPD MicroPC 2446563dd6d7 drm: panel-orientation-quirks: Add quirk for GPD pocket2 8be5629b9622 scsi: hpsa: correct ioaccel2 chaining c1bef204c70a SoC: rt274: Fix internal jack assignment in set_jack callback 1023af0c069d ALSA: hdac: fix memory release for SST and SOF drivers 26a6acde2a42 usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC 9be058f5dd70 usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i] 5284327f4e17 x86/CPU: Add more Icelake model numbers 74929087384f ASoC: sun4i-i2s: Add offset to RX channel select 32475634e8a8 ASoC: sun4i-i2s: Fix sun8i tx channel offset mask 7b7486398a32 ASoC: max98090: remove 24-bit format support if RJ is 0 3b60f98ef496 drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable() 34e5e1c4874f drm/mediatek: clear num_pipes when unbind driver a8a86e9a5533 drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver 79e095d234bb drm/mediatek: unbind components in mtk_drm_unbind() 319f4699bcaa drm/mediatek: fix unbind functions dbd94f4938c6 spi: bitbang: Fix NULL pointer dereference in spi_unregister_master 3f8d3c9506a5 ASoC: ak4458: rstn_control - return a non-zero on error only 3c3dd68c48e8 ASoC: soc-pcm: BE dai needs prepare when pause release after resume 4c31b4b4ba65 ASoC: ak4458: add return value for ak4458_probe 0c19bcdb0db9 ASoC : cs4265 : readable register too low c549680ed59b netfilter: nft_flow_offload: IPCB is only valid for ipv4 family 041c181e6ba0 netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment 48f611ecea0e netfilter: nft_flow_offload: set liberal tracking mode for tcp 3b2734bc839d netfilter: nf_flow_table: ignore DF bit setting 869eec894663 md/raid0: Do not bypass blocking queue entered for raid0 bios c9d8d3e9d7a0 block: Fix a NULL pointer dereference in generic_make_request() 5dd6139a0aa2 Bluetooth: Fix faulty expression for minimum encryption key size check Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 885eeb589ed3150a17a8ac62c44632cb02171478) Signed-off-by: Armin Kuster --- .../linux/linux-yocto-rt_4.19.bb | 6 +++--- .../linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index da87d476f9..c55ef50a5d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "ca2e3322f4c5678eaef6434c808d0842c805d74d" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine ?= "02f0c38dd20819c0e9d279e3b1e95280101ea8ab" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index cadf1a7402..f4f411de19 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b5a2efa31290f31384971494031285d394635938" -SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine_qemuarm ?= "283b870cef5f79a6f07465828a51f27a6aed4c50" +SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 5edb97fed1..fb505862ee 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ca3cb923f8d7962c6d47a8d29923e52da1818854" -SRCREV_machine_qemuarm64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemumips ?= "f624314048dfac57e47ac91d89ca3dc8395ca47a" -SRCREV_machine_qemuppc ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemux86 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemux86-64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemumips64 ?= "ca47368b698795cd5cada84dbfcceda1f47da1aa" -SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine_qemuarm ?= "b0be447bc9053d07f3438999778bd077679ae756" +SRCREV_machine_qemuarm64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemumips ?= "3c8b21d0a335b5f418682969448574dfd0011f02" +SRCREV_machine_qemuppc ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemux86 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemux86-64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemumips64 ?= "2854797711fee4061fb760c2b6e0e3d3135195ab" +SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:43 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:43 -0800 Subject: [OE-core] [warrior 05/14] linux-yocto/4.19: update to v4.19.78 In-Reply-To: References: Message-ID: From: Bruce Ashfield Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: 58fce2064530 Linux 4.19.78 5b0446c8e0a8 9p/cache.c: Fix memory leak in v9fs_cache_session_get_cookie d85bc11a6894 kexec: bail out upon SIGKILL when allocating memory. c8a65ec0602a NFC: fix attrs checks in netlink interface 1b42503211ca smack: use GFP_NOFS while holding inode_smack::smk_lock ef9744a0218f Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set 4703593498d3 soundwire: fix regmap dependencies and align with other serial links 322753c78d1d soundwire: Kconfig: fix help format 74e2a311a226 sch_cbq: validate TCA_CBQ_WRROPT to avoid crash ed9420ddce87 tipc: fix unlimited bundling of small messages a1afd826e549 xen-netfront: do not use ~0U as error return value for xennet_fill_frags() 36a4043c4bb8 net/rds: Fix error handling in rds_ib_add_one() 012363f5ded0 udp: only do GSO if # of segs > 1 5c08d7e4f1ea net: dsa: rtl8366: Check VLAN ID and not ports 3c1f0704401c vsock: Fix a lockdep warning in __vsock_release() 544aee546174 udp: fix gso_segs calculations 79fd59ae7c2f sch_dsmark: fix potential NULL deref in dsmark_init() 76b552775d60 rxrpc: Fix rxrpc_recvmsg tracepoint 7047aae65456 qmi_wwan: add support for Cinterion CLS8 devices dd9c580a6d9b nfc: fix memory leak in llcp_sock_bind() d5b1db1c7ce4 net: Unpublish sk from sk_reuseport_cb before call_rcu 9d0995cc268b net: qlogic: Fix memory leak in ql_alloc_large_buffers 124b64feafa9 net: ipv4: avoid mixed n_redirects and rate_tokens usage 6f8564edf8c1 ipv6: Handle missing host route in __ipv6_ifa_notify 658d7ee4da50 ipv6: drop incoming packets having a v4mapped source address a495fd19cce2 hso: fix NULL-deref on tty open 7f30c44b7ca4 erspan: remove the incorrect mtu limit for erspan 2b8389112292 cxgb4:Fix out-of-bounds MSI-X info array access ed568ca73601 bpf: fix use after free in prog symbol exposure dbb7339cfddf block: mq-deadline: Fix queue restart handling af10ffa69b06 arm: use STACK_TOP when computing mmap base address f91a9c6591c0 arm: properly account for stack randomization and stack guard gap 53ba8d4358eb mips: properly account for stack randomization and stack guard gap e1b391abbfce arm64: consider stack randomization for mmap base only when necessary 30ab799e758e kmemleak: increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE default to 16K 52132ff52cad ocfs2: wait for recovering done after direct unlock request d4a546452dcc kbuild: clean compressed initramfs image d983182d4002 crypto: hisilicon - Fix double free in sec_free_hw_sgl() 22c788ba7a52 hypfs: Fix error number left in struct pointer member bbd76d9514c7 pktcdvd: remove warning on attempting to register non-passthrough dev 0840daeea6cb fat: work around race with userspace's read via blockdev while mounting 297904ea60a3 ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address 9a87ab2b4d60 security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb() 69a32a7306dd PCI: exynos: Propagate errors for optional PHYs 1264d2e7b75b PCI: imx6: Propagate errors for optional regulators 403d6c9284f1 PCI: histb: Propagate errors for optional regulators ac9c0e2ecc49 PCI: rockchip: Propagate errors for optional regulators 709c4841e51f HID: apple: Fix stuck function keys when using FN 31e98cba55ed rtc: pcf85363/pcf85263: fix regmap error in set_time 607f95788fa9 rtc: snvs: fix possible race condition 078937549f47 ARM: 8875/1: Kconfig: default to AEABI w/ Clang 3039c788d648 soundwire: intel: fix channel number reported by hardware 6a684e002561 ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes 0f0ced702d53 livepatch: Nullify obj->mod in klp_module_coming()'s error path 78a1138672af HID: wacom: Fix several minor compiler warnings 3b7fbbddeb7a PCI: tegra: Fix OF node reference leak c74a801ded7d mfd: intel-lpss: Remove D3cold delay 70bb4bf9fdfb i2c-cht-wc: Fix lockdep warning 371077ea2e75 MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean 3ed14a8d2fe7 MIPS: Ingenic: Disable broken BTB lookup optimization. 5b400fed74df ext4: fix potential use after free after remounting with noblock_validity 81fbd2327c32 dma-buf/sw_sync: Synchronize signal vs syncpt free c76e18970d93 scsi: core: Reduce memory required for SCSI logging c6304d4d7458 clk: sprd: add missing kfree 7cd89b8db60c mbox: qcom: add APCS child device for QCS404 324b0c9efc77 powerpc: dump kernel log before carrying out fadump or kdump 72884423e77f clk: at91: select parent if main oscillator or bypass is enabled 952d1c6d7cf0 arm64: fix unreachable code issue with cmpxchg b25bd837a637 pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c b717a47dd913 powerpc/pseries: correctly track irq state in default idle ae089bf87c57 clk: qcom: gcc-sdm845: Use floor ops for sdcc clks 2c16f72135fb pstore: fs superblock limits 0c09b02842b8 powerpc/64s/exception: machine check use correct cfar for late handler 39b6d05169b2 drm/amdgpu/si: fix ASIC tests 4dcbca872a84 drm/amd/display: support spdif 38dfc974f322 clk: renesas: cpg-mssr: Set GENPD_FLAG_ALWAYS_ON for clock domain 0b5ac607db4b clk: renesas: mstp: Set GENPD_FLAG_ALWAYS_ON for clock domain 2cfb89832179 pinctrl: amd: disable spurious-firing GPIO IRQs 274d7acb0b81 drm/nouveau/volt: Fix for some cards having 0 maximum voltage 9b2d2f2ad003 vfio_pci: Restore original state on release c1f7b3fb87cf powerpc/eeh: Clear stale EEH_DEV_NO_HANDLER flag b2df456c83e3 pinctrl: tegra: Fix write barrier placement in pmx_writel 4c91e678d27c powerpc/pseries/mobility: use cond_resched when updating device tree 6d728a172732 powerpc/futex: Fix warning: 'oldval' may be used uninitialized in this function 6aa455b0d0a0 powerpc/rtas: use device model APIs and serialization during LPM 25c501f0f9d9 powerpc/xmon: Check for HV mode when dumping XIVE info from OPAL 2cca24b2cb9a clk: zx296718: Don't reference clk_init_data after registration efa0fe4cde05 clk: sprd: Don't reference clk_init_data after registration 89dc59fb267d clk: sirf: Don't reference clk_init_data after registration bd3a445c2717 clk: actions: Don't reference clk_init_data after registration 437399ed906a powerpc/powernv/ioda2: Allocate TCE table levels on demand for default DMA window 782a77f2eb39 drm/amd/display: reprogram VM config when system resume 24ba84ec0016 drm/amd/display: fix issue where 252-255 values are clipped efb0e1e3d0e1 clk: sunxi-ng: v3s: add missing clock slices for MMC2 module clocks a2279550f7be clk: qoriq: Fix -Wunused-const-variable 84038a98b904 ipmi_si: Only schedule continuously in the thread in maintenance mode b351726bb5be PCI: rpaphp: Avoid a sometimes-uninitialized warning 0936c46139cb gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property() 6e03bca91f8e drm/radeon: Fix EEH during kexec 441c15582338 drm/rockchip: Check for fast link training before enabling psr f3d62177dee3 drm/panel: check failure cases in the probe func 9cb3698dcc86 drm/stm: attach gem fence to atomic state 043f0229f442 video: ssd1307fb: Start page range at page_offset bd5b6a7c89ef drm/panel: simple: fix AUO g185han01 horizontal blanking db472be8b340 drm/bridge: tc358767: Increase AUX transfer length limit 053d0ec61e33 tpm: Fix TPM 1.2 Shutdown sequence to prevent future TPM operations d598712712e4 tpm: use tpm_try_get_ops() in tpm-sysfs.c. 6cad9d0cf87b Linux 4.19.77 2c60da90ec44 drm/amd/display: Restore backlight brightness after system resume 4d8bdf7f3a86 mm/compaction.c: clear total_{migrate,free}_scanned before scanning a new zone 5bead06b3443 fuse: fix deadlock with aio poll and fuse_iqueue::waitq.lock bbe3e2056d27 md/raid0: avoid RAID0 data corruption due to layout confusion. 4290a9e59323 CIFS: Fix oplock handling for SMB 2.1+ protocols a3a150895b6f CIFS: fix max ea value size a0f7fd38acf5 i2c: riic: Clear NACK in tend isr fec38267a2bf hwrng: core - don't wait on add_early_randomness() 060986096fea quota: fix wrong condition in is_quota_modification() 091c754d5ca9 ext4: fix punch hole for inline_data file systems 775e3e734bd3 ext4: fix warning inside ext4_convert_unwritten_extents_endio caa6926d94f1 /dev/mem: Bail out upon SIGKILL. bd3a11af1bde cfg80211: Purge frame registrations on iftype change 5dc86e9574a1 md: only call set_in_sync() when it is expected to succeed. 598a2cda62d3 md: don't report active array_state until after revalidate_disk() completes. e8323e0ddce1 md/raid6: Set R5_ReadError when there is read failure on parity disk bacff03bb286 Btrfs: fix race setting up and completing qgroup rescan workers b5c42ef09df3 btrfs: qgroup: Fix reserved data space leak if we have multiple reserve calls c521bfa8e2dc btrfs: qgroup: Fix the wrong target io_tree when freeing reserved data space 067f82a05c2f btrfs: Relinquish CPUs in btrfs_compare_trees b08344be3546 Btrfs: fix use-after-free when using the tree modification log 4874c6fe1c9e btrfs: fix allocation of free space cache v1 bitmap pages 934243a72849 ovl: filter of trusted xattr results in audit e7265adc0a3c ovl: Fix dereferencing possible ERR_PTR() 2e96c9332595 smb3: allow disabling requesting leases 82652c06f976 block: fix null pointer dereference in blk_mq_rq_timed_out() db5b2fe4d33c i40e: check __I40E_VF_DISABLE bit in i40e_sync_filters_subtask b4a734a529b8 memcg, kmem: do not fail __GFP_NOFAIL charges d40b3eafb52e memcg, oom: don't require __GFP_FS when invoking memcg OOM killer e0c1e6e55bca gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps 3620b06b1db0 efifb: BGRT: Improve efifb_bgrt_sanity_check c4f65c2fb0f5 regulator: Defer init completion for a while after late_initcall 3784576fc639 alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP 174bbcc560cc arm64: dts: rockchip: limit clock rate of MMC controllers for RK3328 8cfe3b8aa3b6 arm64: tlb: Ensure we execute an ISB following walk cache invalidation fc7d6bfdd774 Revert "arm64: Remove unnecessary ISBs from set_{pte,pmd,pud}" 881edc165b8e ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up 2209279439a1 ARM: samsung: Fix system restart on S3C6410 ad884155fb9c ASoC: Intel: Fix use of potentially uninitialized variable 7bdab36455f9 ASoC: Intel: Skylake: Use correct function to access iomem space 3c54f463402f ASoC: Intel: NHLT: Fix debug print format 29ecf8cae5f4 binfmt_elf: Do not move brk for INTERP-less ET_EXEC 02ef5c299d15 media: don't drop front-end reference count for ->detach 589ca8ec4c62 media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table 496cf984a60e KVM: x86: Manually calculate reserved bits when loading PDPTRS 933e3e2b5070 KVM: x86: set ctxt->have_exception in x86_decode_insn() 9723e4458604 KVM: x86: always stop emulation on page fault 8225db4a70b2 parisc: Disable HP HSC-PCI Cards to prevent kernel crash ad41162974c6 fuse: fix missing unlock_page in fuse_writepage() ecfe4b5f70c8 powerpc/imc: Dont create debugfs files for cpu-less nodes e94443fc7b64 scsi: implement .cleanup_rq callback 4ec3ca2770e7 blk-mq: add callback of .cleanup_rq 4848fb93243e ALSA: hda/realtek - PCI quirk for Medion E4254 e9bcaf82dd37 ceph: use ceph_evict_inode to cleanup inode's resource 72f0fff3c450 Revert "ceph: use ceph_evict_inode to cleanup inode's resource" 98dc6d958bd9 randstruct: Check member structs in is_pure_ops_struct() ad6819cd68be IB/hfi1: Define variables as unsigned long to fix KASAN warning a924850c93d4 IB/mlx5: Free mpi in mp_slave mode 40b071992ca5 printk: Do not lose last line in kmsg buffer dump 28f142b940af scsi: qla2xxx: Fix Relogin to prevent modifying scan_state flag 03b75e65ceed scsi: scsi_dh_rdac: zero cdb in send_mode_select() 2e21e5b225ef ALSA: firewire-tascam: check intermediate state of clock status and retry f5779e4449da ALSA: firewire-tascam: handle error code when getting current source of clock fdd131eab68f iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36 6437ec272eda PM / devfreq: passive: fix compiler warning 814f7fe56ebb media: omap3isp: Set device on omap3isp subdevs c5dbd74f8259 btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type 2aeeb0a4b440 iommu/amd: Override wrong IVRS IOAPIC on Raven Ridge systems 291da335040c ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93 8630a4d13683 media: ttusb-dec: Fix info-leak in ttusb_dec_send_command() d47636913bda drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2) 5370cf8d90ad ALSA: hda - Drop unsol event handler for Intel HDMI codecs ac1d43a20a08 e1000e: add workaround for possible stalled packet 35b6cba971f5 libertas: Add missing sentinel at end of if_usb.c fw_table 0a43d5d458d5 raid5: don't increment read_errors on EILSEQ return da87dfca25aa mmc: dw_mmc: Re-store SDIO IRQs mask at system resume a0dd3d95fb21 mmc: core: Add helper function to indicate if SDIO IRQs is enabled 8ba99d50cb61 mmc: sdhci: Fix incorrect switch to HS mode 869122775782 mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD a5443cd24063 raid5: don't set STRIPE_HANDLE to stripe which is in batch list 064fba888e77 ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set 476eda2539bb platform/x86: intel_pmc_core: Do not ioremap RAM e836cd2917c6 x86/cpu: Add Tiger Lake to Intel family b21919eeced6 s390/crypto: xts-aes-s390 fix extra run-time crypto self tests finding fad90d4bfa8d kprobes: Prohibit probing on BUG() and WARN() address 213077da3e7c dmaengine: ti: edma: Do not reset reserved paRAM slots f1db75622996 md/raid1: fail run raid1 array when active disk less than one 76cf93f04c3d hwmon: (acpi_power_meter) Change log level for 'unsafe software power cap' f0956418d997 closures: fix a race on wakeup from closure_sync 9fcfdff61f74 ACPI / PCI: fix acpi_pci_irq_enable() memory leak e4467fb6ef54 ACPI: custom_method: fix memory leaks 6fceb241dc76 ARM: dts: exynos: Mark LDO10 as always-on on Peach Pit/Pi Chromebooks e4b4280dcd97 libtraceevent: Change users plugin directory c55659cd1459 iommu/iova: Avoid false sharing on fq_timer_on 223b0481ed4b libata/ahci: Drop PCS quirk for Denverton and beyond de888e0244cb iommu/amd: Silence warnings under memory pressure 6241c0ac301e ALSA: firewire-motu: add support for MOTU 4pre ad58ce6cacd1 nvme-multipath: fix ana log nsid lookup when nsid is not found 9edc229b9c90 nvmet: fix data units read and written counters in SMART log 7bbb7a9dd2c3 x86/mm/pti: Handle unaligned address gracefully in pti_clone_pagetable() 5201b4ffc324 ASoC: fsl_ssi: Fix clock control issue in master mode 4b7d9c2a716e x86/mm/pti: Do not invoke PTI functions when PTI is disabled eb2485e32f90 arm64: kpti: ensure patched kernel text is fetched from PoU b619496540ba x86/apic/vector: Warn when vector space exhaustion breaks affinity 01e8f487cecb sched/cpufreq: Align trace event behavior of fast switching 2919fa0398ad ACPI / CPPC: do not require the _PSD method b79922133f9c ASoC: es8316: fix headphone mixer volume table dd25f76c1f34 media: ov9650: add a sanity check 342a0bee4d94 perf trace beauty ioctl: Fix off-by-one error in cmd->string table 57409ea782e7 media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate() 78550c5cfe6d media: cpia2_usb: fix memory leaks d796c6c1aab4 media: saa7146: add cleanup in hexium_attach() ab20f38ce522 media: cec-notifier: clear cec_adap in cec_notifier_unregister d51268d7574b PM / devfreq: exynos-bus: Correct clock enable sequence 7e19b7e0d640 PM / devfreq: passive: Use non-devm notifiers f9de170eaf7e EDAC/amd64: Decode syndrome before translating address 6f80e91a66e0 EDAC/amd64: Recognize DRAM device type ECC capability adb97f18b4e7 libperf: Fix alignment trap with xyarray contents in 'perf stat' 4df2427a5148 media: dvb-core: fix a memory leak bug 8d5fccff7b0c posix-cpu-timers: Sanitize bogus WARNONS 9df9652b7345 media: dvb-frontends: use ida for pll number 006a6065c867 media: mceusb: fix (eliminate) TX IR signal length limit d093d3183ca2 nbd: add missing config put e497ec26cc43 led: triggers: Fix a memory leak bug 83c2a42b1b84 ASoC: sun4i-i2s: Don't use the oversample to calculate BCLK 5466c30b11cb tools headers: Fixup bitsperlong per arch includes b1f1b83e2583 ASoC: uniphier: Fix double reset assersion when transitioning to suspend state e6bc6e2c0d1f media: hdpvr: add terminating 0 at end of string 4a2cb7600b72 media: radio/si470x: kill urb on error dfaf60580191 ARM: dts: imx7-colibri: disable HS400 c20ee5d906ec ARM: dts: imx7d: cl-som-imx7: make ethernet work again 21927786df27 m68k: Prevent some compiler warnings in Coldfire builds ba8f56ffaebf net: lpc-enet: fix printk format strings aa2d05a9de05 media: imx: mipi csi-2: Don't fail if initial state times-out 1b7df445d881 media: omap3isp: Don't set streaming state on random subdevs 0c3802174754 media: i2c: ov5645: Fix power sequence 3dfbac0add22 media: vsp1: fix memory leak of dl on error return path c47022e019fe perf record: Support aarch64 random socket_id assignment 482c1d0a7cc4 dmaengine: iop-adma: use correct printk format strings 19a1fa140594 media: rc: imon: Allow iMON RC protocol for ffdc 7e device a527d3d4b513 media: em28xx: modules workqueue not inited for 2nd device 6a1c59a7603d media: fdp1: Reduce FCP not found message level to debug e3f5f626e17a media: mtk-mdp: fix reference count on old device tree 066afce8d87d perf test vfs_getname: Disable ~/.perfconfig to get default output 96b61fe7a5f7 perf config: Honour $PERF_CONFIG env var to specify alternate .perfconfig db751f6d5241 media: gspca: zero usb_buf on error 511110236089 idle: Prevent late-arriving interrupts from disrupting offline 9addfbd40959 sched/fair: Use rq_lock/unlock in online_fair_sched_group 6e9d45022d26 firmware: arm_scmi: Check if platform has released shmem before using 0dbdc1986bb4 efi: cper: print AER info of PCIe fatal error 4410b8517950 EDAC, pnd2: Fix ioremap() size in dnv_rd_reg() cf8f20a1aacf loop: Add LOOP_SET_DIRECT_IO to compat ioctl 18e5e458c6d8 ACPI / processor: don't print errors for processorIDs == 0xff 465bc6e80fd2 media: media/platform: fsl-viu.c: fix build for MICROBLAZE 371538451c21 md: don't set In_sync if array is frozen d38aff20c407 md: don't call spare_active in md_reap_sync_thread if all member devices can't work 1cd972e0a107 md/raid1: end bio when the device faulty 7d75275fbfb1 arm64/prefetch: fix a -Wtype-limits warning 829bebdc1ce6 ASoC: rsnd: don't call clk_get_rate() under atomic context f5bef62df824 EDAC/altera: Use the proper type for the IRQ status bits 87bc43e2a775 ia64:unwind: fix double free for mod->arch.init_unw_table ca57eca32b3e ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid d76b5ac5016c base: soc: Export soc_device_register/unregister APIs 4a75e77ef1b5 media: iguanair: add sanity checks fe8fc7d7cb64 EDAC/mc: Fix grain_bits calculation 55a98e872186 ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() 1af6822f29d6 ALSA: hda - Show the fatal CORB/RIRB error more clearly b40c15c20e42 x86/apic: Soft disable APIC before initializing it ce7fdd5cd83e x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails 0f30856944d4 sched/deadline: Fix bandwidth accounting at all levels after offline migration d29c7b8be599 x86/apic: Make apic_pending_intr_clear() more robust f381d3d2c39c sched/core: Fix CPU controller for !RT_GROUP_SCHED 417cf53b4b85 sched/fair: Fix imbalance due to CPU affinity 7cebdfa62f22 time/tick-broadcast: Fix tick_broadcast_offline() lockdep complaint 64f3fb5d751c media: i2c: ov5640: Check for devm_gpiod_get_optional() error 6cc816dd644e media: hdpvr: Add device num check and handling 8bc254d3e6b8 media: exynos4-is: fix leaked of_node references 7ec720763a20 media: mtk-cir: lower de-glitch counter for rc-mm protocol 920acbff8932 media: dib0700: fix link error for dibx000_i2c_set_speed 8f9dc49928c2 leds: leds-lp5562 allow firmware files up to the maximum length fdcf06a35bc6 dmaengine: bcm2835: Print error in case setting DMA mask fails e841313b5731 firmware: qcom_scm: Use proper types for dma mappings ec4815460d81 ASoC: sgtl5000: Fix charge pump source assignment 84bb4024b358 ASoC: sgtl5000: Fix of unmute outputs on probe a7ace049bddc ASoC: tlv320aic31xx: suppress error message for EPROBE_DEFER 3657e58405fb regulator: lm363x: Fix off-by-one n_voltages for lm3632 ldo_vpos/ldo_vneg 3eec108aa879 ALSA: hda: Flush interrupts on disabling 5b6c791f494d nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs 33fe1f517e29 nfc: enforce CAP_NET_RAW for raw sockets dd651ab7a114 ieee802154: enforce CAP_NET_RAW for raw sockets 6f0f18e53269 ax25: enforce CAP_NET_RAW for raw sockets 6fbf86627608 appletalk: enforce CAP_NET_RAW for raw sockets 50dddec689cb mISDN: enforce CAP_NET_RAW for raw sockets f06b0b3e5d76 net/mlx5: Add device ID of upcoming BlueField-2 3fdcf6a88ded tcp: better handle TCP_USER_TIMEOUT in SYN_SENT state a749eea97ac9 net: sched: fix possible crash in tcf_action_destroy() 831d0fcba1cf usbnet: sanity checking of packet sizes and device mtu b7eeccc1c786 usbnet: ignore endpoints with invalid wMaxPacketSize ff4419d725c7 skge: fix checksum byte order 9a623e1b1d03 sch_netem: fix a divide by zero in tabledist() 1cd663adcece ppp: Fix memory leak in ppp_write 99952b08537c openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC 587df35cbf65 nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs 195a3ea494d2 net_sched: add max len check for TCA_KIND c31096dc586e net/sched: act_sample: don't push mac header on ip6gre ingress abb04d0a9dea net: qrtr: Stop rx_worker before freeing node 6ea3bc412506 net/phy: fix DP83865 10 Mbps HDX loopback disable function 831d082be72c macsec: drop skb sk before calling gro_cells_receive fd0034688358 cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize 0bf79588586c arcnet: provide a buffer big enough to actually receive packets 555161ee1b7a Linux 4.19.76 59a5cea41dd0 f2fs: use generic EFSBADCRC/EFSCORRUPTED fc3d296491f4 net/rds: Check laddr_check before calling it 3de749d6d7ce net/rds: An rds_sock is added too early to the hash table 07f7ec87b5f6 net_sched: check cops->tcf_block in tc_bind_tclass() 90b0761c1b81 Bluetooth: btrtl: Additional Realtek 8822CE Bluetooth devices 6934809432d2 netfilter: nft_socket: fix erroneous socket assignment 649836fe946c xfs: don't crash on null attr fork xfs_bmapi_read 91ae87240166 drm/nouveau/disp/nv50-: fix center/aspect-corrected scaling 3717f4a49b34 ACPI: video: Add new hw_changes_brightness quirk, set it on PB Easynote MZ35 46beb6eacef5 Bluetooth: btrtl: HCI reset on close for Realtek BT chip 8ffd7ba9ffb1 net: don't warn in inet diag when IPV6 is disabled ff0fbfacc94f drm: Flush output polling on shutdown 303f6d6bbc0c f2fs: fix to do sanity check on segment bitmap of LFS curseg dec09554eba9 net/ibmvnic: Fix missing { in __ibmvnic_reset dc9118feb472 dm zoned: fix invalid memory access 73d90f57fcc2 Revert "f2fs: avoid out-of-range memory access" 40cdc71e1111 blk-mq: move cancel of requeue_work to the front of blk_exit_queue 313efb253d03 blk-mq: change gfp flags to GFP_NOIO in blk_mq_realloc_hw_ctxs 75448f40b9f6 initramfs: don't free a non-existent initrd ad16dfef4a44 bcache: remove redundant LIST_HEAD(journal) from run_cache_set() 08fdaee2d97b PCI: hv: Avoid use of hv_pci_dev->pci_slot after freeing it ef2baa03b7f0 f2fs: check all the data segments against all node ones ef06c33dc371 irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices 52b4947bac50 bpf: libbpf: retry loading program on EAGAIN a935d78e54cc Revert "drm/amd/powerplay: Enable/Disable NBPSTATE on On/OFF of UVD" 288831cba980 scsi: qla2xxx: Return switch command on a timeout 2b983f212c68 scsi: qla2xxx: Remove all rports if fabric scan retry fails 6b449e4cf090 scsi: qla2xxx: Turn off IOCB timeout timer on IOCB completion 9423770eb336 locking/lockdep: Add debug_locks check in __lock_downgrade() 0c23335a2d81 power: supply: sysfs: ratelimit property read error message 1456c40aa906 pinctrl: sprd: Use define directive for sprd_pinconf_params values 037d73a6458e objtool: Clobber user CFLAGS variable 952844f31eb7 ALSA: hda - Apply AMD controller workaround for Raven platform 50c9ccffe041 ALSA: hda - Add laptop imic fixup for ASUS M9V laptop 866a1a7e9f23 ALSA: dice: fix wrong packet parameter for Alesis iO26 9829fd27501e ALSA: usb-audio: Add DSD support for EVGA NU Audio 303921276360 ALSA: usb-audio: Add Hiby device family to quirks for native DSD support 8a845c02e495 ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt() a5e2c65034f8 ASoC: Intel: cht_bsw_max98090_ti: Enable codec clock once and keep it enabled ec2a3681b30c media: tvp5150: fix switch exit in set control handler ba6860700d1f iwlwifi: mvm: always init rs_fw with 20MHz bandwidth rates ced0676fc9c2 iwlwifi: mvm: send BCAST management frames to the right station b3873e34cbf2 net/mlx5e: Rx, Check ip headers sanity 404f118f2790 net/mlx5e: Rx, Fixup skb checksum for packets with tail padding c95ebb394d65 net/mlx5e: XDP, Avoid checksum complete when XDP prog is loaded 79e972a89cad net/mlx5e: Allow reporting of checksum unnecessary 8da68f79b3b3 mlx5: fix get_ip_proto() 44da02576b5d net/mlx5e: don't set CHECKSUM_COMPLETE on SCTP packets 6debda97411e net/mlx5e: Set ECN for received packets using CQE indication e867ef113004 CIFS: fix deadlock in cached root handling f3160a1d71f7 crypto: talitos - fix missing break in switch statement c1a7fe486647 mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword() 5fdefdcb92bb HID: Add quirk for HP X500 PIXART OEM mouse 3d072c272b88 HID: hidraw: Fix invalid read in hidraw_ioctl acc96be807bb HID: logitech: Fix general protection fault caused by Logitech driver 3e785174fb35 HID: sony: Fix memory corruption issue on cleanup. eb77929769e3 HID: prodikeys: Fix general protection fault during probe 2661d462aaa9 IB/core: Add an unbound WQ type to the new CQ API 70ec2eecc550 drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines 80fc27953e74 powerpc/xive: Fix bogus error code returned by OPAL 4eb92a114834 RDMA/restrack: Protect from reentry to resource return path 373f9092df95 net/ibmvnic: free reset work of removed device from queue 2af977b0d1db Revert "Bluetooth: validate BLE connection interval updates" d573e8a79f70 Linux 4.19.75 b841a9f58d9c media: technisat-usb2: break out of loop at end of buffer f35f5a990a07 arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field c0ccb4da26bc binfmt_elf: move brk out of mmap when doing direct loader exec c3817ffb1036 floppy: fix usercopy direction 9c13e770cca9 ovl: fix regression caused by overlapping layers detection 5e74396d8beb PCI: kirin: Fix section mismatch warning 0d50f7b1e8c8 iommu/amd: Fix race in increase_address_space() 52f32e4aec50 iommu/amd: Flush old domains in kdump kernel ca77acdf1ac9 keys: Fix missing null pointer check in request_key_auth_describe() d73515a17c14 x86/hyper-v: Fix overflow bug in fill_gva_list() 371357770c8b x86/uaccess: Don't leak the AC flags into __get_user() argument evaluation 72c762b01eb0 dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe() d04b522a65c0 dmaengine: ti: dma-crossbar: Fix a memory leak bug 6bc421d5a04a net: seeq: Fix the function used to release some memory in an error handling path 83360eb798ca net: aquantia: fix out of memory condition on rx side 30c345bd786a tools/power turbostat: fix buffer overrun d485c65853de tools/power x86_energy_perf_policy: Fix argument parsing 254b9b2971a7 tools/power x86_energy_perf_policy: Fix "uninitialized variable" warnings at -O2 a85a0d9f3796 amd-xgbe: Fix error path in xgbe_mod_init() 7ec11cad3fde perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops 560857de3064 perf/x86/intel: Restrict period on Nehalem 65ad72ce10e7 i2c: designware: Synchronize IRQs when unregistering slave client 5a45b14b03f7 sky2: Disable MSI on yet another ASUS boards (P6Xxxx) 6cce2adae3e1 ibmvnic: Do not process reset during or after device removal 080ca754f5db ARM: 8901/1: add a criteria for pfn_valid of arm c6d779fd8197 usb: host: xhci-tegra: Set DMA mask correctly b62946852afa cifs: Use kzfree() to zero out the password 325fa2a6729b cifs: set domainName when a domain-key is used in multiuser 9a74f799b99c kallsyms: Don't let kallsyms_lookup_size_offset() fail on retrieving the first symbol 0f7130177325 NFSv2: Fix write regression 60f0d449601d NFSv2: Fix eof handling 6075729f76da netfilter: nf_conntrack_ftp: Fix debug output 7ac5947f7578 netfilter: xt_physdev: Fix spurious error message in physdev_mt_check e997c0730520 x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines 688fdaa54a3e r8152: Set memory to all 0xFFs on failed reg reads d9f79f0ace55 bpf: allow narrow loads of some sk_reuseport_md fields with offset > 0 7d4201ff9f73 batman-adv: Only read OGM2 tvlv_len after buffer len check 5b8b66274183 ARM: 8874/1: mm: only adjust sections of valid mm structures b870f8afc5a5 qed: Add cleanup in qed_slowpath_start() 30881d79de31 xdp: unpin xdp umem pages in error path 55ed0ad50201 Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105 767877deb25a NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup 4ac4f4716fba NFSv4: Fix return value in nfs_finish_open() d7565d51af18 NFSv4: Fix return values for nfs4_file_open() 4e5fbcb9a615 netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info a02c676c0f03 netfilter: nft_flow_offload: missing netlink attribute policy a4fa6c68ecc3 netfilter: ebtables: Fix argument order to ADD_COUNTER 634dd5a48627 fpga: altera-ps-spi: Fix getting of optional confd gpio 0d393f23f18e tools: bpftool: close prog FD before exit on showing a single program c5bb033529f1 selftests/bpf: fix "bind{4, 6} deny specific IP & port" on s390 48d77ca1497f s390/bpf: use 32-bit index for tail calls 999f33c2438c bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() 1a85d5819ade ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack a8919f8d352f ARM: dts: dra74x: Fix iodelay configuration for mmc3 2ff2bd2c5526 ARM: OMAP2+: Fix omap4 errata warning on other SoCs 73d003274a42 s390/bpf: fix lcgr instruction encoding c1e0937ef4d5 bus: ti-sysc: Fix using configured sysc mask value 0aee9e118eee ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss f696ba6b122d ARM: dts: am57xx: Disable voltage switching for SD card ac8f26f6a035 ieee802154: hwsim: unregister hw while hwsim_subscribe_all_others fails c237a050df3b ieee802154: hwsim: Fix error handle path in hwsim_init_module 6a10e87ffca1 nl80211: Fix possible Spectre-v1 for CQM RSSI thresholds 941431c491a6 mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings 770cee245191 tty/serial: atmel: reschedule TX after RX was started 4c2f60ed8ed8 serial: sprd: correct the wrong sequence of arguments 2871621518ac firmware: google: check if size is valid when decoding VPD data 232a6462f43f KVM: coalesced_mmio: add bounds checking 7a1bad565ceb net_sched: let qdisc_put() accept NULL pointer 47288968eebd xen-netfront: do not assume sk_buff_head list is empty in error handling fdd60d80c429 udp: correct reuseport selection with connected sockets 97b5f8c95b75 ip6_gre: fix a dst leak in ip6erspan_tunnel_xmit 4fb95f299504 phy: renesas: rcar-gen3-usb2: Disable clearing VBUS in over-current abf389e0795a media: tm6000: double free if usb disconnect while streaming 77d4e2a05885 USB: usbcore: Fix slab-out-of-bounds bug during device reset b01b1eb24c04 powerpc/mm/radix: Use the right page size for vmemmap mapping 289f3c82b116 Input: elan_i2c - remove Lenovo Legion Y7000 PnpID 305c3b497662 RDMA/restrack: Release task struct which was hold by CM_ID object 8993c673d6c4 HID: wacom: generic: read HID_DG_CONTACTMAX from any feature report 2a0aa8a06aea netfilter: nf_flow_table: set default timeout after successful insertion dbc29aff8d04 Linux 4.19.74 9d587fe2cd70 x86/build: Add -Wnoaddress-of-packed-member to REALMODE_CFLAGS, to silence GCC9 build warning 96c08711fc66 nvmem: Use the same permissions for eeprom as for nvmem 3622d621e9be rsi: fix a double free bug in rsi_91x_deinit() 780f3aadee1e platform/x86: pmc_atom: Add CB4063 Beckhoff Automation board to critclk_systems DMI table 52bfcc9c8406 modules: fix compile error if don't have strict module rwx ae415d7a2707 modules: fix BUG when load module with rodata=n 0ae0c43abcbf iio: adc: stm32-dfsdm: fix data type acf77c411b4e Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature" a03ed2891cdb drm/mediatek: mtk_drm_drv.c: Add of_node_put() before goto d13a836d787d drm: panel-orientation-quirks: Add extra quirk table entry for GPD MicroPC 4b30a0698208 firmware: ti_sci: Always request response from firmware 3dfc787f2f50 crypto: talitos - HMAC SNOOP NO AFEU mode requires SW icv checking. e89d4cb6fba3 crypto: talitos - Do not modify req->cryptlen on decryption. 9aff4077304b crypto: talitos - fix ECB algs ivsize c4d7148e2d67 crypto: talitos - check data blocksize in ablkcipher. 02ebbb4f8df8 crypto: talitos - fix CTR alg blocksize 39fa02a36bb3 crypto: talitos - check AES key size e1666bcbae0c driver core: Fix use-after-free and double free on glue directory 72cd230b3231 ubifs: Correctly use tnc_next() in search_dh_cookie() a65290083b66 gpio: fix line flag validation in lineevent_create 0f4095f33557 PCI: Always allow probing with driver_override 70facf939ba2 mtd: rawnand: mtk: Fix wrongly assigned OOB buffer pointer issue 6da56f8982bb clk: rockchip: Don't yell about bad mmc phases when getting a63416f39aaf drm/meson: Add support for XBGR8888 & ABGR8888 formats d9e8b4ba0397 powerpc: Add barrier_nospec to raw_copy_in_user() eb020b77b646 x86/purgatory: Change compiler flags from -mcmodel=kernel to -mcmodel=large to fix kexec relocation errors 73c31bd92039 KVM: nVMX: handle page fault in vmread 6e60900cfa3e KVM: x86: work around leak of uninitialized stack contents 09a9f894c65b KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl 9f8a2825918c KVM: s390: kvm_s390_vm_start_migration: check dirty_bitmap before using it as target for memset() 991b3458da56 genirq: Prevent NULL pointer dereference in resend_irqs() 5b5f14601e0a ixgbe: Prevent u8 wrapping of ITR value to something less than 10us 7cbd49cf0d62 Btrfs: fix assertion failure during fsync and use of stale transaction 22ed1d472811 gpio: fix line flag validation in linehandle_create 705df757e937 gpiolib: acpi: Add gpiolib_acpi_run_edge_events_on_boot option and blacklist 0f4ceb259493 tun: fix use-after-free when register netdev failed 9a4598424e99 tipc: add NULL pointer check before calling kfree_rcu 67fe3b94a833 tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR 7c34a29261ee sctp: use transport pf_retrans in sctp_do_8_2_transport_strike 41b624ff83d2 sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()' a9e91767b921 sch_hhf: ensure quantum and hhf_non_hh_weight are non-zero a7f46e18ecfe net: sched: fix reordering issues 3600a311f83d net: phylink: Fix flow control resolution 821302dd0c51 net: gso: Fix skb_segment splat when splitting gso_size mangled skb having linear-headed frag_list 88a46756f016 net: Fix null de-reference of device refcount b26f489245b3 ixgbe: Fix secpath usage for IPsec TX offload. 2354e925e361 isdn/capi: check message length in capi_write() ea6ec671c87e ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()' a20c8e4ae48d cdc_ether: fix rndis support for Mediatek based smartphones f57fd58dda42 bridge/mdb: remove wrong use of NLM_F_MULTI db2d0b7c1dde Linux 4.19.73 ba03ee62aed0 vhost: make sure log_num < in_num 569775bd5364 powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts 052bc385f970 powerpc/tm: Remove msr_tm_active() f193e02265aa PCI: Reset both NVIDIA GPU and HDA in ThinkPad P50 workaround ff69322509bb ext4: unsigned int compared against zero 292666d2d868 ext4: fix block validity checks for journal inodes using indirect blocks 97fbf573460e ext4: don't perform block validity checks on the journal inode 1e88a1f874ca drm/atomic_helper: Allow DPMS On<->Off changes for unregistered connectors b1dd1d06b31d virtio/s390: fix race on airq_areas[] 057cdb6f0f47 drm/i915: Make sure cdclk is high enough for DP audio on VLV/CHV b113f98432ae bcache: fix race in btree_flush_write() f73c35d92976 bcache: add comments for mutex_lock(&b->write_lock) 7989a5026fd1 bcache: only clear BTREE_NODE_dirty bit when it is set 652993a5aae5 NFSv4: Fix delegation state recovery 5026932adb1a iio: adc: gyroadc: fix uninitialized return code 2e7e7c8f9423 mm/migrate.c: initialize pud_entry in migrate_vma() b8ad18a10f70 i2c: at91: fix clk_offset for sama5d2 4c9170b55f3a i2c: at91: disable TXRDY interrupt after sending data c9c90711ee88 gpio: don't WARN() on NULL descs if gpiolib is disabled a532a120a5cd iommu/iova: Remove stale cached32_node c4fc7cb93e0a powerpc/mm: Limit rma_size to 1TB when running without HV mode 5b9a6ba975c0 ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips 87c3692172da drm/panel: Add support for Armadeus ST0700 Adapt ecf99cdea02d dm thin metadata: check if in fail_io mode when setting needs_check 5e9a2ce6d3b4 pstore: Fix double-free in pstore_mkfile() failure path 192b9af8caf0 resource: fix locking in find_next_iomem_res() 485bcc29a200 resource: Fix find_next_iomem_res() iteration issue 9a80dfccade1 resource: Include resource end in walk_*() interfaces 1c13c9c40e31 btrfs: correctly validate compression type 0ca2688bd7cd RDMA/srp: Accept again source addresses that do not have a port number 9541604735b2 RDMA/srp: Document srp_parse_in() arguments bab0ff2d87db ARM: dts: gemini: Set DIR-685 SPI CS as active low 3a1b79ade460 KVM: PPC: Book3S HV: Fix CR0 setting in TM emulation 3ac718069f7c KVM: PPC: Use ccr field in pt_regs struct embedded in vcpu struct beeeead95b2f KVM: VMX: check CPUID before allowing read/write of IA32_XSS 891011ca564d KVM: VMX: Fix handling of #MC that occurs during VM-Entry 74ce13331db9 KVM: VMX: Always signal #GP on WRMSR to MSR_IA32_CR_PAT with bad value 74fd8aae19d9 KVM: x86: optimize check for valid PAT value 812810399999 ceph: use ceph_evict_inode to cleanup inode's resource 42fa0e35d6e0 ALSA: hda - Don't resume forcibly i915 HDMI/DP codec 987564c28e8a cifs: Properly handle auto disabling of serverino option d85e830d8534 scsi: zfcp: fix request object use-after-free in send path causing wrong traces ba8701d2226c staging: wilc1000: fix error path cleanup in wilc_wlan_initialize() 60b856dc1744 scsi: target/iblock: Fix overrun in WRITE SAME emulation ba52842de1ad scsi: target/core: Use the SECTOR_SHIFT constant 17111037fdf0 apparmor: reset pos on failure to unpack for various functions 90ca4912e55d IB/hfi1: Avoid hardlockup with flushlist_lock fa717fc442ff clk: tegra210: Fix default rates for HDA clocks 350503c8982b clk: tegra: Fix maximum audio sync clock for Tegra124/210 acc07941e224 cifs: add spinlock for the openFileList to cifsInodeInfo 1d0648767ccf Btrfs: fix race between block group removal and block group allocation f276beb324cc drm/amdgpu/{uvd,vcn}: fetch ring's read_ptr after alloc 7abeffff7bc3 drm/amdgpu: fix ring test failure issue during s3 in vce 3.0 (V2) d5f6539381c7 kvm: Check irqchip mode before assign irqfd 90772cf58838 drm/amdkfd: Add missing Polaris10 ID cacbc85376b6 ARC: mm: SIGSEGV userspace trying to access kernel virtual memory 7edfa9c99d21 ARC: mm: fix uninitialised signal code in do_page_fault 0828438e523e signal/arc: Use force_sig_fault where appropriate fcb2f1e2ea68 dm crypt: move detailed message into debug level 96b44c20e6f0 cifs: smbd: take an array of reqeusts when sending upper layer data 3f27a14b03d8 PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code 842da8fac182 mmc: sdhci-pci: Add support for Intel CML e238e6dc222b blk-mq: free hw queue's resource in hctx's release handler 69409854ba08 dm mpath: fix missing call of path selector type->end_io 0fe097012b6c PCI: Reset Lenovo ThinkPad P50 nvgpu at boot if necessary 5659dfca74d0 PCI: Add macro for Switchtec quirk declarations e4ba157877db dt-bindings: mmc: Add disable-cqe-dcmd property. eb83f9fa10f7 dt-bindings: mmc: Add supports-cqe property 0a0176f93ea9 ARM: dts: qcom: ipq4019: enlarge PCIe BAR range 445a78ea3f90 ARM: dts: qcom: ipq4019: Fix MSI IRQ type df1216d8bc86 ARM: dts: qcom: ipq4019: fix PCI range 2fd4629de519 ext4: protect journal inode's blocks using block_validity f10a92309b83 media: i2c: tda1997x: select V4L2_FWNODE 4061e662c8e9 cifs: Fix lease buffer length error df5d4ea2d8be KVM: x86: Always use 32-bit SMRAM save state for 32-bit kernels 7a74d806bdaa x86/kvm: move kvm_load/put_guest_xcr0 into atomic context 163b24b1a68c kvm: mmu: Fix overflow on kvm mmu page limit calculation feced628c068 IB/mlx5: Reset access mask when looping inside page fault handler 37222eaf7eb7 arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's 3cfce8b77aad usb: typec: tcpm: Try PD-2.0 if sink does not respond to 3.0 source-caps fba4f7c118e4 drm/i915: Sanity check mmap length against object size 6423a2ad5709 drm/i915: Handle vm_mmap error during I915_GEM_MMAP ioctl with WC set 778d626c6af3 CIFS: Fix leaking locked VFS cache pages in writeback retry fb2dabeabb17 CIFS: Fix error paths in writeback code e407b58c3576 drm: add __user attribute to ptr_to_compat() e1a12c3b6f87 PCI: qcom: Don't deassert reset GPIO during probe be905d0f2330 PCI: qcom: Fix error handling in runtime PM support 476ecc14cfdb btrfs: init csum_list before possible free 936690bdd8e6 btrfs: scrub: fix circular locking dependency warning ff55333f5c52 btrfs: scrub: move scrub_setup_ctx allocation out of device_list_mutex 8ba3169dceac btrfs: scrub: pass fs_info to scrub_setup_ctx df7329207870 mmc: renesas_sdhi: Fix card initialization failure in high speed mode 915c9d0a1d68 powerpc/kvm: Save and restore host AMR/IAMR/UAMOR b3f864b88256 spi: spi-gpio: fix SPI_CS_HIGH capability 1d60902a5448 x86/kvmclock: set offset for kvm unstable clock 716b0cfa88a5 iwlwifi: add new card for 9260 series 213566a9b0de iwlwifi: fix devices with PCI Device ID 0x34F0 and 11ac RF modules 2b76fcb6ba62 drm/nouveau: Don't WARN_ON VCPI allocation failures 173b6557fcbc mt76: fix corrupted software generated tx CCMP PN 0d7f329e2431 iio: adc: exynos-adc: Use proper number of channels for Exynos4x12 4e516b721a50 dt-bindings: iio: adc: exynos-adc: Add S5PV210 variant 7f588a7262b3 iio: adc: exynos-adc: Add S5PV210 variant cd490d44150d KVM: VMX: Compare only a single byte for VMCS' "launched" in vCPU-run 687e470e9123 bcache: treat stale && dirty keys as bad keys d1cec665de2c bcache: replace hard coded number with BUCKET_GC_GEN_MAX ee30121fbd78 tpm: Fix some name collisions with drivers/char/tpm.h c207ac66848e mfd: Kconfig: Fix I2C_DESIGNWARE_PLATFORM dependencies 6fd5e50add36 drm/i915/ilk: Fix warning when reading emon_status with no output 2b4f567912ad drm/vblank: Allow dynamic per-crtc max_vblank_count 71f719105462 crypto: ccree - add missing inline qualifier 72eec6b303f4 crypto: ccree - fix resume race condition on init f0e286550af8 IB/uverbs: Fix OOPs upon device disassociation 8c6fb55abf2c ARC: mm: do_page_fault fixes #1: relinquish mmap_sem if signal arrives while handle_mm_fault 96af7d92d8d2 ARC: show_regs: lockdep: re-enable preemption 424b75b79994 media: vim2m: only cancel work if it is for right context be77686f0369 btrfs: Use real device structure to verify dev extent a2790b9939ae btrfs: volumes: Make sure no dev extent is beyond device boundary cfbf227e0591 powerpc/pkeys: Fix handling of pkey state across fork() 2ad95be18995 scsi: megaraid_sas: Use 63-bit DMA addressing 3263f78640cc scsi: megaraid_sas: Add check for reset adapter bit dc4e3ec9d226 scsi: megaraid_sas: Fix combined reply queue mode detection eb124aaa2e85 btrfs: Fix error handling in btrfs_cleanup_ordered_extents 1669d1d2e696 btrfs: Remove extent_io_ops::fill_delalloc 338a528b7922 Btrfs: fix deadlock with memory reclaim during scrub fac803479f60 Btrfs: clean up scrub is_dev_replace parameter d3984e80d7f2 KVM: PPC: Book3S HV: Fix race between kvm_unmap_hva_range and MMU mode switch d88b01d04c6a drm/i915: Cleanup gt powerstate from gem b185bde520d5 drm/i915: Restore sane defaults for KMS on GEM error load f999485109d1 media: vim2m: use cancel_delayed_work_sync instead of flush_schedule_work a7b6f95f3ca6 media: vim2m: use workqueue e432a58d7a0d s390/zcrypt: reinit ap queue state machine during device probe a4f404af3ca8 ARM: davinci: dm644x: define gpio interrupts as separate resources 8d6b2b24ca85 ARM: davinci: dm355: define gpio interrupts as separate resources d31f2b61e7f9 ARM: davinci: dm646x: define gpio interrupts as separate resources 4883e9e66f76 ARM: davinci: dm365: define gpio interrupts as separate resources 0a6c3bdae2c9 ARM: davinci: da8xx: define gpio interrupts as separate resources 016218ef6bb0 drm/amd/dm: Understand why attaching path/tile properties are needed 853dc0759586 drm/amd/pp: Fix truncated clock value when set watermark 5faabd22ed64 powerplay: Respect units on max dcfclk watermark 11bedb2e77a0 Drivers: hv: kvp: Fix the recent regression caused by incorrect clean-up 74ff258346e4 Drivers: hv: kvp: Fix the indentation of some "break" statements e352d8eb9394 drm/atomic_helper: Disallow new modesets on unregistered connectors cff9e1e33151 drm/i915/gen9+: Fix initial readout for Y tiled framebuffers 8ccbb1d24c26 drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE 4b2dfc0e2d44 drm/i915: Fix intel_dp_mst_best_encoder() 796469e361ed x86/kvm/lapic: preserve gfn_to_hva_cache len on cache reinit cdad0f65050e KVM: hyperv: define VP assist page helpers b0d9043bdbe6 KVM: x86: hyperv: keep track of mismatched VP indexes f031fd03e22e KVM: x86: hyperv: consistently use 'hv_vcpu' for 'struct kvm_vcpu_hv' variables 0b535f7b95af KVM: x86: hyperv: enforce vp_index < KVM_MAX_VCPUS 8e91cc7f7f91 drm/amdgpu: Update gc_9_0 golden settings. bcc3bd761ab5 drm/amdgpu/gfx9: Update gfx9 golden settings. 2c2cf2245ff6 remoteproc: qcom: q6v5-mss: add SCM probe dependency 4d9707586ec7 x86, hibernate: Fix nosave_regions setup for hibernation 805e0e46eb54 Drivers: hv: kvp: Fix two "this statement may fall through" warnings 3f3beae22842 keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h bac1c4edb5c4 scsi: qla2xxx: Move log messages before issuing command to firmware 6e087eae89df media: cec: remove cec-edid.c 851308450a8f media: cec/v4l2: move V4L2 specific CEC functions to V4L2 c09d675f294b drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse" 3015291b2fb5 kernel/module: Fix mem leak in module_add_modinfo_attrs 9c49f7811f82 modules: always page-align module section allocations 84ba9ae18fbb remoteproc: qcom: q6v5: shore up resource probe handling 56944c0b9774 clk: s2mps11: Add used attribute to s2mps11_dt_match 480101a4aea2 nvme-fc: use separate work queue to avoid warning 5f147150b753 riscv: remove unused variable in ftrace 8d23872c7539 scripts/decode_stacktrace: match basepath using shell prefix operator, not regex 6c550a5db18f arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64 573370113b24 media: stm32-dcmi: fix irq = 0 case 7f8b23600779 powerpc/64: mark start_here_multiplatform as __ref 85a24825b2e6 x86/ftrace: Fix warning and considate ftrace_jmp_replace() and ftrace_call_replace() b93aed78eb78 selftests: fib_rule_tests: use pre-defined DEV_ADDR 68829256e1f9 timekeeping: Use proper ktime_add when adding nsecs in coarse offset 1aa38eceb6c0 {nl,mac}80211: fix interface combinations on crypto controlled devices 178d1337a527 blk-iolatency: fix STS_AGAIN handling 5f33e81250a6 Blk-iolatency: warn on negative inflight IO counter 91a71a61da8c hv_sock: Fix hang when a connection is closed 86d5ae21d6b8 batman-adv: Only read OGM tvlv_len after buffer len check 4b5fee457723 batman-adv: fix uninit-value in batadv_netlink_get_ifindex() 47a0f70d7d9a powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction 6e7040d65a71 vhost/test: fix build for vhost test - again 4f45483faadf vhost/test: fix build for vhost test dcd22e14780a drm/vmwgfx: Fix double free in vmw_recv_msg() 38d38d1e0cc5 sched/fair: Don't assign runtime for throttled cfs_rq 044ab4715585 ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentre 849f85bfdf12 ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FL a956998ac1c2 ALSA: hda/realtek - Add quirk for HP Pavilion 15 d11ca2d79334 ALSA: hda/realtek - Fix overridden device-specific initialization 2c4d2ce8b799 ALSA: hda - Fix potential endless loop at applying quirks Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Armin Kuster (cherry picked from commit 611c7d62d67016942323d2fa4f108774c85dce09) Signed-off-by: Armin Kuster --- .../linux/linux-yocto-rt_4.19.bb | 6 +++--- .../linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index c55ef50a5d..8e36d9aa48 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "02f0c38dd20819c0e9d279e3b1e95280101ea8ab" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine ?= "0e4a79e608e92830693e511a3dd282ce7c3b3f41" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index f4f411de19..2af79874e8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "283b870cef5f79a6f07465828a51f27a6aed4c50" -SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine_qemuarm ?= "be50001808f00efee538c2a3e7c0a5a2a2df65da" +SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index fb505862ee..73f1715b13 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "b0be447bc9053d07f3438999778bd077679ae756" -SRCREV_machine_qemuarm64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemumips ?= "3c8b21d0a335b5f418682969448574dfd0011f02" -SRCREV_machine_qemuppc ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemux86 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemux86-64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemumips64 ?= "2854797711fee4061fb760c2b6e0e3d3135195ab" -SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine_qemuarm ?= "7fde51abcaf389193ce5d87ebfb8e8fb66a9271a" +SRCREV_machine_qemuarm64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemumips ?= "8ac68d42beb24b275ac0d2a54a0a2291970e5dde" +SRCREV_machine_qemuppc ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemux86 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemux86-64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemumips64 ?= "ea2cb8731306f734bf0227575e04cafac7dfade0" +SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:44 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:44 -0800 Subject: [OE-core] [warrior 06/14] linux-yocto/4.19: update to v4.19.84 In-Reply-To: References: Message-ID: <69844300d3c547739cb1c3404c7b5ff74ed67d86.1581955142.git.akuster808@gmail.com> From: Bruce Ashfield Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: c555efaf1402 Linux 4.19.84 46a4a014c48e kvm: x86: mmu: Recovery of shattered NX large pages 6082f2e28887 kvm: Add helper function for creating VM worker threads 5219505fcbb6 kvm: mmu: ITLB_MULTIHIT mitigation db77548b1652 KVM: vmx, svm: always run with EFER.NXE=1 when shadow paging is active 37dfbc8ba763 KVM: x86: add tracepoints around __direct_map and FNAME(fetch) 9ef1fae24d58 KVM: x86: change kvm_mmu_page_get_gfn BUG_ON to WARN_ON b182093d1c70 KVM: x86: remove now unneeded hugepage gfn adjustment e79234ce5765 KVM: x86: make FNAME(fetch) and __direct_map more similar 8aaac3068623 kvm: mmu: Do not release the page inside mmu_set_spte() 30d8d8d6cd92 kvm: Convert kvm_lock to a mutex a991063ce576 kvm: x86, powerpc: do not allow clearing largepages debugfs entry 580c79e7e3e5 Documentation: Add ITLB_MULTIHIT documentation db5ae6596ae2 cpu/speculation: Uninline and export CPU mitigations helpers 955607466ace x86/cpu: Add Tremont to the cpu vulnerability whitelist f9aa6b73a407 x86/bugs: Add ITLB_MULTIHIT bug infrastructure 415bb221a070 x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs 4ad7466ddf2d x86/tsx: Add config options to set tsx=on|off|auto e3bf6b3ff55a x86/speculation/taa: Add documentation for TSX Async Abort 2402432d5557 x86/tsx: Add "auto" option to the tsx= cmdline parameter a0808f06dfa1 kvm/x86: Export MDS_NO=0 to guests when TSX is enabled 15dfa5d706df x86/speculation/taa: Add sysfs reporting for TSX Async Abort 6c58ea8525bf x86/speculation/taa: Add mitigation for TSX Async Abort b8eb348ae408 x86/cpu: Add a "tsx=" cmdline option with TSX disabled by default 37cf9ef900cc x86/cpu: Add a helper function x86_read_arch_cap_msr() 4002d16a2ae1 x86/msr: Add the IA32_TSX_CTRL MSR dbf38b17a892 KVM: x86: use Intel speculation bugs and features as derived in generic x86 code fee619bb8136 drm/i915/cmdparser: Fix jump whitelist clearing 255ed51599de drm/i915/gen8+: Add RC6 CTX corruption WA 011b7173cbdb drm/i915: Lower RM timeout to avoid DSI hard hangs a7bda639a17f drm/i915/cmdparser: Ignore Length operands during command matching 6e53c71a6913 drm/i915/cmdparser: Add support for backward jumps f27bc2b5950d drm/i915/cmdparser: Use explicit goto for error paths cdd77c6b4be4 drm/i915: Add gen9 BCS cmdparsing fea688c5dd81 drm/i915: Allow parsing of unsized batches 7ce726b61c57 drm/i915: Support ro ppgtt mapped cmdparser shadow buffers fc3510fe6f6b drm/i915: Add support for mandatory cmdparsing fba4207cf15e drm/i915: Remove Master tables from cmdparser f1ff77080fa1 drm/i915: Disable Secure Batches for gen6+ b4b1abdc6b18 drm/i915: Rename gen7 cmdparser tables e238e05ec2dc vsock/virtio: fix sock refcnt holding during the shutdown 2e7e3f16901d iio: imu: mpu6050: Fix FIFO layout for ICM20602 99ea48af7bd9 net: prevent load/store tearing on sk->sk_stamp d32629dcd1e5 netfilter: ipset: Copy the right MAC address in hash:ip,mac IPv6 sets 5833560d54fd usbip: Fix free of unallocated memory in vhci tx 6890b4bc3d2b cgroup,writeback: don't switch wbs immediately on dead wbs if the memcg is dead d3b3c0a14615 mm/filemap.c: don't initiate writeback if mapping has no dirty pages 285eb6af4351 iio: imu: inv_mpu6050: fix no data on MPU6050 d888a80727ab iio: imu: mpu6050: Add support for the ICM 20602 IMU 522128128dec blkcg: make blkcg_print_stat() print stats only for online blkgs 30b969392cf2 pinctrl: cherryview: Fix irq_valid_mask calculation ca79bb7e1168 ocfs2: protect extent tree in ocfs2_prepare_inode_for_write() 2c655a111968 pinctrl: intel: Avoid potential glitches if pin is in GPIO mode 713adf6dd327 e1000: fix memory leaks 4a05571772cc igb: Fix constant media auto sense switching when no cable is connected 1baab8352d80 net: ethernet: arc: add the missed clk_disable_unprepare 24523745ed41 NFSv4: Don't allow a cached open with a revoked delegation 440a748ed6df usb: dwc3: gadget: fix race when disabling ep with cancelled xfers e66f52eb3f29 hv_netvsc: Fix error handling in netvsc_attach() 99d5f18cebbf drm/amd/display: Passive DP->HDMI dongle detection fix e5edbf9c45ce drm/amdgpu: If amdgpu_ib_schedule fails return back the error. b651ddc15e7a iommu/amd: Apply the same IVRS IOAPIC workaround to Acer Aspire A315-41 214e4f0ecdd1 net: mscc: ocelot: refuse to overwrite the port's native vlan 5aedcc8aa8be net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up 3b956e63e2f3 net: hisilicon: Fix "Trying to free already-free IRQ" f09b99c883e8 fjes: Handle workqueue allocation failure 6376736d016f nvme-multipath: fix possible io hang after ctrl reconnect 1372527e6876 scsi: qla2xxx: stop timer in shutdown path f2bab3ed456c RDMA/hns: Prevent memory leaks of eq->buf_list 55ca08347487 RDMA/iw_cxgb4: Avoid freeing skb twice in arp failure case e36be7959326 usbip: tools: Fix read_usb_vudc_device() error path handling cd9561a53d26 USB: ldusb: use unsigned size format specifiers c753113ae714 USB: Skip endpoints with 0 maxpacket length ef38f4d123d0 perf/x86/uncore: Fix event group support f14751658a01 perf/x86/amd/ibs: Handle erratum #420 only on the affected CPU family (10h) 5b99e97b275a perf/x86/amd/ibs: Fix reading of the IBS OpData register and thus precise RIP validity 45944c4a7743 usb: dwc3: remove the call trace of USBx_GFLADJ dff38149cec4 usb: gadget: configfs: fix concurrent issue between composite APIs 10eb9abd21ba usb: dwc3: pci: prevent memory leak in dwc3_pci_probe c73ccf65e169 usb: gadget: composite: Fix possible double free memory bug 26d31e1c3ab2 usb: gadget: udc: atmel: Fix interrupt storm in FIFO mode. 88912019b49c usb: fsl: Check memory resource before releasing it 3a2675a2d97a macsec: fix refcnt leak in module exit routine 0d0ca85ad424 bonding: fix unexpected IFF_BONDING bit unset 50e31318b525 ipvs: move old_secure_tcp into struct netns_ipvs 102f4078fbdd ipvs: don't ignore errors in case refcounting ip_vs module fails 81de0b500baa netfilter: nf_flow_table: set timeout before insertion into hashes d45fc2ed472b scsi: qla2xxx: Initialized mailbox to prevent driver load failure b6612a3dbad8 scsi: lpfc: Honor module parameter lpfc_use_adisc 4e80e5614770 net: openvswitch: free vport unless register_netdevice() succeeds 027253315d70 RDMA/uverbs: Prevent potential underflow d582769add68 scsi: qla2xxx: fixup incorrect usage of host_byte 42de3a902443 net/mlx5: prevent memory leak in mlx5_fpga_conn_create_cq 7dfdcd9407f3 net/mlx5e: TX, Fix consumer index of error cqe dump 48dd71289ca3 RDMA/qedr: Fix reported firmware version 6208c2bfe224 iw_cxgb4: fix ECN check on the passive accept 89aa9e2626f4 RDMA/mlx5: Clear old rate limit when closing QP d6706b2ec108 HID: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() 113a154ef2f2 dmaengine: sprd: Fix the possible memory leak issue 6040f96d5147 dmaengine: xilinx_dma: Fix control reg update in vdma_channel_set_config 78e7e0248eb8 HID: google: add magnemite/masterball USB ids 8181146cd7de PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 e2dd254bde5c usbip: Implement SG support to vhci-hcd and stub driver f865ae473c16 usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path e9c0fc4a7ccd sched/fair: Fix -Wunused-but-set-variable warnings 502bd151448c sched/fair: Fix low cpu usage with high throttling by removing expiration of cpu-local slices 4ebee4875eab ALSA: usb-audio: Fix copy&paste error in the validator e0051889243d ALSA: usb-audio: remove some dead code 4f6c52002699 ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk() 3a0cdf210b94 ALSA: usb-audio: Clean up check_input_term() 9feeaa50e5b4 ALSA: usb-audio: Remove superfluous bLength checks f0e164f66e75 ALSA: usb-audio: Unify the release of usb_mixer_elem_info objects dae4d839e549 ALSA: usb-audio: Simplify parse_audio_unit() 17821e2fb167 ALSA: usb-audio: More validations of descriptor units 5e36cf8edb58 configfs: fix a deadlock in configfs_symlink() 0dfc45be875a configfs: provide exclusion between IO and removals 25c118d8d158 configfs: new object reprsenting tree fragments 65524d647e9d configfs_register_group() shouldn't be (and isn't) called in rmdirable parts 2bd63490c1dd configfs: stash the data we need into configfs_buffer at open time a7be2debb769 can: peak_usb: fix slab info leak ce9b94da0e04 can: mcba_usb: fix use-after-free on disconnect 5a9e37f2029f can: dev: add missing of_node_put() after calling of_get_child_by_name() 9289226f6982 can: gs_usb: gs_can_open(): prevent memory leak 9f5c59428843 can: rx-offload: can_rx_offload_queue_sorted(): fix error handling, avoid skb mem leak ef502d5a84d6 can: peak_usb: fix a potential out-of-sync while decoding packets 7ae08111ca70 can: c_can: c_can_poll(): only read status register after status IRQ 0327c7818da2 can: flexcan: disable completely the ECC mechanism 46265660e5ba can: usb_8dev: fix use-after-free on disconnect d8a76e300e37 SMB3: Fix persistent handles reconnect caddaf43b024 x86/apic/32: Avoid bogus LDR warnings dc1a91dc4917 intel_th: pci: Add Jasper Lake PCH support f9d3aea1dca2 intel_th: pci: Add Comet Lake PCH support 64997ee49c8c netfilter: ipset: Fix an error code in ip_set_sockfn_get() 1b0e60f6a48b netfilter: nf_tables: Align nft_expr private data to 64-bit 2dae80b5b666 ARM: sunxi: Fix CPU powerdown on A83T 20b9e094dcd3 iio: srf04: fix wrong limitation in distance measuring bee45b44b13e iio: imu: adis16480: make sure provided frequency is positive a428996147e2 iio: adc: stm32-adc: fix stopping dma 78a1d6cdd302 ceph: add missing check in d_revalidate snapdir handling 6f9657793a6e ceph: fix use-after-free in __ceph_remove_cap() 3840610d60b2 arm64: Do not mask out PTE_RDONLY in pte_same() 56f270a1d72c soundwire: bus: set initial value to port_status 9a06efc745c3 soundwire: depend on ACPI a81a4637456b HID: wacom: generic: Treat serial number and related fields as unsigned e3fdd0c1a3d0 drm/radeon: fix si_enable_smc_cac() failed issue f39fbd05f921 perf tools: Fix time sorting 66d53cd683a8 tools: gpio: Use !building_out_of_srctree to determine srctree 8e358a027611 dump_stack: avoid the livelock of the dump_lock 6c944fc51f0a mm, vmstat: hide /proc/pagetypeinfo from normal users 2686f71fdcc5 mm: thp: handle page cache THP correctly in PageTransCompoundMap 7dfa51beacac mm, meminit: recalculate pcpu batch and high limits after init completes 8e6bf4bc3a88 mm: memcontrol: fix network errors from failing __GFP_ATOMIC charges 6ecc16351a84 ALSA: hda/ca0132 - Fix possible workqueue stall 6921b1609912 ALSA: bebob: fix to detect configured source of sampling clock for Focusrite Saffire Pro i/o series b85472244b70 ALSA: timer: Fix incorrectly assigned timer instance 107451b87ea5 net: hns: Fix the stray netpoll locks causing deadlock in NAPI path 26e398dcb3f1 ipv6: fixes rt6_probe() and fib6_nh->last_probe init 05b761423d67 net: mscc: ocelot: fix NULL pointer on LAG slave removal 1cfc967ef584 net: mscc: ocelot: don't handle netdev events for other netdevs a6fdbaeef1f2 qede: fix NULL pointer deref in __qede_remove() 956b38853517 NFC: st21nfca: fix double free 1143496c9632 nfc: netlink: fix double device reference drop 760a1f7f22ee NFC: fdp: fix incorrect free object 5580091ce7d9 net: usb: qmi_wwan: add support for DW5821e with eSIM support 4fd218071f21 net: qualcomm: rmnet: Fix potential UAF when unregistering b9bda52f8f3e net: fix data-race in neigh_event_send() 2fbfdb2de4a1 net: ethernet: octeon_mgmt: Account for second possible VLAN header 88f8c39912bc ipv4: Fix table id reference in fib_sync_down_addr 0ddabef89067 CDC-NCM: handle incomplete transfer of MTU 27b5f4bf5ba9 bonding: fix state transition issue in link monitoring 7d8dbefc22ff Linux 4.19.83 818c96ac80be usb: gadget: udc: core: Fix segfault if udc_bind_to_driver() for pending driver fails b06f37eaa2b3 arm64: dts: ti: k3-am65-main: Fix gic-its node unit-address 54ee5ccd0251 ASoC: pcm3168a: The codec does not support S32_LE 3ddf2a70cf6d selftests/powerpc: Fix compile error on tlbie_test due to newer gcc e7aaa8dd60c5 selftests/powerpc: Add test case for tlbie vs mtpidr ordering issue ec199b24aa5c powerpc/mm: Fixup tlbie vs mtpidr/mtlpidr ordering issue on POWER9 06e8438eddf8 platform/x86: pmc_atom: Add Siemens SIMATIC IPC227E to critclk_systems DMI table 2d830cf287a5 wireless: Skip directory when generating certificates 558d2bdad5f6 net/flow_dissector: switch to siphash f6ef35998fb0 r8152: add device id for Lenovo ThinkPad USB-C Dock Gen 2 c33f7efec3b3 net: dsa: fix switch tree list 6b5bf3f37f72 net: usb: lan78xx: Connect PHY before registering MAC 07c62fc7bf28 net: bcmgenet: reset 40nm EPHY on energy detect 6d3ccc2a5b19 net: phy: bcm7xxx: define soft_reset for 40nm EPHY 97cc6827f418 net: bcmgenet: don't set phydev->link from MAC 57e286f67554 net: dsa: b53: Do not clear existing mirrored port mask db91be8e27c8 net/mlx5e: Fix ethtool self test: link speed 5eb1967bfde3 r8169: fix wrong PHY ID issue with RTL8168dp 9e7c4fa275cf net/mlx5e: Fix handling of compressed CQEs in case of low NAPI budget 0c3355cc8e19 selftests: fib_tests: add more tests for metric update b166e8838a97 ipv4: fix route update on metric change. cd3bcb44ee3b net: add READ_ONCE() annotation in __skb_wait_for_more_packets() 4f3df7f1eaa7 net: use skb_queue_empty_lockless() in busy poll contexts eaf548feaa17 net: use skb_queue_empty_lockless() in poll() handlers afa1f5e98c11 udp: use skb_queue_empty_lockless() d5ac4232c376 net: add skb_queue_empty_lockless() 83532eb48049 vxlan: check tun_info options_len properly a8a5adbbf779 udp: fix data-race in udp_set_dev_scratch() 12fab1634ab1 selftests: net: reuseport_dualstack: fix uninitalized parameter 321c99155f4b net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol() 9da271c1cdc1 net: usb: lan78xx: Disable interrupts before calling generic_handle_irq() 40400fdd312a netns: fix GFP flags in rtnl_net_notifyid() 1d72dbb4ca2f net/mlx4_core: Dynamically set guaranteed amount of counters per VF f05975d9f393 net: hisilicon: Fix ping latency when deal with high throughput 1d5cb12a2539 net: fix sk_page_frag() recursion from memory reclaim 189982d111c0 net: ethernet: ftgmac100: Fix DMA coherency issue with SW checksum 5536fc891221 net: dsa: bcm_sf2: Fix IMP setup for port different than 8 2c50a36d0b78 net: annotate lockless accesses to sk->sk_napi_id 0cfaf03c5d58 net: annotate accesses to sk->sk_incoming_cpu 07de738901d6 inet: stop leaking jiffies on the wire 163901dc945b erspan: fix the tun_info options_len check for erspan 96df1ec22b97 dccp: do not leak jiffies on the wire f291613ff140 cxgb4: fix panic when attaching to ULD fail 1f032ca298dd nbd: handle racing with error'ed out commands 82b7c99ee141 nbd: protect cmd->status with cmd->lock 80b42f4381c2 cifs: Fix cifsInodeInfo lock_sem deadlock when reconnect occurs a7448991fa3e i2c: stm32f7: remove warning when compiling with W=1 86fd9e339ab4 i2c: stm32f7: fix a race in slave mode with arbitration loss irq d746ce649556 i2c: stm32f7: fix first byte to send in slave mode 18e7fae372a1 irqchip/gic-v3-its: Use the exact ITSList for VMOVP 39637aafa173 MIPS: bmips: mark exception vectors as char arrays fcc3f7c810c3 of: unittest: fix memory leak in unittest_data_add c56b9da70d09 ARM: 8926/1: v7m: remove register save to stack before svc fa18f803d1f7 tracing: Fix "gfp_t" format for synthetic events 63571a1f375e scsi: target: core: Do not overwrite CDB byte 1 1df8da335d40 drm/amdgpu: fix potential VM faults 3cd2b6492cde ARM: davinci: dm365: Fix McBSP dma_slave_map entry e18bf407ea3f perf kmem: Fix memory leak in compact_gfp_flags() 05dd6283b8fc 8250-men-mcb: fix error checking when get_num_ports returns -ENODEV 81809424cad7 perf c2c: Fix memory leak in build_cl_output() 7a79420034e0 ARM: dts: imx7s: Correct GPT's ipg clock source e601e103cfed scsi: fix kconfig dependency warning related to 53C700_LE_ON_BE 3dd0be3eeeb0 scsi: sni_53c710: fix compilation error cf372c60ed13 scsi: scsi_dh_alua: handle RTPG sense code correctly during state transitions 3ee6a8bdae81 scsi: qla2xxx: fix a potential NULL pointer dereference 9d27ba401eca ARM: mm: fix alignment handler faults under memory pressure f0eabc9e9acb pinctrl: ns2: Fix off by one bugs in ns2_pinmux_enable() 9a5d5ffb3245 ARM: dts: logicpd-torpedo-som: Remove twl_keypad d7e2a8e271aa ASoc: rockchip: i2s: Fix RPM imbalance 513474f59001 ASoC: wm_adsp: Don't generate kcontrols without READ flags bab5c14b5c89 regulator: pfuze100-regulator: Variable "val" in pfuze100_regulator_probe() could be uninitialized 6ef17b446081 ASoC: rt5682: add NULL handler to set_jack function 772c18df9f3d regulator: ti-abb: Fix timeout in ti_abb_wait_txdone/ti_abb_clear_all_txdone c4c0e64deb9a arm64: dts: Fix gpio to pinmux mapping 0d3aef1ea7e8 arm64: dts: allwinner: a64: sopine-baseboard: Add PHY regulator delay a3a208ac4608 arm64: dts: allwinner: a64: pine64-plus: Add PHY regulator delay dc24ac36f304 ASoC: wm8994: Do not register inapplicable controls for WM1811 0f037d0a62b0 regulator: of: fix suspend-min/max-voltage parsing b17eae5a0e16 kbuild: add -fcf-protection=none when using retpoline flags 5ee93551c703 Linux 4.19.82 914a7d429da5 Revert "ALSA: hda: Flush interrupts on disabling" 8f5603029223 powerpc/powernv: Fix CPU idle to be called with IRQs disabled 92930e922399 ALSA: usb-audio: Add DSD support for Gustard U16/X26 USB Interface c08182dbf057 ALSA: usb-audio: Update DSD support quirks for Oppo and Rotel d8808d2e79b5 ALSA: usb-audio: DSD auto-detection for Playback Designs 831317430693 ALSA: timer: Fix mutex deadlock at releasing card 145fadf6d99a ALSA: timer: Simplify error path in snd_timer_open() a6c91087f5d5 sch_netem: fix rcu splat in netem_enqueue() 3ecf8529d52a net: usb: sr9800: fix uninitialized local variable 14a703ef2dc4 bonding: fix potential NULL deref in bond_update_slave_arr 24aaf7f4528f NFC: pn533: fix use-after-free and memleaks 8d9c4a9b8677 rxrpc: Fix trace-after-put looking at the put peer record e8e51ce79c15 rxrpc: rxrpc_peer needs to hold a ref on the rxrpc_local record 570ab0dd35f9 rxrpc: Fix call ref leak d634bd01b3a0 llc: fix sk_buff leak in llc_conn_service() 3f3f7409f028 llc: fix sk_buff leak in llc_sap_state_process() 948e8eba656f batman-adv: Avoid free/alloc race when handling OGM buffer 74001646d47c NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid() fd9a708c7bde drm/amdgpu/powerplay/vega10: allow undervolting in p7 3e285a5c1401 dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle a0e406be17e5 dmaengine: qcom: bam_dma: Fix resource leak 64efcbc7a5a3 rtlwifi: Fix potential overflow on P2P code a81669161528 arm64: Ensure VM_WRITE|VM_SHARED ptes are clean by default 8dd6066066a2 s390/idle: fix cpu idle time calculation ced8cb0230d0 s390/cmm: fix information leak in cmm_timeout_handler() be87ee689106 nl80211: fix validation of mesh path nexthop 14e0dd84db60 HID: fix error message in hid_open_report() 8a01c4b908cf HID: Fix assumption that devices have inputs cf143d65c556 HID: i2c-hid: add Trekstor Primebook C11B to descriptor override 6608702bec70 scsi: target: cxgbit: Fix cxgbit_fw4_ack() 45e7acdff38e USB: serial: whiteheat: fix line-speed endianness b7ad5aa67058 USB: serial: whiteheat: fix potential slab corruption 36e02e1fba89 usb: xhci: fix __le32/__le64 accessors in debugfs code 8e2cccd6c5d1 USB: ldusb: fix control-message timeout 3f1a7d903b8d USB: ldusb: fix ring-buffer locking f1b94b60bb1c usb-storage: Revert commit 747668dbc061 ("usb-storage: Set virt_boundary_mask to avoid SG overflows") d1c188d330ca USB: gadget: Reject endpoints with 0 maxpacket value ceb6b658f0bd UAS: Revert commit 3ae62a42090f ("UAS: fix alignment of scatter/gather segments") a58cdc35d3a0 ALSA: hda/realtek - Add support for ALC623 101bb262ba43 ALSA: hda/realtek - Fix 2 front mics of codec 0x623 3ae205d7a0a2 ALSA: bebob: Fix prototype of helper function to return negative value 62e42369de37 fuse: truncate pending writes on O_TRUNC 72c913fdde9d fuse: flush dirty data/metadata before non-truncate setattr 696da0225946 ath6kl: fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe() 1a124f16b594 thunderbolt: Use 32-bit writes when writing ring producer/consumer f2cc221b6515 USB: legousbtower: fix a signedness bug in tower_probe() 083322455c67 nbd: verify socket is supported during setup e0064f8de3f5 iwlwifi: exclude GEO SAR support for 3168 5a445f805afc ALSA: hda/realtek: Reduce the Headphone static noise on XPS 9350/9360 ce005e5d6e9f ARM: 8914/1: NOMMU: Fix exc_ret for XIP 394c90d9ce13 tracing: Initialize iter->seq after zeroing in tracing_read_pipe() 12e132664f92 s390/uaccess: avoid (false positive) compiler warnings da24be886ff6 NFSv4: Fix leak of clp->cl_acceptor string cad4448dfc9c nbd: fix possible sysfs duplicate warning c2ea451f22f1 virt: vbox: fix memory leak in hgcm_call_preprocess_linaddr 5865397db6c3 MIPS: fw: sni: Fix out of bounds init of o32 stack 317b6f68abb1 MIPS: include: Mark __xchg as __always_inline 4a4206a83fc6 iio: imu: adis16400: release allocated memory on failure f2824a020746 drm/amdgpu: fix memory leak a1112c465593 perf/x86/amd: Change/fix NMI latency mitigation to use a timestamp 2cd003a820fe sched/vtime: Fix guest/system mis-accounting on task switch 58d33d4a4a1d x86/cpu: Add Comet Lake to the Intel CPU models header 6258745b311b arm64: armv8_deprecated: Checking return value for memory allocation c3689876f5b9 fs: ocfs2: fix a possible null-pointer dereference in ocfs2_info_scan_inode_alloc() 4de544b42c7a fs: ocfs2: fix a possible null-pointer dereference in ocfs2_write_end_nolock() c18d86047622 fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry() 2141f777e6e1 ocfs2: clear zero in unaligned direct IO af140367ae66 x86/xen: Return from panic notifier 0169198631e7 MIPS: include: Mark __cmpxchg as __always_inline 9b7591cf6cf6 efi/x86: Do not clean dummy variable in kexec path 318885aa154d efi/cper: Fix endianness of PCIe class code 02c1fb11b6a0 serial: mctrl_gpio: Check for NULL pointer 497fd98a50b2 fs: cifs: mute -Wunused-const-variable message 579249a08348 gpio: max77620: Use correct unit for debounce times 7f3306a3b2df tty: n_hdlc: fix build on SPARC 14a4689f8847 tty: serial: owl: Fix the link time qualifier of 'owl_uart_exit()' d21a5d4a7339 arm64: ftrace: Ensure synchronisation in PLT setup for Neoverse-N1 #1542419 ca2cc4b47d01 nfs: Fix nfsi->nrequests count error on nfs_inode_remove_request aeb242943505 HID: hyperv: Use in-place iterator API in the channel callback 9c75c230ded2 RDMA/iwcm: Fix a lock inversion issue 962cff4f3f89 RDMA/hfi1: Prevent memory leak in sdma_init dfc1daba843b staging: rtl8188eu: fix null dereference when kzalloc fails 3545c018d0c3 perf annotate: Return appropriate error code for allocation failures f8304a9310c3 perf annotate: Propagate the symbol__annotate() error return 4e2ca0c9143c perf annotate: Fix the signedness of failure returns ec783e28e72d perf annotate: Propagate perf_env__arch() error f0ba7ab26bfc perf tools: Propagate get_cpuid() error c022c7f6171e perf jevents: Fix period for Intel fixed counters 5ecf35ed5d17 perf script brstackinsn: Fix recovery from LBR/binary mismatch 262ed71096ba perf map: Fix overlapped map handling d975e5970965 perf tests: Avoid raising SEGV using an obvious NULL dereference e3dc77d662ca libsubcmd: Make _FORTIFY_SOURCE defines dependent on the feature 915eb63dac7b iio: fix center temperature of bmc150-accel-core 78e6415d4f9a iio: adc: meson_saradc: Fix memory allocation order 1b6901f3c600 power: supply: max14656: fix potential use-after-free a0d8a590d983 drm/amd/display: fix odm combine pipe reset a897f54e921c PCI/PME: Fix possible use-after-free on remove 0e23eeb0fc58 net: dsa: mv88e6xxx: Release lock while requesting IRQ 646e5c77b418 exec: load_script: Do not exec truncated interpreter path f251c83d6c08 ext4: disallow files with EXT4_JOURNAL_DATA_FL from EXT4_IOC_SWAP_BOOT cc4d8283f6e9 media: vimc: Remove unused but set variables c629fed0347e ALSA: hda/realtek - Apply ALC294 hp init also for S4 resume b73132b74d25 cifs: add credits from unmatched responses/messages ee4d28a716e8 CIFS: Respect SMB2 hdr preamble size in read responses 2a2022688a91 scsi: lpfc: Correct localport timeout duration error 1df87fc5e468 mlxsw: spectrum: Set LAG port collector only when active e32271519bb9 arm64: kpti: Whitelist HiSilicon Taishan v110 CPUs 6021dd86ca38 arm64: Add MIDR encoding for HiSilicon Taishan CPUs 9190141529fb rtc: pcf8523: set xtal load capacitance from DT 961ba81d08d8 usb: handle warm-reset port requests on hub resume 3a77562e18bf ALSA: usb-audio: Cleanup DSD whitelist a0608eec296d usb: dwc3: gadget: clear DWC3_EP_TRANSFER_STARTED on cmd complete d0e8b35e915e usb: dwc3: gadget: early giveback if End Transfer already completed 335d4f818246 samples: bpf: fix: seg fault with NULL pointer arg c41f30e8d233 HID: steam: fix deadlock with input devices. 4c8ae7221bcc HID: steam: fix boot loop with bluetooth firmware ce05beb3b402 NFSv4: Ensure that the state manager exits the loop on SIGKILL 952b0285826e HID: Add ASUS T100CHI keyboard dock battery quirks 24ec7c1b9b17 staging: mt7621-pinctrl: use pinconf-generic for 'dt_node_to_map' and 'dt_free_map' b064e272023c scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks 9aafa2996921 clk: boston: unregister clks on failure in clk_boston_setup() 1ba6488775f1 ath10k: assign 'n_cipher_suites = 11' for WCN3990 to enable WPA3 a6af54d4ad0d platform/x86: Fix config space access for intel_atomisp2_pm 8694ceba9338 platform/x86: Add the VLV ISP PCI ID to atomisp2_pm 8c1b1d3c7593 HID: i2c-hid: Add Odys Winbook 13 to descriptor override 3db3961160f6 HID: i2c-hid: Ignore input report if there's no data present on Elan touchpanels e0bcac994ad8 HID: i2c-hid: Disable runtime PM for LG touchscreen d8187ff32b23 netfilter: ipset: Make invalid MAC address checks consistent cb38a17cc880 Btrfs: fix deadlock on tree root leaf when finding free extent 33970cf511c8 PCI: Fix Switchtec DMA aliasing quirk dmesg noise 437de04184bc bcache: fix input overflow to writeback_rate_minimum be488566ef2f drm/msm/dpu: handle failures while initializing displays b5b3bb03c372 x86/cpu: Add Atom Tremont (Jacobsville) ab0888699734 tools/power turbostat: fix goldmont C-state limit decoding 4da8b5f8a71d usb: dwc2: fix unbalanced use of external vbus-supply 649ee6f0c677 HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override ce43554395a3 f2fs: fix to recover inode->i_flags of inode block during POR b619de076f9c f2fs: fix to recover inode's i_gc_failures during POR 23848022460f powerpc/powernv: hold device_hotplug_lock when calling memtrace_offline_pages() bff91a961a05 sc16is7xx: Fix for "Unexpected interrupt: 8" 157c391babd7 scsi: lpfc: Fix a duplicate 0711 log message number. 6b2fbfacd74b f2fs: flush quota blocks after turnning it off e5641f02dc9e wil6210: fix freeing of rx buffers in EDMA mode d8ab4185ea55 btrfs: tracepoints: Fix wrong parameter order for qgroup events 6bcbe35027e2 btrfs: qgroup: Always free PREALLOC META reserve in btrfs_delalloc_release_extents() 96b9b94647b0 Btrfs: fix memory leak due to concurrent append writes with fiemap 692aa7d55ff8 Btrfs: fix inode cache block reserve leak on failure to allocate data space a8afda7774a3 dm snapshot: rework COW throttling to fix deadlock 223f1af69da8 dm snapshot: introduce account_start_copy() and account_end_copy() 0ca37291020e zram: fix race between backing_dev_show and backing_dev_store ef244c308885 Linux 4.19.81 27414f90ff6e RDMA/cxgb4: Do not dma memory off of the stack 054441182b51 blk-rq-qos: fix first node deletion of rq_qos_del() 2ada40308a0d PCI: PM: Fix pci_power_up() ccb02adf3293 xen/netback: fix error path of xenvif_connect_data() 89ab39da1452 cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown 5f19cbb3ab3f memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()' 0b95aaae783f btrfs: tracepoints: Fix bad entry members of qgroup events 1b921b5bc47f Btrfs: check for the full sync flag while holding the inode lock during fsync ac6bae2b524d Btrfs: add missing extents release on file extent cluster relocation error 6cd5be9832eb btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group() a5a10f7800ed pinctrl: armada-37xx: swap polarity on LED group e0e489aa5bd0 pinctrl: armada-37xx: fix control of pins 32 and up 5e9d71802ddc pinctrl: cherryview: restore Strago DMI workaround for all versions 4dedaa73c4c4 x86/apic/x2apic: Fix a NULL pointer deref when handling a dying cpu 1709917289cd x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area e49c84c51c3a dm cache: fix bugs when a GFP_NOWAIT allocation fails 5ce7528c4d4a tracing: Fix race in perf_trace_buf initialization 96202569b9fe perf/aux: Fix AUX output stopping 01332b037066 CIFS: Fix use after free of file info structures 71cf88165ff0 CIFS: avoid using MID 0xFFFF 4292745536d2 arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT d97e4a6d2b2f EDAC/ghes: Fix Use after free in ghes_edac remove path ca65fe21981b parisc: Fix vmap memory leak in ioremap()/iounmap() 19e2ed7bfabe xtensa: drop EXPORT_SYMBOL for outs*/ins* 30cff8ab6ed7 mm/memory-failure: poison read receives SIGKILL instead of SIGBUS if mmaped more than once 91eec7692b94 hugetlbfs: don't access uninitialized memmaps in pfn_range_valid_gigantic() f712e3066f75 mm/page_owner: don't access uninitialized memmaps when reading /proc/pagetypeinfo bb6932c5a473 mm/slub: fix a deadlock in show_slab_objects() 9792afbd630b mm/memory-failure.c: don't access uninitialized memmaps in memory_failure() 01a44055a48a mmc: cqhci: Commit descriptors before setting the doorbell 6ea856efef9f fs/proc/page.c: don't access uninitialized memmaps in fs/proc/page.c 43a2a6c2f0fb drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store() 4d5307c099af drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1 11377c3e997e drm/ttm: Restore ttm prefaulting 33af2a8ee304 drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50 24ca62892032 mac80211: Reject malformed SSID elements 73c066a9552a cfg80211: wext: avoid copying malformed SSIDs 83dc16707f6d ACPI: CPPC: Set pcc_data[pcc_ss_id] to NULL in acpi_cppc_processor_exit() 8e367b029e61 ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting b0dd6a24255e Input: synaptics-rmi4 - avoid processing unknown IRQs aa9402c14df6 Input: da9063 - fix capability and drop KEY_SLEEP e254d4359259 scsi: ch: Make it possible to open a ch device multiple times again 0c6905197c5b scsi: core: try to get module before removing device 2a675e73dfec scsi: core: save/restore command resid for error handling 0cea86f270e9 scsi: sd: Ignore a failure to sync cache due to lack of authorization 3638ccda1009 scsi: zfcp: fix reaction on bit error threshold notification d07c028d2bc9 staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS 4034a5030589 MIPS: tlbex: Fix build_restore_pagemask KScratch restore 9f7e157464cd USB: ldusb: fix read info leaks 3b73a0e453bd USB: usblp: fix use-after-free on disconnect 28ab2c5f5899 USB: ldusb: fix memleak on disconnect edd3e9c71cc8 USB: serial: ti_usb_3410_5052: fix port-close races 068fcbe895cd usb: udc: lpc32xx: fix bad bit shift operation 7ed43d2eb0ec ALSA: hda - Force runtime PM on Nvidia HDMI codecs 7dda74810c9a ALSA: usb-audio: Disable quirks for BOSS Katana amplifiers 6c8a9a46ec57 ALSA: hda/realtek - Enable headset mic on Asus MJ401TA 30a83eb0a09d ALSA: hda/realtek - Add support for ALC711 5366778bf0ed USB: legousbtower: fix memleak on disconnect 99b45e7a1ba1 memfd: Fix locking when tagging pins 2770f80afde7 sctp: change sctp_prot .no_autobind with true cd8c21ca7022 net: stmmac: disable/enable ptp_ref_clk in suspend/resume flow da4f0aed87d5 net: ipv6: fix listify ip6_rcv_finish in case of forwarding cc2d858b3f73 net/ibmvnic: Fix EOI when running in XIVE mode. 3f9d4e3c2954 net: i82596: fix dma_alloc_attr for sni_82596 da0baae9a725 net: bcmgenet: Set phydev->dev_flags only for internal PHYs c0f5839a483f net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 16d67acad815 net: avoid potential infinite loop in tc_ctl_action() 2fa80e64de33 ipv4: Return -ENETUNREACH if we can't create route but saddr is valid 2ec0df4e3fee ipv4: fix race condition between route lookup and invalidation 0d3ad773b445 ocfs2: fix panic due to ocfs2_wq is null 0933b0db7fb2 Revert "drm/radeon: Fix EEH during kexec" 9457994a53d1 md/raid0: fix warning message for parameter default_layout 51f0c10890aa libata/ahci: Fix PCS quirk application 9bc5a4db9aa9 namespace: fix namespace.pl script to support relative paths 6acbcd1429f1 r8152: Set macpassthru in reset_resume callback 0cb5c7b06a0a lib: textsearch: fix escapes in example code 50699af3609c net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write() db1e664e2d80 mips: Loongson: Fix the link time qualifier of 'serial_exit()' b43bf6b10344 net: dsa: rtl8366rb: add missing of_node_put after calling of_get_child_by_name a16a9c10b2b0 netfilter: nft_connlimit: disable bh on garbage collection 13104599d07f mac80211: fix txq null pointer dereference 09c5a5bb0f26 nl80211: fix null pointer dereference 90a886b68faa xen/efi: Set nonblocking callbacks 5d880444955e MIPS: dts: ar9331: fix interrupt-controller size 6d0da953bd8e net: dsa: qca8k: Use up to 7 ports for all operations 1cd24f5edab8 ARM: dts: am4372: Set memory bandwidth limit for DISPC 960019214539 ieee802154: ca8210: prevent memory leak ec3817c62ede ARM: OMAP2+: Fix warnings with broken omap2_set_init_voltage() a23cd06c2cd2 ARM: OMAP2+: Fix missing reset done flag for am3 and am43 fcff55e25593 scsi: qla2xxx: Fix unbound sleep in fcport delete path. c3d475c7d9b9 scsi: megaraid: disable device when probe failed after enabled device c6d91bd3fa35 scsi: ufs: skip shutdown if hba is not powered db783e05df55 nvme-pci: Fix a race in controller removal c3038e718a19 Linux 4.19.80 0603d82bcae4 perf/hw_breakpoint: Fix arch_hw_breakpoint use-before-initialization 91849adc9f90 PCI: vmd: Fix config addressing when using bus offsets cd4b60e57a7a x86/asm: Fix MWAITX C-state hint value 99ada52ce213 hwmon: Fix HWMON_P_MIN_ALARM mask b9040fab5f36 tracing: Get trace_array reference for available_tracers files a6c9fb2c2ce4 ftrace: Get a reference counter for the trace_array on filter files b7f758631d69 tracing/hwlat: Don't ignore outer-loop duration when calculating max_latency 6271cbff9309 tracing/hwlat: Report total time spent in all NMIs during the sample 3766c9d9c47c arm64/sve: Fix wrong free for task->thread.sve_state 6f64aa703c0c media: stkwebcam: fix runtime PM after driver unbind 664ec2db3b1f Fix the locking in dcache_readdir() and friends a64241ba496c arm64: topology: Use PPTT to determine if PE is a thread b098a4cd99ff ACPI/PPTT: Add support for ACPI 6.3 thread flag a73306414fcd ACPICA: ACPI 6.3: PPTT add additional fields in Processor Structure Flags 34ab38cd8098 MIPS: elf_hwcap: Export userspace ASEs aaa81d9e6523 MIPS: Disable Loongson MMI instructions for kernel build e9360f393d7b NFS: Fix O_DIRECT accounting of number of bytes read/written e0805d7f7f1b btrfs: fix uninitialized ret in ref-verify f7313de46e46 btrfs: fix incorrect updating of log root tree a8de7090805d cifs: use cifsInodeInfo->open_file_lock while iterating to avoid a panic f6c715708fb8 iio: adc: stm32-adc: fix a race when using several adcs with dma and irq a9968a4d6399 iio: adc: stm32-adc: move registers definitions 410ab742a503 gpiolib: don't clear FLAG_IS_OUT when emulating open-drain/open-source b41013b51870 firmware: google: increment VPD key_len properly 491a39dcee44 mm/vmpressure.c: fix a signedness bug in vmpressure_register_event() 7bbe6eefdbb3 kernel/sysctl.c: do not override max_threads provided by userspace 230b339a7c75 CIFS: Force reval dentry if LOOKUP_REVAL flag is set 0bc78de461b4 CIFS: Force revalidate inode when dentry is stale d72c2115108f CIFS: Gracefully handle QueryInfo errors during open 345c03a0defb blk-wbt: fix performance regression in wbt scale_up/scale_down d855a5f2dec7 perf inject jit: Fix JIT_CODE_MOVE filename 47a4e4decddd perf llvm: Don't access out-of-scope array ee7ee6cfc3af efivar/ssdt: Don't iterate over EFI vars if no SSDT override was specified c9a182ddf2d4 iio: light: opt3001: fix mutex unlock race 811616a6400d iio: adc: axp288: Override TS pin bias current for some models 99757b1d9c17 iio: adc: ad799x: fix probe error handling 2cb6f0417ee1 iio: adc: hx711: fix bug in sampling of data 2f9a82e2d2e6 staging: vt6655: Fix memory leak in vt6655_probe df455ed36901 Staging: fbtft: fix memory leak in fbtft_framebuffer_alloc d58d477c5852 gpio: eic: sprd: Fix the incorrect EIC offset when toggling ce20fd3e1530 mei: avoid FW version request on Ibex Peak and earlier d7e57796b6c0 mei: me: add comet point (lake) LP device ids f931791751d3 USB: legousbtower: fix use-after-free on release e3f445666f51 USB: legousbtower: fix open after failed reset request 99c0c615ff98 USB: legousbtower: fix potential NULL-deref on disconnect fe471bf16720 USB: legousbtower: fix deadlock on disconnect 4fde6c982393 USB: legousbtower: fix slab info leak at probe dff3bc5edcf6 usb: renesas_usbhs: gadget: Fix usb_ep_set_{halt,wedge}() behavior 55efffb294d2 usb: renesas_usbhs: gadget: Do not discard queues in usb_ep_set_{halt,wedge}() 3b089cef3cc1 USB: dummy-hcd: fix power budget for SuperSpeed mode ab8d87d14d82 USB: microtek: fix info-leak at probe 0f14e44ebc0e USB: usblcd: fix I/O after disconnect 58c2b4c5610d USB: serial: fix runtime PM after driver unbind 8dcda04939fd USB: serial: option: add support for Cinterion CLS8 devices f7ab1c54c1a4 USB: serial: option: add Telit FN980 compositions 13b0420eb2ea USB: serial: ftdi_sio: add device IDs for Sienna and Echelon PL-20 a463d20a5772 USB: serial: keyspan: fix NULL-derefs on open() and write() 21917fcb05d1 serial: uartlite: fix exit path null pointer 0c999b4b00db USB: ldusb: fix NULL-derefs on driver unbind 39fe586c4069 USB: chaoskey: fix use-after-free on release 2f2b039530ea USB: usblp: fix runtime PM after driver unbind 2095532522d1 USB: iowarrior: fix use-after-free after driver unbind 7f93c8c89541 USB: iowarrior: fix use-after-free on release 2fdcf7e19bde USB: iowarrior: fix use-after-free on disconnect ab162d331cc1 USB: adutux: fix use-after-free on release ca9c18c00a95 USB: adutux: fix NULL-derefs on disconnect 316f51d77597 USB: adutux: fix use-after-free on disconnect ea7255663398 xhci: Increase STS_SAVE timeout in xhci_suspend() cbc5abaa6f30 xhci: Prevent deadlock when xhci adapter breaks during init fde058a17c18 usb: xhci: wait for CNR controller not ready bit in xhci resume 13e793da4f70 xhci: Fix USB 3.1 capability detection on early xHCI 1.1 spec based hosts d6bdd4686ffc xhci: Check all endpoints for LPM timeout faa0502a5be5 xhci: Prevent device initiated U1/U2 link pm if exit latency is too long 077855ba2df2 xhci: Fix false warning message about wrong bounce buffer write length 31604075ceb4 USB: usb-skeleton: fix NULL-deref on disconnect dcabc48fe0ac USB: usb-skeleton: fix runtime PM after driver unbind 571a14063619 USB: yurex: fix NULL-derefs on disconnect a8fe336f20b9 USB: yurex: Don't retry on unexpected errors 86575b7f636f USB: rio500: Remove Rio 500 kernel driver 95bcc0d980ae f2fs: use EINVAL for superblock with invalid magic 7d1688c6731b panic: ensure preemption is disabled during panic() dafd634415a7 Linux 4.19.79 1bd17a737c9e nl80211: validate beacon head 527ba5d7634b cfg80211: Use const more consistently in for_each_element macros ad180cace853 cfg80211: add and use strongly typed element iteration macros 3dab5ba6d7ae staging: erofs: detect potential multiref due to corrupted images 8b4341f9b80b staging: erofs: add two missing erofs_workgroup_put for corrupted images 596bbc4e0edf staging: erofs: some compressed cluster should be submitted for corrupted images e7c44410387c staging: erofs: fix an error handling in erofs_readdir() 1b94c1e80ca8 coresight: etm4x: Use explicit barriers on enable/disable effad578c23f vfs: Fix EOVERFLOW testing in put_compat_statfs64 d976344d27f7 arm64/speculation: Support 'mitigations=' cmdline option af33d746286c arm64: Use firmware to detect CPUs that are not affected by Spectre-v2 17d1acc4c61d arm64: Force SSBS on context switch fe22ea561ce0 arm64: ssbs: Don't treat CPUs with SSBS as unaffected by SSB dada3a4abb43 arm64: add sysfs vulnerability show for speculative store bypass f41df38898ec arm64: add sysfs vulnerability show for spectre-v2 9d1bb39cdd96 arm64: Always enable spectre-v2 vulnerability detection b1a33cfd8034 arm64: Advertise mitigation of Spectre-v2, or lack thereof 59a6dc262c85 arm64: Provide a command line to disable spectre_v2 mitigation c131623b1e9d arm64: Always enable ssb vulnerability detection 47a11f2eafcc arm64: enable generic CPU vulnerabilites support 512158d0c67e arm64: add sysfs vulnerability show for meltdown 047aac35fd1a arm64: Add sysfs vulnerability show for spectre-v1 edfc026626d6 arm64: fix SSBS sanitization 09c22781dd2c arm64: docs: Document SSBS HWCAP a59d42ac50a1 KVM: arm64: Set SCTLR_EL2.DSSBS if SSBD is forcefully disabled and !vhe 1eaff33e2441 arm64: ssbd: Add support for PSTATE.SSBS rather than trapping to EL3 d286a37471b6 riscv: Avoid interrupts being erroneously enabled in handle_exception() 5b67a4721ddd perf stat: Reset previous counts on repeat with interval 15c57bf9dcf8 perf tools: Fix segfault in cpu_cache_level__read() e5331c37c08b tick: broadcast-hrtimer: Fix a race in bc_set_next 140acbb09384 tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on failure d1e4b4cc3bba powerpc/book3s64/radix: Rename CPU_FTR_P9_TLBIE_BUG feature flag f5f31a6ea558 powerpc/pseries: Fix cpu_hotplug_lock acquisition in resize_hpt() c688982ffaeb nbd: fix crash when the blksize is zero 63bb8b76ed62 KVM: nVMX: Fix consistency check on injected exception error code 34b13ff69668 KVM: PPC: Book3S HV: XIVE: Free escalation interrupts before disabling the VP 1b155b4fe8b4 drm/radeon: Bail earlier when radeon.cik_/si_support=0 is passed 04e0c84f137d nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs 575a5bb3d372 perf unwind: Fix libunwind build failure on i386 systems b0aaf65bb16a kernel/elfcore.c: include proper prototypes bab46480e6f9 perf build: Add detection of java-11-openjdk-devel package 46ff0e2f869f sched/core: Fix migration to invalid CPU in __set_cpus_allowed_ptr() 6cb7aa1b4f94 sched/membarrier: Fix private expedited registration check e250f2b6aa9e sched/membarrier: Call sync_core only before usermode for same mm 9f33b178cbb2 libnvdimm/nfit_test: Fix acpi_handle redefinition 7b4f541fcd1c fuse: fix memleak in cuse_channel_open 2e93d24ac75e libnvdimm/region: Initialize bad block for volatile namespaces 9025adf37ee8 thermal_hwmon: Sanitize thermal_zone type c01a9dbec18a thermal: Fix use-after-free when unregistering thermal zone device 55ebeb4e865d ntb: point to right memory window index 9dabade5c197 x86/purgatory: Disable the stackleak GCC plugin for the purgatory 65348659535d pwm: stm32-lp: Add check in case requested period cannot be achieved 19b1c70e911c pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors 1c70ae6a91f9 drm/amdgpu: Check for valid number of registers to read e0af3b19ad77 drm/amdgpu: Fix KFD-related kernel oops on Hawaii f7ace7f25214 netfilter: nf_tables: allow lookups in dynamic sets f217883bbc92 watchdog: aspeed: Add support for AST2600 520c2a64fc78 ceph: reconnect connection if session hang in opening state 0275113fc09a ceph: fix directories inode i_blkbits initialization 2bc2a90a083a xen/pci: reserve MCFG areas earlier 18dd2b05f349 9p: avoid attaching writeback_fid on mmap with type PRIVATE 07f3596ce344 9p: Transport error uninitialized 448deb13ab9e fs: nfs: Fix possible null-pointer dereferences in encode_attrs() 4753e7a824cb ima: fix freeing ongoing ahash_request b69c3085fcc6 ima: always return negative code for error 6df3c66de09d arm64: cpufeature: Detect SSBS and advertise to userspace 3a0e673305e2 cfg80211: initialize on-stack chandefs 16c75eb13a72 s390/cio: avoid calling strlen on null pointer 3f41e88f4bd4 ieee802154: atusb: fix use-after-free at disconnect 975859bb69b2 xen/xenbus: fix self-deadlock after killing user process e409b81d9ddb Revert "locking/pvqspinlock: Don't wait if vCPU is preempted" 7ed2867ceb41 mmc: sdhci-of-esdhc: set DMA snooping based on DMA coherence 4509a19d5082 mmc: sdhci: improve ADMA error reporting 873f49d6a4e8 drm/i915/gvt: update vgpu workload head pointer correctly 198bc7040c48 drm/nouveau/kms/nv50-: Don't create MSTMs for eDP connectors 7a85c8673551 drm/msm/dsi: Fix return value check for clk_get_parent 0e45633f49ef drm/omap: fix max fclk divider for omap36xx 90ac4028739c perf stat: Fix a segmentation fault when using repeat forever 22f28afd3d77 watchdog: imx2_wdt: fix min() calculation in imx2_wdt_set_timeout e7cf8cc79f93 PCI: Restore Resizable BAR size bits correctly for 1MB BARs 956ce989c41f PCI: vmd: Fix shadow offsets to reflect spec changes 06f250215beb timer: Read jiffies once when forwarding base clk 12c6c4a50f66 usercopy: Avoid HIGHMEM pfn warning e010c9835183 tracing: Make sure variable reference alias has correct var_ref_idx 022ca58f109e power: supply: sbs-battery: only return health when battery present 5cb6dd823127 power: supply: sbs-battery: use correct flags field fb93ccde081e MIPS: Treat Loongson Extensions as ASEs a0dc60ac6bef crypto: ccree - use the full crypt length value f5c087a0d9a0 crypto: ccree - account for TEE not ready to report 561bf9309209 crypto: caam - fix concurrency issue in givencrypt descriptor 3683dd7074dc crypto: cavium/zip - Add missing single_release() cd8e0a5d94fb crypto: skcipher - Unmap pages after an external error 9349108ae499 crypto: qat - Silence smp_processor_id() warning 532920b26678 tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file 4aaea17d3c31 can: mcp251x: mcp251x_hw_reset(): allow more time after a reset 9124eac41a67 powerpc/book3s64/mm: Don't do tlbie fixup for some hardware revisions 19c12f12093e powerpc/powernv/ioda: Fix race in TCE level allocation 032ce7d766a9 powerpc/powernv: Restrict OPAL symbol map to only be readable by root ba3ca9fcb0e7 powerpc/mce: Schedule work from irq_work ee6eeeb88e79 powerpc/mce: Fix MCE handling for huge pages 1284f2073415 ASoC: sgtl5000: Improve VAG power and mute control 50090b75fa89 ASoC: Define a set of DAPM pre/post-up events 42b888f63333 PM / devfreq: tegra: Fix kHz to Hz conversion 9f0f39c92e4f nbd: fix max number of supported devs eff3a54aae68 KVM: nVMX: handle page fault in vmread fix 21874027e1de KVM: X86: Fix userspace set invalid CR4 30fbe0d380aa KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9 4faa7f05af75 KVM: PPC: Book3S HV: Check for MMU ready on piggybacked virtual cores 577a5119d7af KVM: PPC: Book3S HV: Fix race in re-enabling XIVE escalation interrupts 46cb14a57088 s390/cio: exclude subchannels with no parent from pseudo check 9aa823b3c0a6 s390/topology: avoid firing events before kobjs are created ddfef75f877b KVM: s390: Test for bad access register and size at the start of S390_MEM_OP 8b41a30f91db s390/process: avoid potential reading of freed stack Signed-off-by: Bruce Ashfield (cherry picked from commit e23a86fa40be2e1dfe50baeebe787e98f793cc5b) Signed-off-by: Armin Kuster (cherry picked from commit 8a36666265002805134cc3786c0e81bc709d8d10) Signed-off-by: Armin Kuster --- .../linux/linux-yocto-rt_4.19.bb | 6 +++--- .../linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index 8e36d9aa48..f588d7f522 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "0e4a79e608e92830693e511a3dd282ce7c3b3f41" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine ?= "f272b39688fbec016d91b5c0c9d1bb7b5bc3b2ca" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 2af79874e8..0f3b0d569b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "be50001808f00efee538c2a3e7c0a5a2a2df65da" -SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine_qemuarm ?= "d971adf5221e18df3ba46bddee4719c85f98977a" +SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 73f1715b13..17620c74b5 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "7fde51abcaf389193ce5d87ebfb8e8fb66a9271a" -SRCREV_machine_qemuarm64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemumips ?= "8ac68d42beb24b275ac0d2a54a0a2291970e5dde" -SRCREV_machine_qemuppc ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemux86 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemux86-64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemumips64 ?= "ea2cb8731306f734bf0227575e04cafac7dfade0" -SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine_qemuarm ?= "425023bd5cfe4f4f7b950c84f62861de600d4f6c" +SRCREV_machine_qemuarm64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemumips ?= "6273d88ca69ada3ae4684fc6301e39381f4cd3e4" +SRCREV_machine_qemuppc ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemux86 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemux86-64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemumips64 ?= "f9368853646be5ce9f122adb733cbf8225641e8c" +SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:46 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:46 -0800 Subject: [OE-core] [warrior 08/14] python2: add ntpath In-Reply-To: References: Message-ID: <3e69681857b88be44797d1d302b9e44a46a7634d.1581955142.git.akuster808@gmail.com> python3 has this but python is missing this. [Yocto #13740] Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie (cherry picked from commit af41a2238beec0c34c1c1e5f25eed55f2a214643) Signed-off-by: Armin Kuster --- meta/recipes-devtools/python/python/python2-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json index eb52e862ab..fd98774d00 100644 --- a/meta/recipes-devtools/python/python/python2-manifest.json +++ b/meta/recipes-devtools/python/python/python2-manifest.json @@ -267,6 +267,7 @@ "${libdir}/python2.7/lib-dynload/xreadlines.so", "${libdir}/python2.7/linecache.py", "${libdir}/python2.7/new.py", + "${libdir}/python2.7/ntpath.py", "${libdir}/python2.7/os.py", "${libdir}/python2.7/platform.py", "${libdir}/python2.7/posixpath.py", -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:45 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:45 -0800 Subject: [OE-core] [warrior 07/14] linux-yocto/4.19: update to v4.19.87 In-Reply-To: References: Message-ID: From: Bruce Ashfield Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: 174651bdf802 Linux 4.19.87 6938a9da7ff8 PM / devfreq: Fix kernel oops on governor module load 345712c95eec KVM: PPC: Book3S HV: Flush link stack on guest exit to host kernel 0a60d4bddc0b powerpc/book3s64: Fix link stack flush on context switch 19d98b4d55b0 powerpc/64s: support nospectre_v2 cmdline option b7e2a040d9fc staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error 4101916e9f08 USB: serial: option: add support for Foxconn T77W968 LTE modules 62aca6645c08 USB: serial: option: add support for DW5821e with eSIM support 3349ed266ae2 USB: serial: mos7840: fix remote wakeup abbda35d6a6e USB: serial: mos7720: fix remote wakeup 84743898d60b USB: serial: mos7840: add USB ID to support Moxa UPort 2210 356440a79b6b appledisplay: fix error handling in the scheduled work 0439d6b90187 USB: chaoskey: fix error case of a timeout a18675e5d5f7 usb-serial: cp201x: support Mark-10 digital force gauge 61f6a3fac394 usbip: Fix uninitialized symbol 'nents' in stub_recv_cmd_submit() 375b26a86481 usbip: tools: fix fd leakage in the function of read_attr_usbip_status e70448b92253 USBIP: add config dependency for SGL_ALLOC 5d0b56f6725d virtio_ring: fix return code on DMA mapping fails 78260a294c04 media: imon: invalid dereference in imon_touch_event 94a94b605916 media: cxusb: detect cxusb_ctrl_msg error in query 8b42c263ec1a media: b2c2-flexcop-usb: add sanity checking 56be9f1b8733 media: uvcvideo: Fix error path in control parsing failure 61e73cf57ed8 cpufreq: Add NULL checks to show() and store() methods of cpufreq f217cef919da media: usbvision: Fix races among open, close, and disconnect 467052f6ea5a media: vivid: Fix wrong locking that causes race conditions on streaming stop b73b28b1b2cb media: vivid: Set vid_cap_streaming and vid_out_streaming to true af8071f50f46 nfc: port100: handle command failure cleanly 3510fb7947d5 ALSA: usb-audio: Fix NULL dereference at parsing BADD 2819f4030f43 futex: Prevent robust futex exit race d3f8c58d701c y2038: futex: Move compat implementation into futex.c 344966da99c9 nbd: prevent memory leak ed7a3dde0aa2 x86/speculation: Fix redundant MDS mitigation message 0af5ae268e24 x86/speculation: Fix incorrect MDS/TAA mitigation status ed7312096a1f x86/insn: Fix awk regexp warnings 99b933bbc7b0 ARC: perf: Accommodate big-endian CPU e02f1448282b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary 046f0fcf7397 ocfs2: remove ocfs2_is_o2cb_active() 36bef080b55f net: phy: dp83867: increase SGMII autoneg timer duration 87997a7800a1 net: phy: dp83867: fix speed 10 in sgmii mode 5779cbc98369 mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() a268d985f089 md/raid10: prevent access of uninitialized resync_pages offset f8dc0350d32b ath9k_hw: fix uninitialized variable data f0cfe98332d6 ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe 4ae7392ab6f4 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved 03bf4876a593 Bluetooth: Fix invalid-free in bcsp_close() 006360ec33d9 mm/page_io.c: do not free shared swap slots 16a300fb1dbb cfg80211: call disconnect_wk when AP stops 2b3541ffdd05 ipv6: Fix handling of LLA with VRF and sockets bound to VRF 091ed093c9c8 mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock 896f7398152b i2c: uniphier-f: fix timeout error after reading 8 bytes 1efa17ab9cb8 spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch 1b0f1b2dde06 nvme-pci: fix surprise removal 597a37d01b69 PCI: keystone: Use quirk to limit MRRS for K2G c0418c4a61aa pinctrl: zynq: Use define directive for PIN_CONFIG_IO_STANDARD 0858006cda38 pinctrl: lpc18xx: Use define directive for PIN_CONFIG_GPIO_PIN_INT 5efa36e7f04a pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL bad4da12b797 pinctrl: qcom: spmi-gpio: fix gpio-hog related boot issues c24fe7807320 cfg80211: Prevent regulatory restore during STA disconnect in concurrent interfaces ee7d2473812b tools: bpftool: pass an argument to silence open_obj_pinned() 367e64ce11fc of: unittest: initialize args before calling of_*parse_*() e4547e028547 of: unittest: allow base devicetree to have symbol metadata 1303c938c953 net: bcmgenet: return correct value 'ret' from bcmgenet_power_down 1d6a0dd6aa53 ACPICA: Use %d for signed int print formatting instead of %u d15b8b691725 clk: tegra20: Turn EMC clock gate into divider 91c5f99d131e vrf: mark skb for multicast or link-local as enslaved to VRF 5c2a3997ae5b dlm: don't leak kernel pointer to userspace afb4717ab81b dlm: fix invalid free 30fc13ae88b2 usb: typec: tcpm: charge current handling for sink during hard reset 5e989b6cad68 scsi: lpfc: Correct loss of fc4 type on remote port address change a391709b636e scsi: lpfc: Fix odd recovery in duplicate FLOGIs in point-to-point 05678af01a33 scsi: lpfc: fcoe: Fix link down issue after 1000+ link bounces e6d0262e1628 scsi: megaraid_sas: Fix goto labels in error handling 83e679606e78 scsi: megaraid_sas: Fix msleep granularity ff997bf13c1e scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11 80224e3b08ff scsi: mpt3sas: Don't modify EEDPTagMode field setting on SAS3.5 HBA devices 5553e2bdcb02 scsi: mpt3sas: Fix Sync cache command failure during driver unload 5f2dc610eb28 net: dsa: bcm_sf2: Turn on PHY to allow successful registration 2ac94b9e902f rtlwifi: rtl8192de: Fix misleading REG_MCUFWDL information 13d434fed1a2 wireless: airo: potential buffer overflow in sprintf() fad934bb2e47 brcmsmac: never log "tid x is not agg'able" by default bdb61fa50b70 rtl8xxxu: Fix missing break in switch 06ed77066838 wlcore: Fix the return value in case of error in 'wlcore_vendor_cmd_smart_config_start()' c68a499448e1 ath10k: snoc: fix unbalanced clock error handling c262dc0655df wil6210: fix locking in wmi_call ccb2390e8933 wil6210: fix RGF_CAF_ICR address for Talyn-MB 0e1304ae42c2 wil6210: fix L2 RX status handling aa2112d57152 wil6210: fix debugfs memory access alignment ea136e61e4df btrfs: avoid link error with CONFIG_NO_AUTO_INLINE 4a035f2643c6 media: ov13858: Check for possible null pointer 3ee72f30c163 nds32: Fix bug in bitfield.h e6c6c0439a93 net: bpfilter: fix iptables failure if bpfilter_umh is disabled 811c8141d663 sock_diag: fix autoloading of the raw_diag module 3c69a033b416 audit: print empty EXECVE args 5dc441fbef91 soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL 9cdfff0a5e61 clk: sunxi-ng: enable so-said LDOs for A64 SoC's pll-mipi clock a2e6fe1f647f ARM: dts: imx6sx-sdb: Fix enet phy regulator 465073e44fda openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS 31bced01fe77 sched/fair: Don't increase sd->balance_interval on newidle balance ed023646c2cf sched/topology: Fix off by one bug f9fca78e6cf2 net: do not abort bulk send on BQL status 0d3b9ac2844f ocfs2: fix clusters leak in ocfs2_defrag_extent() 6c150df9c2e8 ocfs2: don't put and assigning null to bh allocated outside 6fd469d06eb8 ocfs2: don't use iocb when EIOCBQUEUED returns abc7968b86b1 ocfs2: without quota support, avoid calling quota recovery 6a2245d828e4 mm: handle no memcg case in memcg_kmem_charge() properly 08f07d9f5b17 tools/power turbosat: fix AMD APIC-id output b167fee4e45d arm64: makefile fix build of .i file in external module case fa7f1bce27c0 nvme-pci: fix conflicting p2p resource adds 0bbb8382db4c irq/matrix: Fix memory overallocation ad8298fccd70 ntb: intel: fix return value for ndev_vec_mask() 3bd4422af874 ntb_netdev: fix sleep time mismatch 8dbecf6c2f17 net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read 12eeb72afac2 net: hns3: bugfix for is_valid_csq_clean_head() e3345108409c net: hns3: bugfix for reporting unknown vector0 interrupt repeatly problem b0465d06d4c6 net: hns3: bugfix for buffer not free problem during resetting 3d9bc014c519 fm10k: ensure completer aborts are marked as non-fatal after a resume 2fed73906e97 igb: shorten maximum PHC timecounter update interval 3081ae5e378f powerpc/powernv: hold device_hotplug_lock when calling device_online() 17523d7a1cc8 mm/memory_hotplug: fix online/offline_pages called w.o. mem_hotplug_lock 02735d5987b9 mm/memory_hotplug: make add_memory() take the device_hotplug_lock 023c071f101c kernel/panic.c: do not append newline to the stack protector panic string 1914e5edd811 fs/hfs/extent.c: fix array out of bounds read of array extent a9f38975eb98 hfs: update timestamp on truncate() 0013adceb521 hfsplus: update timestamps on truncate() 38e7b916daa2 hfs: fix return value of hfs_get_block() 550da9ee35fd hfsplus: fix return value of hfsplus_get_block() 8687d57d247a hfs: prevent btree data loss on ENOSPC 0b54b59d8541 hfsplus: prevent btree data loss on ENOSPC 7beaf6105e2e hfs: fix BUG on bnode parent update 1df96949ebfb hfsplus: fix BUG on bnode parent update 08751e477f0e lib/bitmap.c: fix remaining space computation in bitmap_print_to_pagebuf 1d5834945945 linux/bitmap.h: fix type of nbits in bitmap_shift_right() 8deaaf77ce2e linux/bitmap.h: handle constant zero-size bitmaps correctly 30598425aecc mm/gup_benchmark.c: prevent integer overflow in ioctl 9663d294ae28 block: call rq_qos_exit() after queue is frozen a125df22d134 selftests/powerpc/cache_shape: Fix out-of-tree build 024cd793bbe1 selftests/powerpc/switch_endian: Fix out-of-tree build a4a660f7abd9 selftests/powerpc/signal: Fix out-of-tree build f74f406bbd0b selftests/powerpc/ptrace: Fix out-of-tree build 57aab8f0a33d powerpc/xmon: Relax frame size for clang 32d7474b7a08 ipv4/igmp: fix v1/v2 switchback timeout based on rfc3376, 8.12 691bd94c15b1 vfs: avoid problematic remapping requests into partial EOF block cdc45f204775 um: Make line/tty semantics use true write IRQ a17e3bbfb97c i2c: uniphier-f: fix race condition when IRQ is cleared a118403a5ecc i2c: uniphier-f: fix occasional timeout error 1466eae37a9f i2c: uniphier-f: make driver robust against concurrency 10807b374663 block: fix the DISCARD request merge b948d56951be macsec: let the administrator set UP state even if lowerdev is down f5bdad7106fc macsec: update operstate when lower device changes 4291e97c69f6 mm: thp: fix MADV_DONTNEED vs migrate_misplaced_transhuge_page race condition ac1cad79bcad tools/testing/selftests/vm/gup_benchmark.c: fix 'write' flag usage 2d9d6c099eaf mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock bcba80f38a00 fs/ocfs2/dlm/dlmdebug.c: fix a sleep-in-atomic-context bug in dlm_print_one_mle() 99b3146b799a arm64: lib: use C string functions with KASAN enabled b84e965c7edb sparc64: Rework xchg() definition to avoid warnings. 4e4cad4365e0 powerpc/process: Fix flush_all_to_thread for SPE 54299e1cf379 bpf, btf: fix a missing check bug in btf_parse 8044e741eee4 bpf: devmap: fix wrong interface selection in notifier_call 7b557dbdc519 net: ethernet: cadence: fix socket buffer corruption problem 3681b901e94a thermal: rcar_thermal: Prevent hardware access during system suspend 436e610bf195 thermal: rcar_thermal: fix duplicate IRQ request 51aa1a10fbac selftests: fix warning: "_GNU_SOURCE" redefined c62be4108883 selftests: kvm: Fix -Wformat warnings 5802cb25de86 selftests: watchdog: Fix error message. 74685702363c selftests: watchdog: fix message when /dev/watchdog open fails 58ceffabad41 selftests/ftrace: Fix to test kprobe $comm arg only if available adcb6d9ff121 spi: uniphier: fix incorrect property items 6c2075f792c6 fs/cifs: fix uninitialised variable warnings c5621fbd6560 net: socionext: Stop PHY before resetting netsec 0a6fa6119ab1 mfd: max8997: Enale irq-wakeup unconditionally 5a04242e8c23 mfd: intel_soc_pmic_bxtwc: Chain power button IRQs as well dd72391c9a53 mfd: mc13xxx-core: Fix PMIC shutdown when reading ADC values 02c9ec11860f mfd: arizona: Correct calling of runtime_put_sync e79d230832d0 net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode 7c011435110f qlcnic: fix a return in qlcnic_dcb_get_capability() 321c40dce581 mISDN: Fix type of switch control variable in ctrl_teimanager 074af1668038 f2fs: spread f2fs_set_inode_flags() e7f81efae3b5 f2fs: fix to spread clear_cold_data() 733fddc34651 thermal: armada: fix a test in probe() bb925b9bece2 RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap 829aa617bf6e rtc: s35390a: Change buf's type to u8 in s35390a_init 8112f3d4ed03 ceph: only allow punch hole mode in fallocate 146fb4b0d4fe ceph: fix dentry leak in ceph_readdir_prepopulate 083757d84859 tools: bpftool: fix completion for "bpftool map update" 570c05378d97 selftests/bpf: fix return value comparison for tests in test_libbpf.sh 3173e226ca41 powerpc/64s/radix: Fix radix__flush_tlb_collapsed_pmd double flushing pmd b43c5287f6bc powerpc/mm/radix: Fix small page at boundary when splitting b499fa070ee4 powerpc/mm/radix: Fix overuse of small pages in splitting logic 434551e9fd44 powerpc/mm/radix: Fix off-by-one in split mapping logic ee35e01b0f08 powerpc/pseries: Export raw per-CPU VPA data via debugfs 9ed143cf730d scsi: hisi_sas: Fix NULL pointer dereference ff6618e06cb4 sparc: Fix parport build warnings. 3d02e3bb3cfe x86/intel_rdt: Prevent pseudo-locking from using stale pointers b6e44f743951 spi: omap2-mcspi: Set FIFO DMA trigger level to word length ad9a4e963c92 swiotlb: do not panic on mapping failures 9b572e8bc038 s390/perf: Return error when debug_register fails 641f1f798c80 atm: zatm: Fix empty body Clang warnings f9304c6277ed sunrpc: safely reallow resvport min/max inversion 7983dea8c368 SUNRPC: Fix a compile warning for cmpxchg64() a0ec7f6eabe8 selftests/bpf: fix file resource leak in load_kallsyms 56b8b1832122 dm raid: avoid bitmap with raid4/5/6 journal device 4de506d51177 sctp: use sk_wmem_queued to check for writable space 1f7f2a0666a3 usbip: tools: fix atoi() on non-null terminated string 283d9618e22b USB: misc: appledisplay: fix backlight update_status return code 80a23f70d546 PCI: vmd: Detach resources after stopping root bus b0f69ccfff3a macintosh/windfarm_smu_sat: Fix debug output 86f63146f886 ALSA: i2c/cs8427: Fix int to char conversion 46729b27706a PM / Domains: Deal with multiple states but no governor in genpd cf800f2b630b ACPI / scan: Create platform device for INT33FE ACPI nodes cb6a3096ec2f kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack f0f842a1a9f9 xfs: clear ail delwri queued bufs on unmount of shutdown fs bb64349b6f56 xfs: fix use-after-free race in xfs_buf_rele e0e8d83e4878 net: ena: Fix Kconfig dependency on X86 7ac437558e4a net: fix warning in af_unix 5e110ec2d924 net: dsa: mv88e6xxx: Fix 88E6141/6341 2500mbps SERDES speed 274726bcf5ba scsi: zorro_esp: Limit DMA transfers to 65535 bytes 1f13afca914f scsi: dc395x: fix DMA API usage in sg_update_list e95ec662b126 scsi: dc395x: fix dma API usage in srb_done 95655b10529d ASoC: tegra_sgtl5000: fix device_node refcounting f1f1002a9987 clk: at91: audio-pll: fix audio pmc type f15b802890bb clk: mmp2: fix the clock id for sdh2_clk and sdh3_clk 6391dd5eb0ef PCI: mediatek: Fixup MSI enablement logic by enabling MSI before clocks 305c262fb8ee nvme-pci: fix hot removal during error handling 4e4b97f59050 nvmet-fcloop: suppress a compiler warning 2f1e4e65ba41 nvmet: avoid integer overflow in the discard code 30ca1af49481 crypto: ccree - avoid implicit enum conversion 5bbeb4fcf39a scsi: iscsi_tcp: Explicitly cast param in iscsi_sw_tcp_host_get_param 06815ae5e27f scsi: bfa: Avoid implicit enum conversion in bfad_im_post_vendor_event f4bf2dc77826 scsi: isci: Change sci_controller_start_task's return type to sci_status 3a40068dc831 scsi: isci: Use proper enumerated type in atapi_d2h_reg_frame_handler 6288f52ed258 clk: tegra: Fixes for MBIST work around 5a487f40e717 KVM/x86: Fix invvpid and invept register operand size in 64-bit mode 7392aa08f8a4 KVM: nVMX: move check_vmentry_postreqs() call to nested_vmx_enter_non_root_mode() 9fe573d539a8 KVM: nVMX: reset cache/shadows when switching loaded VMCS cec14148c1a9 nfp: bpf: protect against mis-initializing atomic counters bfe01cddb81a scsi: ips: fix missing break in switch 073f454cc28c qed: Align local and global PTT to propagate through the APIs. 45f89cf0f329 amiflop: clean up on errors during setup 4043bc0f634b pwm: lpss: Only set update bit if we are actually changing the settings ad78a958663a pinctrl: sunxi: Fix a memory leak in 'sunxi_pinctrl_build_state()' fae3cf8874c3 RDMA/bnxt_re: Avoid resource leak in case the NQ registration fails b1bf1e424dcb RDMA/bnxt_re: Fix qp async event reporting 2f241e333f7b RDMA/bnxt_re: Avoid NULL check after accessing the pointer bbeeadb7bab4 scsi: hisi_sas: Free slot later in slot_complete_vx_hw() 628cae51693a scsi: hisi_sas: Fix the race between IO completion and timeout for SMP/internal IO d10b7dd14a37 scsi: hisi_sas: Feed back linkrate(max/min) when re-attached 92ac0e324974 m68k: fix command-line parsing when passed from u-boot 4ab1594e699e w1: IAD Register is yet readable trough iad sys file. Fix snprintf (%u for unsigned, count for max size). d11d985d0a82 misc: mic: fix a DMA pool free failure a2204a295554 gsmi: Fix bug in append_to_eventlog sysfs handler cc08097f2619 btrfs: handle error of get_old_root 1b49c453a564 btrfs: defrag: use btrfs_mod_outstanding_extents in cluster_pages_for_defrag 9325e8f4688c PCI: mediatek: Fix class type for MT7622 to PCI_CLASS_BRIDGE_PCI dfffae314a02 mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail e2c158f58522 mmc: mediatek: fill the actual clock for mmc debugfs e3fa491211c4 spi: sh-msiof: fix deferred probing 2cd0b70c55b0 cdrom: don't attempt to fiddle with cdo->capability 0c5c34c1aaf3 skd: fixup usage of legacy IO API 196b007ac0a6 ath10k: allocate small size dma memory in ath10k_pci_diag_write_mem 17fbe3c91ad4 ath10k: set probe request oui during driver start 8111f99f7c44 brcmsmac: AP mode: update beacon when TIM changes 20e42ddf6c1d mt76x0: phy: fix restore phase in mt76x0_phy_recalibrate_after_assoc 8cb568162524 mt76: do not store aggregation sequence number for null-data frames b95998fb6c50 EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr() 97aab1a43a2f powerpc/eeh: Fix use of EEH_PE_KEEP on wrong field bd2a7e53cd6e powerpc/eeh: Fix null deref for devices removed during EEH 16e4657a1d25 powerpc/boot: Disable vector instructions 5346c8403733 powerpc/boot: Fix opal console in boot wrapper 4505cff2ef4a powerpc: Fix signedness bug in update_flash_db() 93b943c0602f synclink_gt(): fix compat_ioctl() 8d67a4ecb473 pty: fix compat ioctls fa3fe5f442ab gfs2: Fix marking bitmaps non-full 26a4c6a562ce PCI: cadence: Write MSI data with 32bits ca71f9c8adc2 pinctrl: madera: Fix uninitialized variable bug in madera_mux_set_mux 4465a916eaa7 printk: fix integer overflow in setup_log_buf() 90d73768ddb6 printk: lock/unlock console only for new logbuf entries 8888689bd433 crypto: testmgr - fix sizeof() on COMP_BUF_SIZE 3757657af27e ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback 49a9643b5e8d mwifiex: Fix NL80211_TX_POWER_LIMITED e80e88ef6057 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() a0ee03bb5269 drm/i915/pmu: "Frequency" is reported as accumulated cycles 8a67fbf65971 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs e8d355befc42 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() b28da9da6e51 Revert "fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()" 67380639dfdb virtio_console: allocate inbufs in add_port() only if it is needed 65d153c8ed65 nbd:fix memory leak in nbd_get_socket() 036588ec6888 tools: gpio: Correctly add make dependencies for gpio_utils 7cb8ee734c18 gpio: max77620: Fixup debounce delays 70d594d17ebb vhost/vsock: split packets to send using multiple buffers 48bc34efbc65 net/mlx5: Fix auto group size calculation 28a4cc2b5d6f net/mlxfw: Verify FSM error code translation doesn't exceed array size 7c1a53817782 net/mlx5e: Fix set vf link state error flow 1ff2a0f8692f sfc: Only cancel the PPS workqueue if it exists 13512a5eb818 net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key 2ba6a4f5402e net/sched: act_pedit: fix WARN() in the traffic path 9f6de5cf5390 net: rtnetlink: prevent underflows in do_setvfinfo() ebcb0840a76b net/mlx4_en: Fix wrong limitation for number of TX rings 5408138df1db net/mlx4_en: fix mlx4 ethtool -N insertion baa888ca02db mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel 14260788bbb9 Linux 4.19.86 2e1f151cd2d9 x86/resctrl: Fix rdt_find_domain() return value and checks d64b58520670 mmc: tmio: fix SCC error handling to avoid false positive CRC error e2a37708cfca powerpc/time: Fix clockevent_decrementer initalisation for PR KVM ff36ace6c107 tools: PCI: Fix broken pcitest compilation 4039b5dd0f67 PM / devfreq: Fix static checker warning in try_then_request_governor 903cfafe0874 ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate 6491a2d26c08 tcp: start receiver buffer autotuning sooner ef0811ef95ea ARM: dts: omap5: Fix dual-role mode on Super-Speed port 183f9ae8c4d2 mlxsw: spectrum_switchdev: Check notification relevance based on upper device 16ad1c43196a spi: rockchip: initialize dma_slave_config properly f28abe5a3695 mac80211: minstrel: fix sampling/reporting of CCK rates in HT mode 83ea4ccdb9eb mac80211: minstrel: fix CCK rate group streams value 8bbedf4dffe9 mac80211: minstrel: fix using short preamble CCK rates on HT clients 5d017065cec9 misc: cxl: Fix possible null pointer dereference 9089b2f0049e netfilter: nft_compat: do not dump private area e6c540bf9786 net: sched: avoid writing on noop_qdisc b80939a47413 selftests: forwarding: Have lldpad_app_wait_set() wait for unknown, too a119952d4be6 hwmon: (npcm-750-pwm-fan) Change initial pwm target to 255 4bbc8deedd89 hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros 5bdad12ab211 hwmon: (pwm-fan) Silence error on probe deferral 0cb6525b75e1 hwmon: (nct6775) Fix names of DIMM temperature sources a58d5770493c hwmon: (k10temp) Support all Family 15h Model 6xh and Model 7xh processors 1301b861cf50 scsi: arcmsr: clean up clang warning on extraneous parentheses b0c75ea8d372 pinctrl: gemini: Fix up TVC clock group 2a6c8fc0af64 orangefs: rate limit the client not running info message 336793832f26 x86/mm: Do not warn about PCI BIOS W+X mappings 1eeb7407d233 ARM: 8802/1: Call syscall_trace_exit even when system call skipped e616dd603c29 spi: spidev: Fix OF tree warning logic 4fabd2e530ab pinctrl: gemini: Mask and set properly 8aa36b8a7684 spi: fsl-lpspi: Prevent FIFO under/overrun by default 07ed61a0a711 gpio: syscon: Fix possible NULL ptr usage 312de5a09d10 net: fix generic XDP to handle if eth header was mangled 014045888a74 bpf: btf: Fix a missing check bug 85f996c36e15 x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error 3f4f4c639f29 lightnvm: pblk: consider max hw sectors supported for max_write_pgs d4ab0df8d5dd lightnvm: pblk: fix error handling of pblk_lines_init() cdf73455471a lightnvm: do no update csecs and sos on 1.2 1fb60da4d736 lightnvm: pblk: guarantee mw_cunits on read buffer 1e9796622bc7 lightnvm: pblk: fix write amplificiation calculation d56fe8f59a23 lightnvm: pblk: guarantee emeta on line close c7e49f73152f lightnvm: pblk: fix incorrect min_write_pgs ced6b5dae1dc lightnvm: pblk: fix rqd.error return value in pblk_blk_erase_sync e99956093f70 ALSA: hda/ca0132 - Fix input effect controls for desktop cards 9c30ea2dda5d media: venus: vdec: fix decoded data size 5b388c45c3e5 media: cx231xx: fix potential sign-extension overflow on large shift 4d7cf69b77ce GFS2: Flush the GFS2 delete workqueue before stopping the kernel threads 1adde6589b4a media: isif: fix a NULL pointer dereference bug 3404019d6d0f printk: Give error on attempt to set log buffer length to over 2G b2d6db3e572a mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable b0c6a78a8a5a backlight: lm3639: Unconditionally call led_classdev_unregister 94764e3ae569 proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted() e78c55ad6657 s390/kasan: avoid user access code instrumentation ef5ad4f11e74 s390/kasan: avoid instrumentation of early C code 5228d07c4f92 s390/kasan: avoid vdso instrumentation 0046af383099 mmc: mmci: expand startbiterr to irqmask and error check 322f530fd959 x86/intel_rdt: CBM overlap should also check for overlap with CDP peer 36cf91317ca9 x86/intel_rdt: Introduce utility to obtain CDP peer f9a2a8b8a5d4 mtd: devices: m25p80: Make sure WRITE_EN is issued before each write 6664533b4fc1 mtd: spi-nor: cadence-quadspi: Use proper enum for dma_[un]map_single 370dbbc7b5cb media: cx18: Don't check for address of video_dev 76765353043b media: dw9807-vcm: Fix probe error handling 96134bbea649 media: dw9714: Fix error handling in probe function 2103ebde9ac0 platform/x86: mlx-platform: Properly use mlxplat_mlxcpld_msn201x_items 04d38fa8436b bcache: recal cached_dev_sectors on detach 65910055b560 bcache: account size of buckets used in uuid write to ca->meta_sectors_written 16c2d36b1123 reset: Fix potential use-after-free in __of_reset_control_get() 84b787e35482 fbdev: fix broken menu dependencies 21bb43c0dd86 fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() e57ba9db8c5f fbdev: sbuslib: use checked version of put_user() 964cd867ef63 atmel_lcdfb: support native-mode display-timings a3a76b5d22f0 mmc: renesas_sdhi_internal_dmac: set scatter/gather max segment size e8853ef02e2d mmc: tmio: Fix SCC error detection 01395b5f089b mmc: renesas_sdhi_internal_dmac: Whitelist r8a774a1 500c933055e7 x86/fsgsbase/64: Fix ptrace() to read the FS/GS base accurately b17ddbdc6035 xsk: proper AF_XDP socket teardown ordering 29fda86178fe iwlwifi: mvm: don't send keys when entering D3 d43b7b99fe77 ACPI / SBS: Fix rare oops when removing modules 7f02606367b3 xfrm: use correct size to initialise sp->ovec 6b9c4eddb3be crypto: mxs-dcp - Fix AES issues 70ecd0459d03 crypto: mxs-dcp - Fix SHA null hashes and output length fef30612e23c dmaengine: rcar-dmac: set scatter/gather max segment size af23231acaf6 x86/olpc: Fix build error with CONFIG_MFD_CS5535=m 624cd074631a kexec: Allocate decrypted control pages for kdump if SME is enabled 59e5269c692e remoteproc: qcom: q6v5: Fix a race condition on fatal crash 4b8c7bce49ca remoteproc: Check for NULL firmwares in sysfs interface e4aecc15d7c4 tc-testing: fix build of eBPF programs d653bd939cb1 net: hns3: Fix for rx vlan id handle to support Rev 0x21 hardware 3bef7420e129 soc: fsl: bman_portals: defer probe after bman's probe 090122baa262 Input: silead - try firmware reload after unsuccessful resume c13b00c39464 Input: st1232 - set INPUT_PROP_DIRECT property 205ae6b06288 i2c: zx2967: use core to detect 'no zero length' quirk 1698ed9f0e2f i2c: tegra: use core to detect 'no zero length' quirk d511166558a4 i2c: qup: use core to detect 'no zero length' quirk e0d9c58c49e6 i2c: omap: use core to detect 'no zero length' quirk f3afad5d1eff gfs2: slow the deluge of io error messages 35c8125cbea4 media: cec-gpio: select correct Signal Free Time 58d0a3dbad2b media: ov5640: fix framerate update 47dd538e9c44 dmaengine: ioat: fix prototype of ioat_enumerate_channels 90d73c1cadb8 NFSv4.x: fix lock recovery during delegation recall 799c98cba071 printk: Correct wrong casting e7ff1141b60c i2c: brcmstb: Allow enabling the driver on DSL SoCs 8b3e444fe8d0 clk: samsung: Use clk_hw API for calling clk framework from clk notifiers 599d5350f123 clk: samsung: exynos5420: Define CLK_SECKEY gate clock only or Exynos5420 06da39429640 clk: samsung: Use NOIRQ stage for Exynos5433 clocks suspend/resume fe46630cd2a1 qtnfmac: drop error reports for out-of-bounds key indexes 4ecc631d975c qtnfmac: inform wireless core about supported extended capabilities 28d5342b2ae4 qtnfmac: pass sgi rate info flag to wireless core 5554e47a2946 qtnfmac: request userspace to do OBSS scanning if FW can not 75a1e8dec421 brcmfmac: fix full timeout waiting for action frame on-channel tx c01258a2ad7d brcmfmac: reduce timeout for action frame scan 89cf2472a295 cpu/SMT: State SMT is disabled even with nosmt and without "=force" 8fce141f4805 mtd: physmap_of: Release resources on error d46cd42b4ffa usb: dwc2: disable power_down on rockchip devices 3ad0531dbe0c USB: serial: cypress_m8: fix interrupt-out transfer length 24ce099a5388 KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR 8b6021ca47a3 bnxt_en: return proper error when FW returns HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED 6e454b0ad02d ALSA: hda/sigmatel - Disable automute for Elo VuPoint 6925a5afc148 media: i2c: adv748x: Support probing a single output a02bad04d110 media: rcar-vin: fix redeclaration of symbol 14dc7aeef3f4 media: pxa_camera: Fix check for pdev->dev.of_node 7672ca60a14a media: rc: ir-rc6-decoder: enable toggle bit for Kathrein RCU-676 remote 01e9e39f4f61 qed: Avoid implicit enum conversion in qed_ooo_submit_tx_buffers d1dff747758f ata: ep93xx: Use proper enums for directions 6a70c66a84e0 powerpc/64s/radix: Explicitly flush ERAT with local LPID invalidation 9e4649e443e2 powerpc/time: Use clockevents_register_device(), fixing an issue with large decrementer d7e546d06182 ASoC: qdsp6: q6asm-dai: checking NULL vs IS_ERR() 27ab8f1648ac cpuidle: menu: Fix wakeup statistics updates for polling state 38ad2aa9331b ACPICA: Never run _REG on system_memory and system_IO 216929d15b2c OPP: Return error on error from dev_pm_opp_get_opp_count() 3d0c72f99efc msm/gpu/a6xx: Force of_dma_configure to setup DMA for GMU 674b223d7a48 rpmsg: glink: smem: Support rx peak for size less than 4 bytes ec9fc981de57 IB/mlx4: Avoid implicit enumerated type conversion d5d78049b7a4 RDMA/hns: Limit the size of extend sge of sq 010af7a8d0ae RDMA/hns: Bugfix for CM test 5b7064adfb4b RDMA/hns: Submit bad wr when post send wr exception af76265532a8 RDMA/hns: Bugfix for reserved qp number 350703fae672 IB/rxe: avoid srq memory leak e3db306d1fda IB/mthca: Fix error return code in __mthca_init_one() 1b86b8ad6e47 ixgbe: Fix crash with VFs and flow director on interface flap 0e1fd69cff75 i40e: Use proper enum in i40e_ndo_set_vf_link_state 22b8d7e3bcb5 ixgbe: Fix ixgbe TX hangs with XDP_TX beyond queue limit b69cfc4f2665 md: allow metadata updates while suspending an array - fix 4aa110048087 ice: Fix forward to queue group logic d97a02b84879 clocksource/drivers/sh_cmt: Fix clocksource width for 32-bit machines 31fb5ea6ed1b clocksource/drivers/sh_cmt: Fixup for 64-bit machines 0e8855ba9f9a tools: PCI: Fix compilation warnings 9372023e10ee PM / hibernate: Check the success of generating md5 digest before hibernation ed896ddfae94 mtd: rawnand: sh_flctl: Use proper enum for flctl_dma_fifo0_transfer 83cda9ea1876 ARM: dts: at91: sama5d2_ptc_ek: fix bootloader env offsets 10551e574d79 ARM: dts: at91: at91sam9x5cm: fix addressable nand flash size 825d176a1049 ARM: dts: at91: sama5d4_xplained: fix addressable nand flash size ab9928588283 powerpc/xive: Move a dereference below a NULL test 38d7fa28157e powerpc/pseries: Fix how we iterate over the DTL entries a3576a228404 powerpc/pseries: Fix DTL buffer registration b28aa87d081c cxgb4: Use proper enum in IEEE_FAUX_SYNC efdacf2b7aa7 cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update 743ccf759e8e mei: samples: fix a signedness bug in amt_host_if_call() cc7d996a4428 x86/PCI: Apply VMD's AERSID fixup generically 6cedfaffb4ac sunrpc: Fix connect metrics 7e4602eac666 clk: keystone: Enable TISCI clocks if K3_ARCH 6c487c0e877a ext4: fix build error when DX_DEBUG is defined f2877a3c332d ALSA: hda: Fix mismatch for register mask and value in ext controller. ae3765a0a33d dmaengine: timb_dma: Use proper enum in td_prep_slave_sg 0c21aa9b5651 dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction 671ce9f892b9 printk: CON_PRINTBUFFER console registration is a bit racy cd120df118d7 printk: Do not miss new messages when replaying the log 5a6f7274e67b KVM: PPC: Inform the userspace about TCE update failures 38374aa3c916 watchdog: w83627hf_wdt: Support NCT6796D, NCT6797D, NCT6798D 96505abd2435 watchdog: sama5d4: fix timeout-sec usage 26d6e542dc47 watchdog: renesas_wdt: stop when unregistering f4cfb7eeae62 watchdog: core: fix null pointer dereference when releasing cdev a9f36455edc1 irqchip/irq-mvebu-icu: Fix wrong private data retrieval be4f5457a5fd nl80211: Fix a GET_KEY reply attribute 21ba66937e0d usb: dwc3: gadget: Check ENBLSLPM before sending ep command 639fce0bc8b5 usb: gadget: udc: fotg210-udc: Fix a sleep-in-atomic-context bug in fotg210_get_status() f22a4d8cf049 selftests/tls: Fix recv(MSG_PEEK) & splice() test cases 475398b72984 ath9k: fix reporting calculated new FFT upper max f6ec4fccbf9a PM / devfreq: stopping the governor before device_unregister() fc491a1e77be PM / devfreq: Fix handling of min/max_freq == 0 b5add975c871 PM / devfreq: Fix devfreq_add_device() when drivers are built as modules. 5f5a8d36749f ata: ahci_brcm: Allow using driver or DSL SoCs 4cfcb5379a9c rtlwifi: btcoex: Use proper enumerated types for Wi-Fi only interface e5895e41aeb3 ath10k: fix vdev-start timeout on error 06cb99e6399d arm64/numa: Report correct memblock range for the dummy node 256a29480733 kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table bae080e72e92 iommu/arm-smmu-v3: Fix unexpected CMD_SYNC timeout 2bab3df8f506 iommu/io-pgtable-arm: Fix race handling in split_blk_unmap() 741a445a88e4 mt76: fix handling ps-poll frames ddb4299f1d78 mt76x2: disable WLAN core before probe b14825a5c652 mt76x2: fix tx power configuration for VHT mcs 9 449b9ae3504c IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds e0dee1c839e3 IB/hfi1: Error path MAD response size is incorrect 8d93707e7195 f2fs: keep lazytime on remount a5f7bf0379d3 ACPI / LPSS: Resume BYT/CHT I2C controllers from resume_noirq aa39d53f2b89 ACPI / LPSS: Make acpi_lpss_find_device() also find PCI devices 9372a40b54d0 SUNRPC: Fix priority queue fairness 43876b1ce42b tcp: up initial rmem to 128KB and SYN rwin to around 64KB d2cacb6ac4ff ARM: dts: sun8i: h3: bpi-m2-plus: Fix address for external RGMII Ethernet PHY ed220d3dcc79 ARM: dts: sun8i: h3-h5: ir register size should be the whole memory block ac02379889e2 f2fs: return correct errno in f2fs_gc 7cbac9d598a7 net: hns3: Fix loss of coal configuration while doing reset af98283da9e9 net: hns3: Fix for netdev not up problem when setting mtu 7a1f314e3c80 ARM: dts: omap5: enable OTG role for DWC3 controller 789d29044793 ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode 6d286faeee74 net: xen-netback: fix return type of ndo_start_xmit function c234566f1ea0 net: ovs: fix return type of ndo_start_xmit function d51d9605888d bpf, x32: Fix bug for BPF_JMP | {BPF_JSGT, BPF_JSLE, BPF_JSLT, BPF_JSGE} f3c40792cf4b bpf, x32: Fix bug with ALU64 {LSH, RSH, ARSH} BPF_K shift by 0 a085f797449e bpf, x32: Fix bug with ALU64 {LSH, RSH, ARSH} BPF_X shift by 0 860a7d18b9e6 bpf, x32: Fix bug for BPF_ALU64 | BPF_NEG 03543b9c5573 fbdev: Ditch fb_edid_add_monspecs 703662598b9c arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault f8b09a043685 mm/memory_hotplug: fix updating the node span 6631def3ee38 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() a16a3669273b idr: Fix idr_get_next race with idr_remove 4c62337d8f17 net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size() 17a82bc67728 Revert "OPP: Protect dev_list with opp_table lock" 4f4ab0b49cf2 tee: optee: add missing of_node_put after of_device_is_available 2008d0e3d364 i2c: mediatek: modify threshold passed to i2c_get_dma_safe_msg_buf() 976e944e005f spi: mediatek: use correct mata->xfer_len when in fifo transfer c63ee2939dc1 Linux 4.19.85 e99d64837815 slcan: Fix memory leak in error path e4cc9c81e230 memfd: Use radix_tree_deref_slot_protected to avoid the warning. 914834a73b16 net: phy: mdio-bcm-unimac: mark PM functions as __maybe_unused 2ed924f2782f s390/vdso: correct vdso mapping for compat tasks 1b904b2eb9c1 media: ov2680: fix null dereference at power on 0c3e32230bcc IB/iser: Fix possible NULL deref at iser_inv_desc() d7b412e1448e fuse: use READ_ONCE on congestion_threshold and max_background 2e72489c822e usb: usbtmc: uninitialized symbol 'actual' in usbtmc_ioctl_clear eb9b6c203870 usb: xhci-mtk: fix ISOC error when interval is zero 8ddec6aaad86 netfilter: masquerade: don't flush all conntracks if only one address deleted on device ba8c4cc746a5 rtc: armada38x: fix possible race condition 44bb1b1256b5 rtc: tx4939: fixup nvmem name and register size e7ab2bab7e60 rtc: isl1208: avoid possible sysfs race 70f0ead5c6af ARM: dts: lpc32xx: Fix SPI controller node names 8e359bce724c arm64: dts: lg: Fix SPI controller node names f52a34b5b111 arm64: dts: amd: Fix SPI bus warnings b26edaa53496 scsi: NCR5380: Check for bus reset 080b37aacd2b scsi: NCR5380: Handle BUS FREE during reselection aa45f4ab86a2 scsi: NCR5380: Don't call dsprintk() following reselection interrupt 23635cf271a3 scsi: NCR5380: Don't clear busy flag when abort fails aeb0ed2e5bb9 scsi: NCR5380: Check for invalid reselection target 98c6d8f8a401 scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data 1a46e4d3da31 scsi: NCR5380: Withhold disconnect privilege for REQUEST SENSE 624f60251f1a scsi: NCR5380: Have NCR5380_select() return a bool 873506e566ef scsi: NCR5380: Clear all unissued commands on host reset fe5ef5fe3e19 iwlwifi: mvm: Allow TKIP for AP mode c4a3dcb0a273 iwlwifi: mvm: use correct FIFO length d395b6f51cf7 iwlwifi: pcie: fit reclaim msg to MAX_MSG_LEN 08d2000d2162 iwlwifi: pcie: gen2: build A-MSDU only for GSO f4f0909f3d3f iwlwifi: api: annotate compressed BA notif array sizes e455ecaf52da iwlwifi: pcie: read correct prph address for newer devices c5eafde04ad3 iwlwifi: fix non_shared_ant for 22000 devices f73c75560ffd iwlwifi: dbg: don't crash if the firmware crashes in the middle of a debug dump 98ca4f397feb crypto: fix a memory leak in rsa-kcs1pad's encryption mode 975b3c8dd182 crypto: s5p-sss: Fix Fix argument list alignment ef089d9b58a7 crypto: s5p-sss: Fix race in error handling d34465e722e7 x86/hyperv: Suppress "PCI: Fatal: No config space access function found" 23a4059cd6b8 Bluetooth: btrsi: fix bt tx timeout issue 245b2765e87c Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS 2c8946462f07 Bluetooth: hci_serdev: clear HCI_UART_PROTO_READY to avoid closing proto races f416fe070ec1 firmware: dell_rbu: Make payload memory uncachable 5d3675e3e6d1 ARM: dts: realview: Fix SPI controller node names 57b78e41a397 EDAC: Raise the maximum number of memory controllers 352668d32cd5 RDMA: Fix dependencies for rdma_user_mmap_io 36ffc9a76df9 f2fs: mark inode dirty explicitly in recover_inode() a4bd303d6774 f2fs: fix to recover inode's project id during POR 7bae8b6b73e4 f2fs: update i_size after DIO completion 9de276a804c7 PCI/ERR: Run error recovery callbacks for all affected devices 8738fd312e63 net: faraday: fix return type of ndo_start_xmit function 8ff333f3f819 net: smsc: fix return type of ndo_start_xmit function 4481669a3a95 ARM: dts: paz00: fix wakeup gpio keycode 4e9cf62e8ffb ARM: tegra: colibri_t30: fix mcp2515 can controller interrupt polarity 63c28c08e485 ARM: tegra: apalis_t30: fix mcp2515 can controller interrupt polarity 2241b82d7b3f ARM: tegra: apalis_t30: fix mmc1 cmd pull-up 1717eca134f2 ARM: dts: tegra20: restore address order 619f46726e66 ARM: dts: tegra30: fix xcvr-setup-use-fuses 70c4b0fb4fd5 arm64: tegra: I2C on Tegra194 is not compatible with Tegra114 e821b710b58d ARM: dts: imx51-zii-rdu1: Fix the rtc compatible string a09b6731c4dd arm64: dts: fsl: Fix I2C and SPI bus warnings 2d6b885ba741 phy: lantiq: Fix compile warning 6fce50c100c8 f2fs: fix remount problem of option io_bits c4a33c4ecc1f scsi: libsas: always unregister the old device if going to discover new 2f9d0f703b9c iw_cxgb4: Use proper enumerated type in c4iw_bar2_addrs 1ae5bfee6cff vfio/pci: Mask buggy SR-IOV VF INTx support dde3433de9a0 vfio/pci: Fix potential memory leak in vfio_msi_cap_len 86f886e91dcf vmbus: keep pointer to ring buffer page 728a7552dc49 misc: genwqe: should return proper error value. 6707b1ba53be misc: kgdbts: Fix restrict error 890bee675729 silmbus: ngd: register controller after power up. 932980ed5b77 slimbus: ngd: return proper error code instead of zero 9874abd5c878 slimbus: ngd: register ngd driver only once. 614744f4e80e coresight: dynamic-replicator: Handle multiple connections 36aa9cd28c59 coresight: tmc: Fix byte-address alignment for RRP 0bb87d413aef coresight: etm4x: Configure EL2 exception level when kernel is running in HYP a0e0ec0a5544 coresight: tmc-etr: Handle driver mode specific ETR buffers 1099665125ed coresight: perf: Disable trace path upon source error 87e382c3f706 coresight: perf: Fix per cpu path management 25deeb3c1b9f coresight: Fix handling of sinks 59a488998caf coresight: Use ERR_CAST instead of ERR_PTR 240293e02123 usb: gadget: uvc: Only halt video streaming endpoint in bulk mode bb7c36e91d45 usb: gadget: uvc: Factor out video USB request queueing c4635c27d3ac ARM: dts: imx6ull: update vdd_soc voltage for 900MHz operating point a9c11660389c phy: phy-twl4030-usb: fix denied runtime access 6e176dd0e4c2 phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs f0525581df5f phy: brcm-sata: allow PHY_BRCM_SATA driver to be built for DSL SoCs ff0eabfaf4a4 ARM: at91: pm: call put_device instead of of_node_put in at91_pm_config_ws 1b23c28d87e7 gpiolib: Fix gpio_direction_* for single direction GPIOs ec0b30347e4a i2c: aspeed: fix invalid clock parameters for very large divisors de2875336ee8 ARM: dts: exynos: Correct audio subsystem parent clock on Peach Chromebooks 4e6c65624090 usb: gadget: uvc: configfs: Sort frame intervals upon writing d036103870c6 usb: gadget: uvc: configfs: Prevent format changes after linking header e6e1ad1e2537 usb: gadget: uvc: configfs: Drop leaked references to config items b7ffda42d720 ARM: dts: rockchip: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock 0b08daf034cc media: davinci: Fix implicit enum conversion warning 0994d0cb86ec media: au0828: Fix incorrect error messages 0e63f5db54d8 media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init() 2dacea472335 media: imx: work around false-positive warning, again 1b73ea8377da mlxsw: Make MLXSW_SP1_FWREV_MINOR a hard requirement 9d2ce0611ad5 arm64: dts: rockchip: Fix microSD in rk3399 sapphire board 46a9bbe9d579 MIPS: kexec: Relax memory restriction 3b9528b302a6 EDAC: Correct DIMM capacity unit symbol e897dd4cfdde x86/CPU: Change query logic so CPUID is enabled before testing d26ad73be70f x86/CPU: Use correct macros for Cyrix calls fd3f592b2af6 net: freescale: fix return type of ndo_start_xmit function cab175f881c5 net: micrel: fix return type of ndo_start_xmit function 590ee2e0aec7 net: phy: mdio-bcm-unimac: Allow configuring MDIO clock divider 73cb54858021 samples/bpf: fix compilation failure 3536c05af6f4 PCI/ERR: Use slot reset if available 0729c5944eee PCI/AER: Don't read upstream ports below fatal errors f3f55d83ea0d PCI/AER: Take reference on error devices 40ebd8b31fea bnx2x: Ignore bandwidth attention in single function mode 0769f445afa4 ARM: dts: stm32: Fix SPI controller node names c6305dfb214b ARM: dts: clearfog: fix sdhci supply property name b939d8b914d8 ARM: dts: stm32: enable display on stm32mp157c-ev1 board 098e12f385f9 x86/mce-inject: Reset injection struct after injection aa190837bec5 ARM: dts: marvell: Fix SPI and I2C bus warnings ccc8bf41dac8 crypto: arm/crc32 - avoid warning when compiling with Clang 9e70da12d01f cpufeature: avoid warning when compiling with clang ad28c2ba4318 crypto: chacha20 - Fix chacha20_block() keystream alignment (again) af4749d23d46 spi: pic32: Use proper enum in dmaengine_prep_slave_rg c2f76a19fbc8 ARM: dts: ste: Fix SPI controller node names 4d22878d5894 ARM: dts: ux500: Fix LCDA clock line muxing 8be4d596d3f2 ARM: dts: ux500: Correct SCU unit address dfc81686a642 f2fs: fix to recover inode's uid/gid during POR c783946ea9b1 f2fs: avoid infinite loop in f2fs_alloc_nid caab324d1b01 ARM: dts: ti: Fix SPI and I2C bus warnings 2cf6352a6d4c ARM: dts: am335x-evm: fix number of cpsw 1eeee2fd2e0c PCI: portdrv: Initialize service drivers directly 38bee3f3f280 mlxsw: spectrum: Init shaper for TCs 8..15 636cbdec5cf4 brcmsmac: Use kvmalloc() for ucode allocations 2980b6a81378 brcmfmac: increase buffer for obtaining firmware capabilities 59d6e59f32cc s390/vdso: correct CFI annotations of vDSO functions 84bfa03445bc s390/vdso: avoid 64-bit vdso mapping for compat tasks 3d510bdf35c2 s390/zcrypt: enable AP bus scan without a valid default domain 5e9923e85e1c usb: usbtmc: Fix ioctl USBTMC_IOCTL_ABORT_BULK_OUT 92aeb3756c43 usb: chipidea: Fix otg event handler 979f541851d9 usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started b39e733da3f8 nfp: provide a better warning when ring allocation fails 883843b5a912 net: hns3: Fix parameter type for q_id in hclge_tm_q_to_qs_map_cfg() a1b2c39f3ec7 net: hns3: Fix client initialize state issue when roce client initialize failed 20f2b72faff0 net: hns3: Clear client pointer when initialize client failed or unintialize finished ae95237256de net: hns3: Fix cmdq registers initialization issue for vf 110de23fc502 net: hns3: Fix for setting speed for phy failed problem bd23121daecf net: sun: fix return type of ndo_start_xmit function 5d52c10c345d net: amd: fix return type of ndo_start_xmit function 0cd3edaf82e6 net: broadcom: fix return type of ndo_start_xmit function 63a0e0512dba net: xilinx: fix return type of ndo_start_xmit function df9f5c799d85 net: toshiba: fix return type of ndo_start_xmit function e50d7274104c net: marvell: fix return type of ndo_start_xmit function 28fae2d588be net: mvpp2: fix the number of queues per cpu for PPv2.2 0ede78b3576c power: supply: twl4030_charger: disable eoc interrupt on linear charge 773fb69e4307 power: supply: twl4030_charger: fix charging current out-of-bounds 0729f87b840a libfdt: Ensure INT_MAX is defined in libfdt_env.h e000de3f01c5 of/unittest: Fix I2C bus unit-address error 4c64ce947cfa OPP: Protect dev_list with opp_table lock 51e509caf5fa ARM: dts: atmel: Fix I2C and SPI bus warnings 7cfb3b04d096 RDMA/i40iw: Fix incorrect iterator type eb355ccfdf1d powerpc: Fix duplicate const clang warning in user access code e7b37640916f powerpc/pseries: Disable CPU hotplug across migrations 9271304c26fc powerpc/pseries/memory-hotplug: Only update DT once per memory DLPAR request 0ab2545aa404 powerpc/64s/hash: Fix stab_rr off by one initialization a3581509e890 selftests/powerpc: Do not fail with reschedule 089b169ceb80 powerpc/iommu: Avoid derefence before pointer check 13d5bc50f405 net: ibm: fix return type of ndo_start_xmit function efe22c12087d net: cavium: fix return type of ndo_start_xmit function 279a4f77546a net: hns3: fix return type of ndo_start_xmit function dd4b87a945c1 ipmi: fix return value of ipmi_set_my_LUN ea944c71360f ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address 438bf726def0 ipmi_si: fix potential integer overflow on large shift 78538bae1dab ipmi_si_pci: fix NULL device in ipmi_si error message 5ab64c1633f6 ASoC: rt5682: Fix the boost volume at the begining of playback 6237e9d0715a spi: mediatek: Don't modify spi_transfer when transfer. 779c96ef3fac spi/bcm63xx-hsspi: keep pll clk enabled eaa4d5ac4403 samples/bpf: fix a compilation failure feb52253d738 arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2 1ea4603cc812 tty: serial: qcom_geni_serial: Fix serial when not used as console 87153f7a04c9 serial: mxs-auart: Fix potential infinite loop 400caa3d02ea serial: samsung: Enable baud clock for UART reset procedure in resume 30cfa3ebc0ed serial: uartps: Fix suspend functionality bad4e6d3d40d ARM: dts: xilinx: Fix I2C and SPI bus warnings d15e5038213e PCI: mediatek: Fix unchecked return value 80ec7fcb04a0 net: socionext: Fix two sleep-in-atomic-context bugs in ave_rxfifo_reset() 176f6203a4f4 PCI/ACPI: Correct error message for ASPM disabling 525552a0e849 media: ov2680: don't register the v4l2 subdevice before checking chip ID f4683c89808f media: vsp1: Fix YCbCr planar formats pitch calculation ee5a1460f271 media: vsp1: Fix vsp1_regs.h license header 2d7578285958 s390/qeth: invoke softirqs after napi_schedule() 66fb291b264d s390/qeth: uninstall IRQ handler on device removal ccc1e600844d ath9k: Fix a locking bug in ath9k_add_interface() e97d09277b77 netfilter: nf_tables: avoid BUG_ON usage d1440f1a38eb ACPI / LPSS: Exclude I2C busses shared with PUNIT from pmc_atom_d3_mask 75fd1aec33c6 arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou 5fc9af407fc5 ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 0592c2178e3c scsi: ufshcd: Fix NULL pointer dereference for in ufshcd_init 6745591c8da9 ip_gre: fix parsing gre header in ipgre_err ada2a0f1ac54 kernfs: Fix range checks in kernfs_get_target_path 5fba81510697 component: fix loop condition to call unbind() if bind() fails 925c19a8c6bb power: supply: max8998-charger: Fix platform data retrieval 82d8a34470e9 power: reset: at91-poweroff: do not procede if at91_shdwc is allocated 1fb3d279a384 power: supply: ab8500_fg: silence uninitialized variable warnings c9398259cf85 arm64: dts: meson: Fix erroneous SPI bus warnings 89f4d27c1bcd blok, bfq: do not plug I/O if all queues are weight-raised 6c9a79651bff block, bfq: inject other-queue I/O into seeky idle queues on NCQ flash 6d7757f04866 arm64: fix for bad_mode() handler to always result in panic 7f49a2210e85 cxgb4: Fix endianness issue in t4_fwcache() b0cb2d8164d0 android: binder: no outgoing transaction when thread todo has transaction 31e470f92d9e ARM: dts: sun9i: Fix I2C bus warnings 0989aa65bc37 pinctrl: at91: don't use the same irqchip with multiple gpiochips d1b9d321df35 ARM: dts: sunxi: Fix I2C bus warnings 8ac08053744c ARM: dts: socfpga: Fix I2C bus unit-address error e70ccd8a13a9 powerpc/vdso: Correct call frame information 11d7842812f8 ARM: dts: aspeed: Fix I2C bus warnings 5a8130ed237f ARM: dts: bcm: Fix SPI bus warnings 08ffefc8e7ed arm64: dts: broadcom: Fix I2C and SPI bus warnings 174e8262f08a drivers: qcom: rpmh-rsc: clear wait_for_compl after use 09c8a33ed766 soc: qcom: apr: Avoid string overflow 6651ecf92f3c soc: qcom: wcnss_ctrl: Avoid string overflow 4a2c4d1a0b6b soc: qcom: geni: geni_se_clk_freq_match() should always accept multiples 331ed266987e soc: qcom: geni: Don't ignore clk_round_rate() errors in geni_se_clk_tbl_get() b0826d4774c2 ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value 9a484516a410 llc: avoid blocking in llc_sap_close() 50e40ebcaa32 pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map() 3f57f7387db2 arm64: dts: renesas: r8a77965: Fix clock/reset for usb2_phy1 7ed1974d2b03 arm64: dts: renesas: r8a77965: Fix HS-USB compatible dc521bf8ffda arm64: dts: renesas: r8a77965: Attach the SYS-DMAC to the IPMMU 1badf45f08b3 arm64: dts: renesas: salvator-common: adv748x: Override secondary addresses 20f93eb9194c ALSA: intel8x0m: Register irq handler after register initializations e80e83fb0106 arm64: dts: meson-axg: use the proper compatible for ethmac 2694107888a5 arm64: dts: meson: libretech: update board model 3804f9dd8f76 net: bcmgenet: Fix speed selection for reverse MII 914282c62ab2 media: dvb: fix compat ioctl translation 03056f8c725a media: fix: media: pci: meye: validate offset to avoid arbitrary access fe384ab1496c ALSA: hda: Fix implicit definition of pci_iomap() on SH 6281d021bbb3 media: dt-bindings: adv748x: Fix decimal unit addresses 88e9f8198dd5 nvmem: core: return error code instead of NULL from nvmem_device_get b0d54e40f3c4 Drivers: hv: vmbus: Fix synic per-cpu context initialization a1d374ea1e95 net: aquantia: fix hw_atl_utils_fw_upload_dwords a9cab0fe6e26 kprobes: Don't call BUG_ON() if there is a kprobe in use on free list 7aea0bd886ae scsi: pm80xx: Fixed system hang issue during kexec boot a66a544dca32 scsi: pm80xx: Corrected dma_unmap_sg() parameter ac892349e21b ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set 86d5ceaea04c scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir() 66b2e4c7afd0 scsi: lpfc: Fix errors in log messages. 87c32dbd7eff scsi: lpfc: Correct invalid EQ doorbell write on if_type=6 8caed6a5d385 scsi: lpfc: Fix GFT_ID and PRLI logic for RSCN 050e019c2d69 scsi: qla2xxx: Fix duplicate switch's Nport ID entries c7ddd7ba1d05 scsi: qla2xxx: Fix dropped srb resource. 8c32664a6a0d scsi: qla2xxx: Fix port speed display on chip reset 3e3a2c5c4569 scsi: qla2xxx: Check for Register disconnect 3a7ec92a5b2a scsi: qla2xxx: Increase abort timeout value 5320b946687a scsi: qla2xxx: Fix deadlock between ATIO and HW lock 6f6e01ff7413 scsi: qla2xxx: Terminate Plogi/PRLI if WWN is 0 f91811dd9501 scsi: qla2xxx: Defer chip reset until target mode is enabled 667bdc46aa4e scsi: qla2xxx: Fix iIDMA error ca35c5a1cb21 scsi: qla2xxx: Use correct qpair for ABTS/CMD a1f14df33c05 f2fs: fix setattr project check upon fssetxattr ioctl 7b55102cdc61 f2fs: fix memory leak of percpu counter in fill_super() 883037308018 f2fs: fix memory leak of write_io in fill_super() e5b515f56626 signal: Properly deliver SIGSEGV from x86 uprobes 91c3a88054c1 signal: Properly deliver SIGILL from uprobes 3b5681d39fa4 signal: Always ignore SIGKILL and SIGSTOP sent to the global init 93ae4ded2abe IB/hfi1: Missing return value in error path for user sdma 45d0ddf97448 RDMA/hns: Fix an error code in hns_roce_v2_init_eq_table() 8edddc2cf3c1 dmaengine: at_xdmac: remove a stray bottom half unlock 9234fbbd7782 ath9k: add back support for using active monitor interfaces for tx99 82663f99cbdf rtc: pl030: fix possible race condition 5a869e9828e8 rtc: mt6397: fix possible race condition 0773f03aebdd EDAC, sb_edac: Return early on ADDRV bit and address type test fc7be6308364 dmaengine: dma-jz4780: Further residue status fix f6d4561cae3a dmaengine: dma-jz4780: Don't depend on MACH_JZ4780 a34ea3ddc763 usb: mtu3: disable vbus rise/fall interrupts of ltssm a5d1ffee2f2f ARM: dts: exynos: Disable pull control for PMIC IRQ line on Artik5 board 67e477d8eaa0 arm64: dts: rockchip: Fix VCC5V0_HOST_EN on rk3399-sapphire 4c884128b414 firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings d786bf93f0c5 sched/debug: Use symbolic names for task state constants e4e522609854 sched/debug: Explicitly cast sched_feat() to bool 0ddcbbf4cd47 failover: Fix error return code in net_failover_create eca5b74e0080 f2fs: submit bio after shutdown 0f9c9a216288 ARM: dts: omap3-gta04: keep vpll2 always on d59817b0ca62 ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot 6b268c233df7 ARM: dts: omap3-gta04: fix touchscreen tsc2007 96907aa1ab3c ARM: dts: omap3-gta04: tvout: enable as display1 alias 8f03a5116e9d ARM: dts: omap3-gta04: fixes for tvout / venc 5cacb026fe26 ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files 69116e3bae2b of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC cc5f462c1b08 ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA 3d5d2f7806a9 ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation 0376916b7b2c ASoC: dapm: Avoid uninitialised variable warning 0204720dde67 udf: Fix crash during mount 52cda4c1d9cd mips: txx9: fix iounmap related issue f63587cbb091 RDMA/core: Follow correct unregister order between sysfs and cgroup 6b827d38cead RDMA/core: Rate limit MAD error messages a618cca0438b IB/ipoib: Ensure that MTU isn't less than minimum permitted 2543eeba256a IB/mlx5: Don't hold spin lock while checking device state 4d8d651e1c5f i2c: mediatek: Use DMA safe buffers for i2c transactions d0d8f0efb6bd ath10k: wmi: disable softirq's while calling ieee80211_rx 14c9bc4be084 ARM: dts: exynos: Disable pull control for S5M8767 PMIC 588822fcb313 ath10k: avoid possible memory access violation 34293775f117 ASoC: sgtl5000: avoid division by zero if lo_vag is zero 6cbd0932ab9a rtnetlink: move type calculation out of loop 4b702fdd6e7e net: lan78xx: Bail out if lan78xx_get_endpoints fails 23ad83c399b0 f2fs: avoid wrong decrypted data from disk b6410b95c224 cfg80211: validate wmm rule when setting 8d705195a9a3 mac80211: fix saving a few HE values 4d146d72687e qxl: fix null-pointer crash during suspend f5ee703ff92c IB/mlx5: Change TX affinity assignment in RoCE LAG mode 5128ea974c22 mtd: rawnand: qcom: don't include dma-direct.h d6ebf70120c6 mtd: rawnand: fsl_ifc: fixup SRAM init for newer ctrl versions 29535bafb64b mtd: rawnand: fsl_ifc: check result of SRAM initialization 6ae8c86ee458 mtd: rawnand: marvell: use regmap_update_bits() for syscon access 6c7644ad22ae ARM: dts: meson8b: fix the clock controller register size e39779f6ea67 ARM: dts: meson8: fix the clock controller register size 6da9a4a98215 net: phy: mscc: read 'vsc8531, edge-slowdown' as an u32 77f9e263e296 net: phy: mscc: read 'vsc8531,vddmac' as an u32 5dc1cbcff700 net/mlx5: Fix atomic_mode enum values b5f6d6de5b12 net: hns3: Change the dst mac addr of loopback packet f995b2efa439 net: hns3: Fix for loopback selftest failed problem d01caf35564c net: hns3: Fix error of checking used vlan id 4aea8f76727e net: hns3: Fix for multicast failure e5f48f8eff66 ASoC: rsnd: ssi: Fix issue in dma data address assignment 0b8e8bddc5c0 soc: imx: gpc: fix PDN delay 7f88d806443f mt76: Fix comparisons with invalid hardware key index 1f54ec5b3047 brcmfmac: fix wrong strnchr usage f05f8607622c mwifex: free rx_cmd skb in suspended state 6c27b9267a84 mwifiex: do no submit URB in suspended state cd554b025c09 rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument c495a8c78b50 ARM: dts: pxa: fix power i2c base address 72e13203c56d ARM: dts: pxa: fix the rtc controller fe9048c7bb38 media: ov772x: Disable clk on error path b489c1e010e4 media: i2c: Fix pm_runtime_get_if_in_use() usage in sensor drivers 5a21c7a0b592 media: vicodec: fix out-of-range values when decoding 17743861edc7 iwlwifi: mvm: avoid sending too many BARs 75de80e11e6b iwlwifi: don't WARN on trying to dump dead firmware ecedae02e89d iwlwifi: drop packets with bad status in CD 02adbecf542e IB/rxe: fixes for rdma read retry cad889676bdb IB/rxe: avoid back-to-back retries ac0ab821c4d5 i40e: Prevent deleting MAC address from VF when set by PF 712d35e0d2c1 i40evf: cancel workqueue sync for adminq when a VF is removed e5d3afbe3a5c i40e: hold the rtnl lock on clearing interrupt scheme f9a84bbd3ca6 i40evf: Don't enable vlan stripping when rx offload is turned on fe301cf64f7e i40e: Check and correct speed values for link on open 8d7e6ab3b5d2 i40evf: set IFF_UNICAST_FLT flag for the VF 015fc5251996 i40e: use correct length for strncpy a90fcbdb9b22 i40evf: Validate the number of queues a PF sends 2da61f212f4d ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks d4e5c8aeb198 arm64: dts: stratix10: i2c clock running out of spec b0bac46b52a9 liquidio: fix race condition in instruction completion processing b2e427c268f3 ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook 0b53b56287ab ARM: dts: exynos: Fix HDMI-HPD line handling on Arndale 0baa3fe5805e ARM: dts: exynos: Use i2c-gpio for HDMI-DDC on Arndale 8e6acc5ee14d MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3 7c68184fced7 pinctrl: ingenic: Probe driver at subsys_initcall 8ddea21d4c0b ASoC: AMD: Change MCLK to 48Mhz bdb7368ac333 ASoC: meson: axg-fifo: report interrupt request failure aac9381b2ca8 ASoC: dpcm: Properly initialise hw->rate_max ac66c0c470a3 ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl d3a45d4d6f2d ice: Fix and update driver version string 48b128cddb91 gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated 9ca72984d7c0 ice: Prevent control queue operations during reset a881088f512e ice: Update request resource command to latest specification f71230e6898e ath10k: limit available channels via DT ieee80211-freq-limit 8cad5d80f8d0 wil6210: fix invalid memory access for rx_buff_mgmt debugfs bcaabaa75eeb wil6210: prevent usage of tx ring 0 for eDMA acf041edec0a wil6210: set edma variables only for Talyn-MB devices be039c973093 wil6210: drop Rx multicast packets that are looped-back to STA 1b0581bf379f ath9k: fix tx99 with monitor mode interface a618e2069783 ath10k: skip resetting rx filter for WCN3990 f7b2312c68a8 ALSA: seq: Do error checks at creating system ports c2f459d3340f cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set d377d63a9228 extcon: cht-wc: Return from default case to avoid warnings 7575a34ed101 remoteproc/davinci: Use %zx for formating size_t c2dca83e9e83 rtc: rv8803: fix the rv8803 id in the OF table 5a408693b414 rtc: sysfs: fix NULL check in rtc_add_groups() a01d6a320440 ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45 ea6a25cd2d41 ARM: dts: rcar: Correct SATA device sizes to 2 MiB 32d3fe68d20e y2038: make do_gettimeofday() and get_seconds() inline 5a830803b593 arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply a124e7f2fecf soc/tegra: pmc: Fix pad voltage configuration for Tegra186 90cfef191a30 ALSA: pcm: signedness bug in snd_pcm_plug_alloc() e84cb5882da6 arm64: dts: allwinner: a64: NanoPi-A64: Fix DCDC1 voltage 3bbce894d52d arm64: dts: allwinner: a64: Olinuxino: fix DRAM voltage d304218f959e arm64: dts: allwinner: a64: Orange Pi Win: Fix SD card node 030f6397eb89 soundwire: intel: Fix uninitialized adev deref 4b4153b7d6af soundwire: Initialize completion for defer messages 38d1ecc23e3e clk: sunxi-ng: h6: fix PWM gate/reset offset 6c0fcc727ff0 iio: dac: mcp4922: fix error handling in mcp4922_write_raw f125d1831402 ath10k: fix kernel panic by moving pci flush after napi_disable 75a600d7f062 tee: optee: take DT status property into account cd3de5870c80 iio: adc: max9611: explicitly cast gain_selectors a6bb63183de2 mmc: sdhci-of-at91: fix quirk2 overwrite b4bc6498c39b mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() bb1bc2d8231c mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() 653d9e0c55bf mm: mempolicy: fix the wrong return value and potential pages leak of mbind 5b1c342fc3e0 iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros 29dcbbb5ab0a net: ethernet: dwmac-sun8i: Use the correct function in exit path bdae2f7b2031 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either beb3860c2e0e ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable 1a48aaabf1cd i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present 9ace24bba657 IB/hfi1: Use a common pad buffer for 9B and 16B packets 6ec4a5498ee5 IB/hfi1: Ensure full Gen3 speed in a Gen4 system 1f3bbf9f0adc Input: synaptics-rmi4 - destroy F54 poller workqueue when removing 5c9fd709c5f5 Input: synaptics-rmi4 - clear IRQ enables for F54 fbe9849f79aa Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) 924a8f2c745a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver 8e347aa4e04b Input: synaptics-rmi4 - fix video buffer size c02230815282 Input: ff-memless - kill timer in destroy() 47d06a15f25a Btrfs: fix log context list corruption after rename exchange operation f2465526866a ALSA: usb-audio: Fix incorrect size check for processing/extension units 420433f6cf5c ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk() ab2ee4299b7e ALSA: usb-audio: not submit urb for stopped endpoint a2c763cd9609 ALSA: usb-audio: Fix missing error check at mixer resolution test edc471038b48 slip: Fix memory leak in slip_open error path 4cd50a31ac9e net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules 0a772b2ac696 net: gemini: add missed free_netdev 66daa05750a9 ipmr: Fix skb headroom in ipmr_get_route(). 20beeb30083e ax88172a: fix information leak on short answers c4a0f567e652 scsi: core: Handle drivers which set sg_tablesize to zero 81adf034d5d6 MIPS: BCM63XX: fix switch core reset on BCM6368 dbf1ef2dc0d5 KVM: x86: introduce is_pae_paging Signed-off-by: Bruce Ashfield (cherry picked from commit 064811c18fe26c7d9bc84f86047325e25e2a1001) Signed-off-by: Armin Kuster (cherry picked from commit 7e944cca62851689f9ddf8a5308ee3331f763957) Signed-off-by: Armin Kuster --- .../linux/linux-yocto-rt_4.19.bb | 6 +++--- .../linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index f588d7f522..7b89a24223 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "f272b39688fbec016d91b5c0c9d1bb7b5bc3b2ca" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine ?= "d3fb163023de0a5a57a021e58b55976f68142fc0" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 0f3b0d569b..9cde2c2342 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "d971adf5221e18df3ba46bddee4719c85f98977a" -SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine_qemuarm ?= "6e7574e9a9b41143e0c42fcb31b13802529602f0" +SRCREV_machine ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 17620c74b5..aab30a981e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "425023bd5cfe4f4f7b950c84f62861de600d4f6c" -SRCREV_machine_qemuarm64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemumips ?= "6273d88ca69ada3ae4684fc6301e39381f4cd3e4" -SRCREV_machine_qemuppc ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemux86 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemux86-64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemumips64 ?= "f9368853646be5ce9f122adb733cbf8225641e8c" -SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine_qemuarm ?= "4d9d89763cde098e4a8b879e8c831e35a5f39ae6" +SRCREV_machine_qemuarm64 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemumips ?= "1f0855745653c8cb7d72ea2d03197889cc82a410" +SRCREV_machine_qemuppc ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemux86 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemux86-64 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemumips64 ?= "5ed73d6e6dc7d4ad8184de8eb6641bdb265ae2ea" +SRCREV_machine ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:47 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:47 -0800 Subject: [OE-core] [warrior 09/14] timezone: update to 2019b In-Reply-To: References: Message-ID: <1d1dcea1d2de02cb49950235586adbe4593f0eb7.1581955142.git.akuster808@gmail.com> Briefly: Brazil no longer observes DST. 'zic -b slim' outputs smaller TZif files; please try it out. Palestine's 2019 spring-forward transition was on 03-29, not 03-30. Changes to future timestamps Brazil has canceled DST and will stay on standard time indefinitely. (Thanks to Steffen Thorsen, Marcus Diniz, and Daniel Soares de Oliveira.) Predictions for Morocco now go through 2087 instead of 2037, to work around a problem on newlib when using TZif files output by zic 2019a or earlier. (Problem reported by David Gauchard.) Changes to past and future timestamps Palestine's 2019 spring transition was 03-29 at 00:00, not 03-30 at 01:00. (Thanks to Sharef Mustafa and Even Scharning.) Guess future transitions to be March's last Friday at 00:00. Changes to past timestamps Hong Kong's 1941-06-15 spring-forward transition was at 03:00, not 03:30. Its 1945 transition from JST to HKT was on 11-18 at 02:00, not 09-15 at 00:00. In 1946 its spring-forward transition was on 04-21 at 00:00, not the previous day at 03:30. From 1946 through 1952 its fall-back transitions occurred at 04:30, not at 03:30. In 1947 its fall-back transition was on 11-30, not 12-30. (Thanks to P Chan.) Changes to past time zone abbreviations Italy's 1866 transition to Rome Mean Time was on December 12, not September 22. This affects only the time zone abbreviation for Europe/Rome between those dates. (Thanks to Stephen Trainor and Luigi Rosa.) Changes affecting metadata only Add info about the Crimea situation in zone1970.tab and zone.tab. (Problem reported by Serhii Demediuk.) Changes to code zic's new -b option supports a way to control data bloat and to test for year-2038 bugs in software that reads TZif files. 'zic -b fat' and 'zic -b slim' generate larger and smaller output; for example, changing from fat to slim shrinks the Europe/London file from 3648 to 1599 bytes, saving about 56%. Fat and slim files represent the same set of timestamps and use the same TZif format as documented in tzfile(5) and in Internet RFC 8536. Fat format attempts to work around bugs or incompatibilities in older software, notably software that mishandles 64-bit TZif data or uses obsolete TZ strings like "EET-2EEST" that lack DST rules. Slim format is more efficient and does not work around 64-bit bugs or obsolete TZ strings. Currently zic defaults to fat format unless you compile with -DZIC_BLOAT_DEFAULT=\"slim\"; this out-of-the-box default is intended to change in future releases as the buggy software often mishandles timestamps anyway. zic no longer treats a set of rules ending in 2037 specially. Previously, zic assumed that such a ruleset meant that future timestamps could not be predicted, and therefore omitted a POSIX-like TZ string in the TZif output. The old behavior is no longer needed for current tzdata, and caused problems with newlib when used with older tzdata (reported by David Gauchard). zic no longer generates some artifact transitions. For example, Europe/London no longer has a no-op transition in January 1996. Changes to build procedure tzdata.zi now assumes zic 2017c or later. This shrinks tzdata.zi by a percent or so. Changes to documentation and commentary The Makefile now documents the POSIXRULES macro as being obsolete, and similarly, zic's -p POSIXRULES option is now documented as being obsolete. Although the POSIXRULES feature still exists and works as before, in practice it is rarely used for its intended purpose, and it does not work either in the default reference implementation (for timestamps after 2037) or in common implementations such as GNU/Linux (for contemporary timestamps). Since POSIXRULES was designed primarily as a temporary transition facility for System V platforms that died off decades ago, it is being decommissioned rather than institutionalized. New info on Bonin Islands and Marcus (thanks to Wakaba and Phake Nick). Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie (cherry picked from commit bbbb985808e5c301cdb7fdb1ff677706e99b4785) Signed-off-by: Armin Kuster --- meta/recipes-extended/timezone/timezone.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 1ade0075e6..ce16524ebb 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "PD & BSD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2019a" +PV = "2019b" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -12,7 +12,7 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.md5sum] = "27585a20bc5401324f42c8deb6e4677f" -SRC_URI[tzcode.sha256sum] = "8739f162bc30cdfb482435697f969253abea49595541a0afd5f443fbae433ff5" -SRC_URI[tzdata.md5sum] = "288f7b1e43018c633da108f13b27cf91" -SRC_URI[tzdata.sha256sum] = "90366ddf4aa03e37a16cd49255af77f801822310b213f195e2206ead48c59772" +SRC_URI[tzcode.md5sum] = "91e0978d947496fd6aaf46d351f9c41d" +SRC_URI[tzcode.sha256sum] = "2e479d409337da41408629ce6c3b4d8410b10ba6d4431d862e22d2b137d7756d" +SRC_URI[tzdata.md5sum] = "b26b5d7d844cb96c73ed2fb6d588daaf" +SRC_URI[tzdata.sha256sum] = "05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:48 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:48 -0800 Subject: [OE-core] [warrior 10/14] timezone:upgrade 2019b -> 2019c In-Reply-To: References: Message-ID: <0d58f5a01c7d49765d66a7e2d73eef0adb868eac.1581955142.git.akuster808@gmail.com> From: Zang Ruochen -tzdata : upgrade from 2019b to 2019c. -tzcode-native : upgrade from 2019b to 2019c. -tzdata.bb and tzcode-native.bb require timezone.inc. Signed-off-by: Zang Ruochen Signed-off-by: Ross Burton (cherry picked from commit c5a382429d18642d35d40a4df6a58b971c724603) Signed-off-by: Armin Kuster --- meta/recipes-extended/timezone/timezone.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index ce16524ebb..f6bab1acb4 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "PD & BSD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2019b" +PV = "2019c" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -12,7 +12,7 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.md5sum] = "91e0978d947496fd6aaf46d351f9c41d" -SRC_URI[tzcode.sha256sum] = "2e479d409337da41408629ce6c3b4d8410b10ba6d4431d862e22d2b137d7756d" -SRC_URI[tzdata.md5sum] = "b26b5d7d844cb96c73ed2fb6d588daaf" -SRC_URI[tzdata.sha256sum] = "05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64" +SRC_URI[tzcode.md5sum] = "195a17454c5db05cab96595380650391" +SRC_URI[tzcode.sha256sum] = "f6ebd3668e02d5ed223d3b7b1947561bf2d2da2f4bd1db61efefd9e06c167ed4" +SRC_URI[tzdata.md5sum] = "f6987e6dfdb2eb83a1b5076a50b80894" +SRC_URI[tzdata.sha256sum] = "79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:50 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:50 -0800 Subject: [OE-core] [warrior 12/14] linux-firmware: add PE back In-Reply-To: References: Message-ID: From: Oleksandr Kravchuk Add PE (package epoch) from the previous version of the recipe to avoid problems with package upgrade due to changed versioning scheme. See: http://lists.openembedded.org/pipermail/openembedded-core/2019-August/285633.html Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie (cherry picked from commit 8b6ec55da696087c8ea7bacc042307ee652afd9e) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb index acaca955be..9afaad73f3 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb @@ -190,6 +190,8 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" +PE = "1" + SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:49 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:49 -0800 Subject: [OE-core] [warrior 11/14] linux-firmware: bump to 20190618 In-Reply-To: References: Message-ID: <1c16c37e907f4712f40aa70d62c6a526e5228195.1581955142.git.akuster808@gmail.com> From: Oleksandr Kravchuk Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie (cherry picked from commit 4cbb7392c729a2436c26308c2320fdae5c450d7a) Signed-off-by: Armin Kuster --- .../{linux-firmware_git.bb => linux-firmware_20190618.bb} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_git.bb => linux-firmware_20190618.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_git.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb index 8b6ad96dba..acaca955be 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb @@ -92,7 +92,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ - file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ + file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \ file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ @@ -123,7 +123,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=b6e44adf71bc37e5f26ebfe5a08b5490 \ + file://WHENCE;md5=55814698bbae7c7dd40c9fbde91af0a8 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -190,9 +190,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "711d3297bac870af42088a467459a0634c1970ca" -PE = "1" -PV = "0.0+git${SRCPV}" +SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:51 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:51 -0800 Subject: [OE-core] [warrior 13/14] linux-firmware: Upgrade 20190618 -> 20190815 In-Reply-To: References: Message-ID: <34428eca5f845293b648801bf61957afd249b315.1581955142.git.akuster808@gmail.com> From: Otavio Salvador License-Update: - WHENCE: New firmware files additions and version updates Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton (cherry picked from commit b4c8f2f139d0eeb2ebef3dc5f8309486afdea3d4) Signed-off-by: Armin Kuster --- ...{linux-firmware_20190618.bb => linux-firmware_20190815.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20190618.bb => linux-firmware_20190815.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb index 9afaad73f3..518638806f 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb @@ -123,7 +123,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=55814698bbae7c7dd40c9fbde91af0a8 \ + file://WHENCE;md5=37a01e379219d1e06dbccfa90a8fc0ad \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -192,7 +192,7 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" +SRCREV = "07b925b450bfb4cf3e141c612ec5b104658cd020" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- 2.17.1 From akuster808 at gmail.com Mon Feb 17 16:00:52 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Mon, 17 Feb 2020 08:00:52 -0800 Subject: [OE-core] [warrior 14/14] linux-firmware: update packaging for brcm files In-Reply-To: References: Message-ID: <8063a1277433c58a9df43f0185bb89c79f865aa9.1581955142.git.akuster808@gmail.com> From: Samuli Piippo Add new package for bcm4366c and include available NVRAM config files into the corrent bcm* packages. Signed-off-by: Samuli Piippo Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster (cherry picked from commit 957c3d39b63f57d896ee89d727007ac2ce6672e3) Signed-off-by: Armin Kuster --- .../linux-firmware/linux-firmware_20190815.bb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb index 518638806f..d83000b64f 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb @@ -273,6 +273,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-bcm4358 \ ${PN}-bcm43602 \ ${PN}-bcm4366b \ + ${PN}-bcm4366c \ ${PN}-bcm4371 \ ${PN}-bcm4373 \ ${PN}-bcm43xx \ @@ -571,7 +572,7 @@ FILES_${PN}-bcm43xx-hdr = "${nonarch_base_libdir}/firmware/brcm/bcm43xx_hdr-0.fw FILES_${PN}-bcm4329-fullmac = "${nonarch_base_libdir}/firmware/brcm/bcm4329-fullmac-4.bin" FILES_${PN}-bcm43236b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43236b.bin" FILES_${PN}-bcm4329 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4329-sdio.bin" -FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin" +FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*" FILES_${PN}-bcm4334 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin" FILES_${PN}-bcm4335 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4335-sdio.bin" FILES_${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin" @@ -582,8 +583,8 @@ FILES_${PN}-bcm43242a = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43242a.bin FILES_${PN}-bcm43143 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43143.bin \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin \ " -FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.bin" -FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.bin" +FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*" +FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.*" FILES_${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin" FILES_${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin" FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.bin" @@ -594,6 +595,7 @@ FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie. ${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.ap.bin \ " FILES_${PN}-bcm4366b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366b-pcie.bin" +FILES_${PN}-bcm4366c = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366c-pcie.bin" FILES_${PN}-bcm4371 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4371-pcie.bin" # for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e "LICENSE_\${PN}-$pkg = \"Firmware-broadcom_bcm43xx\"\nRDEPENDS_\${PN}-$pkg += \"\${PN}-broadcom-license\""; done @@ -647,6 +649,8 @@ LICENSE_${PN}-bcm43602 = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm43602 += "${PN}-broadcom-license" LICENSE_${PN}-bcm4366b = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm4366b += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4366c = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4366c += "${PN}-broadcom-license" LICENSE_${PN}-bcm4371 = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm4371 += "${PN}-broadcom-license" @@ -656,11 +660,11 @@ LICENSE_${PN}-cypress-license = "Firmware-cypress" FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress" FILES_${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd" -FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.bin" -FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.bin" -FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin" +FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.*" +FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.*" +FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.*" FILES_${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin" -FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.bin" +FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.*" FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ " -- 2.17.1 From jonathan.rajotte-julien at efficios.com Mon Feb 17 16:48:18 2020 From: jonathan.rajotte-julien at efficios.com (Jonathan Rajotte-Julien) Date: Mon, 17 Feb 2020 11:48:18 -0500 Subject: [OE-core] [PATCH] babeltrace: update to 1.5.8 In-Reply-To: References: <20200217105930.902-1-wallinux@gmail.com> Message-ID: <20200217164818.GC17818@joraj-alpa> Hi, On Mon, Feb 17, 2020 at 12:43:43PM +0100, Alexander Kanavin wrote: > Also, there?s now a babeltrace 2, so we should update to that rather ? Babeltrace 1.5.x and Babeltrace 2 are "setup" to be co-installed. Currently lttng-tools depends on babeltrace 1.5 for testing (the "babeltrace" excutable). We plan to make the switch officialy in the upcoming months. We recommend (upstream) that if a Babeltrace2 recipe is to be exposed that it is done so in parallel to a Babeltrace 1.5.x recipe and that the default be Babeltrace 1.5.x for now. AFAIK all tests from lttng-tools do pass when using Babeltrace2 and babeltrace2 is full compatible (CLI) with babeltrace 1.5.x. Still, we recommended that for now 1.5.x be the default. Cheers > > Alex > > On Mon 17. Feb 2020 at 12.03, Jacob Kroon wrote: > > > On 2/17/20 11:59 AM, Anders Wallin wrote: > > > updated HOMEPAGE to http://babeltrace.org/ > > > updated LICENSE to include LGPLv2.1 > > > > > > Signed-off-by: Anders Wallin > > > --- > > > meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 20 +++++++++++++++++++ > > > 1 file changed, 20 insertions(+) > > > create mode 100644 meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > > > > > > diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > > b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > > > new file mode 100644 > > > index 0000000000..b6b7653037 > > > --- /dev/null > > > +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb > > > @@ -0,0 +1,20 @@ > > > +SUMMARY = "Babeltrace - Trace Format Babel Tower" > > > +DESCRIPTION = "Babeltrace provides trace read and write libraries in > > host side, as well as a trace converter, which used to convert LTTng 2.0 > > traces into human-readable log." > > > +HOMEPAGE = "http://babeltrace.org/" > > > +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" > > > +LICENSE = "MIT & GPLv2 & LGPLv2.1" > > > +LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" > > > + > > > +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" > > > + > > > +SRC_URI = "git:// > > git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" > > > +SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" > > > +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" > > > + > > > +S = "${WORKDIR}/git" > > > + > > > +inherit autotools pkgconfig > > > + > > > +EXTRA_OECONF = "--disable-debug-info" > > > + > > > +ASNEEDED = "" > > > > > > > Looks like this patch adds a new recipe for 1.5.8, and keeps the 1.5.7 > > recipe. Was that intentional ? > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Jonathan Rajotte-Julien EfficiOS From raj.khem at gmail.com Mon Feb 17 18:39:22 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 17 Feb 2020 10:39:22 -0800 Subject: [OE-core] [PATCH 02/10] procps: upstream has switched to gitlab In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-2-alex.kanavin@gmail.com> Message-ID: Ok, thanks. for confirmation On Mon, Feb 17, 2020 at 12:12 AM Alexander Kanavin wrote: > > I looked it up. Actually, potfiles.in is typically not a generated file, and should be placed under version control. The comment is valid. > > Alex > > On Mon 17. Feb 2020 at 3.36, Khem Raj wrote: >> >> On Sun, Feb 16, 2020 at 12:45 PM Alexander Kanavin >> wrote: >> > >> > On Sun, 16 Feb 2020 at 21:07, Khem Raj wrote: >> >> >> >> >>> -S = "${WORKDIR}/procps-ng-${PV}" >> >> >>> +# Upstream has a custom autogen.sh which invokes po/update-potfiles as they >> >> >>> +# don't ship a po/POTFILES.in (which is silly). Without that file gettext >> >> >>> +# doesn't believe po/ is a gettext directory and won't generate po/Makefile. >> >> >> >> >> >> Do we miss .in file from tarball ? Or is it missing in a git checkout >> >> >> This is expected when building in a maintainer mode >> >> >> Tarballs are produced by maintainers for users >> >> >> Who wants to build from source >> >> > >> >> > >> >> > The .in is available in tarballs, but not in git repo. It's generated as explained above. >> >> >> >> right. Then revise the comment, since its expected to be absent when >> >> we are building from >> >> git sources. >> > >> > >> > The fix and the comment were copied wholesale and were originally written by Ross. How is POTFILES.in normally generated (i.e. without involving custom autogen.sh)? >> >> any .in file is usually generated by maintainer into source tarball >> since the build is not consuming source tar anymore >> this comment perhaps should be deleted. >> >> > >> > Alex From sno at netbsd.org Mon Feb 17 18:43:08 2020 From: sno at netbsd.org (Jens Rehsack) Date: Mon, 17 Feb 2020 19:43:08 +0100 Subject: [OE-core] [PATCH] bitbake: fetch2: svn: care for path_spec Message-ID: <20200217184308.25673-1-sno@netbsd.org> From: Jens Rehsack Documentation says: "path_spec": A specific directory in which to checkout the specified svn module. but existing svn fetcher uses "module" always as path of checked out svn-module, regardless whether path_spec was given or not. Signed-off-by: Jens Rehsack --- bitbake/lib/bb/fetch2/svn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py index 6c8caf5fb9..385a6b2cf1 100644 --- a/bitbake/lib/bb/fetch2/svn.py +++ b/bitbake/lib/bb/fetch2/svn.py @@ -47,7 +47,7 @@ class Svn(FetchMethod): svndir = d.getVar("SVNDIR") or (d.getVar("DL_DIR") + "/svn") relpath = self._strip_leading_slashes(ud.path) ud.pkgdir = os.path.join(svndir, ud.host, relpath) - ud.moddir = os.path.join(ud.pkgdir, ud.module) + ud.moddir = os.path.join(ud.pkgdir, ud.path_spec) # Protects the repository from concurrent updates, e.g. from two # recipes fetching different revisions at the same time ud.svnlock = os.path.join(ud.pkgdir, "svn.lock") -- 2.17.1 From raj.khem at gmail.com Mon Feb 17 18:44:33 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 17 Feb 2020 10:44:33 -0800 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Mon, Feb 17, 2020 at 5:15 AM Alexander Kanavin wrote: > > On Mon, 17 Feb 2020 at 09:22, Alexander Kanavin wrote: >>> >>> \perhaps then make this chage such thst it only affects the >>> architecture you have tested. >> >> >> Fbdev backend is not documented, and there is no guarantee by upstream that it will work. You wouldn?t want to use it on actual targets either as it has no hw acceleration support. I think the change should apply to all, we should test standard drm/kms code paths everywhere and fix/report issues as needed. hw acceleration is not going to work for non-x86 qemus, while other qemus should be fixed but not by breaking them first. As suggested limit this change to tested architectures and it would be fine. then if interested to fix it globally make changes to fix rest of qemus and then instrument global change after that > > > The issue with qemumips in particular is that it is still using cirrus for the graphics card, which has been superseded by '-vga std' for a long time: > https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ > > If that is switched, then fbdev backend should be no longer necessary just like in qemux86_64. > this is interesting, I will try it out on mips. > Alex From patchwork at patchwork.openembedded.org Mon Feb 17 19:02:19 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 17 Feb 2020 19:02:19 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_bitbake=3A?= =?utf-8?q?_fetch2=3A_svn=3A_care_for_path=5Fspec?= In-Reply-To: <20200217184308.25673-1-sno@netbsd.org> References: <20200217184308.25673-1-sno@netbsd.org> Message-ID: <20200217190219.2277.86366@do> == Series Details == Series: bitbake: fetch2: svn: care for path_spec Revision: 1 URL : https://patchwork.openembedded.org/series/22713/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists [test_target_mailing_list] Suggested fix Send the series again to the correct mailing list (ML) Suggested ML bitbake-devel at lists.openembedded.org [http://git.openembedded.org/bitbake/] Patch's path: bitbake/lib/bb/fetch2/svn.py * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at c9b5802bbe) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From alex.kanavin at gmail.com Mon Feb 17 19:29:31 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 17 Feb 2020 20:29:31 +0100 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Mon, 17 Feb 2020 at 19:45, Khem Raj wrote: > > hw acceleration is not going to work for non-x86 qemus, while other > qemus should be fixed but not > by breaking them first. As suggested limit this change to tested > architectures and it would be fine. > then if interested to fix it globally make changes to fix rest of > qemus and then instrument global change > after that > arm64 qemu should work, as it is using the same video hardware as x86_64. My computing resources are severely limited right now, so I cannot try it out immediately unfortunately, but I'll get to it, or you are welcome to try and report. Mips can be either fixed like suggested, or be a specific exception. For the rest of the targets, I see that you have extended the fbdev fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone is using them to run weston (not to mention how painfully slow that would be), and so it would just be wasteful to test or fix them. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From bruce.ashfield at gmail.com Mon Feb 17 19:40:49 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Mon, 17 Feb 2020 14:40:49 -0500 Subject: [OE-core] [PATCH] db: Fix timespec length assumptions In-Reply-To: References: <20200214223334.2473195-1-raj.khem@gmail.com> Message-ID: On Fri, Feb 14, 2020 at 11:10 PM Bruce Ashfield wrote: > > On Fri, Feb 14, 2020 at 5:33 PM Khem Raj wrote: > > > > This should fix the vdso crashes seen with kernel 5.0+ > > cool. I'll test this locally and follow up over the weekend. I can confirm that 32bit x86 + musl no longer traps for me with this patch in place. I'll bump the 5.4 recipes again, retest and then send the patches to make them the default. Bruce > > Bruce > > > > > python3[11312] general protection fault ip:b7e966b0 sp:bf8175cc error:0 in libc.so[b7e8b000+6b000] > > > > Signed-off-by: Khem Raj > > Cc: Bruce Ashfield > > --- > > ...001-clock-Do-not-define-own-timespec.patch | 45 +++++++++++++++++++ > > meta/recipes-support/db/db_5.3.28.bb | 1 + > > 2 files changed, 46 insertions(+) > > create mode 100644 meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch > > > > diff --git a/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch > > new file mode 100644 > > index 0000000000..9d51a44a26 > > --- /dev/null > > +++ b/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch > > @@ -0,0 +1,45 @@ > > +From 96b303caf70a7635953c36e5bfb9ad6e75cb7637 Mon Sep 17 00:00:00 2001 > > +From: Khem Raj > > +Date: Fri, 14 Feb 2020 14:12:59 -0800 > > +Subject: [PATCH] clock: Do not define own timespec > > + > > +timespec is provided by libc and its best left to libc > > +os_gettime takes a db_timespec and passed its address to clock_gettime > > +which assumes that db_timespec and timespec are same but actually > > +its 12-bytes here and libc has 16-bytes > > + > > +This can cause problems especially with 64bit time_t > > + > > +Upstream-Status: Pending > > +Signed-off-by: Khem Raj > > +--- > > + src/dbinc/clock.h | 17 +---------------- > > + 1 file changed, 1 insertion(+), 16 deletions(-) > > + > > +--- a/src/dbinc/clock.h > > ++++ b/src/dbinc/clock.h > > +@@ -44,22 +44,8 @@ > > + extern "C" { > > + #endif > > + > > +-/* > > +- * This declaration is POSIX-compatible. Because there are lots of different > > +- * time.h include file patterns out there, it's easier to declare our own name > > +- * in all cases than to try and discover if a system has a struct timespec. > > +- * For the same reason, and because we'd have to #include in db.h, > > +- * we don't export any timespec structures in the DB API, even in places where > > +- * it would make sense, like the replication statistics information. > > +- */ > > +-typedef struct { > > +- time_t tv_sec; /* seconds */ > > +-#ifdef HAVE_MIXED_SIZE_ADDRESSING > > +- int32_t tv_nsec; > > +-#else > > +- long tv_nsec; /* nanoseconds */ > > +-#endif > > +-} db_timespec; > > ++#include > > ++#define db_timespec struct timespec > > + > > + /* Operations on timespecs */ > > + #undef timespecclear > > diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb > > index a2969055a6..badb79f9ea 100644 > > --- a/meta/recipes-support/db/db_5.3.28.bb > > +++ b/meta/recipes-support/db/db_5.3.28.bb > > @@ -26,6 +26,7 @@ SRC_URI += "file://fix-parallel-build.patch \ > > file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ > > file://sequence-type.patch \ > > file://0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch \ > > + file://0001-clock-Do-not-define-own-timespec.patch \ > > " > > # We are not interested in official latest 6.x versions; > > # let's track what debian is using. > > -- > > 2.25.0 > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From jupiter.hce at gmail.com Tue Feb 18 01:00:26 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 18 Feb 2020 12:00:26 +1100 Subject: [OE-core] Change RO rootfs failed RF Kill Switch Status and Failed to start Run pending postinsts Message-ID: Hi, Apologize for the cross posting. I am running kernel 4.19.75 on iMX6 customized device with WiFi and 4G LTE, it was running well in an RW rootfs. After I have just changed rootfs to RO UBIFS partition, it failed RF Kill and postinsts I suspect both try write to the RO and failed, any advice how to fix it? Despite it failed RF Kill and postinsts, it was still working. [ 6.097762] UBIFS (ubi0:2): UBIFS: mounted UBI device 0, volume 2, name "rootfs-volume", R/O mode .............. [ 6.151932] VFS: Mounted root (ubifs filesystem) readonly on device 0:13. ................. [ OK ] Listening on Load/Save RF Kill Switch Status /dev/rfkill Watch. Starting Load/Save RF Kill Switch Status... [FAILED] Failed to start Load/Save RF Kill Switch Status. See 'systemctl status systemd-rfkill.service' for details. [FAILED] Failed to start Run pending postinsts. See 'systemctl status run-postinsts.service' for details. ............... root# Thank you. Kind regards, - jh From raj.khem at gmail.com Tue Feb 18 01:56:30 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 17 Feb 2020 17:56:30 -0800 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Mon, Feb 17, 2020 at 11:29 AM Alexander Kanavin wrote: > On Mon, 17 Feb 2020 at 19:45, Khem Raj wrote: > >> >> hw acceleration is not going to work for non-x86 qemus, while other >> qemus should be fixed but not >> by breaking them first. As suggested limit this change to tested >> architectures and it would be fine. >> then if interested to fix it globally make changes to fix rest of >> qemus and then instrument global change >> after that >> > > arm64 qemu should work, as it is using the same video hardware as x86_64. > My computing resources are severely limited right now, so I cannot try it > out immediately unfortunately, > Ok then resend it later but I'll get to it, or you are welcome to try and report. > Mips can be either fixed like suggested, or be a specific exception. > > For the rest of the targets, I see that you have extended the fbdev > fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone > is using them to run weston (not to mention how painfully slow that would > be), and so it would just be wasteful to test or fix them. > We should be only applying tested part debugging these breakages is very hard so when we know it will break we should be careful as with this patch > > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From li.zhou at windriver.com Tue Feb 18 02:06:53 2020 From: li.zhou at windriver.com (Li Zhou) Date: Tue, 18 Feb 2020 10:06:53 +0800 Subject: [OE-core] [PATCH] kernel-devsrc: fix missing generated files from the packet Message-ID: <1581991613-30949-1-git-send-email-li.zhou@windriver.com> The file arch/arm/include/generated/asm/unistd-nr.h is needed by some external kernel module. Error occurs when building the module with the SDK. Add arch/${ARCH}/include/generated dir and files under it to kernel-devsrc package to solve this issue. Signed-off-by: Li Zhou --- meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index b6f2dbc..8621fe1 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -108,6 +108,12 @@ do_install() { fi cp -a include $kerneldir/build/include + + if [ -d arch/${ARCH}/include/generated ]; then + mkdir -p $kerneldir/build/arch/${ARCH}/include + cp -r arch/${ARCH}/include/generated $kerneldir/build/arch/${ARCH}/include + fi + ) # now grab the chunks from the source tree that we need -- 1.9.1 From bruce.ashfield at gmail.com Tue Feb 18 02:12:36 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Mon, 17 Feb 2020 21:12:36 -0500 Subject: [OE-core] [PATCH] kernel-devsrc: fix missing generated files from the packet In-Reply-To: <1581991613-30949-1-git-send-email-li.zhou@windriver.com> References: <1581991613-30949-1-git-send-email-li.zhou@windriver.com> Message-ID: On Mon, Feb 17, 2020 at 9:07 PM Li Zhou wrote: > > The file arch/arm/include/generated/asm/unistd-nr.h is needed by some > external kernel module. Error occurs when building the module with > the SDK. > > Add arch/${ARCH}/include/generated dir and files under it to > kernel-devsrc package to solve this issue. > > Signed-off-by: Li Zhou > --- > meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb > index b6f2dbc..8621fe1 100644 > --- a/meta/recipes-kernel/linux/kernel-devsrc.bb > +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb > @@ -108,6 +108,12 @@ do_install() { > fi > > cp -a include $kerneldir/build/include > + > + if [ -d arch/${ARCH}/include/generated ]; then > + mkdir -p $kerneldir/build/arch/${ARCH}/include > + cp -r arch/${ARCH}/include/generated $kerneldir/build/arch/${ARCH}/include > + fi This is just papering over the real problem. Anything that is generated, should be regenerated when the headers are used/prepared. What is missing and/or why isn't that happening with this ? Bruce > + > ) > > # now grab the chunks from the source tree that we need > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From De.Huo at windriver.com Tue Feb 18 02:46:04 2020 From: De.Huo at windriver.com (Huo, De) Date: Tue, 18 Feb 2020 02:46:04 +0000 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> References: , <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> Message-ID: <444185BB2F013F4E92378F99BCF8A58BC9AF9CBD@ALA-MBD.corp.ad.wrs.com> I applied the patch to fix CVE defect CVE-2019-18276. Can I reproduce this failure on my side? ________________________________________ From: Chet Ramey [chet.ramey at case.edu] Sent: Monday, February 17, 2020 10:24 PM To: Phil Reid; Huo, De; akuster808 at gmail.com; Richard Purdie; Patches and discussions about the oe-core layer Cc: chet.ramey at case.edu Subject: Re: bash: Fix CVE-2019-18276 On 2/16/20 9:56 PM, Phil Reid wrote: > Hi All, > > I recently started get the following failure with bash after "b348e31c93f0 > bash: Fix CVE-2019-18276" > was applied to zeus. > > Any thoughts? What is the `Fix CVE-2019-18276' patch? Who supplied it? -- ``The lyf so short, the craft so long to lerne.'' - Chaucer ``Ars longa, vita brevis'' - Hippocrates Chet Ramey, UTech, CWRU chet at case.edu http://tiswww.cwru.edu/~chet/ From Kai.Kang at windriver.com Tue Feb 18 02:55:59 2020 From: Kai.Kang at windriver.com (Kang Kai) Date: Tue, 18 Feb 2020 10:55:59 +0800 Subject: [OE-core] [PATCH] glibc-package.inc: fix multilib headers conflict In-Reply-To: <20200211150741.2729-1-kai.kang@windriver.com> References: <20200211150741.2729-1-kai.kang@windriver.com> Message-ID: <2580ac74-38f2-4fdc-9030-7591d9cc26cb@windriver.com> On 2020/2/11 ??11:07, kai.kang at windriver.com wrote: > From: Kai Kang > > Pass bits/endianness.h and bits/struct_rwlock.h to oe_multilib_header in > glibc-package.inc to fix files conflict: > > | Error: Transaction check error: > | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 > | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 Ping. Could reproduce with config require conf/multilib.conf MACHINE = "qemuarm64" MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7vethf" Regards, Kai > > Signed-off-by: Kai Kang > --- > meta/recipes-core/glibc/glibc-package.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc > index 3aed7be4f8..285a9aa2f5 100644 > --- a/meta/recipes-core/glibc/glibc-package.inc > +++ b/meta/recipes-core/glibc/glibc-package.inc > @@ -87,7 +87,7 @@ do_install() { > rmdir --ignore-fail-on-non-empty ${D}${libexecdir} > fi > > - oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h > + oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h > > if [ -f ${D}${bindir}/mtrace ]; then > sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace -- Kai Kang From Kai.Kang at windriver.com Tue Feb 18 02:58:04 2020 From: Kai.Kang at windriver.com (Kang Kai) Date: Tue, 18 Feb 2020 10:58:04 +0800 Subject: [OE-core] [PATCH] glibc-package.inc: fix multilib headers conflict In-Reply-To: <2580ac74-38f2-4fdc-9030-7591d9cc26cb@windriver.com> References: <20200211150741.2729-1-kai.kang@windriver.com> <2580ac74-38f2-4fdc-9030-7591d9cc26cb@windriver.com> Message-ID: On 2020/2/18 ??10:55, Kang Kai wrote: > On 2020/2/11 ??11:07, kai.kang at windriver.com wrote: >> From: Kai Kang >> >> Pass bits/endianness.h and bits/struct_rwlock.h to oe_multilib_header in >> glibc-package.inc to fix files conflict: >> >> | Error: Transaction check error: >> |?? file /usr/include/bits/endianness.h conflicts between attempted >> installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and >> libc6-dev-2.31-r0.aarch64 >> |?? file /usr/include/bits/struct_rwlock.h conflicts between >> attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and >> libc6-dev-2.31-r0.aarch64 > > Ping. > > Could reproduce with config > > require conf/multilib.conf > MACHINE = "qemuarm64" > MULTILIBS = "multilib:lib32" > DEFAULTTUNE_virtclass-multilib-lib32 = "armv7vethf" And IMAGE_INSTALL_append = " lib32-libc6-dev libc6-dev" of course. > > Regards, > Kai > > >> >> Signed-off-by: Kai Kang >> --- >> ? meta/recipes-core/glibc/glibc-package.inc | 2 +- >> ? 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/recipes-core/glibc/glibc-package.inc >> b/meta/recipes-core/glibc/glibc-package.inc >> index 3aed7be4f8..285a9aa2f5 100644 >> --- a/meta/recipes-core/glibc/glibc-package.inc >> +++ b/meta/recipes-core/glibc/glibc-package.inc >> @@ -87,7 +87,7 @@ do_install() { >> ????????? rmdir --ignore-fail-on-non-empty ${D}${libexecdir} >> ????? fi >> ? -??? oe_multilib_header bits/syscall.h bits/long-double.h >> bits/floatn.h >> +??? oe_multilib_header bits/syscall.h bits/long-double.h >> bits/floatn.h bits/endianness.h bits/struct_rwlock.h >> ? ????? if [ -f ${D}${bindir}/mtrace ]; then >> ????????? sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e >> '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace > > -- Kai Kang From li.zhou at windriver.com Tue Feb 18 03:57:28 2020 From: li.zhou at windriver.com (zhou li) Date: Tue, 18 Feb 2020 11:57:28 +0800 Subject: [OE-core] [PATCH] kernel-devsrc: fix missing generated files from the packet In-Reply-To: References: <1581991613-30949-1-git-send-email-li.zhou@windriver.com> Message-ID: <342f0a1b-aec2-932a-2a49-cd2b896d8822@windriver.com> On 2/18/20 10:12 AM, Bruce Ashfield wrote: > On Mon, Feb 17, 2020 at 9:07 PM Li Zhou wrote: >> The file arch/arm/include/generated/asm/unistd-nr.h is needed by some >> external kernel module. Error occurs when building the module with >> the SDK. >> >> Add arch/${ARCH}/include/generated dir and files under it to >> kernel-devsrc package to solve this issue. >> >> Signed-off-by: Li Zhou >> --- >> meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb >> index b6f2dbc..8621fe1 100644 >> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb >> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb >> @@ -108,6 +108,12 @@ do_install() { >> fi >> >> cp -a include $kerneldir/build/include >> + >> + if [ -d arch/${ARCH}/include/generated ]; then >> + mkdir -p $kerneldir/build/arch/${ARCH}/include >> + cp -r arch/${ARCH}/include/generated $kerneldir/build/arch/${ARCH}/include >> + fi > This is just papering over the real problem. > > Anything that is generated, should be regenerated when the headers are > used/prepared. > > What is missing and/or why isn't that happening with this ? > > Bruce In some old version yocto, the file arch/arm/include/generated/asm/unistd-nr.h can be directly used from our sdk. So now it isn't permitted any more? And we should figure out how to generate it again when developing the external kernel modules? Thank you. > >> + >> ) >> >> # now grab the chunks from the source tree that we need >> -- >> 1.9.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- Best Regards! Zhou Li Phone number: 86-10-84778511 From jupiter.hce at gmail.com Tue Feb 18 04:35:25 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 18 Feb 2020 15:35:25 +1100 Subject: [OE-core] Change RO rootfs failed RF Kill Switch Status and Failed to start Run pending postinsts In-Reply-To: References: Message-ID: It also seems mwifiex_sdio tried to write to RO rootfs and failed and triggled RF Killm, does mwifiex_sdio needs some system directories for RW? [ 26.636845] mwifiex_sdio mmc0:0001:1: mwifiex_process_cmdresp: cmd 0x242 fain Starting Load/Save RF Kill Switch Status... [ 26.852990] mwifiex_sdio mmc0:0001:1: info: MWIFIEX VERSION: mwifiex 1.0 (14 [ 26.861518] mwifiex_sdio mmc0:0001:1: driver_version = mwifiex 1.0 (14.68.36 [FAILED] Failed to start Load/Save RF Kill Switch Status. See 'systemctl status systemd-rfkill.service' for details. Starting Load/Save RF Kill Switch Status... [FAILED] Failed to start Load/Save RF Kill Switch Status. See 'systemctl status systemd-rfkill.service' for details. Starting Load/Save RF Kill Switch Status... [FAILED] Failed to start Load/Save RF Kill Switch Status. See 'systemctl status systemd-rfkill.service' for details. Starting Load/Save RF Kill Switch Status... On 2/18/20, JH wrote: > Hi, > > Apologize for the cross posting. > > I am running kernel 4.19.75 on iMX6 customized device with WiFi and 4G > LTE, it was running well in an RW rootfs. After I have just changed > rootfs to RO UBIFS partition, it failed RF Kill and postinsts I > suspect both try write to the RO and failed, any advice how to fix it? > Despite it failed RF Kill and postinsts, it was still working. > > [ 6.097762] UBIFS (ubi0:2): UBIFS: mounted UBI device 0, volume 2, > name "rootfs-volume", R/O mode > .............. > [ 6.151932] VFS: Mounted root (ubifs filesystem) readonly on device > 0:13. > ................. > [ OK ] Listening on Load/Save RF Kill Switch Status /dev/rfkill Watch. > Starting Load/Save RF Kill Switch Status... > [FAILED] Failed to start Load/Save RF Kill Switch Status. > See 'systemctl status systemd-rfkill.service' for details. > > [FAILED] Failed to start Run pending postinsts. > See 'systemctl status run-postinsts.service' for details. > ............... > root# > > Thank you. > > Kind regards, > > - jh > From wangmy at cn.fujitsu.com Tue Feb 18 13:39:55 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Tue, 18 Feb 2020 05:39:55 -0800 Subject: [OE-core] [PATCH] libarchive: upgrade 3.4.1 -> 3.4.2 In-Reply-To: <1582033197-93331-1-git-send-email-wangmy@cn.fujitsu.com> References: <1582033197-93331-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1582033197-93331-2-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} (93%) diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb similarity index 93% rename from meta/recipes-extended/libarchive/libarchive_3.4.1.bb rename to meta/recipes-extended/libarchive/libarchive_3.4.2.bb index 2d33dd80ab..c3edb573e7 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -33,8 +33,8 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" -SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" +SRC_URI[md5sum] = "d953ed6b47694dadf0e6042f8f9ff451" +SRC_URI[sha256sum] = "b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176" inherit autotools update-alternatives pkgconfig -- 2.17.1 From wangmy at cn.fujitsu.com Tue Feb 18 13:39:54 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Tue, 18 Feb 2020 05:39:54 -0800 Subject: [OE-core] [PATCH] bison: upgrade 3.5.1 -> 3.5.2 Message-ID: <1582033197-93331-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../recipes-devtools/bison/{bison_3.5.1.bb => bison_3.5.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/bison/{bison_3.5.1.bb => bison_3.5.2.bb} (90%) diff --git a/meta/recipes-devtools/bison/bison_3.5.1.bb b/meta/recipes-devtools/bison/bison_3.5.2.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.1.bb rename to meta/recipes-devtools/bison/bison_3.5.2.bb index e70252d974..b5b4a8ef76 100644 --- a/meta/recipes-devtools/bison/bison_3.5.1.bb +++ b/meta/recipes-devtools/bison/bison_3.5.2.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" -SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" +SRC_URI[md5sum] = "49fc2cf23e31e697d5072835e1662a97" +SRC_URI[sha256sum] = "24e273db9eb6da8bbb6f0648284d0724a5cbd6268a163db402f961350a4e50dd" inherit autotools gettext texinfo -- 2.17.1 From wangmy at cn.fujitsu.com Tue Feb 18 13:39:56 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Tue, 18 Feb 2020 05:39:56 -0800 Subject: [OE-core] [PATCH] libcap: upgrade 2.31 -> 2.32 In-Reply-To: <1582033197-93331-1-git-send-email-wangmy@cn.fujitsu.com> References: <1582033197-93331-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1582033197-93331-3-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../recipes-support/libcap/{libcap_2.31.bb => libcap_2.32.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libcap/{libcap_2.31.bb => libcap_2.32.bb} (93%) diff --git a/meta/recipes-support/libcap/libcap_2.31.bb b/meta/recipes-support/libcap/libcap_2.32.bb similarity index 93% rename from meta/recipes-support/libcap/libcap_2.31.bb rename to meta/recipes-support/libcap/libcap_2.32.bb index 97959c1025..d78a58f7d2 100644 --- a/meta/recipes-support/libcap/libcap_2.31.bb +++ b/meta/recipes-support/libcap/libcap_2.32.bb @@ -12,8 +12,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[md5sum] = "52120c05dc797b01f5a7ae70f4335e96" -SRC_URI[sha256sum] = "c6088de41e1c97fa8047e2e7de0e4ee0cd13e6cc16538022230ae76727a87c46" +SRC_URI[md5sum] = "7416119c9fdcfd0e8dd190a432c668e9" +SRC_URI[sha256sum] = "1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" -- 2.17.1 From wangmy at cn.fujitsu.com Tue Feb 18 13:39:57 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Tue, 18 Feb 2020 05:39:57 -0800 Subject: [OE-core] [PATCH] libpcre: upgrade 8.43 -> 8.44 In-Reply-To: <1582033197-93331-1-git-send-email-wangmy@cn.fujitsu.com> References: <1582033197-93331-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1582033197-93331-4-git-send-email-wangmy@cn.fujitsu.com> out-of-tree.patch Removed since it is included in 8.44. Copyright updated: 2019 -> 2020 Signed-off-by: Wang Mingyu --- .../libpcre/libpcre/out-of-tree.patch | 26 ------------------- .../{libpcre_8.43.bb => libpcre_8.44.bb} | 7 +++-- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-support/libpcre/libpcre/out-of-tree.patch rename meta/recipes-support/libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} (91%) diff --git a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch deleted file mode 100644 index d56789615f..0000000000 --- a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch +++ /dev/null @@ -1,26 +0,0 @@ -In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is. - -Upstream-Status: Backport [r1750] -Signed-off-by: Ross Burton - -Index: configure.ac -=================================================================== ---- a/configure.ac (revision 1749) -+++ b/configure.ac (working copy) -@@ -159,6 +159,8 @@ - - if test "$enable_jit" = "auto"; then - AC_LANG(C) -+ SAVE_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$srcdir - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define SLJIT_CONFIG_AUTO 1 - #include "sljit/sljitConfigInternal.h" -@@ -165,6 +167,7 @@ - #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) - #error unsupported - #endif]])], enable_jit=yes, enable_jit=no) -+ CPPFLAGS=$SAVE_CPPFLAGS - fi - - # Handle --disable-pcregrep-jit (enabled by default) diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.44.bb similarity index 91% rename from meta/recipes-support/libpcre/libpcre_8.43.bb rename to meta/recipes-support/libpcre/libpcre_8.44.bb index f9a22fee9d..a1f835e454 100644 --- a/meta/recipes-support/libpcre/libpcre_8.43.bb +++ b/meta/recipes-support/libpcre/libpcre_8.44.bb @@ -6,16 +6,15 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ - file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" -SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" +SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" +SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" CVE_PRODUCT = "pcre" -- 2.17.1 From marek.belisko at gmail.com Tue Feb 18 06:37:41 2020 From: marek.belisko at gmail.com (Belisko Marek) Date: Tue, 18 Feb 2020 07:37:41 +0100 Subject: [OE-core] [yocto] Change RO rootfs failed RF Kill Switch Status and Failed to start Run pending postinsts In-Reply-To: References: Message-ID: Hi, On Tue, Feb 18, 2020 at 2:00 AM JH wrote: > > Hi, > > Apologize for the cross posting. > > I am running kernel 4.19.75 on iMX6 customized device with WiFi and 4G > LTE, it was running well in an RW rootfs. After I have just changed > rootfs to RO UBIFS partition, it failed RF Kill and postinsts I > suspect both try write to the RO and failed, any advice how to fix it? > Despite it failed RF Kill and postinsts, it was still working. > > [ 6.097762] UBIFS (ubi0:2): UBIFS: mounted UBI device 0, volume 2, > name "rootfs-volume", R/O mode > .............. > [ 6.151932] VFS: Mounted root (ubifs filesystem) readonly on device 0:13. > ................. > [ OK ] Listening on Load/Save RF Kill Switch Status /dev/rfkill Watch. > Starting Load/Save RF Kill Switch Status... > [FAILED] Failed to start Load/Save RF Kill Switch Status. > See 'systemctl status systemd-rfkill.service' for details. Can you pls provide output of systemctl status systemd-rfkill There should be some more info what issue is. > > [FAILED] Failed to start Run pending postinsts. > See 'systemctl status run-postinsts.service' for details. Pls this one also: systemctl status run-postinsts > ............... > root# > > Thank you. > > Kind regards, > > - jh > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > > View/Reply Online (#48463): https://lists.yoctoproject.org/g/yocto/message/48463 > Mute This Topic: https://lists.yoctoproject.org/mt/71363457/900721 > Group Owner: yocto+owner at lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [marek.belisko at gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- BR, marek From preid at electromag.com.au Tue Feb 18 06:41:16 2020 From: preid at electromag.com.au (Phil Reid) Date: Tue, 18 Feb 2020 14:41:16 +0800 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: <981f9211365c2dfc6da70b737f43f3e89d87f7d4.camel@linuxfoundation.org> References: <981f9211365c2dfc6da70b737f43f3e89d87f7d4.camel@linuxfoundation.org> Message-ID: On 17/02/2020 17:55, Richard Purdie wrote: > On Mon, 2020-02-17 at 07:44 +0100, Andrey Zhizhikin wrote: >> On Mon, Feb 17, 2020 at 4:26 AM Phil Reid >> wrote: >>> Hi All, >>> >>> I recently started get the following failure with bash after >>> "b348e31c93f0 bash: Fix CVE-2019-18276" >>> was applied to zeus. >>> >>> Any thoughts? >>> >>> >>> NOTE: Applying patch 'bash50-001' (downloads/bash50-001) >>> NOTE: Applying patch 'bash50-002' (downloads/bash50-002) >>> NOTE: Applying patch 'bash50-003' (downloads/bash50-003) >>> NOTE: Applying patch 'bash50-004' (downloads/bash50-004) >>> NOTE: Applying patch 'bash50-005' (downloads/bash50-005) >>> NOTE: Applying patch 'bash50-006' (downloads/bash50-006) >>> NOTE: Applying patch 'bash50-007' (downloads/bash50-007) >>> NOTE: Applying patch 'execute_cmd.patch' (layers/openembedded- >>> core/meta/recipes-extended/bash/bash/execute_cmd.patch) >>> NOTE: Applying patch 'mkbuiltins_have_stringize.patch' >>> (layers/openembedded-core/meta/recipes- >>> extended/bash/bash/mkbuiltins_have_stringize.patch) >>> NOTE: Applying patch 'build-tests.patch' (layers/openembedded- >>> core/meta/recipes-extended/bash/bash/build-tests.patch) >>> NOTE: Applying patch 'test-output.patch' (layers/openembedded- >>> core/meta/recipes-extended/bash/bash/test-output.patch) >>> NOTE: Applying patch 'fix-run-builtins.patch' (layers/openembedded- >>> core/meta/recipes-extended/bash/bash/fix-run-builtins.patch) >>> NOTE: Applying patch 'bash-CVE-2019-18276.patch' >>> (layers/openembedded-core/meta/recipes-extended/bash/bash/bash-CVE- >>> 2019-18276.patch) >>> ERROR: Command Error: 'quilt --quiltrc >>> /home/preid/dev/linux/v2019.11/tmp-glibc/work/cortexa9t2hf-neon- >>> emit-linux-gnueabi/bash/5.0-r0/recipe-sysroot-native/etc/quiltrc >>> push' exited with 0 Output: >>> Applying patch bash-CVE-2019-18276.patch >>> patching file MANIFEST >>> patching file bashline.c >>> patching file builtins/help.def >>> patching file config.h.in >>> patching file configure >>> Hunk #1 FAILED at 10281. >>> 1 out of 1 hunk FAILED -- rejects in file configure >>> patching file configure.ac >>> patching file doc/bash.1 >>> patching file doc/bashref.texi >>> patching file lib/glob/glob.c >>> patching file pathexp.c >>> patching file shell.c >>> patching file tests/glob.tests >>> patching file tests/glob6.sub >>> patching file tests/glob7.sub >>> Patch bash-CVE-2019-18276.patch does not apply (enforce with -f) >>> DEBUG: Python function patch_do_patch finished >>> DEBUG: Python function do_patch finished >> >> Had the same issue the day before, re-building bash clean solved it. >> At first I wanted to report it as well, but then after I tried "-c >> cleanall" - the issue was gone. >> >> Try to do a clean build of bash and see if it is still reproducible. > > I think I understand what happens here. When you do a rebuild, bitbake > tries to pop off all the old patches, then apply the new ones. > > In this case its patching configure which we rebuild. It therefore > can't apply the new patch to configure since its changed by the > do_configure task. > > The fix is to remove the configure change from the patch since we just > need the configure.ac piece. > I've run "bitbake -c cleanall bash" and the build has then succeeded. I guess we wait and see if it pops up again when bash needs to be rebuilt. I did try quickly hacking the patch and removing the configure patch section, but the resulting configure looked different. So I went with the easy option above. Thanks Phil From jupiter.hce at gmail.com Tue Feb 18 07:20:36 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 18 Feb 2020 18:20:36 +1100 Subject: [OE-core] [yocto] Change RO rootfs failed RF Kill Switch Status and Failed to start Run pending postinsts In-Reply-To: References: Message-ID: Hi Belisko, Thanks for your resonse. On 2/18/20, Belisko Marek wrote: > Can you pls provide output of systemctl status systemd-rfkill > There should be some more info what issue is. Failed at step STATE_DIRECTORY spawning /lib/systemd/systemd-rfkill: Read-only file system, did it try to write something in /lib/systemd? How should I fix it? # systemctl status systemd-rfkill -l * systemd-rfkill.service - Load/Save RF Kill Switch Status Loaded: loaded (8;;file://solar/lib/systemd/system/systemd-rfkill.service/lib/systemd/system/systemd-rfkill.service8;;; static; vendor preset: disabled) Active: failed (Result: exit-code) since Tue 2020-02-18 00:47:30 UTC; 1min 59s ago Docs: 8;;man:systemd-rfkill.service(8)man:systemd-rfkill.service(8)8;; Process: 149 ExecStart=/lib/systemd/systemd-rfkill (code=exited, status=238/STATE_DIRECTORY) Main PID: 149 (code=exited, status=238/STATE_DIRECTORY) Feb 18 00:47:30 solar systemd[1]: Starting Load/Save RF Kill Switch Status... Feb 18 00:47:30 solar systemd[149]: systemd-rfkill.service: Failed to set up special execution directory in /var/lib: Read-only file system Feb 18 00:47:30 solar systemd[149]: systemd-rfkill.service: Failed at step STATE_DIRECTORY spawning /lib/systemd/systemd-rfkill: Read-only file system Feb 18 00:47:30 solar systemd[1]: systemd-rfkill.service: Main process exited, code=exited, status=238/STATE_DIRECTORY Feb 18 00:47:30 solar systemd[1]: systemd-rfkill.service: Failed with result 'exit-code'. Feb 18 00:47:30 solar systemd[1]: Failed to start Load/Save RF Kill Switch Status. Feb 18 00:47:30 solar systemd[1]: systemd-rfkill.service: Start request repeated too quickly. Feb 18 00:47:30 solar systemd[1]: systemd-rfkill.service: Failed with result 'exit-code'. Feb 18 00:47:30 solar systemd[1]: Failed to start Load/Save RF Kill Switch Status. >> [FAILED] Failed to start Run pending postinsts. >> See 'systemctl status run-postinsts.service' for details. > Pls this one also: systemctl status run-postinsts # systemctl status run-postinsts -l * run-postinsts.service - Run pending postinsts Loaded: loaded (8;;file://solar/lib/systemd/system/run-postinsts.service/lib/systemd/system/run-postinsts.service8;;; enabled; vendor preset: enabled) Active: failed (Result: exit-code) since Tue 2020-02-18 00:47:37 UTC; 6min ago Process: 153 ExecStart=/usr/sbin/run-postinsts (code=exited, status=0/SUCCESS) Process: 159 ExecStartPost=/bin/systemctl --no-reload disable run-postinsts.service (code=exited, status=1/FAILURE) Main PID: 153 (code=exited, status=0/SUCCESS) Feb 18 00:47:36 solar systemd[1]: Starting Run pending postinsts... Feb 18 00:47:36 solar run-postinsts[153]: Configuring packages on first boot.... Feb 18 00:47:36 solar run-postinsts[153]: (This may take several minutes. Please do not power off the machine.) Feb 18 00:47:36 solar run-postinsts[153]: /usr/sbin/run-postinsts: eval: line 1: can't create /var/log/postinstall.log: nonexistent directory Feb 18 00:47:36 solar run-postinsts[153]: Removing any system startup links for run-postinsts ... Feb 18 00:47:37 solar systemctl[159]: Failed to disable unit: File /etc/systemd/system/sysinit.target.wants/run-postinsts.service: Read-only file system Feb 18 00:47:37 solar systemd[1]: run-postinsts.service: Control process exited, code=exited, status=1/FAILURE Feb 18 00:47:37 solar systemd[1]: run-postinsts.service: Failed with result 'exit-code'. Feb 18 00:47:37 solar systemd[1]: Failed to start Run pending postinsts. Was the problem to write to /var/log, the /var/volatile does not have a log? # ls -l /var drwxr-xr-x 2 1000 1000 160 Feb 18 2020 backups drwxr-xr-x 5 1000 1000 100 Feb 18 00:47 cache drwxr-xr-x 9 1000 1000 180 Feb 18 00:47 lib drwxr-xr-x 3 1000 1000 224 Feb 18 2020 local lrwxrwxrwx 1 1000 1000 11 Feb 18 2020 lock -> ../run/lock lrwxrwxrwx 1 1000 1000 12 Feb 18 00:52 log -> volatile/log lrwxrwxrwx 1 1000 1000 6 Feb 18 2020 run -> ../run drwxr-xr-x 3 1000 1000 60 Feb 18 2020 spool lrwxrwxrwx 1 1000 1000 12 Feb 18 2020 tmp -> volatile/tmp drwxrwxrwt 8 root root 160 Feb 18 00:47 volatile # ls -l /var/volatile/ drwxr-xr-x 5 1000 1000 100 Feb 18 00:47 cache drwxr-xr-x 9 1000 1000 180 Feb 18 00:47 lib drwxr-xr-x 3 1000 1000 60 Feb 18 2020 spool All system mount is the same as the original RW rootfs, did both write to none standard RW system mount? Here is defined system mount in fstab: proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 tmpfs /var/volatile tmpfs defaults 0 0 Here is the mount: # mount ubi0:rootfs-volume on / type ubifs (ro,relatime,assert=read-only,ubi=0,vol=2) devtmpfs on /dev type devtmpfs (rw,relatime,size=84564k,nr_inodes=21141,mode=755) sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,relatime) proc on /proc type proc (rw,relatime) securityfs on /sys/kernel/security type securityfs (rw,nosuid,nodev,noexec,relatime) tmpfs on /dev/shm type tmpfs (rw,nosuid,nodev) devpts on /dev/pts type devpts (rw,relatime,gid=5,mode=620,ptmxmode=000) tmpfs on /run type tmpfs (rw,nosuid,nodev,mode=755) tmpfs on /sys/fs/cgroup type tmpfs (ro,nosuid,nodev,noexec,mode=755) cgroup2 on /sys/fs/cgroup/unified type cgroup2 (rw,nosuid,nodev,noexec,relatime,nsdelegate) cgroup on /sys/fs/cgroup/systemd type cgroup (rw,nosuid,nodev,noexec,relatime,xattr,name=systemd) tmpfs on /etc/machine-id type tmpfs (ro,mode=755) tmpfs on /tmp type tmpfs (rw,nosuid,nodev) debugfs on /sys/kernel/debug type debugfs (rw,nosuid,nodev,noexec,relatime) fusectl on /sys/fs/fuse/connections type fusectl (rw,nosuid,nodev,noexec,relatime) tmpfs on /var/volatile type tmpfs (rw,relatime) ubi0:data-volume on /data type ubifs (rw,noatime,assert=read-only,ubi=0,vol=3) tmpfs on /var/spool type tmpfs (rw,relatime) tmpfs on /var/cache type tmpfs (rw,relatime) tmpfs on /var/lib type tmpfs (rw,relatime) tracefs on /sys/kernel/debug/tracing type tracefs (rw,nosuid,nodev,noexec,relatime) How should I fix it? Thank you. Kind regards, - jh From richard.purdie at linuxfoundation.org Tue Feb 18 08:14:11 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 18 Feb 2020 08:14:11 +0000 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: References: <981f9211365c2dfc6da70b737f43f3e89d87f7d4.camel@linuxfoundation.org> Message-ID: <54127a38f14d1a3fc8ea554cce595052ec40f35c.camel@linuxfoundation.org> On Tue, 2020-02-18 at 14:41 +0800, Phil Reid wrote: > On 17/02/2020 17:55, Richard Purdie wrote: > > On Mon, 2020-02-17 at 07:44 +0100, Andrey Zhizhikin wrote: > > > On Mon, Feb 17, 2020 at 4:26 AM Phil Reid < > > > preid at electromag.com.au> > > > wrote: > > > > Hi All, > > > > > > > > I recently started get the following failure with bash after > > > > "b348e31c93f0 bash: Fix CVE-2019-18276" > > > > was applied to zeus. > > > > > > > > Any thoughts? > > > > > > > > > > > > NOTE: Applying patch 'bash50-001' (downloads/bash50-001) > > > > NOTE: Applying patch 'bash50-002' (downloads/bash50-002) > > > > NOTE: Applying patch 'bash50-003' (downloads/bash50-003) > > > > NOTE: Applying patch 'bash50-004' (downloads/bash50-004) > > > > NOTE: Applying patch 'bash50-005' (downloads/bash50-005) > > > > NOTE: Applying patch 'bash50-006' (downloads/bash50-006) > > > > NOTE: Applying patch 'bash50-007' (downloads/bash50-007) > > > > NOTE: Applying patch 'execute_cmd.patch' (layers/openembedded- > > > > core/meta/recipes-extended/bash/bash/execute_cmd.patch) > > > > NOTE: Applying patch 'mkbuiltins_have_stringize.patch' > > > > (layers/openembedded-core/meta/recipes- > > > > extended/bash/bash/mkbuiltins_have_stringize.patch) > > > > NOTE: Applying patch 'build-tests.patch' (layers/openembedded- > > > > core/meta/recipes-extended/bash/bash/build-tests.patch) > > > > NOTE: Applying patch 'test-output.patch' (layers/openembedded- > > > > core/meta/recipes-extended/bash/bash/test-output.patch) > > > > NOTE: Applying patch 'fix-run-builtins.patch' > > > > (layers/openembedded- > > > > core/meta/recipes-extended/bash/bash/fix-run-builtins.patch) > > > > NOTE: Applying patch 'bash-CVE-2019-18276.patch' > > > > (layers/openembedded-core/meta/recipes-extended/bash/bash/bash- > > > > CVE- > > > > 2019-18276.patch) > > > > ERROR: Command Error: 'quilt --quiltrc > > > > /home/preid/dev/linux/v2019.11/tmp-glibc/work/cortexa9t2hf- > > > > neon- > > > > emit-linux-gnueabi/bash/5.0-r0/recipe-sysroot- > > > > native/etc/quiltrc > > > > push' exited with 0 Output: > > > > Applying patch bash-CVE-2019-18276.patch > > > > patching file MANIFEST > > > > patching file bashline.c > > > > patching file builtins/help.def > > > > patching file config.h.in > > > > patching file configure > > > > Hunk #1 FAILED at 10281. > > > > 1 out of 1 hunk FAILED -- rejects in file configure > > > > patching file configure.ac > > > > patching file doc/bash.1 > > > > patching file doc/bashref.texi > > > > patching file lib/glob/glob.c > > > > patching file pathexp.c > > > > patching file shell.c > > > > patching file tests/glob.tests > > > > patching file tests/glob6.sub > > > > patching file tests/glob7.sub > > > > Patch bash-CVE-2019-18276.patch does not apply (enforce with > > > > -f) > > > > DEBUG: Python function patch_do_patch finished > > > > DEBUG: Python function do_patch finished > > > > > > Had the same issue the day before, re-building bash clean solved > > > it. > > > At first I wanted to report it as well, but then after I tried "- > > > c > > > cleanall" - the issue was gone. > > > > > > Try to do a clean build of bash and see if it is still > > > reproducible. > > > > I think I understand what happens here. When you do a rebuild, > > bitbake > > tries to pop off all the old patches, then apply the new ones. > > > > In this case its patching configure which we rebuild. It therefore > > can't apply the new patch to configure since its changed by the > > do_configure task. > > > > The fix is to remove the configure change from the patch since we > > just > > need the configure.ac piece. > > > I've run "bitbake -c cleanall bash" and the build has then succeeded. > I guess we wait and see if it pops up again when bash needs to be > rebuilt. > > I did try quickly hacking the patch and removing the configure patch > section, but the resulting configure looked different. So I went with > the easy option above. Reproducing should be as simple as: bitbake bash -c configure bitbake bash -c patch -f Cheers, Richard From Mikko.Rapeli at bmw.de Tue Feb 18 08:58:48 2020 From: Mikko.Rapeli at bmw.de (Mikko.Rapeli at bmw.de) Date: Tue, 18 Feb 2020 08:58:48 +0000 Subject: [OE-core] [yocto] Change RO rootfs failed RF Kill Switch Status and Failed to start Run pending postinsts In-Reply-To: References: Message-ID: <20200218085848.GA104502@korppu> (trimming lists to yocto only) Hi, I think you may be missing volatile-binds package and service from your image. See poky/meta/recipes-core/volatile-binds/volatile-binds.bb It may be missing /var/log but with systemd there should not be needs to write to that location after image builds... -Mikko From jupiter.hce at gmail.com Tue Feb 18 09:43:01 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 18 Feb 2020 20:43:01 +1100 Subject: [OE-core] [yocto] Change RO rootfs failed RF Kill Switch Status and Failed to start Run pending postinsts In-Reply-To: <20200218085848.GA104502@korppu> References: <20200218085848.GA104502@korppu> Message-ID: Hi Mikko, On 2/18/20, Mikko.Rapeli at bmw.de wrote: > I think you may be missing volatile-binds package and service from your > image. > See poky/meta/recipes-core/volatile-binds/volatile-binds.bb I got the source in my build system, it is zeus: oe-core/meta/recipes-core/volatile-binds/volatile-binds.bb ./all-oe-linux/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/packages-split/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/sysroot-destdir/sysroot-providers/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/pkgdata-pdata-input/runtime/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/pkgdata-pdata-input/runtime-reverse/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/pkgdata-pdata-input/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/pkgdata/runtime/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/pkgdata/runtime-reverse/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/pkgdata/volatile-binds ./all-oe-linux/volatile-binds/1.0-r0/license-destdir/volatile-binds Are there correct? > It may be missing /var/log but with systemd there should not be needs to > write > to that location after image builds... The volatile did not have the log, so /var/log -> volatile/log was an invalid link, should I manually create it? Thanks Mikko, - jh From Mikko.Rapeli at bmw.de Tue Feb 18 10:11:22 2020 From: Mikko.Rapeli at bmw.de (Mikko.Rapeli at bmw.de) Date: Tue, 18 Feb 2020 10:11:22 +0000 Subject: [OE-core] [yocto] Change RO rootfs failed RF Kill Switch Status and Failed to start Run pending postinsts In-Reply-To: References: <20200218085848.GA104502@korppu> Message-ID: <20200218101122.GE104502@korppu> On Tue, Feb 18, 2020 at 08:43:01PM +1100, JH wrote: > Hi Mikko, > > On 2/18/20, Mikko.Rapeli at bmw.de wrote: > > I think you may be missing volatile-binds package and service from your > > image. > > See poky/meta/recipes-core/volatile-binds/volatile-binds.bb > > I got the source in my build system, it is zeus: > > oe-core/meta/recipes-core/volatile-binds/volatile-binds.bb > > ./all-oe-linux/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/packages-split/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/sysroot-destdir/sysroot-providers/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/pkgdata-pdata-input/runtime/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/pkgdata-pdata-input/runtime-reverse/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/pkgdata-pdata-input/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/pkgdata/runtime/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/pkgdata/runtime-reverse/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/pkgdata/volatile-binds > ./all-oe-linux/volatile-binds/1.0-r0/license-destdir/volatile-binds > > Are there correct? > > > It may be missing /var/log but with systemd there should not be needs to > > write > > to that location after image builds... > > The volatile did not have the log, so /var/log -> volatile/log was an > invalid link, should I manually create it? > > Thanks Mikko, Well I have zeus and am using read-only rootfs with volatile binds and I did not need anything extra. I would dig into this /var/log thing and patch it away. I use systemd journal so no need for syslogs. Cheers, -Mikko From jupiter.hce at gmail.com Tue Feb 18 11:30:40 2020 From: jupiter.hce at gmail.com (JH) Date: Tue, 18 Feb 2020 22:30:40 +1100 Subject: [OE-core] [yocto] Change RO rootfs failed RF Kill Switch Status and Failed to start Run pending postinsts In-Reply-To: <20200218101122.GE104502@korppu> References: <20200218085848.GA104502@korppu> <20200218101122.GE104502@korppu> Message-ID: Hi Mikko, On 2/18/20, Mikko.Rapeli at bmw.de wrote: > Well I have zeus and am using read-only rootfs with volatile binds and > I did not need anything extra. I would dig into this /var/log thing > and patch it away. I use systemd journal so no need for syslogs. I actually not too worry about the rfkill error but more worried about why the rfkill failed? Was it caused by some system problem? At the moment, I could not get WiFi or LTE connected, which used to be working in RW partition. Thank you. Kind regards, - jh From rpjday at crashcourse.ca Tue Feb 18 11:57:18 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Tue, 18 Feb 2020 06:57:18 -0500 (EST) Subject: [OE-core] what is the purpose of COMPATIBLE_MACHINE_genericx86 = "genericx86"? Message-ID: i suspect i've asked this before but i can't recall if i saw an answer (apologies if one was posted) ... under meta-yocto-bsp, in linux-yocto_5.2.bbappend: COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" are the above not simply saying (for example): "if this target is a genericx86, then i am compatible with a genericx86?" and so on, and so on? would this not be equivalent to just writing: COMPATIBLE_MACHINE = "genericx86|genericx86-64|edgerouter|..." (or possibly with += depending on what else is going on.) is there something different by using those individual assignments? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== From wallinux at gmail.com Tue Feb 18 13:20:54 2020 From: wallinux at gmail.com (Anders Wallin) Date: Tue, 18 Feb 2020 14:20:54 +0100 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 Message-ID: <20200218132054.20341-1-wallinux@gmail.com> Babeltrace 1 vs. Babeltrace 2 The Babeltrace project exists since 2010. In 2020, Babeltrace 2 was released. Babeltrace 2 is a complete rewrite of the library, Python bindings, and CLI. It is plugin based and offers much more features and potential than Babeltrace 1. Because Babeltrace 2 is still a young released project, some distributions still provide packages for the Babeltrace 1 project. Both projects can coexist on the same system as there are no common installed files. Signed-off-by: Anders Wallin --- .../recipes-kernel/lttng/babeltrace2_2.0.1.bb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb new file mode 100644 index 0000000000..d49a96faff --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Babeltrace2 - Trace Format Babel Tower" +DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." +HOMEPAGE = "http://babeltrace.org/" +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" +LICENSE = "MIT & GPLv2 & LGPLv2.1 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" + +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" + +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0" +SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-debug-info" + +PACKAGECONFIG ??= "manpages" +PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" + +FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" +FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" + +ASNEEDED = "" -- 2.25.0 From wallinux at gmail.com Tue Feb 18 13:24:50 2020 From: wallinux at gmail.com (Anders Wallin) Date: Tue, 18 Feb 2020 14:24:50 +0100 Subject: [OE-core] [PATCH] babeltrace: added ptest Message-ID: <20200218132450.21597-1-wallinux@gmail.com> Signed-off-by: Anders Wallin --- .../recipes-kernel/lttng/babeltrace/run-ptest | 9 ++ meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 82 ++++++++++++++++++- 2 files changed, 89 insertions(+), 2 deletions(-) create mode 100755 meta/recipes-kernel/lttng/babeltrace/run-ptest diff --git a/meta/recipes-kernel/lttng/babeltrace/run-ptest b/meta/recipes-kernel/lttng/babeltrace/run-ptest new file mode 100755 index 0000000000..f4b7ce11e2 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh +# use target=recheck if you want to recheck failing tests +[ "$target" = "" ] && target=check + +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index b6b7653037..c050dc674d 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -7,14 +7,92 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \ + file://run-ptest \ + " SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF = "--disable-debug-info" ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk" + +addtask do_patch_ptest_path after do_patch before do_configure +do_patch_ptest_path () { + for f in $(grep -l -r abs_top_srcdir ${S}/tests); do + sed -i 's:\@abs_top_srcdir\@:${PTEST_PATH}:' ${f} + done + + for f in $(grep -l -r abs_top_builddir ${S}/tests); do + sed -i 's:\@abs_top_builddir\@:${PTEST_PATH}:' ${f} + done + for f in $(grep -l -r GREP ${S}/tests); do + sed -i 's:\@GREP\@:grep:' ${f} + done + + for f in $(grep -l -r SED ${S}/tests); do + sed -i 's:\@SED\@:sed:' ${f} + done +} + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + # Copy required files from source directory + for f in config/tap-driver.sh config/test-driver; do + install -D "${S}/$f" "${D}${PTEST_PATH}/$f" + done + install -d "$f" "${D}${PTEST_PATH}/tests/ctf-traces/" + cp -a ${S}/tests/ctf-traces/* ${D}${PTEST_PATH}/tests/ctf-traces/ + + # Copy the tests directory tree and the executables and + # Makefiles found within. + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + test -r "${B}/tests/$d/Makefile" && \ + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f + done + done + + install -D ${B}/formats/ctf/metadata/.libs/ctf-parser-test \ + ${D}${PTEST_PATH}/formats/ctf/metadata/ctf-parser-test + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ + sed -i \ + -e '/Makefile:/,/^$/d' \ + -e '/$(check_SCRIPTS)/s/^/#/' \ + -e '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Remove path to babeltrace. + for f in $(grep -l -r "^BABELTRACE_BIN" ${D}${PTEST_PATH}); do + sed -i 's:^BABELTRACE_BIN.*:BABELTRACE_BIN=/usr/bin/babeltrace:' ${f} + done + for f in $(grep -l -r "^BTBIN" ${D}${PTEST_PATH}); do + sed -i 's:^BTBIN.*:BTBIN=/usr/bin/babeltrace:' ${f} + done +} -- 2.25.0 From wallinux at gmail.com Tue Feb 18 13:26:06 2020 From: wallinux at gmail.com (Anders Wallin) Date: Tue, 18 Feb 2020 14:26:06 +0100 Subject: [OE-core] [PATCH] babeltrace2: added ptest Message-ID: <20200218132606.22055-1-wallinux@gmail.com> Signed-off-by: Anders Wallin --- ...001-test_plugin-do-not-test-in-.libs.patch | 24 +++++++ .../lttng/babeltrace2/run-ptest | 9 +++ .../recipes-kernel/lttng/babeltrace2_2.0.1.bb | 70 ++++++++++++++++++- 3 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch create mode 100755 meta/recipes-kernel/lttng/babeltrace2/run-ptest diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch new file mode 100644 index 0000000000..d1dbabab44 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch @@ -0,0 +1,24 @@ +From 49edc1efa64d7597f492c78b2b7c4b115c0a0ef7 Mon Sep 17 00:00:00 2001 +Message-Id: <49edc1efa64d7597f492c78b2b7c4b115c0a0ef7.1581587378.git.anders.wallin at windriver.com> +From: Anders Wallin +Date: Thu, 13 Feb 2020 10:49:28 +0100 +Subject: [PATCH] test_plugin: do not test in .libs + +Signed-off-by: Anders Wallin +--- + tests/lib/test_plugin | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin +index 652c90cc..1f817c50 100755 +--- a/tests/lib/test_plugin ++++ b/tests/lib/test_plugin +@@ -26,4 +26,4 @@ fi + # shellcheck source=../utils/utils.sh + source "$UTILSSH" + +-"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs" ++"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins" +-- +2.25.0 + diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest new file mode 100755 index 0000000000..72fe223436 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh +# use target=recheck if you want to recheck failing tests +[ "$target" = "" ] && target=check + +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index d49a96faff..43748b760a 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -7,13 +7,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0" +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ + file://run-ptest \ + file://0001-test_plugin-do-not-test-in-.libs.patch \ + " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF = "--disable-debug-info" @@ -24,3 +27,66 @@ FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk python3" + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + install -d "${D}${PTEST_PATH}/tests" + + # Copy required files from source directory + for d in $(find "${S}/tests" -type d -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${S}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + find "${S}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.py \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.expect \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" + cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/ctf-traces/ + + # Copy the tests directory tree and the executables and + # Makefiles found within. + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + test -r "${B}/tests/$d/Makefile" && \ + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f + done + done + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ + sed -i \ + -e '/Makefile:/,/^$/d' \ + -e '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Substitute links to installed binaries. + install -d "${D}${PTEST_PATH}/src/cli/" + ln -s "${bindir}/babeltrace2" ${D}${PTEST_PATH}/src/cli/ + + # Remove architechture specific testfiles + rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* +} -- 2.25.0 From patchwork at patchwork.openembedded.org Tue Feb 18 13:32:10 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Tue, 18 Feb 2020 13:32:10 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_babeltrace?= =?utf-8?q?=3A_added_ptest?= In-Reply-To: <20200218132450.21597-1-wallinux@gmail.com> References: <20200218132450.21597-1-wallinux@gmail.com> Message-ID: <20200218133210.2273.3241@do> == Series Details == Series: babeltrace: added ptest Revision: 1 URL : https://patchwork.openembedded.org/series/22726/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at c9b5802bbe) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From patchwork at patchwork.openembedded.org Tue Feb 18 13:32:11 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Tue, 18 Feb 2020 13:32:11 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_babeltrace?= =?utf-8?q?2=3A_added_ptest?= In-Reply-To: <20200218132606.22055-1-wallinux@gmail.com> References: <20200218132606.22055-1-wallinux@gmail.com> Message-ID: <20200218133211.2274.56681@do> == Series Details == Series: babeltrace2: added ptest Revision: 1 URL : https://patchwork.openembedded.org/series/22727/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at c9b5802bbe) * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From bruce.ashfield at gmail.com Tue Feb 18 13:36:15 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 18 Feb 2020 08:36:15 -0500 Subject: [OE-core] [PATCH] kernel-devsrc: fix missing generated files from the packet In-Reply-To: <342f0a1b-aec2-932a-2a49-cd2b896d8822@windriver.com> References: <1581991613-30949-1-git-send-email-li.zhou@windriver.com> <342f0a1b-aec2-932a-2a49-cd2b896d8822@windriver.com> Message-ID: On Mon, Feb 17, 2020 at 10:58 PM zhou li wrote: > > > On 2/18/20 10:12 AM, Bruce Ashfield wrote: > > On Mon, Feb 17, 2020 at 9:07 PM Li Zhou wrote: > >> The file arch/arm/include/generated/asm/unistd-nr.h is needed by some > >> external kernel module. Error occurs when building the module with > >> the SDK. > >> > >> Add arch/${ARCH}/include/generated dir and files under it to > >> kernel-devsrc package to solve this issue. > >> > >> Signed-off-by: Li Zhou > >> --- > >> meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++++++ > >> 1 file changed, 6 insertions(+) > >> > >> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb > >> index b6f2dbc..8621fe1 100644 > >> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb > >> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb > >> @@ -108,6 +108,12 @@ do_install() { > >> fi > >> > >> cp -a include $kerneldir/build/include > >> + > >> + if [ -d arch/${ARCH}/include/generated ]; then > >> + mkdir -p $kerneldir/build/arch/${ARCH}/include > >> + cp -r arch/${ARCH}/include/generated $kerneldir/build/arch/${ARCH}/include > >> + fi > > This is just papering over the real problem. > > > > Anything that is generated, should be regenerated when the headers are > > used/prepared. > > > > What is missing and/or why isn't that happening with this ? > > > > Bruce > > > In some old version yocto, the file > arch/arm/include/generated/asm/unistd-nr.h can be directly used from our > sdk. So now it isn't permitted any more? And we should figure out how to Anything in the generated subdirectories of the kernel build should be regenerated when we do the make prepare/scripts/modules_prepare steps. If it isn't being regenerated, then we are missing something in devsrc that can regenerate them (either a step in the preparation, a Makefile, a script ..). If we start pulling bits and pieces out of generated, we'll end up constantly having to take more and more, when the right thing (by the way our minimal devsrc is designed) is to have it regenerated. It's valid to use it, but we shouldn't need to copy it if it can be generated. If it can't be generated, we should document why with a comment in the code and in the commit message of the change. Bruce > generate it again when developing the external kernel modules? Thank you. > > > > > >> + > >> ) > >> > >> # now grab the chunks from the source tree that we need > >> -- > >> 1.9.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > -- > Best Regards! > Zhou Li > Phone number: 86-10-84778511 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From richard.purdie at linuxfoundation.org Tue Feb 18 13:42:46 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 18 Feb 2020 13:42:46 +0000 Subject: [OE-core] [PATCH] webkitgtk: Fix errors when api-documentation is enabled Message-ID: <20200218134246.59893-1-richard.purdie@linuxfoundation.org> This recipe hasn't built correctly since we removed "python" from HOSTTOOLS when api-documentation is enabled. Add in an extra symlink to "python" rather than trying to fix the multiple scripts in webkit to refer to python3. The autobuilder didn't detect this as wekbkit was excluded from the API docs world build but that is changed now so this fixes build failures. Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index c7f0d5e9836..3eb27a15506 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -58,6 +58,12 @@ PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +# webkitgtk is full of /usr/bin/env python, particular for generating docs +do_configure[postfuncs] += "setup_python_link" +setup_python_link() { + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python +} + EXTRA_OECMAKE = " \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -- 2.25.0 From richard.purdie at linuxfoundation.org Tue Feb 18 13:56:19 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 18 Feb 2020 13:56:19 +0000 Subject: [OE-core] [PATCH] p11-kit: Fix builds with systemd Message-ID: <20200218135619.60419-1-richard.purdie@linuxfoundation.org> In systemd enabled builds this was failing with unpackaged unit files. Fix this. Signed-off-by: Richard Purdie --- meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb index 03c8158ae62..19895ec2690 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb @@ -20,7 +20,8 @@ GTKDOC_MESON_OPTION = 'gtk_doc' FILES_${PN} += " \ ${libdir}/p11-kit-proxy.so \ ${libdir}/pkcs11/*.so \ - ${libdir}/pkcs11/*.la" + ${libdir}/pkcs11/*.la \ + ${systemd_user_unitdir}/*" # PN contains p11-kit-proxy.so, a symlink to a loadable module INSANE_SKIP_${PN} = "dev-so" -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 18 13:57:06 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 18 Feb 2020 14:57:06 +0100 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: <20200218132054.20341-1-wallinux@gmail.com> References: <20200218132054.20341-1-wallinux@gmail.com> Message-ID: Thanks. May I request that this recipe is named babletrace, while babeltrace 1.x recipe is at the same time renamed to babeltrace1? I'd like to avoid adding version numbers to the 'latest' version. Lttng should at the same time be adjusted to use babeltrace1, as advised by upstream. Alex On Tue, 18 Feb 2020 at 14:21, Anders Wallin wrote: > Babeltrace 1 vs. Babeltrace 2 > > The Babeltrace project exists since 2010. In 2020, Babeltrace 2 was > released. > Babeltrace 2 is a complete rewrite of the library, Python bindings, and > CLI. It > is plugin based and offers much more features and potential than > Babeltrace 1. > > Because Babeltrace 2 is still a young released project, some distributions > still > provide packages for the Babeltrace 1 project. Both projects can coexist > on the > same system as there are no common installed files. > > Signed-off-by: Anders Wallin > --- > .../recipes-kernel/lttng/babeltrace2_2.0.1.bb | 26 +++++++++++++++++++ > 1 file changed, 26 insertions(+) > create mode 100644 meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb > > diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb > b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb > new file mode 100644 > index 0000000000..d49a96faff > --- /dev/null > +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb > @@ -0,0 +1,26 @@ > +SUMMARY = "Babeltrace2 - Trace Format Babel Tower" > +DESCRIPTION = "Babeltrace provides trace read and write libraries in host > side, as well as a trace converter, which used to convert LTTng 2.0 traces > into human-readable log." > +HOMEPAGE = "http://babeltrace.org/" > +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" > +LICENSE = "MIT & GPLv2 & LGPLv2.1 & BSD-2-Clause" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" > + > +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" > + > +SRC_URI = "git:// > git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0" > +SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" > +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" > + > +S = "${WORKDIR}/git" > + > +inherit autotools pkgconfig > + > +EXTRA_OECONF = "--disable-debug-info" > + > +PACKAGECONFIG ??= "manpages" > +PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native > xmlto-native" > + > +FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" > +FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" > + > +ASNEEDED = "" > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Tue Feb 18 13:58:25 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 18 Feb 2020 14:58:25 +0100 Subject: [OE-core] [PATCH] babeltrace2: added ptest In-Reply-To: <20200218132606.22055-1-wallinux@gmail.com> References: <20200218132606.22055-1-wallinux@gmail.com> Message-ID: You need to at the same time add the ptest package to PTESTS_FAST or PTESTS_SLOW (depending on whether tests takes less or more than 30 seconds to complete). (I don't remember the exact filename in oe-core where the lists are defined but you can easily grep for it) Alex On Tue, 18 Feb 2020 at 14:26, Anders Wallin wrote: > Signed-off-by: Anders Wallin > --- > ...001-test_plugin-do-not-test-in-.libs.patch | 24 +++++++ > .../lttng/babeltrace2/run-ptest | 9 +++ > .../recipes-kernel/lttng/babeltrace2_2.0.1.bb | 70 ++++++++++++++++++- > 3 files changed, 101 insertions(+), 2 deletions(-) > create mode 100644 > meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch > create mode 100755 meta/recipes-kernel/lttng/babeltrace2/run-ptest > > diff --git > a/meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch > b/meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch > new file mode 100644 > index 0000000000..d1dbabab44 > --- /dev/null > +++ > b/meta/recipes-kernel/lttng/babeltrace2/0001-test_plugin-do-not-test-in-.libs.patch > @@ -0,0 +1,24 @@ > +From 49edc1efa64d7597f492c78b2b7c4b115c0a0ef7 Mon Sep 17 00:00:00 2001 > +Message-Id: < > 49edc1efa64d7597f492c78b2b7c4b115c0a0ef7.1581587378.git.anders.wallin at windriver.com > > > +From: Anders Wallin > +Date: Thu, 13 Feb 2020 10:49:28 +0100 > +Subject: [PATCH] test_plugin: do not test in .libs > + > +Signed-off-by: Anders Wallin > +--- > + tests/lib/test_plugin | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin > +index 652c90cc..1f817c50 100755 > +--- a/tests/lib/test_plugin > ++++ b/tests/lib/test_plugin > +@@ -26,4 +26,4 @@ fi > + # shellcheck source=../utils/utils.sh > + source "$UTILSSH" > + > +-"${BT_TESTS_BUILDDIR}/lib/plugin" > "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs" > ++"${BT_TESTS_BUILDDIR}/lib/plugin" > "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins" > +-- > +2.25.0 > + > diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest > b/meta/recipes-kernel/lttng/babeltrace2/run-ptest > new file mode 100755 > index 0000000000..72fe223436 > --- /dev/null > +++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest > @@ -0,0 +1,9 @@ > +#!/bin/sh > +# use target=recheck if you want to recheck failing tests > +[ "$target" = "" ] && target=check > + > +# Without --ignore-exit, the tap harness causes any FAILs within a > +# test plan to raise ERRORs; this is just noise. > +makeargs="LOG_DRIVER_FLAGS=--ignore-exit abs_top_srcdir=$PWD > abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" > + > +exec make -C tests -k -s $makeargs $target 2>/dev/null > diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb > b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb > index d49a96faff..43748b760a 100644 > --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb > +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb > @@ -7,13 +7,16 @@ LIC_FILES_CHKSUM = > "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" > > DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" > > -SRC_URI = "git:// > git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0" > +SRC_URI = "git:// > git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ > + file://run-ptest \ > + file://0001-test_plugin-do-not-test-in-.libs.patch \ > + " > SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" > UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" > > S = "${WORKDIR}/git" > > -inherit autotools pkgconfig > +inherit autotools pkgconfig ptest > > EXTRA_OECONF = "--disable-debug-info" > > @@ -24,3 +27,66 @@ FILES_${PN}-staticdev += > "${libdir}/babeltrace2/plugins/*.a" > FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" > > ASNEEDED = "" > + > +RDEPENDS_${PN}-ptest += "bash gawk python3" > + > +do_compile_ptest () { > + make -C tests all > +} > + > +do_install_ptest () { > + install -d "${D}${PTEST_PATH}/tests" > + > + # Copy required files from source directory > + for d in $(find "${S}/tests" -type d -printf '%P ') ; do > + install -d "${D}${PTEST_PATH}/tests/$d" > + find "${S}/tests/$d" -maxdepth 1 -executable -type f \ > + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + > + find "${S}/tests/$d" -maxdepth 1 -name *.sh \ > + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; > + find "${S}/tests/$d" -maxdepth 1 -name *.py \ > + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; > + find "${S}/tests/$d" -maxdepth 1 -name *.expect \ > + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; > + done > + install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" > + cp -a ${S}/tests/data/ctf-traces/* > ${D}${PTEST_PATH}/tests/data/ctf-traces/ > + > + # Copy the tests directory tree and the executables and > + # Makefiles found within. > + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" > + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') > ; do > + install -d "${D}${PTEST_PATH}/tests/$d" > + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ > + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + > + test -r "${B}/tests/$d/Makefile" && \ > + install -t "${D}${PTEST_PATH}/tests/$d" > "${B}/tests/$d/Makefile" > + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ > + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; > + done > + > + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do > + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f > -printf '%P ') ; do > + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f > + done > + done > + > + # Prevent attempts to update Makefiles during test runs, and > + # silence "Making check in $SUBDIR" messages. > + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ > + sed -i \ > + -e '/Makefile:/,/^$/d' \ > + -e '/%: %.in/,/^$/d' \ > + -e '/echo "Making $$target in $$subdir"; \\/d' \ > + -e 's/^srcdir = \(.*\)/srcdir = ./' \ > + -e 's/^builddir = \(.*\)/builddir = ./' \ > + -e 's/^all-am:.*/all-am:/' \ > + {} + > + > + # Substitute links to installed binaries. > + install -d "${D}${PTEST_PATH}/src/cli/" > + ln -s "${bindir}/babeltrace2" ${D}${PTEST_PATH}/src/cli/ > + > + # Remove architechture specific testfiles > + rm -rf > ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* > +} > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From trevor.gamblin at windriver.com Tue Feb 18 14:56:18 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Tue, 18 Feb 2020 09:56:18 -0500 Subject: [OE-core] [PATCH] concurrencytest.py: add outSideTestaddSkip for subunit Message-ID: <20200218145618.3286796-1-trevor.gamblin@windriver.com> see: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13663 When running oe-selftest in concurrency mode (e.g. with oe-selftest --run-tests oescripts.OEPybootchartguyTests -j 4), if a skip occurred during setUpClass() rather than within individual tests, the entire suite would show "UNKNOWN" as each test's result. This is because subunit doesn't know how to handle skips outside of individual tests. An example of where this occurs is when running the above call to oe-selftest in concurrency mode on a host machine that does not have python3-cairo installed. Patch subunit inside concurrencytest.py to provide a method called outSideTestaddSkip, which will allow subunit to correctly detect the skip in setUpClass(). Signed-off-by: Trevor Gamblin --- meta/lib/oeqa/core/utils/concurrencytest.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 71ec0df5fa..71e1a9e872 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -146,6 +146,20 @@ def outSideTestaddError(self, offset, line): subunit._OutSideTest.addError = outSideTestaddError +# Like outSideTestaddError above, we need an equivalent for skips +# happening at the setUpClass() level, otherwise we will see "UNKNOWN" +# as a result for concurrent tests +# +def outSideTestaddSkip(self, offset, line): + """A 'skip:' directive has been read.""" + test_name = line[offset:-1].decode('utf8') + self.parser._current_test = subunit.RemotedTestCase(test_name) + self.parser.current_test_description = test_name + self.parser._state = self.parser._reading_skip_details + self.parser._reading_skip_details.set_simple() + self.parser.subunitLineReceived(line) + +subunit._OutSideTest.addSkip = outSideTestaddSkip # # A dummy structure to add to io.StringIO so that the .buffer object -- 2.24.1 From richard.purdie at linuxfoundation.org Tue Feb 18 15:35:18 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 18 Feb 2020 15:35:18 +0000 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> References: <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> <444185BB2F013F4E92378F99BCF8A58BC9AF9CBD@ALA-MBD.corp.ad.wrs.com> <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> Message-ID: <9b99752af2094590137fdaacf6668f170b34158c.camel@linuxfoundation.org> On Tue, 2020-02-18 at 10:28 -0500, Chet Ramey wrote: > On 2/17/20 9:46 PM, Huo, De wrote: > > I applied the patch to fix CVE defect CVE-2019-18276. > > That's not exactly an answer to the question of who produced the patch. > If that patch is the one causing failures when it's applied, doesn't it > make sense to go back to the person who produced it and ask them to > update it if necessary? Its likely a general CVE patch where both configure and configure.ac are patched. For OE, we can drop the configure part since we reautoconf the code. Its therefore the OE port of the patch which is likely at fault. Someone just needs to remove that section of the patch. Cheers, Richard From anuj.mittal at intel.com Tue Feb 18 15:43:50 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Tue, 18 Feb 2020 15:43:50 +0000 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: <9b99752af2094590137fdaacf6668f170b34158c.camel@linuxfoundation.org> References: <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> <444185BB2F013F4E92378F99BCF8A58BC9AF9CBD@ALA-MBD.corp.ad.wrs.com> <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> <9b99752af2094590137fdaacf6668f170b34158c.camel@linuxfoundation.org> Message-ID: <41e8a2902bc8594a17f0afa1744f04a6facd5316.camel@intel.com> On Tue, 2020-02-18 at 15:35 +0000, Richard Purdie wrote: > On Tue, 2020-02-18 at 10:28 -0500, Chet Ramey wrote: > > On 2/17/20 9:46 PM, Huo, De wrote: > > > I applied the patch to fix CVE defect CVE-2019-18276. > > > > That's not exactly an answer to the question of who produced the > > patch. > > If that patch is the one causing failures when it's applied, > > doesn't it > > make sense to go back to the person who produced it and ask them to > > update it if necessary? > > Its likely a general CVE patch where both configure and configure.ac > are patched. For OE, we can drop the configure part since we > reautoconf > the code. Its therefore the OE port of the patch which is likely at > fault. > > Someone just needs to remove that section of the patch. There are other issues with this patch which should also be fixed I think. It has been marked as a Backport while it is not one. The patch includes changes that are irrelevant to the CVE. And, it should have gone to master first. Thanks, Anuj From richard.purdie at linuxfoundation.org Tue Feb 18 15:45:32 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 18 Feb 2020 15:45:32 +0000 Subject: [OE-core] bitbake memory usage debugging using tracemalloc Message-ID: <64d9a5e38cb0159c1cce6f75b66f46b0d532c7fc.camel@linuxfoundation.org> I wanted to quickly share an example of how we can use tracemalloc to debug memory usage in bitbake. What I'd noticed was that for each loop through the parsing code in the parsing thread, the RSS increased by a lot more than I'd expect. In other words it appeared to be leaking. I've given a code example below, you can see the RSS increase using psutil or resource which basically show the same thing. guppy3 is able to show there are a much larger number of sets and strings at the end compared to the start but not *where* they're hiding. Using tracemalloc, you can snapshot at the start, then at the finish and then get a difference. You run bitbake as "PYTHONTRACEMALLOC=1 bitbake -p". Some example output is: WARNING: /media/build1/poky/bitbake/lib/bb/data.py:364: size=45.0 MiB (+45.0 MiB), count=136542 (+136542), average=346 B WARNING: /media/build1/poky/bitbake/lib/bb/data.py:388: size=10.1 MiB (+10.1 MiB), count=320 (+320), average=32.3 KiB WARNING: /media/build1/poky/bitbake/lib/bb/data.py:419: size=3868 KiB (+3868 KiB), count=9634 (+9634), average=411 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:93: size=3643 KiB (+3639 KiB), count=61407 (+61340), average=61 B WARNING: /media/build1/poky/bitbake/lib/bb/data.py:357: size=2828 KiB (+2828 KiB), count=37541 (+37541), average=77 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py:163: size=936 KiB (-933 KiB), count=11639 (-736), average=82 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py:83: size=0 B (-858 KiB), count=0 (-9278) WARNING: /media/build1/poky/bitbake/lib/bb/data.py:276: size=786 KiB (+786 KiB), count=3725 (+3725), average=216 B WARNING: /media/build1/poky/bitbake/lib/bb/siggen.py:150: size=682 KiB (+682 KiB), count=4998 (+4998), average=140 B WARNING: /usr/lib/python3.8/copy.py:76: size=730 KiB (+646 KiB), count=1962 (+1761), average=381 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:89: size=633 KiB (+612 KiB), count=3001 (+2901), average=216 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:88: size=633 KiB (+612 KiB), count=3001 (+2901), average=216 B WARNING: /media/build1/poky/bitbake/lib/bb/data.py:426: size=552 KiB (+552 KiB), count=4998 (+4998), average=113 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:84: size=422 KiB (+407 KiB), count=6002 (+5793), average=72 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:158: size=793 KiB (+372 KiB), count=956 (+680), average=850 B WARNING: /media/build1/poky/bitbake/lib/bb/data.py:296: size=334 KiB (+334 KiB), count=963 (+963), average=355 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:193: size=724 KiB (+309 KiB), count=554 (+158), average=1338 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:798: size=296 KiB (+296 KiB), count=435 (+435), average=697 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:145: size=322 KiB (-256 KiB), count=1964 (-1558), average=168 B WARNING: /media/build1/poky/bitbake/lib/bb/data.py:353: size=252 KiB (+252 KiB), count=3428 (+3428), average=75 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:23: size=1600 B (-242 KiB), count=25 (-4654), average=64 B WARNING: :580: size=8878 KiB (+222 KiB), count=107185 (+2382), average=85 B WARNING: /media/build1/poky/bitbake/lib/bb/utils.py:305: size=653 KiB (+185 KiB), count=7046 (+2206), average=95 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:90: size=188 KiB (+181 KiB), count=3002 (+2891), average=64 B WARNING: /media/build1/poky/bitbake/lib/bb/data.py:427: size=178 KiB (+178 KiB), count=164 (+164), average=1112 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/__init__.py:163: size=185 KiB (+156 KiB), count=12 (+10), average=15.4 KiB WARNING: /media/build1/poky/bitbake/lib/bb/data.py:331: size=149 KiB (+149 KiB), count=2235 (+2235), average=68 B WARNING: /media/build1/poky/bitbake/lib/bb/data.py:379: size=145 KiB (+145 KiB), count=9 (+9), average=16.1 KiB WARNING: /media/build1/poky/bitbake/lib/bb/siggen.py:159: size=144 KiB (+144 KiB), count=1 (+1), average=144 KiB WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:409: size=137 KiB (+127 KiB), count=1445 (+1358), average=97 B (I'd changed the mutiple set() generations in data.py into one single one at the end of the function just to confirm it was that which was persisting in this chart, and to check I was understanding the trace). The remaining thing was to realise those sets allocated in that data.py function were being stored in the siggen code, which is apparent when you trace the function call paths or know the code. Compared to after my recent patch: WARNING: /media/build1/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py:163: size=499 KiB (-1369 KiB), count=6297 (-6078), average=81 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py:83: size=0 B (-858 KiB), count=0 (-9278) WARNING: /media/build1/poky/bitbake/lib/bb/siggen.py:150: size=682 KiB (+682 KiB), count=4998 (+4998), average=140 B WARNING: /media/build1/poky/bitbake/lib/bb/data.py:426: size=552 KiB (+552 KiB), count=4998 (+4998), average=113 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:89: size=381 KiB (+360 KiB), count=1807 (+1707), average=216 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:88: size=381 KiB (+360 KiB), count=1807 (+1707), average=216 B WARNING: /usr/lib/python3.8/copy.py:76: size=433 KiB (+348 KiB), count=978 (+777), average=453 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:145: size=315 KiB (-263 KiB), count=1918 (-1602), average=168 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:23: size=1792 B (-242 KiB), count=28 (-4651), average=64 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:84: size=254 KiB (+239 KiB), count=3614 (+3405), average=72 B WARNING: :580: size=8723 KiB (+222 KiB), count=105611 (+2379), average=85 B WARNING: /media/build1/poky/bitbake/lib/bb/utils.py:305: size=653 KiB (+184 KiB), count=7042 (+2203), average=95 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:465: size=333 KiB (-168 KiB), count=3791 (-1747), average=90 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:193: size=252 KiB (-163 KiB), count=237 (-159), average=1089 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:158: size=274 KiB (-147 KiB), count=212 (-64), average=1324 B WARNING: /media/build1/poky/bitbake/lib/bb/siggen.py:159: size=144 KiB (+144 KiB), count=1 (+1), average=144 KiB WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:90: size=113 KiB (+106 KiB), count=1808 (+1697), average=64 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/ast.py:287: size=456 B (-106 KiB), count=1 (-1947), average=456 B WARNING: /media/build1/poky/bitbake/lib/bb/utils.py:395: size=203 KiB (+102 KiB), count=395 (+172), average=525 B WARNING: /usr/lib/python3.8/tracemalloc.py:532: size=92.5 KiB (+92.4 KiB), count=1631 (+1630), average=58 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/__init__.py:163: size=106 KiB (+77.7 KiB), count=7 (+5), average=15.2 KiB WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:750: size=85.0 KiB (+76.8 KiB), count=518 (+468), average=168 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:409: size=72.2 KiB (+62.4 KiB), count=729 (+642), average=101 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:1064: size=656 B (-61.7 KiB), count=1 (-1129), average=656 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:587: size=153 KiB (-61.2 KiB), count=2508 (-1010), average=62 B WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:839: size=59.1 KiB (+54.7 KiB), count=9 (+5), average=6720 B WARNING: /media/build1/poky/bitbake/lib/bb/codeparser.py:38: size=57.0 KiB (+54.3 KiB), count=517 (+493), average=113 B WARNING: /media/build1/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py:165: size=0 B (-48.7 KiB), count=0 (-137) WARNING: /media/build1/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py:171: size=0 B (-45.7 KiB), count=0 (-186) WARNING: /media/build1/poky/bitbake/lib/bb/data_smart.py:489: size=45.5 KiB (+45.2 KiB), count=7 (+6), average=6650 B so 45MB of data in just one object is removed, the overall gains were higher. I'm quite impressed with this module and I think we could use it to find other issues in bitbake. Cheers, Richard diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 2d937a413cb..f4b25c336ed 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1890,6 +1890,11 @@ class ParsingFailure(Exception): self.recipe = recipe Exception.__init__(self, realexception, recipe) +import psutil +import resource +import guppy +import tracemalloc + class Parser(multiprocessing.Process): def __init__(self, jobs, results, quit, init, profile): self.jobs = jobs @@ -1922,6 +1927,11 @@ class Parser(multiprocessing.Process): if self.init: self.init() + psprocess = psutil.Process(os.getpid()) + bb.warn("Init %d %s %s" % (os.getpid(), str(psprocess.memory_info().rss), str(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss))) + + snapshot1 = tracemalloc.take_snapshot() + pending = [] while True: try: @@ -1942,11 +1952,26 @@ class Parser(multiprocessing.Process): result = self.parse(*job) # Clear the siggen cache after parsing to control memory usage, its huge bb.parse.siggen.postparsing_clean_cache() + + psprocess = psutil.Process(os.getpid()) + bb.warn("Mid %d %s %s" % (os.getpid(), str(psprocess.memory_info().rss), str(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss))) + try: self.results.put(result, timeout=0.25) except queue.Full: pending.append(result) + snapshot2 = tracemalloc.take_snapshot() + top_stats = snapshot2.compare_to(snapshot1, 'lineno') + for stat in top_stats[:30]: + bb.warn(str(stat)) + + psprocess = psutil.Process(os.getpid()) + bb.warn("Exit %d %s %s" % (os.getpid(), str(psprocess.memory_info().rss), str(resource.getrusage(resource.RUSAGE_SELF).ru_maxrss))) + + bb.warn(str(guppy.hpy().heap())) + + def parse(self, filename, appends): try: origfilter = bb.event.LogHandler.filter From richard.purdie at linuxfoundation.org Tue Feb 18 15:49:10 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 18 Feb 2020 15:49:10 +0000 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: <41e8a2902bc8594a17f0afa1744f04a6facd5316.camel@intel.com> References: <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> <444185BB2F013F4E92378F99BCF8A58BC9AF9CBD@ALA-MBD.corp.ad.wrs.com> <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> <9b99752af2094590137fdaacf6668f170b34158c.camel@linuxfoundation.org> <41e8a2902bc8594a17f0afa1744f04a6facd5316.camel@intel.com> Message-ID: On Tue, 2020-02-18 at 15:43 +0000, Mittal, Anuj wrote: > On Tue, 2020-02-18 at 15:35 +0000, Richard Purdie wrote: > > On Tue, 2020-02-18 at 10:28 -0500, Chet Ramey wrote: > > > On 2/17/20 9:46 PM, Huo, De wrote: > > > > I applied the patch to fix CVE defect CVE-2019-18276. > > > > > > That's not exactly an answer to the question of who produced the > > > patch. > > > If that patch is the one causing failures when it's applied, > > > doesn't it > > > make sense to go back to the person who produced it and ask them > > > to > > > update it if necessary? > > > > Its likely a general CVE patch where both configure and > > configure.ac > > are patched. For OE, we can drop the configure part since we > > reautoconf > > the code. Its therefore the OE port of the patch which is likely at > > fault. > > > > Someone just needs to remove that section of the patch. > > There are other issues with this patch which should also be fixed I > think. It has been marked as a Backport while it is not one. The > patch > includes changes that are irrelevant to the CVE. And, it should have > gone to master first. I shall await guidance from you/Armin then. Cheers, Richard From sjolley.yp.pm at gmail.com Tue Feb 18 16:09:38 2020 From: sjolley.yp.pm at gmail.com (sjolley.yp.pm at gmail.com) Date: Tue, 18 Feb 2020 08:09:38 -0800 Subject: [OE-core] Yocto Project Status WW07'20 Message-ID: <0b8a01d5e675$d2363e30$76a2ba90$@gmail.com> Current Dev Position: YP 3.1 M3 Next Deadline: YP 3.1 M3 build date 2/24/2020 Next Team Meetings: * Bug Triage meeting Thursday Feb. 20th at 7:30am PDT ( https://zoom.us/j/454367603) * Monthly Project Meeting Tuesday Mar. 3rd at 8am PDT ( https://zoom.us/j/990892712) * Weekly Engineering Sync Tuesday Feb. 18th at 8am PDT ( https://zoom.us/j/990892712) * Twitch - Next event is Tuesday Mar. 10th at 8am PDT ( https://www.twitch.tv/yocto_project) Key Status/Updates: * The project recently updated its git hosting infrastructure and there were some issues encountered with the cgit http/https repository sharing. Those issues should now be resolved, apologies if they caused issues for anyone. The git:// protocol sharing was unaffected. * YP 3.0.2 rc2 is in QA with the report due soon. * We continue to see a small number of reproducibility issues with master which need resolving for green builds (in particular gstreamer and perl). * A significant memory usage issue was identified during bitbake parsing where memory usage would grow in each parser thread linearly per number of recipes parsed. This would therefore particularly affect large numbers of layers, multilibs and multiconfig. The fix has merged into bitbake along with the corresponding zeus and warrior branches. For one test case it reduced peak memory usage during parsing for 5 multiconfigs from 20GB to 2GB. * Warrior patches for 2.7.3 are out for review. * With the git infrastructure issue updated, we now have centos8 workers added to the autobuilder. * We are making various queued changes to the autobuilder configuration to fix bugs, improve efficiency and test coverage but this may result in some test result instability as we test and resolve issues. * We're collecting a list of companies, products and projects which use the Yocto Project on the wiki: https://wiki.yoctoproject.org/wiki/Project_Users Please add any you know are missing (or email Richard/Stephen who can add). * The triage team is worried about attendance at triage meetings and the project is finding it hard to find people to help fix bugs. If anyone is willing to work on bugs, assistance would be greatly appreciated. YP 3.1 Milestone Dates: * YP 3.1 M3 build date 2/24/2020 * YP 3.1 M3 release date 3/6/2020 * YP 3.1 M4 build date 3/30/2020 * YP 3.1 M4 release date 4/24/2020 Planned upcoming dot releases: * YP 2.7.3 built and in QA * YP 2.7.3 release date 2/21/2020 * YP 3.0.2 build date 2/3/2020 * YP 3.0.2 release date 2/14/2020 Tracking Metrics: * WDD 2710 (last week 2728) ( https://wiki.yoctoproject.org/charts/combo.html) * Poky Patch Metrics * Total patches found: 1360 (last week 1361) * Patches in the Pending State: 546 (40%) [last week 547 (40%)] The Yocto Project's technical governance is through its Technical Steering Committee, more information is available at: https://wiki.yoctoproject.org/wiki/TSC The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status [If anyone has suggestions for other information you'd like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Tue Feb 18 16:44:24 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 18 Feb 2020 17:44:24 +0100 Subject: [OE-core] Yocto Project Status WW07'20 In-Reply-To: <0b8a01d5e675$d2363e30$76a2ba90$@gmail.com> References: <0b8a01d5e675$d2363e30$76a2ba90$@gmail.com> Message-ID: On Tue, 18 Feb 2020 at 17:10, wrote: > > - With the git infrastructure issue updated, we now have centos8 > workers added to the autobuilder. > > What are the current plans for centos 7? Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From armccurdy at gmail.com Tue Feb 18 17:55:34 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 18 Feb 2020 09:55:34 -0800 Subject: [OE-core] how does "PREFERRED_PROVIDER" interact with layer priorities? In-Reply-To: References: Message-ID: On Mon, Feb 17, 2020 at 4:02 AM Robert P. J. Day wrote: > > (note: when i finally learn python, i'll be able to RTFS and figure > out stuff like this without assistance. until then ...) > > was going to enhance the explanation of PREFERRED_PROVIDER in the > docs, until i realized i don't understand it completely. > > first, if there is a recipe named, say, "foo", then even if there > are other recipes (with different names) that include: > > PROVIDES = "foo" > > by default (and ignoring layer priority complications), if there is a > dependency on "foo", it is the "foo" recipe that will be selected as > the provider, correct? that is, if there is a recipe that *exactly* > matches the name requested, that's the selected provider? Never seen that stated before. The recipe name (actually ${PN}) is known to be a provider for the recipe because it's prepended to PROVIDES from bitbake.conf. There probably isn't anything special (ie no guaranteed precedence) about PROVIDES being set to the recipe name from bitbake.conf vs being set to something else from within the recipe. > conversely, if one wants to override that default selection, one > would need to: > > PREFERRED_PROVIDER_foo = "foo_experimental" > > in short, if the above is true, then there would seem to be no value > in ever stating: > > PREFERRED_PROVIDER_foo = "foo" > > but i just noticed that that's done a fair bit in oe-core's > default-providers.inc, as in (just a few examples): > > PREFERRED_PROVIDER_opkg ?= "opkg" > PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig" > PREFERRED_PROVIDER_openssl ?= "openssl" > > that puzzled me until i saw this snippet from the same file: > > # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb > PREFERRED_PROVIDER_ltp ?= "ltp" > > which inspired the conclusion that if there is a higher priority layer > that provides that recipe name, *that* recipe would be used instead. > and since prio of oe-core is 5 and prio of meta-oe is 6, if you want > the *regular* oe-core recipe of "ltp", you need to explicitly ask for > it. is that what's going on here? because if it isn't, then i'm > unclear on the purpose of lines like the above. If there are multiple possible providers then bitbake will generate a warning if you don't specify which one you prefer. > rday > > p.s. ironically, i was just going to see what meta-oe's recipe of > "ltp-ddt" was doing, but that recipe was deleted so, at the very > least, that comment should be removed. > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Tue Feb 18 18:21:16 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 18 Feb 2020 18:21:16 +0000 Subject: [OE-core] Yocto Project Status WW07'20 In-Reply-To: References: <0b8a01d5e675$d2363e30$76a2ba90$@gmail.com> Message-ID: On Tue, 2020-02-18 at 17:44 +0100, Alexander Kanavin wrote: > On Tue, 18 Feb 2020 at 17:10, wrote: > > With the git infrastructure issue updated, we now have centos8 > > workers added to the autobuilder. > > > > What are the current plans for centos 7? Project members are keen to see support for centos7 retained. I think we need to sort our buildtools plan, then we have more options as we can use that on Centos7. Cheers, Richard From scott.branden at broadcom.com Tue Feb 18 19:08:36 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 18 Feb 2020 11:08:36 -0800 Subject: [OE-core] [PATCH] iproute2: add devlink support to iproute2 In-Reply-To: <20200209202600.2918-1-scott.branden@broadcom.com> References: <20200209202600.2918-1-scott.branden@broadcom.com> Message-ID: <8d0addba-a2f8-a9c6-172d-57ee31ce9ef1@broadcom.com> Could somebody have a look at merging this patch? On 2020-02-09 12:26 p.m., Scott Branden wrote: > Add devlink support to iproute2 recipe. > > Signed-off-by: Scott Branden > --- > meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc > index fc31b8444e..6ef9201258 100644 > --- a/meta/recipes-connectivity/iproute2/iproute2.inc > +++ b/meta/recipes-connectivity/iproute2/iproute2.inc > @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig > > CLEANBROKEN = "1" > > -PACKAGECONFIG ??= "tipc elf" > +PACKAGECONFIG ??= "tipc elf devlink" > PACKAGECONFIG[tipc] = ",,libmnl," > PACKAGECONFIG[elf] = ",,elfutils," > +PACKAGECONFIG[devlink] = ",,libmnl," > > -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ > +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl \ > + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ > ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > > do_configure_append () { > @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ > ${PN}-rtacct \ > ${PN}-nstat \ > ${PN}-ss \ > - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" > + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ > + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" > FILES_${PN}-tc = "${base_sbindir}/tc* \ > ${libdir}/tc/*.so" > FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ > @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" > FILES_${PN}-nstat = "${base_sbindir}/nstat" > FILES_${PN}-ss = "${base_sbindir}/ss" > FILES_${PN}-tipc = "${base_sbindir}/tipc" > +FILES_${PN}-devlink = "${base_sbindir}/devlink" > > ALTERNATIVE_${PN} = "ip" > ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" From scott.branden at broadcom.com Tue Feb 18 19:14:22 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 18 Feb 2020 11:14:22 -0800 Subject: [OE-core] [PATCH] rpm2cpio.sh: fix to handle newline character Message-ID: <20200218191422.8359-1-scott.branden@broadcom.com> From: Lori Hikichi This script is attempting to read binary data from an rpm file. If any of the bytes it is attempt to read is the binary value 0xa (i.e. a newline) then the script does not properly deal with this special case. Due to the behavior of command substitution, instead of fetching the value 0xa, the script makes an error and get the value 0 instead. The fix and the following explantion was taken from this post... https://unix.stackexchange.com/questions/10801/ how-to-use-bash-script-to-read-binary-file-content Command substitution $(?) strips final newlines in the command output. There's a fairly easy workaround. Make sure the output ends in a character other than a newline, then strip that one character. Signed-off-by: Lori Hikichi Signed-off-by: Scott Branden --- scripts/rpm2cpio.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh index 876c53c5d9..7cd771bbe7 100755 --- a/scripts/rpm2cpio.sh +++ b/scripts/rpm2cpio.sh @@ -22,7 +22,8 @@ calcsize() { i=0 while [ $i -lt 8 ]; do - b="$(_dd $(($offset + $i)) bs=1 count=1)" + b=$(_dd $(($offset + $i)) bs=1 count=1; echo X) + b=${b%X} [ -z "$b" ] && b="0" || b="$(exec printf '%u\n' "'$b")" -- 2.17.1 From andrey.z at gmail.com Tue Feb 18 19:38:47 2020 From: andrey.z at gmail.com (Andrey Zhizhikin) Date: Tue, 18 Feb 2020 20:38:47 +0100 Subject: [OE-core] [PATCH] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: <265ac69eb8eb8d129d9f66f6d037d44242c42e57.camel@intel.com> References: <20200206075334.835418-1-anuj.mittal@intel.com> <265ac69eb8eb8d129d9f66f6d037d44242c42e57.camel@intel.com> Message-ID: Hello Anuj, On Fri, Feb 7, 2020 at 5:15 AM Mittal, Anuj wrote: > > On Thu, 2020-02-06 at 12:41 +0100, Carlos Rafael Giani wrote: > > Shouldn't this be split into two commits, one that fixes > > EXTRA_OECONF, > > and one that fixes the qt5 support? > > > > Also, are we sure that meson's qt5 moc/rcc/uic autodetection won't > > cause > > any problems in OE? > > Typically, we disable such "automagical" detections to ensure > > deterministic builds. > > Right. I will send v2 and keep it disabled explicitly. Just a gentle ping: Is there any follow-up on this patch(es)? > > Thanks, > > Anuj > > > > > On 06.02.20 08:53, Anuj Mittal wrote: > > > Use the correct variable so options actually get used. > > > > > > qt5 support is currently automagically detected with meson and > > > having an > > > explicit disabled doesn't do anything. Remove it so it can be > > > handled > > > in qt layer with appropriate DEPENDS added. > > > > > > Signed-off-by: Anuj Mittal > > > --- > > > .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 7 > > > +++---- > > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > > > plugins-good_1.16.1.bb b/meta/recipes- > > > multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > > > index a6eb9986dd..e78162172a 100644 > > > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- > > > good_1.16.1.bb > > > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- > > > good_1.16.1.bb > > > @@ -50,12 +50,12 @@ PACKAGECONFIG[vpx] = "-Dvpx=enabled,- > > > Dvpx=disabled,libvpx" > > > PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,- > > > Dwavpack=disabled,wavpack" > > > PACKAGECONFIG[x11] = > > > "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > > > > > > -# qt5 support is disabled, because it is not present in OE core, > > > and requires more work than > > > -# just adding a packageconfig (it requires access to moc, uic, > > > rcc, and qmake paths). > > > +# qt5 support is disabled by default unless dependencies are > > > present. Enabling it requires > > > +# more work than just adding a packageconfig (it requires access > > > to moc, uic, rcc, and qmake paths). > > > # This is better done in a separate qt5 layer (which then should > > > add a "qt5" packageconfig > > > # in a gstreamer1.0-plugins-good bbappend). > > > > > > -EXTRA_OECONF += " \ > > > +EXTRA_OEMESON += " \ > > > -Daalib=disabled \ > > > -Ddirectsound=disabled \ > > > -Ddv=disabled \ > > > @@ -64,7 +64,6 @@ EXTRA_OECONF += " \ > > > -Doss4=disabled \ > > > -Dosxaudio=disabled \ > > > -Dosxvideo=disabled \ > > > - -Dqt=disabled \ > > > -Dshout2=disabled \ > > > -Dtwolame=disabled \ > > > -Dwaveform=disabled \ > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Regards, Andrey. From matthew.zeng at windriver.com Tue Feb 18 19:46:49 2020 From: matthew.zeng at windriver.com (Mingde (Matthew) Zeng) Date: Tue, 18 Feb 2020 14:46:49 -0500 Subject: [OE-core] [PATCH v2] glib-2.0: add dependencies to fix ptest failures Message-ID: <87pnebadau.fsf@windriver.com> There are a number of ptest failures due to executables not found in the image. Since these executables are in FILES_${PN}-dev, depending all of -dev which is an overkill. We take them out of -dev and put in -utils, then depend on the latter instead. When starting a glib ptest but decided to Ctrl-c interrupt midway, ./run-ptest cannot be restarted unless running `userdel glib2-test` manually. Therefore adding a check prior to ptest will ensure the ptest can be restarted. Signed-off-by: Matthew Zeng --- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 +++ meta/recipes-core/glib-2.0/glib.inc | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index fc50082c8e..7a231b514b 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest @@ -1,6 +1,9 @@ #! /bin/sh set -eux +if id -u glib2-test; then + userdel glib2-test +fi useradd glib2-test su glib2-test -c 'gnome-desktop-testing-runner glib' userdel glib2-test diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index f4aff297e5..23c347dbf7 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -58,13 +58,15 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/gio \ ${libexecdir}/*gio-querymodules \ ${datadir}/glib-2.0/schemas" + +FILES_${PN}-utils += "${bindir}/glib-genmarshal \ + ${bindir}/glib-gettextize \ + ${bindir}/glib-mkenums \ + ${bindir}/glib-compile-resources" + FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la \ - ${bindir}/glib-genmarshal \ - ${bindir}/glib-gettextize \ - ${bindir}/glib-mkenums \ - ${bindir}/glib-compile-resources \ ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ ${datadir}/glib-2.0/schemas/gschema.dtd \ ${datadir}/glib-2.0/valgrind/glib.supp \ @@ -138,6 +140,8 @@ CODEGEN_PYTHON_RDEPENDS_mingw32 = "" RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" +RDEPENDS_${PN}-ptest += "${PN}-utils" + RDEPENDS_${PN}-ptest += "\ coreutils \ libgcc \ -- 2.24.0 From jonathan.richardson at broadcom.com Tue Feb 18 20:31:36 2020 From: jonathan.richardson at broadcom.com (Jonathan Richardson) Date: Tue, 18 Feb 2020 12:31:36 -0800 Subject: [OE-core] [meta-oe] [PATCH 1/1] fio: remove disabling of compiler optimizations Message-ID: <20200218203136.8314-1-jonathan.richardson@broadcom.com> Disabling compiler optimizations affects fio performance by 25-30% so remove this from EXTRA_OECONF. Disabling of optimizations should be machine specific if there are bugs in the code instead of the default. Signed-off-by: Jonathan Richardson --- meta-oe/recipes-benchmark/fio/fio_3.18.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/fio/fio_3.18.bb b/meta-oe/recipes-benchmark/fio/fio_3.18.bb index b6484290f..2c461b8c5 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.18.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.18.bb @@ -33,7 +33,6 @@ S = "${WORKDIR}/git" DISABLE_STATIC = "" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" -EXTRA_OECONF = "--disable-optimizations" do_configure() { ./configure ${EXTRA_OECONF} -- 2.17.1 From armccurdy at gmail.com Tue Feb 18 20:52:27 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 18 Feb 2020 12:52:27 -0800 Subject: [OE-core] [meta-oe] [PATCH 1/1] fio: remove disabling of compiler optimizations In-Reply-To: <20200218203136.8314-1-jonathan.richardson@broadcom.com> References: <20200218203136.8314-1-jonathan.richardson@broadcom.com> Message-ID: On Tue, Feb 18, 2020 at 12:32 PM Jonathan Richardson via Openembedded-core wrote: > > Disabling compiler optimizations affects fio performance by 25-30% so > remove this from EXTRA_OECONF. Disabling of optimizations should be > machine specific if there are bugs in the code instead of the default. Wrong mailing list ( patches for meta-oe should be sent to openembedded-devel at lists.openembedded.org ) In general when removing a workaround or fix it's also helpful to include a link to the commit which added it, in this case: https://git.openembedded.org/meta-openembedded/commit/?id=739349da0826221f98648b64b693f9ae33e7d4ea (FWIW since that crash was seen with a much older version of fio compiled with a now obsolete toolchain it seems perfectly justified to remove it). > Signed-off-by: Jonathan Richardson > --- > meta-oe/recipes-benchmark/fio/fio_3.18.bb | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta-oe/recipes-benchmark/fio/fio_3.18.bb b/meta-oe/recipes-benchmark/fio/fio_3.18.bb > index b6484290f..2c461b8c5 100644 > --- a/meta-oe/recipes-benchmark/fio/fio_3.18.bb > +++ b/meta-oe/recipes-benchmark/fio/fio_3.18.bb > @@ -33,7 +33,6 @@ S = "${WORKDIR}/git" > DISABLE_STATIC = "" > > EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" > -EXTRA_OECONF = "--disable-optimizations" > > do_configure() { > ./configure ${EXTRA_OECONF} > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From jonathan.richardson at broadcom.com Tue Feb 18 21:00:29 2020 From: jonathan.richardson at broadcom.com (Jonathan Richardson) Date: Tue, 18 Feb 2020 13:00:29 -0800 Subject: [OE-core] [meta-oe] [PATCH 1/1] fio: remove disabling of compiler optimizations In-Reply-To: References: <20200218203136.8314-1-jonathan.richardson@broadcom.com> Message-ID: Sorry, that was a typo. I'll send it to devel with an updated comment. Thanks! On Tue, Feb 18, 2020 at 12:52 PM Andre McCurdy wrote: > > On Tue, Feb 18, 2020 at 12:32 PM Jonathan Richardson via > Openembedded-core wrote: > > > > Disabling compiler optimizations affects fio performance by 25-30% so > > remove this from EXTRA_OECONF. Disabling of optimizations should be > > machine specific if there are bugs in the code instead of the default. > > Wrong mailing list ( patches for meta-oe should be sent to > openembedded-devel at lists.openembedded.org ) > > In general when removing a workaround or fix it's also helpful to > include a link to the commit which added it, in this case: > > https://git.openembedded.org/meta-openembedded/commit/?id=739349da0826221f98648b64b693f9ae33e7d4ea > > (FWIW since that crash was seen with a much older version of fio > compiled with a now obsolete toolchain it seems perfectly justified to > remove it). > > > Signed-off-by: Jonathan Richardson > > --- > > meta-oe/recipes-benchmark/fio/fio_3.18.bb | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/meta-oe/recipes-benchmark/fio/fio_3.18.bb b/meta-oe/recipes-benchmark/fio/fio_3.18.bb > > index b6484290f..2c461b8c5 100644 > > --- a/meta-oe/recipes-benchmark/fio/fio_3.18.bb > > +++ b/meta-oe/recipes-benchmark/fio/fio_3.18.bb > > @@ -33,7 +33,6 @@ S = "${WORKDIR}/git" > > DISABLE_STATIC = "" > > > > EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" > > -EXTRA_OECONF = "--disable-optimizations" > > > > do_configure() { > > ./configure ${EXTRA_OECONF} > > -- > > 2.17.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core From patchwork at patchwork.openembedded.org Tue Feb 18 21:02:01 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Tue, 18 Feb 2020 21:02:01 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_=5Bmeta-oe?= =?utf-8?q?=5D_fio=3A_remove_disabling_of_compiler_optimizations?= In-Reply-To: <20200218203136.8314-1-jonathan.richardson@broadcom.com> References: <20200218203136.8314-1-jonathan.richardson@broadcom.com> Message-ID: <20200218210201.2277.77760@do> == Series Details == Series: [meta-oe] fio: remove disabling of compiler optimizations Revision: 1 URL : https://patchwork.openembedded.org/series/22736/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [meta-oe,1/1] fio: remove disabling of compiler optimizations Issue Series sent to the wrong mailing list [test_target_mailing_list] Suggested fix Check the project's README (meta-oe,1/1) and send the patch to the indicated list * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at c9b5802bbe) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From armccurdy at gmail.com Tue Feb 18 21:33:39 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 18 Feb 2020 13:33:39 -0800 Subject: [OE-core] [PATCH 1/3] musl: Update to latest tip In-Reply-To: References: <20200214154240.2222810-1-raj.khem@gmail.com> Message-ID: On Fri, Feb 14, 2020 at 5:21 PM Khem Raj wrote: > > On Fri, Feb 14, 2020 at 5:02 PM Andre McCurdy wrote: > > > > On Fri, Feb 14, 2020 at 7:42 AM Khem Raj wrote: > > > > > > Detailed changelog is here [1] > > > > > > [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=e6093b5a870a38ebfb3e54382acd48c698bde15d..a662220df547e5c2446518e74440a7d834f9ebe6 > > > > Up to now, musl version updates have basically always just made things > > better and there's never been a good reason not to switch to a new > > musl release (in my own forks of oe-core I've updated both OE 2.7 and > > OE 3.0 to the musl 1.1.24 release, etc). > > > > However, after 1.1.24, musl switches 32bit targets to a 64bit time_t > > (in preparation for 2038) and from my initial testing that seems to be > > a change which is going to cause a lot of problems (both build time > > and run time) for proprietary components and BSPs etc which are only > > ever used on a 32bit target. Anything open source is likely to have > > been well tested on a 64bit target and so any assumptions about the > > size of time_t will have been fixed long ago, but even then there's a > > chance of problems (see recent fixes in oe-core for build time issues > > in strace, systemd, busybox, etc. I guess that run time issues are > > likely to emerge too as the latest musl snapshot gets more testing on > > 32bit targets). > > > > Updating musl beyond 1.1.24 in oe-core probably needs some careful > > consideration, especially just before OE 3.1 LTS. > > yes I am well aware of 64bit time_t changes, 1.25 should release well before > 3.1 cut-off, musl maintainers are aware of it Yes, I'm sure you're aware and that the musl maintainers are aware too :-) It's end users of OE who perhaps haven't been given enough warning. > and we have been fixing buggy apps which have assumptions about > the length of time_t, we would like to ship with 1.25 for 3.1 > so please report isssues if you find and we can work along with them The issues I've seen are in a proprietary BSP, so reporting them here wouldn't be appropriate. I'm already carrying ~300 patches to build their code with OE 3.0 and musl 1.1.24 (which the BSP vendor has no interesting in supporting) but the time_t issues may be pervasive enough that the safest approach will be to go back to glibc and find the code size savings elsewhere. Anyway, my point is just to make it clear that this change in musl may be a big deal for some end users even if it's a relative non-event for oe-core. > > (Note that the version of musl in oe-core master is already beyond > > 1.1.24, so these comments don't apply specifically to this commit). > > > > > > > Signed-off-by: Khem Raj > Signed-off-by: Richard Purdie > > > --- > > > meta/recipes-core/musl/musl_git.bb | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb > > > index f4853b4f2e..b6ec6fe9af 100644 > > > --- a/meta/recipes-core/musl/musl_git.bb > > > +++ b/meta/recipes-core/musl/musl_git.bb > > > @@ -4,7 +4,7 @@ > > > require musl.inc > > > inherit linuxloader > > > > > > -SRCREV = "e6093b5a870a38ebfb3e54382acd48c698bde15d" > > > +SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" > > > > > > BASEVER = "1.1.24" > > > > > > -- > > > 2.25.0 > > > > > > -- > > > _______________________________________________ > > > Openembedded-core mailing list > > > Openembedded-core at lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Tue Feb 18 22:02:27 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 18 Feb 2020 22:02:27 +0000 Subject: [OE-core] [PATCH] perl: Fix encode module reproducibility issues Message-ID: <20200218220227.75037-1-richard.purdie@linuxfoundation.org> The code is encoding host compiler parameters into target builds. Avoid this for our target builds. This should resolve builds which aren't reproducible between hosts with different compilers. Signed-off-by: Richard Purdie --- .../perl/files/encodefix.patch | 20 +++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/encodefix.patch diff --git a/meta/recipes-devtools/perl/files/encodefix.patch b/meta/recipes-devtools/perl/files/encodefix.patch new file mode 100644 index 00000000000..396ed0d53e3 --- /dev/null +++ b/meta/recipes-devtools/perl/files/encodefix.patch @@ -0,0 +1,20 @@ +The code is encoding host compiler parameters into target builds. Avoid +this for our target builds (patch is target specific, not native) + +Upstream-Status: Inappropriate [Cross compile hack] +RP 2020/2/18 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/cpan/Encode/bin/enc2xs +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/bin/enc2xs ++++ perl-5.30.1/cpan/Encode/bin/enc2xs +@@ -195,7 +195,7 @@ sub compiler_info { + # above becomes false. + my $sized = $declaration && !($compat && !$pedantic); + +- return ($cpp, $static, $sized); ++ return (0, 1, 1); + } + + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 5d762710df3..b37f175f973 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -26,6 +26,9 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ " +SRC_URI_append_class-target = " \ + file://encodefix.patch \ +" SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" -- 2.25.0 From anuj.mittal at intel.com Tue Feb 18 22:32:39 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Tue, 18 Feb 2020 22:32:39 +0000 Subject: [OE-core] [PATCH] iproute2: add devlink support to iproute2 In-Reply-To: <20200209202600.2918-1-scott.branden@broadcom.com> References: <20200209202600.2918-1-scott.branden@broadcom.com> Message-ID: <3472c876f40a18fac2974f91c92e87166f0ceb34.camel@intel.com> On Sun, 2020-02-09 at 12:26 -0800, Scott Branden via Openembedded-core wrote: > -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} > DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ > +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} > DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl > \ > + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', > 'devlink', '', d)} \ > ${@bb.utils.contains('PACKAGECONFIG', 'tipc', > 'tipc', '', d)}' Looks like you added devlink twice in SUBDIRS. The one being added unconditionally should be removed. Thanks, Anuj From scott.branden at broadcom.com Tue Feb 18 22:43:19 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 18 Feb 2020 14:43:19 -0800 Subject: [OE-core] [PATCH] iproute2: add devlink support to iproute2 In-Reply-To: <3472c876f40a18fac2974f91c92e87166f0ceb34.camel@intel.com> References: <20200209202600.2918-1-scott.branden@broadcom.com> <3472c876f40a18fac2974f91c92e87166f0ceb34.camel@intel.com> Message-ID: <1a65a089-91e3-7110-1f79-49d196ea269c@broadcom.com> On 2020-02-18 2:32 p.m., Mittal, Anuj wrote: > On Sun, 2020-02-09 at 12:26 -0800, Scott Branden via Openembedded-core > wrote: >> -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} >> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ >> +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} >> DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl >> \ >> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', >> 'devlink', '', d)} \ >> ${@bb.utils.contains('PACKAGECONFIG', 'tipc', >> 'tipc', '', d)}' > Looks like you added devlink twice in SUBDIRS. The one being added > unconditionally should be removed. Yes, thanks for pointing that out.? Will send v2 patch. > > Thanks, > > Anuj From scott.branden at broadcom.com Tue Feb 18 22:44:55 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 18 Feb 2020 14:44:55 -0800 Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to iproute2 Message-ID: <20200218224455.14551-1-scott.branden@broadcom.com> Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden --- meta/recipes-connectivity/iproute2/iproute2.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b8444e..98793af88e 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" do_configure_append () { @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ ${PN}-rtacct \ ${PN}-nstat \ ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- 2.17.1 From peter.kjellerstedt at axis.com Tue Feb 18 23:18:51 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Tue, 18 Feb 2020 23:18:51 +0000 Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to iproute2 In-Reply-To: <20200218224455.14551-1-scott.branden@broadcom.com> References: <20200218224455.14551-1-scott.branden@broadcom.com> Message-ID: <20c4646f9a30462bb6c9ae0f49b71092@XBOX03.axis.com> > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Scott Branden via > Openembedded-core > Sent: den 18 februari 2020 23:45 > To: openembedded-core at lists.openembedded.org > Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to > iproute2 > > Add devlink support to iproute2 recipe. > > Signed-off-by: Scott Branden > --- > meta/recipes-connectivity/iproute2/iproute2.inc | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc > b/meta/recipes-connectivity/iproute2/iproute2.inc > index fc31b8444e..98793af88e 100644 > --- a/meta/recipes-connectivity/iproute2/iproute2.inc > +++ b/meta/recipes-connectivity/iproute2/iproute2.inc > @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig > > CLEANBROKEN = "1" > > -PACKAGECONFIG ??= "tipc elf" > +PACKAGECONFIG ??= "tipc elf devlink" > PACKAGECONFIG[tipc] = ",,libmnl," > PACKAGECONFIG[elf] = ",,elfutils," > +PACKAGECONFIG[devlink] = ",,libmnl," > > EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ > + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ > ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" You can simplify the above to: EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" but I also recommend to reformat it to make it more readable: EXTRA_OEMAKE = "\ CC='${CC}' \ KERNEL_INCLUDE=${STAGING_INCDIR} \ DOCDIR=${docdir}/iproute2 \ SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ SBINDIR='${base_sbindir}' \ LIBDIR='${libdir}' \ " > > do_configure_append () { > @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ > ${PN}-rtacct \ > ${PN}-nstat \ > ${PN}-ss \ > - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" > + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ > + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" Assuming that the tipc and devlink binaries are only created when tipc and devlink are included in SUBDIRS above, which seems reasonable, you can simplify the above and remove the PACKAGECONFIG checks since the packages will only be created if there actually are files to put in them, e.g.: PACKAGES =+ "\ ${PN}-tc \ ${PN}-lnstat \ ${PN}-ifstat \ ${PN}-genl \ ${PN}-rtacct \ ${PN}-nstat \ ${PN}-ss \ ${PN}-tipc \ ${PN}-devlink \ " > FILES_${PN}-tc = "${base_sbindir}/tc* \ > ${libdir}/tc/*.so" > FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ > @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" > FILES_${PN}-nstat = "${base_sbindir}/nstat" > FILES_${PN}-ss = "${base_sbindir}/ss" > FILES_${PN}-tipc = "${base_sbindir}/tipc" > +FILES_${PN}-devlink = "${base_sbindir}/devlink" > > ALTERNATIVE_${PN} = "ip" > ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" > -- > 2.17.1 //Peter From armccurdy at gmail.com Tue Feb 18 23:36:28 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 18 Feb 2020 15:36:28 -0800 Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to iproute2 In-Reply-To: <20c4646f9a30462bb6c9ae0f49b71092@XBOX03.axis.com> References: <20200218224455.14551-1-scott.branden@broadcom.com> <20c4646f9a30462bb6c9ae0f49b71092@XBOX03.axis.com> Message-ID: On Tue, Feb 18, 2020 at 3:19 PM Peter Kjellerstedt wrote: > > > -----Original Message----- > > From: openembedded-core-bounces at lists.openembedded.org > bounces at lists.openembedded.org> On Behalf Of Scott Branden via > > Openembedded-core > > Sent: den 18 februari 2020 23:45 > > To: openembedded-core at lists.openembedded.org > > Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to > > iproute2 > > > > Add devlink support to iproute2 recipe. > > > > Signed-off-by: Scott Branden > > --- > > meta/recipes-connectivity/iproute2/iproute2.inc | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc > > b/meta/recipes-connectivity/iproute2/iproute2.inc > > index fc31b8444e..98793af88e 100644 > > --- a/meta/recipes-connectivity/iproute2/iproute2.inc > > +++ b/meta/recipes-connectivity/iproute2/iproute2.inc > > @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig > > > > CLEANBROKEN = "1" > > > > -PACKAGECONFIG ??= "tipc elf" > > +PACKAGECONFIG ??= "tipc elf devlink" > > PACKAGECONFIG[tipc] = ",,libmnl," > > PACKAGECONFIG[elf] = ",,elfutils," > > +PACKAGECONFIG[devlink] = ",,libmnl," > > > > EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ > > + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ > > ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > > You can simplify the above to: > > EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ > ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > > but I also recommend to reformat it to make it more readable: > > EXTRA_OEMAKE = "\ > CC='${CC}' \ > KERNEL_INCLUDE=${STAGING_INCDIR} \ > DOCDIR=${docdir}/iproute2 \ > SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ > SBINDIR='${base_sbindir}' \ > LIBDIR='${libdir}' \ > " You could take the cleanup one step further by merging the recipe and the .inc file (and then including CCOPTS='${CFLAGS}' directly in the definition of EXTRA_OEMAKE). > > > > do_configure_append () { > > @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ > > ${PN}-rtacct \ > > ${PN}-nstat \ > > ${PN}-ss \ > > - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" > > + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ > > + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" > > Assuming that the tipc and devlink binaries are only created when tipc > and devlink are included in SUBDIRS above, which seems reasonable, you > can simplify the above and remove the PACKAGECONFIG checks since the > packages will only be created if there actually are files to put in > them, e.g.: > > PACKAGES =+ "\ > ${PN}-tc \ > ${PN}-lnstat \ > ${PN}-ifstat \ > ${PN}-genl \ > ${PN}-rtacct \ > ${PN}-nstat \ > ${PN}-ss \ > ${PN}-tipc \ > ${PN}-devlink \ > " > > > FILES_${PN}-tc = "${base_sbindir}/tc* \ > > ${libdir}/tc/*.so" > > FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ > > @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" > > FILES_${PN}-nstat = "${base_sbindir}/nstat" > > FILES_${PN}-ss = "${base_sbindir}/ss" > > FILES_${PN}-tipc = "${base_sbindir}/tipc" > > +FILES_${PN}-devlink = "${base_sbindir}/devlink" > > > > ALTERNATIVE_${PN} = "ip" > > ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" > > -- > > 2.17.1 > > //Peter > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From scott.branden at broadcom.com Wed Feb 19 00:26:14 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 18 Feb 2020 16:26:14 -0800 Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to iproute2 In-Reply-To: References: <20200218224455.14551-1-scott.branden@broadcom.com> <20c4646f9a30462bb6c9ae0f49b71092@XBOX03.axis.com> Message-ID: <9dde2b9f-e709-a7dd-df85-70af5e720af6@broadcom.com> Hi Andre, On 2020-02-18 3:36 p.m., Andre McCurdy wrote: > On Tue, Feb 18, 2020 at 3:19 PM Peter Kjellerstedt > wrote: >>> -----Original Message----- >>> From: openembedded-core-bounces at lists.openembedded.org >> bounces at lists.openembedded.org> On Behalf Of Scott Branden via >>> Openembedded-core >>> Sent: den 18 februari 2020 23:45 >>> To: openembedded-core at lists.openembedded.org >>> Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to >>> iproute2 >>> >>> Add devlink support to iproute2 recipe. >>> >>> Signed-off-by: Scott Branden >>> --- >>> meta/recipes-connectivity/iproute2/iproute2.inc | 8 ++++++-- >>> 1 file changed, 6 insertions(+), 2 deletions(-) >>> >>> diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc >>> b/meta/recipes-connectivity/iproute2/iproute2.inc >>> index fc31b8444e..98793af88e 100644 >>> --- a/meta/recipes-connectivity/iproute2/iproute2.inc >>> +++ b/meta/recipes-connectivity/iproute2/iproute2.inc >>> @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig >>> >>> CLEANBROKEN = "1" >>> >>> -PACKAGECONFIG ??= "tipc elf" >>> +PACKAGECONFIG ??= "tipc elf devlink" >>> PACKAGECONFIG[tipc] = ",,libmnl," >>> PACKAGECONFIG[elf] = ",,elfutils," >>> +PACKAGECONFIG[devlink] = ",,libmnl," >>> >>> EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ >>> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ >>> ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" >> You can simplify the above to: >> >> EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ >> ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" >> >> but I also recommend to reformat it to make it more readable: >> >> EXTRA_OEMAKE = "\ >> CC='${CC}' \ >> KERNEL_INCLUDE=${STAGING_INCDIR} \ >> DOCDIR=${docdir}/iproute2 \ >> SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ >> SBINDIR='${base_sbindir}' \ >> LIBDIR='${libdir}' \ >> " > You could take the cleanup one step further by merging the recipe and > the .inc file (and then including CCOPTS='${CFLAGS}' directly in the > definition of EXTRA_OEMAKE). Sounds like a more involved change that should be taken up in an unrelated cleanup exercise? > >>> do_configure_append () { >>> @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ >>> ${PN}-rtacct \ >>> ${PN}-nstat \ >>> ${PN}-ss \ >>> - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" >>> + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ >>> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" >> Assuming that the tipc and devlink binaries are only created when tipc >> and devlink are included in SUBDIRS above, which seems reasonable, you >> can simplify the above and remove the PACKAGECONFIG checks since the >> packages will only be created if there actually are files to put in >> them, e.g.: >> >> PACKAGES =+ "\ >> ${PN}-tc \ >> ${PN}-lnstat \ >> ${PN}-ifstat \ >> ${PN}-genl \ >> ${PN}-rtacct \ >> ${PN}-nstat \ >> ${PN}-ss \ >> ${PN}-tipc \ >> ${PN}-devlink \ >> " >> >>> FILES_${PN}-tc = "${base_sbindir}/tc* \ >>> ${libdir}/tc/*.so" >>> FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ >>> @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" >>> FILES_${PN}-nstat = "${base_sbindir}/nstat" >>> FILES_${PN}-ss = "${base_sbindir}/ss" >>> FILES_${PN}-tipc = "${base_sbindir}/tipc" >>> +FILES_${PN}-devlink = "${base_sbindir}/devlink" >>> >>> ALTERNATIVE_${PN} = "ip" >>> ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" >>> -- >>> 2.17.1 >> //Peter >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From scott.branden at broadcom.com Wed Feb 19 00:26:56 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 18 Feb 2020 16:26:56 -0800 Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to iproute2 In-Reply-To: <20c4646f9a30462bb6c9ae0f49b71092@XBOX03.axis.com> References: <20200218224455.14551-1-scott.branden@broadcom.com> <20c4646f9a30462bb6c9ae0f49b71092@XBOX03.axis.com> Message-ID: Hi Peter, On 2020-02-18 3:18 p.m., Peter Kjellerstedt wrote: >> -----Original Message----- >> From: openembedded-core-bounces at lists.openembedded.org > bounces at lists.openembedded.org> On Behalf Of Scott Branden via >> Openembedded-core >> Sent: den 18 februari 2020 23:45 >> To: openembedded-core at lists.openembedded.org >> Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to >> iproute2 >> >> Add devlink support to iproute2 recipe. >> >> Signed-off-by: Scott Branden >> --- >> meta/recipes-connectivity/iproute2/iproute2.inc | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc >> b/meta/recipes-connectivity/iproute2/iproute2.inc >> index fc31b8444e..98793af88e 100644 >> --- a/meta/recipes-connectivity/iproute2/iproute2.inc >> +++ b/meta/recipes-connectivity/iproute2/iproute2.inc >> @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig >> >> CLEANBROKEN = "1" >> >> -PACKAGECONFIG ??= "tipc elf" >> +PACKAGECONFIG ??= "tipc elf devlink" >> PACKAGECONFIG[tipc] = ",,libmnl," >> PACKAGECONFIG[elf] = ",,elfutils," >> +PACKAGECONFIG[devlink] = ",,libmnl," >> >> EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ >> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \ >> ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > You can simplify the above to: > > EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ > ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > > but I also recommend to reformat it to make it more readable: > > EXTRA_OEMAKE = "\ > CC='${CC}' \ > KERNEL_INCLUDE=${STAGING_INCDIR} \ > DOCDIR=${docdir}/iproute2 \ > SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ > SBINDIR='${base_sbindir}' \ > LIBDIR='${libdir}' \ > " > >> do_configure_append () { >> @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \ >> ${PN}-rtacct \ >> ${PN}-nstat \ >> ${PN}-ss \ >> - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" >> + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \ >> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}" > Assuming that the tipc and devlink binaries are only created when tipc > and devlink are included in SUBDIRS above, which seems reasonable, you > can simplify the above and remove the PACKAGECONFIG checks since the > packages will only be created if there actually are files to put in > them, e.g.: > > PACKAGES =+ "\ > ${PN}-tc \ > ${PN}-lnstat \ > ${PN}-ifstat \ > ${PN}-genl \ > ${PN}-rtacct \ > ${PN}-nstat \ > ${PN}-ss \ > ${PN}-tipc \ > ${PN}-devlink \ > " OK, all of this can be put in with this commit change - thanks. >> FILES_${PN}-tc = "${base_sbindir}/tc* \ >> ${libdir}/tc/*.so" >> FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ >> @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" >> FILES_${PN}-nstat = "${base_sbindir}/nstat" >> FILES_${PN}-ss = "${base_sbindir}/ss" >> FILES_${PN}-tipc = "${base_sbindir}/tipc" >> +FILES_${PN}-devlink = "${base_sbindir}/devlink" >> >> ALTERNATIVE_${PN} = "ip" >> ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" >> -- >> 2.17.1 > //Peter From scott.branden at broadcom.com Wed Feb 19 00:38:01 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 18 Feb 2020 16:38:01 -0800 Subject: [OE-core] [meta-oe][PATCH v3] iproute2: add devlink support to iproute2 Message-ID: <20200219003801.15549-1-scott.branden@broadcom.com> Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden --- .../iproute2/iproute2.inc | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b8444e..8efc0ec589 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)} \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- 2.17.1 From jpewhacker at gmail.com Wed Feb 19 00:44:42 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Tue, 18 Feb 2020 18:44:42 -0600 Subject: [OE-core] [PATCH 0/2] Use jQuery in diffoscope output Message-ID: <20200219004444.21297-1-JPEWhacker@gmail.com> The diffoscope HTML output has the option of using jQuery to make browsing the output easier. Enable support for this in the reproducible OEQA test. Joshua Watt (2): jquery: Add recipe oeqa: reproducible: Include jquery in results meta/conf/distro/include/maintainers.inc | 1 + meta/lib/oeqa/selftest/cases/reproducible.py | 13 +++++++-- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 29 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/jquery/jquery_3.4.1.bb -- 2.24.1 From jpewhacker at gmail.com Wed Feb 19 00:44:43 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Tue, 18 Feb 2020 18:44:43 -0600 Subject: [OE-core] [PATCH 1/2] jquery: Add recipe In-Reply-To: <20200219004444.21297-1-JPEWhacker@gmail.com> References: <20200219004444.21297-1-JPEWhacker@gmail.com> Message-ID: <20200219004444.21297-2-JPEWhacker@gmail.com> Adds a recipe that packages jQuery in a manner borrowed from debian. The primary purpose is to make the diffoscope output from the autobuilder easier to navigate. Signed-off-by: Joshua Watt --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/jquery/jquery_3.4.1.bb | 29 ++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-devtools/jquery/jquery_3.4.1.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4a267faabce..901d607f2ec 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -284,6 +284,7 @@ RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae " RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal " RECIPE_MAINTAINER_pn-json-c = "Yi Zhao " RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao " +RECIPE_MAINTAINER_pn-jquery = "Joshua Watt " RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin " RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield " RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield " diff --git a/meta/recipes-devtools/jquery/jquery_3.4.1.bb b/meta/recipes-devtools/jquery/jquery_3.4.1.bb new file mode 100644 index 00000000000..e1080aec1d1 --- /dev/null +++ b/meta/recipes-devtools/jquery/jquery_3.4.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "jQuery is a fast, small, and feature-rich JavaScript library" +HOMEPAGE = "https://jquery.com/" +LICENSE = "MIT" +SECTION = "devel" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}.js;startline=8;endline=10;md5=cdb86f5bda90caec023592d2e768357c" + +SRC_URI = "\ + https://code.jquery.com/${BP}.js;name=js \ + https://code.jquery.com/${BP}.min.js;name=min \ + https://code.jquery.com/${BP}.min.map;name=map \ + " + +SRC_URI[js.sha256sum] = "5a93a88493aa32aab228bf4571c01207d3b42b0002409a454d404b4d8395bd55" +SRC_URI[min.sha256sum] = "0925e8ad7bd971391a8b1e98be8e87a6971919eb5b60c196485941c3c1df089a" +SRC_URI[map.sha256sum] = "8da74aec0fcdd7678a2663b3cc9bafbaf009e6d6929b28bb3dd95bced18206f6" + +inherit allarch + +do_install() { + install -d ${D}${datadir}/javascript/${BPN}/ + install -m 644 ${WORKDIR}/${BP}.js ${D}${datadir}/javascript/${BPN}/${BPN}.js + install -m 644 ${WORKDIR}/${BP}.min.js ${D}${datadir}/javascript/${BPN}/${BPN}.min.js + install -m 644 ${WORKDIR}/${BP}.min.map ${D}${datadir}/javascript/${BPN}/${BPN}.min.map +} + +PACKAGES = "${PN}" +FILES_${PN} = "${datadir}" + +BBCLASSEXTEND += "native nativesdk" -- 2.24.1 From jpewhacker at gmail.com Wed Feb 19 00:44:44 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Tue, 18 Feb 2020 18:44:44 -0600 Subject: [OE-core] [PATCH 2/2] oeqa: reproducible: Include jquery in results In-Reply-To: <20200219004444.21297-1-JPEWhacker@gmail.com> References: <20200219004444.21297-1-JPEWhacker@gmail.com> Message-ID: <20200219004444.21297-3-JPEWhacker@gmail.com> Includes jquery in the output directory to make the diffoscope output easier to navigate Signed-off-by: Joshua Watt --- meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index d3fd8c392b8..5d3959be77b 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -174,9 +174,10 @@ class ReproducibleTests(OESelftestTestCase): # Build native utilities self.write_config('') - bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") + bitbake("diffoscope-native diffutils-native jquery-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") + jquery_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "jquery-native") if self.save_results: os.makedirs(self.save_results, exist_ok=True) @@ -225,8 +226,14 @@ class ReproducibleTests(OESelftestTestCase): os.rmdir(save_dir) else: self.logger.info('Running diffoscope') - runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], - native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) + package_dir = os.path.join(save_dir, 'packages') + package_html_dir = os.path.join(package_dir, 'diff-html') + + # Copy jquery to improve the diffoscope output usability + self.copy_file(os.path.join(jquery_sysroot, 'usr/share/javascript/jquery/jquery.min.js'), os.path.join(package_html_dir, 'jquery.js')) + + runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', package_html_dir, 'reproducibleA', 'reproducibleB'], + native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir) if fails: self.fail('\n'.join(fails)) -- 2.24.1 From scott.branden at broadcom.com Wed Feb 19 01:08:12 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 18 Feb 2020 17:08:12 -0800 Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to iproute2 In-Reply-To: <9dde2b9f-e709-a7dd-df85-70af5e720af6@broadcom.com> References: <20200218224455.14551-1-scott.branden@broadcom.com> <20c4646f9a30462bb6c9ae0f49b71092@XBOX03.axis.com> <9dde2b9f-e709-a7dd-df85-70af5e720af6@broadcom.com> Message-ID: <6868a2dc-13c0-dad0-c3ca-ec29ca085d94@broadcom.com> On 2020-02-18 4:26 p.m., Scott Branden wrote: > Hi Andre, > > On 2020-02-18 3:36 p.m., Andre McCurdy wrote: >> On Tue, Feb 18, 2020 at 3:19 PM Peter Kjellerstedt >> wrote: >>>> -----Original Message----- >>>> From: openembedded-core-bounces at lists.openembedded.org >>>> >>> bounces at lists.openembedded.org> On Behalf Of Scott Branden via >>>> Openembedded-core >>>> Sent: den 18 februari 2020 23:45 >>>> To: openembedded-core at lists.openembedded.org >>>> Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink >>>> support to >>>> iproute2 >>>> >>>> Add devlink support to iproute2 recipe. >>>> >>>> Signed-off-by: Scott Branden >>>> --- >>>> ? meta/recipes-connectivity/iproute2/iproute2.inc | 8 ++++++-- >>>> ? 1 file changed, 6 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc >>>> b/meta/recipes-connectivity/iproute2/iproute2.inc >>>> index fc31b8444e..98793af88e 100644 >>>> --- a/meta/recipes-connectivity/iproute2/iproute2.inc >>>> +++ b/meta/recipes-connectivity/iproute2/iproute2.inc >>>> @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion >>>> pkgconfig >>>> >>>> ? CLEANBROKEN = "1" >>>> >>>> -PACKAGECONFIG ??= "tipc elf" >>>> +PACKAGECONFIG ??= "tipc elf devlink" >>>> ? PACKAGECONFIG[tipc] = ",,libmnl," >>>> ? PACKAGECONFIG[elf] = ",,elfutils," >>>> +PACKAGECONFIG[devlink] = ",,libmnl," >>>> >>>> ? EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} >>>> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ >>>> +??????????????? ${@bb.utils.contains('PACKAGECONFIG', 'devlink', >>>> 'devlink', '', d)}?????????????????????????????????????????????? \ >>>> ????????????????? ${@bb.utils.contains('PACKAGECONFIG', 'tipc', >>>> 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" >>> You can simplify the above to: >>> >>> EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} >>> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ >>> ???????????????? ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', >>> d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" >>> >>> but I also recommend to reformat it to make it more readable: >>> >>> EXTRA_OEMAKE = "\ >>> ???? CC='${CC}' \ >>> ???? KERNEL_INCLUDE=${STAGING_INCDIR} \ >>> ???? DOCDIR=${docdir}/iproute2 \ >>> ???? SUBDIRS='lib tc ip bridge misc genl >>> ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ >>> ???? SBINDIR='${base_sbindir}' \ >>> ???? LIBDIR='${libdir}' \ >>> " >> You could take the cleanup one step further by merging the recipe and >> the .inc file (and then including CCOPTS='${CFLAGS}' directly in the >> definition of EXTRA_OEMAKE). > Sounds like a more involved change that should be taken up in an > unrelated cleanup exercise? Actually, I see the reason to keep the inc file is so that you can support different versions of iproute2 if needed. Each recipe version would just require the inc file. From armccurdy at gmail.com Wed Feb 19 02:17:22 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 18 Feb 2020 18:17:22 -0800 Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink support to iproute2 In-Reply-To: <6868a2dc-13c0-dad0-c3ca-ec29ca085d94@broadcom.com> References: <20200218224455.14551-1-scott.branden@broadcom.com> <20c4646f9a30462bb6c9ae0f49b71092@XBOX03.axis.com> <9dde2b9f-e709-a7dd-df85-70af5e720af6@broadcom.com> <6868a2dc-13c0-dad0-c3ca-ec29ca085d94@broadcom.com> Message-ID: On Tue, Feb 18, 2020 at 5:08 PM Scott Branden wrote: > > On 2020-02-18 4:26 p.m., Scott Branden wrote: > > Hi Andre, > > > > On 2020-02-18 3:36 p.m., Andre McCurdy wrote: > >> On Tue, Feb 18, 2020 at 3:19 PM Peter Kjellerstedt > >> wrote: > >>>> -----Original Message----- > >>>> From: openembedded-core-bounces at lists.openembedded.org > >>>> >>>> bounces at lists.openembedded.org> On Behalf Of Scott Branden via > >>>> Openembedded-core > >>>> Sent: den 18 februari 2020 23:45 > >>>> To: openembedded-core at lists.openembedded.org > >>>> Subject: [OE-core] [meta-oe][PATCH v2] iproute2: add devlink > >>>> support to > >>>> iproute2 > >>>> > >>>> Add devlink support to iproute2 recipe. > >>>> > >>>> Signed-off-by: Scott Branden > >>>> --- > >>>> meta/recipes-connectivity/iproute2/iproute2.inc | 8 ++++++-- > >>>> 1 file changed, 6 insertions(+), 2 deletions(-) > >>>> > >>>> diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc > >>>> b/meta/recipes-connectivity/iproute2/iproute2.inc > >>>> index fc31b8444e..98793af88e 100644 > >>>> --- a/meta/recipes-connectivity/iproute2/iproute2.inc > >>>> +++ b/meta/recipes-connectivity/iproute2/iproute2.inc > >>>> @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion > >>>> pkgconfig > >>>> > >>>> CLEANBROKEN = "1" > >>>> > >>>> -PACKAGECONFIG ??= "tipc elf" > >>>> +PACKAGECONFIG ??= "tipc elf devlink" > >>>> PACKAGECONFIG[tipc] = ",,libmnl," > >>>> PACKAGECONFIG[elf] = ",,elfutils," > >>>> +PACKAGECONFIG[devlink] = ",,libmnl," > >>>> > >>>> EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} > >>>> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ > >>>> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', > >>>> 'devlink', '', d)} \ > >>>> ${@bb.utils.contains('PACKAGECONFIG', 'tipc', > >>>> 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > >>> You can simplify the above to: > >>> > >>> EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} > >>> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ > >>> ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', > >>> d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > >>> > >>> but I also recommend to reformat it to make it more readable: > >>> > >>> EXTRA_OEMAKE = "\ > >>> CC='${CC}' \ > >>> KERNEL_INCLUDE=${STAGING_INCDIR} \ > >>> DOCDIR=${docdir}/iproute2 \ > >>> SUBDIRS='lib tc ip bridge misc genl > >>> ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ > >>> SBINDIR='${base_sbindir}' \ > >>> LIBDIR='${libdir}' \ > >>> " > >> You could take the cleanup one step further by merging the recipe and > >> the .inc file (and then including CCOPTS='${CFLAGS}' directly in the > >> definition of EXTRA_OEMAKE). > > Sounds like a more involved change that should be taken up in an > > unrelated cleanup exercise? > Actually, I see the reason to keep the inc file is so that you can > support different versions of iproute2 if needed. > Each recipe version would just require the inc file. Yes, that's been the historical argument. However we don't typically support multiple versions of a recipe at the same time in oe-core any more and the maintenance effort and potential for bugs (e.g. in this case, casual readers may not realise that the definition of EXTRA_OEMAKE is split between the two files) means we've been gradually cleaning up and merging .inc files into recipes. From anuj.mittal at intel.com Wed Feb 19 02:36:41 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Wed, 19 Feb 2020 10:36:41 +0800 Subject: [OE-core] [PATCH v2] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON Message-ID: <20200219023641.3308-1-anuj.mittal@intel.com> Use the correct variable so options actually get used and use the correct qt option name to prevent errors. Signed-off-by: Anuj Mittal --- .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb index a6eb9986dd..07a0bf5085 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" # This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig # in a gstreamer1.0-plugins-good bbappend). -EXTRA_OECONF += " \ +EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ -Ddv=disabled \ @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ - -Dqt=disabled \ + -Dqt5=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- 2.24.1 From raj.khem at gmail.com Wed Feb 19 02:39:51 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 18 Feb 2020 18:39:51 -0800 Subject: [OE-core] [PATCH v2] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: <20200219023641.3308-1-anuj.mittal@intel.com> References: <20200219023641.3308-1-anuj.mittal@intel.com> Message-ID: On Tue, Feb 18, 2020 at 6:37 PM Anuj Mittal wrote: > > Use the correct variable so options actually get used and use the > correct qt option name to prevent errors. > > Signed-off-by: Anuj Mittal > --- > .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > index a6eb9986dd..07a0bf5085 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > # This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig > # in a gstreamer1.0-plugins-good bbappend). > > -EXTRA_OECONF += " \ > +EXTRA_OEMESON += " \ > -Daalib=disabled \ > -Ddirectsound=disabled \ > -Ddv=disabled \ > @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ > -Doss4=disabled \ > -Dosxaudio=disabled \ > -Dosxvideo=disabled \ > - -Dqt=disabled \ > + -Dqt5=disabled \ this perhaps should be a packageconfig so people using meta-qt5 can enable it > -Dshout2=disabled \ > -Dtwolame=disabled \ > -Dwaveform=disabled \ > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From anuj.mittal at intel.com Wed Feb 19 02:43:16 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Wed, 19 Feb 2020 02:43:16 +0000 Subject: [OE-core] [PATCH v2] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: References: <20200219023641.3308-1-anuj.mittal@intel.com> Message-ID: On Tue, 2020-02-18 at 18:39 -0800, Khem Raj wrote: > On Tue, Feb 18, 2020 at 6:37 PM Anuj Mittal > wrote: > > Use the correct variable so options actually get used and use the > > correct qt option name to prevent errors. > > > > Signed-off-by: Anuj Mittal > > --- > > .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 4 > > ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > > plugins-good_1.16.1.bb b/meta/recipes- > > multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > > index a6eb9986dd..07a0bf5085 100644 > > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- > > good_1.16.1.bb > > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- > > good_1.16.1.bb > > @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = > > "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > > # This is better done in a separate qt5 layer (which then should > > add a "qt5" packageconfig > > # in a gstreamer1.0-plugins-good bbappend). > > > > -EXTRA_OECONF += " \ > > +EXTRA_OEMESON += " \ > > -Daalib=disabled \ > > -Ddirectsound=disabled \ > > -Ddv=disabled \ > > @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ > > -Doss4=disabled \ > > -Dosxaudio=disabled \ > > -Dosxvideo=disabled \ > > - -Dqt=disabled \ > > + -Dqt5=disabled \ > > this perhaps should be a packageconfig so people using meta-qt5 can > enable it Yes probably but in a separate change I think. This just ensures that the right options are used and nothing else is changed. Thanks, Anuj > > > -Dshout2=disabled \ > > -Dtwolame=disabled \ > > -Dwaveform=disabled \ > > -- > > 2.24.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core From anuj.mittal at intel.com Wed Feb 19 02:45:57 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Wed, 19 Feb 2020 10:45:57 +0800 Subject: [OE-core] [zeus][PATCH] Revert "bash: Fix CVE-2019-18276" Message-ID: <20200219024557.7357-1-anuj.mittal@intel.com> This reverts commit 09e695246d30ef9b73e743e0130e710e19793d14. This isn't a Backport as indicated in patch and not all the changes in this change are relevant to the CVE. Revert and wait for the fix to be available upstream. Signed-off-by: Anuj Mittal --- .../bash/bash/bash-CVE-2019-18276.patch | 402 ------------------ meta/recipes-extended/bash/bash_5.0.bb | 1 - 2 files changed, 403 deletions(-) delete mode 100644 meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch diff --git a/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch b/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch deleted file mode 100644 index 78dcc1b636..0000000000 --- a/meta/recipes-extended/bash/bash/bash-CVE-2019-18276.patch +++ /dev/null @@ -1,402 +0,0 @@ -From 951bdaad7a18cc0dc1036bba86b18b90874d39ff Mon Sep 17 00:00:00 2001 -From: Chet Ramey -Date: Mon, 1 Jul 2019 09:03:53 -0400 -Subject: [PATCH] commit bash-20190628 snapshot - -An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 patch 11. -By default, if Bash is run with its effective UID not equal to its real UID, -it will drop privileges by setting its effective UID to its real UID. -However, it does so incorrectly. On Linux and other systems that support "saved UID" functionality, -the saved UID is not dropped. An attacker with command execution in the shell can use "enable -f" for -runtime loading of a new builtin, which can be a shared object that calls setuid() and therefore -regains privileges. However, binaries running with an effective UID of 0 are unaffected. - -Upstream-Status: Backport [https://github.com/bminor/bash/commit/951bdaad7a18cc0dc1036bba86b18b90874d39ff] -CVE: CVE-2019-18276 -Signed-off-by: Chet Ramey -Signed-off-by: De Huo ---- - MANIFEST | 2 ++ - bashline.c | 50 +------------------------------------------------- - builtins/help.def | 2 +- - config.h.in | 10 +++++++++- - configure | 11 +++++++++++ - configure.ac | 1 + - doc/bash.1 | 3 ++- - doc/bashref.texi | 3 ++- - lib/glob/glob.c | 5 ++++- - pathexp.c | 16 ++++++++++++++-- - shell.c | 8 ++++++++ - tests/glob.tests | 2 ++ - tests/glob6.sub | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - tests/glob7.sub | 11 +++++++++++ - 14 files changed, 122 insertions(+), 56 deletions(-) - create mode 100644 tests/glob6.sub - create mode 100644 tests/glob7.sub - -diff --git a/MANIFEST b/MANIFEST -index 03de221..f9ccad7 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -1037,6 +1037,8 @@ tests/extglob3.tests f - tests/extglob3.right f - tests/extglob4.sub f - tests/extglob5.sub f -+tests/glob6.sub f -+tests/glob7.sub f - tests/func.tests f - tests/func.right f - tests/func1.sub f -diff --git a/bashline.c b/bashline.c -index 824ea9d..d86b47d 100644 ---- a/bashline.c -+++ b/bashline.c -@@ -3718,55 +3718,7 @@ static int - completion_glob_pattern (string) - char *string; - { -- register int c; -- char *send; -- int open; -- -- DECLARE_MBSTATE; -- -- open = 0; -- send = string + strlen (string); -- -- while (c = *string++) -- { -- switch (c) -- { -- case '?': -- case '*': -- return (1); -- -- case '[': -- open++; -- continue; -- -- case ']': -- if (open) -- return (1); -- continue; -- -- case '+': -- case '@': -- case '!': -- if (*string == '(') /*)*/ -- return (1); -- continue; -- -- case '\\': -- if (*string++ == 0) -- return (0); -- } -- -- /* Advance one fewer byte than an entire multibyte character to -- account for the auto-increment in the loop above. */ --#ifdef HANDLE_MULTIBYTE -- string--; -- ADVANCE_CHAR_P (string, send - string); -- string++; --#else -- ADVANCE_CHAR_P (string, send - string); --#endif -- } -- return (0); -+ return (glob_pattern_p (string) == 1); - } - - static char *globtext; -diff --git a/builtins/help.def b/builtins/help.def -index 006c4b5..92f9b38 100644 ---- a/builtins/help.def -+++ b/builtins/help.def -@@ -128,7 +128,7 @@ help_builtin (list) - - /* We should consider making `help bash' do something. */ - -- if (glob_pattern_p (list->word->word)) -+ if (glob_pattern_p (list->word->word) == 1) - { - printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1))); - print_word_list (list, ", "); -diff --git a/config.h.in b/config.h.in -index 8554aec..ad4b1e8 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -1,6 +1,6 @@ - /* config.h -- Configuration file for bash. */ - --/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc. -+/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. - -@@ -807,6 +807,14 @@ - #undef HAVE_SETREGID - #undef HAVE_DECL_SETREGID - -+/* Define if you have the setregid function. */ -+#undef HAVE_SETRESGID -+#undef HAVE_DECL_SETRESGID -+ -+/* Define if you have the setresuid function. */ -+#undef HAVE_SETRESUID -+#undef HAVE_DECL_SETRESUID -+ - /* Define if you have the setvbuf function. */ - #undef HAVE_SETVBUF - -diff --git a/configure b/configure -index 2f62662..b3321c9 100755 ---- a/configure -+++ b/configure -@@ -10281,6 +10281,17 @@ cat >>confdefs.h <<_ACEOF - #define HAVE_DECL_SETREGID $ac_have_decl - _ACEOF - -+ac_fn_c_check_decl "$LINENO" "" "ac_cv_have_decl_" "$ac_includes_default" -+if test "x$ac_cv_have_decl_" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ $ac_have_decl -+_ACEOF -+(setresuid, setresgid) - ac_fn_c_check_decl "$LINENO" "strcpy" "ac_cv_have_decl_strcpy" "$ac_includes_default" - if test "x$ac_cv_have_decl_strcpy" = xyes; then : - ac_have_decl=1 -diff --git a/configure.ac b/configure.ac -index 52b4cdb..549adef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -810,6 +810,7 @@ AC_CHECK_DECLS([confstr]) - AC_CHECK_DECLS([printf]) - AC_CHECK_DECLS([sbrk]) - AC_CHECK_DECLS([setregid]) -+AC_CHECK_DECLS[(setresuid, setresgid]) - AC_CHECK_DECLS([strcpy]) - AC_CHECK_DECLS([strsignal]) - -diff --git a/doc/bash.1 b/doc/bash.1 -index e6cd08d..9e58a0b 100644 ---- a/doc/bash.1 -+++ b/doc/bash.1 -@@ -4681,7 +4681,8 @@ above). - .PD - .SH "SIMPLE COMMAND EXPANSION" - When a simple command is executed, the shell performs the following --expansions, assignments, and redirections, from left to right. -+expansions, assignments, and redirections, from left to right, in -+the following order. - .IP 1. - The words that the parser has marked as variable assignments (those - preceding the command name) and redirections are saved for later -diff --git a/doc/bashref.texi b/doc/bashref.texi -index d33cd57..3065126 100644 ---- a/doc/bashref.texi -+++ b/doc/bashref.texi -@@ -2964,7 +2964,8 @@ is not specified. If the file does not exist, it is created. - @cindex command expansion - - When a simple command is executed, the shell performs the following --expansions, assignments, and redirections, from left to right. -+expansions, assignments, and redirections, from left to right, in -+the following order. - - @enumerate - @item -diff --git a/lib/glob/glob.c b/lib/glob/glob.c -index 398253b..2eaa33e 100644 ---- a/lib/glob/glob.c -+++ b/lib/glob/glob.c -@@ -607,6 +607,7 @@ glob_vector (pat, dir, flags) - register unsigned int i; - int mflags; /* Flags passed to strmatch (). */ - int pflags; /* flags passed to sh_makepath () */ -+ int hasglob; /* return value from glob_pattern_p */ - int nalloca; - struct globval *firstmalloc, *tmplink; - char *convfn; -@@ -648,10 +649,12 @@ glob_vector (pat, dir, flags) - patlen = (pat && *pat) ? strlen (pat) : 0; - - /* If the filename pattern (PAT) does not contain any globbing characters, -+ or contains a pattern with only backslash escapes (hasglob == 2), - we can dispense with reading the directory, and just see if there is - a filename `DIR/PAT'. If there is, and we can access it, just make the - vector to return and bail immediately. */ -- if (skip == 0 && glob_pattern_p (pat) == 0) -+ hasglob = 0; -+ if (skip == 0 && (hasglob = glob_pattern_p (pat)) == 0 || hasglob == 2) - { - int dirlen; - struct stat finfo; -diff --git a/pathexp.c b/pathexp.c -index c1bf2d8..e6c5392 100644 ---- a/pathexp.c -+++ b/pathexp.c -@@ -58,7 +58,10 @@ int extended_glob = EXTGLOB_DEFAULT; - /* Control enabling special handling of `**' */ - int glob_star = 0; - --/* Return nonzero if STRING has any unquoted special globbing chars in it. */ -+/* Return nonzero if STRING has any unquoted special globbing chars in it. -+ This is supposed to be called when pathname expansion is performed, so -+ it implements the rules in Posix 2.13.3, specifically that an unquoted -+ slash cannot appear in a bracket expression. */ - int - unquoted_glob_pattern_p (string) - register char *string; -@@ -85,10 +88,14 @@ unquoted_glob_pattern_p (string) - continue; - - case ']': -- if (open) -+ if (open) /* XXX - if --open == 0? */ - return (1); - continue; - -+ case '/': -+ if (open) -+ open = 0; -+ - case '+': - case '@': - case '!': -@@ -106,6 +113,11 @@ unquoted_glob_pattern_p (string) - string++; - continue; - } -+ else if (open && *string == '/') -+ { -+ string++; /* quoted slashes in bracket expressions are ok */ -+ continue; -+ } - else if (*string == 0) - return (0); - -diff --git a/shell.c b/shell.c -index a2b2a55..6adabc8 100644 ---- a/shell.c -+++ b/shell.c -@@ -1293,7 +1293,11 @@ disable_priv_mode () - { - int e; - -+#if HAVE_DECL_SETRESUID -+ if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0) -+#else - if (setuid (current_user.uid) < 0) -+#endif - { - e = errno; - sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid); -@@ -1302,7 +1306,11 @@ disable_priv_mode () - exit (e); - #endif - } -+#if HAVE_DECL_SETRESGID -+ if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0) -+#else - if (setgid (current_user.gid) < 0) -+#endif - sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid); - - current_user.euid = current_user.uid; -diff --git a/tests/glob.tests b/tests/glob.tests -index 01913bb..fb012f7 100644 ---- a/tests/glob.tests -+++ b/tests/glob.tests -@@ -12,6 +12,8 @@ ${THIS_SH} ./glob1.sub - ${THIS_SH} ./glob2.sub - ${THIS_SH} ./glob3.sub - ${THIS_SH} ./glob4.sub -+${THIS_SH} ./glob6.sub -+${THIS_SH} ./glob7.sub - - MYDIR=$PWD # save where we are - -diff --git a/tests/glob6.sub b/tests/glob6.sub -new file mode 100644 -index 0000000..b099811 ---- /dev/null -+++ b/tests/glob6.sub -@@ -0,0 +1,54 @@ -+# tests of the backslash-in-glob-patterns discussion on the austin-group ML -+ -+: ${TMPDIR:=/var/tmp} -+ -+ORIG=$PWD -+GLOBDIR=$TMPDIR/bash-glob-$$ -+mkdir $GLOBDIR && cd $GLOBDIR -+ -+# does the pattern matcher allow backslashes as escape characters and remove -+# them as part of matching? -+touch abcdefg -+pat='ab\cd*' -+printf '<%s>\n' $pat -+pat='\.' -+printf '<%s>\n' $pat -+rm abcdefg -+ -+# how about when escaping pattern characters? -+touch '*abc.c' -+a='\**.c' -+printf '%s\n' $a -+rm -f '*abc.c' -+ -+# how about when making the distinction between readable and searchable path -+# components? -+mkdir -m a=x searchable -+mkdir -m a=r readable -+ -+p='searchable/\.' -+printf "%s\n" $p -+ -+p='searchable/\./.' -+printf "%s\n" $p -+ -+p='readable/\.' -+printf "%s\n" $p -+ -+p='readable/\./.' -+printf "%s\n" $p -+ -+printf "%s\n" 'searchable/\.' -+printf "%s\n" 'readable/\.' -+ -+echo */. -+ -+p='*/\.' -+echo $p -+ -+echo */'.' -+ -+rmdir searchable readable -+ -+cd $ORIG -+rmdir $GLOBDIR -diff --git a/tests/glob7.sub b/tests/glob7.sub -new file mode 100644 -index 0000000..0212b8e ---- /dev/null -+++ b/tests/glob7.sub -@@ -0,0 +1,11 @@ -+# according to Posix 2.13.3, a slash in a bracket expression renders that -+# bracket expression invalid -+shopt -s nullglob -+ -+echo 1: [qwe/qwe] -+echo 2: [qwe/ -+echo 3: [qwe/] -+ -+echo 4: [qwe\/qwe] -+echo 5: [qwe\/ -+echo 6: [qwe\/] --- -1.9.1 diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb index 1b7058746f..eadc82279d 100644 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ b/meta/recipes-extended/bash/bash_5.0.bb @@ -19,7 +19,6 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://run-ptest \ file://run-bash-ptests \ file://fix-run-builtins.patch \ - file://bash-CVE-2019-18276.patch \ " SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" -- 2.24.1 From raj.khem at gmail.com Wed Feb 19 02:55:10 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 18 Feb 2020 18:55:10 -0800 Subject: [OE-core] [PATCH v2] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: References: <20200219023641.3308-1-anuj.mittal@intel.com> Message-ID: On 2/18/20 6:43 PM, Mittal, Anuj wrote: > On Tue, 2020-02-18 at 18:39 -0800, Khem Raj wrote: >> On Tue, Feb 18, 2020 at 6:37 PM Anuj Mittal >> wrote: >>> Use the correct variable so options actually get used and use the >>> correct qt option name to prevent errors. >>> >>> Signed-off-by: Anuj Mittal >>> --- >>> .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 4 >>> ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- >>> plugins-good_1.16.1.bb b/meta/recipes- >>> multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb >>> index a6eb9986dd..07a0bf5085 100644 >>> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- >>> good_1.16.1.bb >>> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- >>> good_1.16.1.bb >>> @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = >>> "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" >>> # This is better done in a separate qt5 layer (which then should >>> add a "qt5" packageconfig >>> # in a gstreamer1.0-plugins-good bbappend). >>> >>> -EXTRA_OECONF += " \ >>> +EXTRA_OEMESON += " \ >>> -Daalib=disabled \ >>> -Ddirectsound=disabled \ >>> -Ddv=disabled \ >>> @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ >>> -Doss4=disabled \ >>> -Dosxaudio=disabled \ >>> -Dosxvideo=disabled \ >>> - -Dqt=disabled \ >>> + -Dqt5=disabled \ >> this perhaps should be a packageconfig so people using meta-qt5 can >> enable it > Yes probably but in a separate change I think. This just ensures that > the right options are used and nothing else is changed. perhaps no, since it will regress meta-qt5 which already does something like this https://github.com/meta-qt5/meta-qt5/blob/master/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%25.bbappend this being wrong in OE-core was ok for meta-qt5. > > Thanks, > > Anuj > >>> -Dshout2=disabled \ >>> -Dtwolame=disabled \ >>> -Dwaveform=disabled \ >>> -- >>> 2.24.1 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core From anuj.mittal at intel.com Wed Feb 19 02:52:53 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Wed, 19 Feb 2020 02:52:53 +0000 Subject: [OE-core] what is MACHINE_HWCODECS used for these days? In-Reply-To: References: Message-ID: <504b19d868c02c0ee7a68a8432b166a7578b5c5f.camel@intel.com> On Fri, 2020-02-14 at 08:04 -0500, Robert P. J. Day wrote: > was documenting the use of [EXTRA_]IMAGE_FEATURES, and noticed that > while the oe-core layer defines a related feature: > > core-image.bbclass:FEATURE_PACKAGES_hwcodecs = > "${MACHINE_HWCODECS}" > core-image.bbclass:MACHINE_HWCODECS ??= "" This ensures that packages in MACHINE_HWCODECS are installed in the image if hwcodecs in included in IMAGE_FEATURES. Thanks, Anuj > > i see no actual usage of that variable in oe-core (the git log goes > way back to 2013: > > commit 1cb370587fd72e3f0f69678748108cc4116767fb > Author: Richard Purdie > Date: Wed Jan 23 21:56:11 2013 -0800 > > core-image: Add hwcodecs IMAGE_FEATURE > > Currently hardware codecs are being injected in rather ugly ways > and end up > either in no or all images. This adds a dedicated IMAGE_FEATURE > for them based > on the MACHINE_HWCODECS variable. We may need to refine this in > due course > but this patch at least illustrates the concept. > > i looked through other layers on my system, and found some references > in meta-intel: > > conf/machine/intel-core2-32.conf:MACHINE_HWCODECS ?= "intel-vaapi- > driver gstreamer1.0-vaapi" > conf/machine/intel-corei7-64.conf:MACHINE_HWCODECS ?= " > ${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver > intel-mediasdk', d)} intel-vaapi-driver gstreamer1.0-vaapi" > conf/machine/intel-skylake-64.conf:MACHINE_HWCODECS ?= "intel-media- > driver intel-mediasdk intel-vaapi-driver > gstreamer1.0-vaapi" > > but i see nothing in *that* layer that actually does anything with > that variable after setting it. what is it used for? and how is it > processed? > > rday > From anuj.mittal at intel.com Wed Feb 19 03:04:33 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Wed, 19 Feb 2020 03:04:33 +0000 Subject: [OE-core] [PATCH v2] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: References: <20200219023641.3308-1-anuj.mittal@intel.com> Message-ID: <92a4baed36443295a7ce12444120bb1afb09f1e5.camel@intel.com> On Tue, 2020-02-18 at 18:55 -0800, Khem Raj wrote: > On 2/18/20 6:43 PM, Mittal, Anuj wrote: > > On Tue, 2020-02-18 at 18:39 -0800, Khem Raj wrote: > > > On Tue, Feb 18, 2020 at 6:37 PM Anuj Mittal < > > > anuj.mittal at intel.com> > > > wrote: > > > > Use the correct variable so options actually get used and use > > > > the > > > > correct qt option name to prevent errors. > > > > > > > > Signed-off-by: Anuj Mittal > > > > --- > > > > .../gstreamer/gstreamer1.0-plugins- > > > > good_1.16.1.bb | 4 > > > > ++-- > > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > > > > plugins-good_1.16.1.bb b/meta/recipes- > > > > multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb > > > > index a6eb9986dd..07a0bf5085 100644 > > > > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- > > > > good_1.16.1.bb > > > > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- > > > > good_1.16.1.bb > > > > @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = > > > > "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > > > > # This is better done in a separate qt5 layer (which then > > > > should > > > > add a "qt5" packageconfig > > > > # in a gstreamer1.0-plugins-good bbappend). > > > > > > > > -EXTRA_OECONF += " \ > > > > +EXTRA_OEMESON += " \ > > > > -Daalib=disabled \ > > > > -Ddirectsound=disabled \ > > > > -Ddv=disabled \ > > > > @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ > > > > -Doss4=disabled \ > > > > -Dosxaudio=disabled \ > > > > -Dosxvideo=disabled \ > > > > - -Dqt=disabled \ > > > > + -Dqt5=disabled \ > > > this perhaps should be a packageconfig so people using meta-qt5 > > > can > > > enable it > > Yes probably but in a separate change I think. This just ensures > > that > > the right options are used and nothing else is changed. > > perhaps no, since it will regress meta-qt5 which already does > something > like this > > https://github.com/meta-qt5/meta-qt5/blob/master/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%25.bbappend > > > this being wrong in OE-core was ok for meta-qt5. Okay, should that PACKAGECONFIG be added here? I don't use or test qt so can't test the change. Thanks, Anuj From raj.khem at gmail.com Wed Feb 19 03:35:05 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 18 Feb 2020 19:35:05 -0800 Subject: [OE-core] [PATCH v2] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON In-Reply-To: <92a4baed36443295a7ce12444120bb1afb09f1e5.camel@intel.com> References: <20200219023641.3308-1-anuj.mittal@intel.com> <92a4baed36443295a7ce12444120bb1afb09f1e5.camel@intel.com> Message-ID: <06a1d07e-6418-c1ab-211a-4f03f9278948@gmail.com> On 2/18/20 7:04 PM, Mittal, Anuj wrote: > On Tue, 2020-02-18 at 18:55 -0800, Khem Raj wrote: >> On 2/18/20 6:43 PM, Mittal, Anuj wrote: >>> On Tue, 2020-02-18 at 18:39 -0800, Khem Raj wrote: >>>> On Tue, Feb 18, 2020 at 6:37 PM Anuj Mittal < >>>> anuj.mittal at intel.com> >>>> wrote: >>>>> Use the correct variable so options actually get used and use >>>>> the >>>>> correct qt option name to prevent errors. >>>>> >>>>> Signed-off-by: Anuj Mittal >>>>> --- >>>>> .../gstreamer/gstreamer1.0-plugins- >>>>> good_1.16.1.bb | 4 >>>>> ++-- >>>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- >>>>> plugins-good_1.16.1.bb b/meta/recipes- >>>>> multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb >>>>> index a6eb9986dd..07a0bf5085 100644 >>>>> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- >>>>> good_1.16.1.bb >>>>> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- >>>>> good_1.16.1.bb >>>>> @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = >>>>> "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" >>>>> # This is better done in a separate qt5 layer (which then >>>>> should >>>>> add a "qt5" packageconfig >>>>> # in a gstreamer1.0-plugins-good bbappend). >>>>> >>>>> -EXTRA_OECONF += " \ >>>>> +EXTRA_OEMESON += " \ >>>>> -Daalib=disabled \ >>>>> -Ddirectsound=disabled \ >>>>> -Ddv=disabled \ >>>>> @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ >>>>> -Doss4=disabled \ >>>>> -Dosxaudio=disabled \ >>>>> -Dosxvideo=disabled \ >>>>> - -Dqt=disabled \ >>>>> + -Dqt5=disabled \ >>>> this perhaps should be a packageconfig so people using meta-qt5 >>>> can >>>> enable it >>> Yes probably but in a separate change I think. This just ensures >>> that >>> the right options are used and nothing else is changed. >> >> perhaps no, since it will regress meta-qt5 which already does >> something >> like this >> >> https://github.com/meta-qt5/meta-qt5/blob/master/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%25.bbappend >> >> >> this being wrong in OE-core was ok for meta-qt5. > > Okay, should that PACKAGECONFIG be added here? I don't use or test qt > so can't test the change. thats fine, add it as a PACKAGECONFIG as done in bbappend and then we can eventually stop defining it from meta-qt5 > > Thanks, > > Anuj > From de.huo at windriver.com Wed Feb 19 03:56:19 2020 From: de.huo at windriver.com (dhuo) Date: Wed, 19 Feb 2020 11:56:19 +0800 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: <41e8a2902bc8594a17f0afa1744f04a6facd5316.camel@intel.com> References: <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> <444185BB2F013F4E92378F99BCF8A58BC9AF9CBD@ALA-MBD.corp.ad.wrs.com> <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> <9b99752af2094590137fdaacf6668f170b34158c.camel@linuxfoundation.org> <41e8a2902bc8594a17f0afa1744f04a6facd5316.camel@intel.com> Message-ID: <31dfaafd-6dee-4e60-b372-7cb59cfb7cd4@windriver.com> Hi Anuj, Do you think there is irrelevant changes to the CVE in https://github.com/bminor/bash/commit/ 951bdaad7a18cc0dc1036bba86b18b90874d39ff or in this pach? Could you please specify what's the irrelevant part? I ask this because we also use this patch in our product. Thanks in advance. ? 2020/2/18 23:43, Mittal, Anuj ??: > On Tue, 2020-02-18 at 15:35 +0000, Richard Purdie wrote: >> On Tue, 2020-02-18 at 10:28 -0500, Chet Ramey wrote: >>> On 2/17/20 9:46 PM, Huo, De wrote: >>>> I applied the patch to fix CVE defect CVE-2019-18276. >>> That's not exactly an answer to the question of who produced the >>> patch. >>> If that patch is the one causing failures when it's applied, >>> doesn't it >>> make sense to go back to the person who produced it and ask them to >>> update it if necessary? >> Its likely a general CVE patch where both configure and configure.ac >> are patched. For OE, we can drop the configure part since we >> reautoconf >> the code. Its therefore the OE port of the patch which is likely at >> fault. >> >> Someone just needs to remove that section of the patch. > There are other issues with this patch which should also be fixed I > think. It has been marked as a Backport while it is not one. The patch > includes changes that are irrelevant to the CVE. And, it should have > gone to master first. > > Thanks, > > Anuj From de.huo at windriver.com Wed Feb 19 04:01:38 2020 From: de.huo at windriver.com (dhuo) Date: Wed, 19 Feb 2020 12:01:38 +0800 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> References: <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> <444185BB2F013F4E92378F99BCF8A58BC9AF9CBD@ALA-MBD.corp.ad.wrs.com> <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> Message-ID: <3a9468a2-ab8b-fbb0-50ad-37d3eb6f6e28@windriver.com> Hi All, Do you know how to reproduce this isse on my side? Since we also provide this patch in our current WRLinux product. Thanks in advance. ? 2020/2/18 23:28, Chet Ramey ??: > On 2/17/20 9:46 PM, Huo, De wrote: >> I applied the patch to fix CVE defect CVE-2019-18276. > That's not exactly an answer to the question of who produced the patch. > If that patch is the one causing failures when it's applied, doesn't it > make sense to go back to the person who produced it and ask them to > update it if necessary? > From alex.kanavin at gmail.com Wed Feb 19 09:45:35 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 10:45:35 +0100 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Tue, 18 Feb 2020 at 02:56, Khem Raj wrote: > > but I'll get to it, or you are welcome to try and report. >> Mips can be either fixed like suggested, or be a specific exception. >> >> For the rest of the targets, I see that you have extended the fbdev >> fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone >> is using them to run weston (not to mention how painfully slow that would >> be), and so it would just be wasteful to test or fix them. >> > > We should be only applying tested part debugging these breakages is very > hard so when we know it will break we should be careful as with this patch > I have tested these things now: 1. Switching mips from cirrus to std vga works fine, as long as xorg.conf is also deleted (it's written specifically for cirrus and isn't working or needed with std vga). Both weston and sato boot and look right. I'll send a patch for it. 2. Switching weston to kms backend degrades performance to unusable level, as neither kvm nor virtio/virgl are available for non-x86 qemu, and kms backend is using software renderer in mesa. So fbdev is the only realistic option there. But for x86 qemu kms is still viable. I'm not sure how to best configure it though. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From wallinux at gmail.com Wed Feb 19 10:06:12 2020 From: wallinux at gmail.com (Anders Wallin) Date: Wed, 19 Feb 2020 11:06:12 +0100 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: References: <20200218132054.20341-1-wallinux@gmail.com> Message-ID: Hi Alex, I think it's better to use babeltrace2 since it's a new version of babeltrace. The dist packages uses babeltrace2 and the main application/program is called babeltrace2. Jonatan; Do you have any comment on the naming? Regards Anders Wallin On Tue, Feb 18, 2020 at 2:56 PM Alexander Kanavin wrote: > Thanks. May I request that this recipe is named babletrace, while > babeltrace 1.x recipe is at the same time renamed to babeltrace1? I'd like > to avoid adding version numbers to the 'latest' version. Lttng should at > the same time be adjusted to use babeltrace1, as advised by upstream. > > Alex > > On Tue, 18 Feb 2020 at 14:21, Anders Wallin wrote: > >> Babeltrace 1 vs. Babeltrace 2 >> >> The Babeltrace project exists since 2010. In 2020, Babeltrace 2 was >> released. >> Babeltrace 2 is a complete rewrite of the library, Python bindings, and >> CLI. It >> is plugin based and offers much more features and potential than >> Babeltrace 1. >> >> Because Babeltrace 2 is still a young released project, some >> distributions still >> provide packages for the Babeltrace 1 project. Both projects can coexist >> on the >> same system as there are no common installed files. >> >> Signed-off-by: Anders Wallin >> --- >> .../recipes-kernel/lttng/babeltrace2_2.0.1.bb | 26 +++++++++++++++++++ >> 1 file changed, 26 insertions(+) >> create mode 100644 meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb >> >> diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb >> b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb >> new file mode 100644 >> index 0000000000..d49a96faff >> --- /dev/null >> +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb >> @@ -0,0 +1,26 @@ >> +SUMMARY = "Babeltrace2 - Trace Format Babel Tower" >> +DESCRIPTION = "Babeltrace provides trace read and write libraries in >> host side, as well as a trace converter, which used to convert LTTng 2.0 >> traces into human-readable log." >> +HOMEPAGE = "http://babeltrace.org/" >> +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" >> +LICENSE = "MIT & GPLv2 & LGPLv2.1 & BSD-2-Clause" >> +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" >> + >> +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" >> + >> +SRC_URI = "git:// >> git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0" >> +SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" >> +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" >> + >> +S = "${WORKDIR}/git" >> + >> +inherit autotools pkgconfig >> + >> +EXTRA_OECONF = "--disable-debug-info" >> + >> +PACKAGECONFIG ??= "manpages" >> +PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native >> xmlto-native" >> + >> +FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" >> +FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" >> + >> +ASNEEDED = "" >> -- >> 2.25.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From jupiter.hce at gmail.com Wed Feb 19 10:12:08 2020 From: jupiter.hce at gmail.com (JH) Date: Wed, 19 Feb 2020 21:12:08 +1100 Subject: [OE-core] oe-core recipe for defining directories in / Message-ID: Hi, Which recipe defines all directories in "/"? I need to make a bbapand to add directories to /. Thank you. Kind regards, - jh From quentin.schulz at streamunlimited.com Wed Feb 19 10:29:08 2020 From: quentin.schulz at streamunlimited.com (Quentin Schulz) Date: Wed, 19 Feb 2020 11:29:08 +0100 Subject: [OE-core] oe-core recipe for defining directories in / In-Reply-To: References: Message-ID: <20200219102908.cpe7lxm3v64ff2hf@qschulz> Hi JH, On Wed, Feb 19, 2020 at 09:12:08PM +1100, JH wrote: > Hi, > > Which recipe defines all directories in "/"? I need to make a bbapand > to add directories to /. > None. Or all of them, depends on how one sees it. You just create a directory in do_install of a recipe. You then make sure this directory is part of a package by checking it's in one of the recipe's generated packages's FILES_. Quentin From jupiter.hce at gmail.com Wed Feb 19 10:36:50 2020 From: jupiter.hce at gmail.com (JH) Date: Wed, 19 Feb 2020 21:36:50 +1100 Subject: [OE-core] Zeus failed DHCP Message-ID: Hi, My build connman on Thud works on WiFi, but Zeus does not work, the connman could not get WiFi DHCP response, it puts a local IP address 169.254.24.188 to my WiFi interface. Has anyone found that the problem in Zeus or it just me may be miss some packages or configuration? What are packages could cause DHCP not working? Here is Thud working log: # systemctl status connman -l ??? connman.service - Connection service Loaded: loaded (8;;file://solar/lib/systemd/system/connman.service/lib/systemd/system/connman.service8;;; enabl) Active: active (running) since Thu 2020-02-13 03:18:51 UTC; 6 days ago Main PID: 131 (connmand) CGroup: /system.slice/connman.service ??????131 /usr/sbin/connmand -n Feb 18 22:37:16 solar connmand[131]: rp_filter set to 2 (loose mode routing), old value was 1 Feb 18 22:37:16 solar connmand[131]: mlan0 {add} address 192.168.0.100/24 label mlan0 family 2 Feb 18 22:37:16 solar connmand[131]: mlan0 {add} route 192.168.0.0 gw 0.0.0.0 scope 253 Feb 18 22:37:16 solar connmand[131]: mlan0 {add} route 192.168.0.1 gw 0.0.0.0 scope 253 Feb 18 22:37:16 solar connmand[131]: mlan0 {add} route 212.227.81.55 gw 192.168.0.1 scope 0 Feb 18 22:37:17 solar connmand[131]: mlan0 {del} route 212.227.81.55 gw 192.168.0.1 scope 0 Feb 18 22:37:17 solar connmand[131]: wwan0 {del} route 0.0.0.0 gw 10.114.57.126 scope 0 Feb 18 22:37:17 solar connmand[131]: mlan0 {add} route 0.0.0.0 gw 192.168.0.1 scope 0 Feb 18 22:37:17 solar connmand[131]: mlan0 {add} route 212.227.81.55 gw 192.168.0.1 scope 0 Feb 18 22:37:17 solar connmand[131]: mlan0 {del} route 212.227.81.55 gw 192.168.0.1 scope 0 # systemctl status wpa_supplicant -l ??? wpa_supplicant.service - WPA supplicant Loaded: loaded (8;;file://solar/lib/systemd/system/wpa_supplicant.service/lib/systemd/system/wpa_supplicant.service8;;; disabled; vendor preset: enabled) Active: active (running) since Thu 2020-02-13 03:18:53 UTC; 6 days ago Main PID: 503 (wpa_supplicant) CGroup: /system.slice/wpa_supplicant.service ??????503 /usr/sbin/wpa_supplicant -u Feb 19 07:37:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Feb 19 07:47:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Feb 19 07:57:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Feb 19 08:07:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Feb 19 08:17:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Feb 19 08:19:01 solar wpa_supplicant[503]: mlan0: CTRL-EVENT-SIGNAL-CHANGE above=0 signal=-85 noise=-97 txrate=1000 Feb 19 08:27:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Feb 19 08:37:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Feb 19 08:47:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Feb 19 08:57:29 solar wpa_supplicant[503]: mlan0: WPA: Group rekeying completed with 34:08:04:12:b1:a2 [GTK=TKIP] Here is Zenu build did not work: # systemctl status connman -l * connman.service - Connection service Loaded: loaded (8;;file://solar/lib/systemd/system/connman.service/lib/systemd/system/connman.service8;;; enabled; vendor preset: enabled) Active: active (running) since Tue 2020-02-18 00:47:43 UTC; 1 day 9h ago Main PID: 184 (connmand) CGroup: /system.slice/connman.service `-184 /usr/sbin/connmand -n Feb 19 10:27:33 solar connmand[184]: mlan0 {newlink} index 3 operstate 5 Feb 19 10:27:33 solar connmand[184]: mlan0 {add} route ff00:: gw :: scope 0 Feb 19 10:27:33 solar connmand[184]: mlan0 {add} route fe80:: gw :: scope 0 Feb 19 10:27:33 solar connmand[184]: mlan0 {RX} 10 packets 1650 bytes Feb 19 10:27:33 solar connmand[184]: mlan0 {TX} 256 packets 96668 bytes Feb 19 10:27:33 solar connmand[184]: mlan0 {update} flags 102467 Feb 19 10:27:33 solar connmand[184]: mlan0 {newlink} index 3 address D4:CA:6E:9A:7E:29 mtu 1500 Feb 19 10:27:33 solar connmand[184]: mlan0 {newlink} index 3 operstate 6 Feb 19 10:28:13 solar connmand[184]: mlan0 {add} address 169.254.241.106/16 label mlan0 family 2 Feb 19 10:28:14 solar connmand[184]: mlan0 {add} route 169.254.0.0 gw 0.0.0.0 scope 253 # systemctl status wpa_supplicant -l * wpa_supplicant.service - WPA supplicant Loaded: loaded (8;;file://solar/lib/systemd/system/wpa_supplicant.service/lib/systemd/system/wpa_supplicant.service8;;; disabled; vendor preset: disabled) Active: active (running) since Tue 2020-02-18 00:47:48 UTC; 1 day 9h ago Main PID: 263 (wpa_supplicant) CGroup: /system.slice/wpa_supplicant.service `-263 /usr/sbin/wpa_supplicant -u Feb 19 09:57:33 solar wpa_supplicant[263]: mlan0: CTRL-EVENT-SIGNAL-CHANGE above=0 signal=-47 noise=-92 txrate=65000 Feb 19 10:05:36 solar wpa_supplicant[263]: mlan0: CTRL-EVENT-SIGNAL-CHANGE above=0 signal=-52 noise=-92 txrate=72200 Feb 19 10:07:32 solar wpa_supplicant[263]: mlan0: CTRL-EVENT-DISCONNECTED bssid=34:08:04:12:b1:a2 reason=2 Feb 19 10:07:32 solar wpa_supplicant[263]: dbus: wpa_dbus_property_changed: no property SessionLength in object /fi/w1/wpa_supplicant1/Interfaces/0 Feb 19 10:07:33 solar wpa_supplicant[263]: mlan0: Trying to associate with 34:08:04:12:b1:a2 (SSID='Jupiter' freq=2437 MHz) Feb 19 10:07:33 solar wpa_supplicant[263]: mlan0: Associated with 34:08:04:12:b1:a2 Feb 19 10:07:33 solar wpa_supplicant[263]: mlan0: CTRL-EVENT-SUBNET-STATUS-UPDATE status=0 Feb 19 10:07:33 solar wpa_supplicant[263]: mlan0: WPA: Key negotiation completed with 34:08:04:12:b1:a2 [PTK=CCMP GTK=TKIP] Feb 19 10:07:33 solar wpa_supplicant[263]: mlan0: CTRL-EVENT-CONNECTED - Connection to 34:08:04:12:b1:a2 completed [id=0 id_str=] Feb 19 10:07:33 solar wpa_supplicant[263]: mlan0: CTRL-EVENT-SIGNAL-CHANGE above=0 signal=-51 noise=-92 txrate=65000 Thank From alex.kanavin at gmail.com Wed Feb 19 10:50:26 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 11:50:26 +0100 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: References: <20200218132054.20341-1-wallinux@gmail.com> Message-ID: Basically I would like to maintain the principle that a recipe without a version number is the 'latest' version, and staying on an older version has to be an opt-in decision. There are already things like python3 and gstreamer10 in core, and I would want to have less of that. Alex On Wed, 19 Feb 2020 at 11:06, Anders Wallin wrote: > Hi Alex, > > I think it's better to use babeltrace2 since it's a new version of > babeltrace. > The dist packages uses babeltrace2 and the main application/program is > called babeltrace2. > > Jonatan; Do you have any comment on the naming? > > Regards > Anders Wallin > > > On Tue, Feb 18, 2020 at 2:56 PM Alexander Kanavin > wrote: > >> Thanks. May I request that this recipe is named babletrace, while >> babeltrace 1.x recipe is at the same time renamed to babeltrace1? I'd like >> to avoid adding version numbers to the 'latest' version. Lttng should at >> the same time be adjusted to use babeltrace1, as advised by upstream. >> >> Alex >> >> On Tue, 18 Feb 2020 at 14:21, Anders Wallin wrote: >> >>> Babeltrace 1 vs. Babeltrace 2 >>> >>> The Babeltrace project exists since 2010. In 2020, Babeltrace 2 was >>> released. >>> Babeltrace 2 is a complete rewrite of the library, Python bindings, and >>> CLI. It >>> is plugin based and offers much more features and potential than >>> Babeltrace 1. >>> >>> Because Babeltrace 2 is still a young released project, some >>> distributions still >>> provide packages for the Babeltrace 1 project. Both projects can coexist >>> on the >>> same system as there are no common installed files. >>> >>> Signed-off-by: Anders Wallin >>> --- >>> .../recipes-kernel/lttng/babeltrace2_2.0.1.bb | 26 +++++++++++++++++++ >>> 1 file changed, 26 insertions(+) >>> create mode 100644 meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb >>> >>> diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb >>> b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb >>> new file mode 100644 >>> index 0000000000..d49a96faff >>> --- /dev/null >>> +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb >>> @@ -0,0 +1,26 @@ >>> +SUMMARY = "Babeltrace2 - Trace Format Babel Tower" >>> +DESCRIPTION = "Babeltrace provides trace read and write libraries in >>> host side, as well as a trace converter, which used to convert LTTng 2.0 >>> traces into human-readable log." >>> +HOMEPAGE = "http://babeltrace.org/" >>> +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" >>> +LICENSE = "MIT & GPLv2 & LGPLv2.1 & BSD-2-Clause" >>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" >>> + >>> +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" >>> + >>> +SRC_URI = "git:// >>> git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0" >>> +SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" >>> +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" >>> + >>> +S = "${WORKDIR}/git" >>> + >>> +inherit autotools pkgconfig >>> + >>> +EXTRA_OECONF = "--disable-debug-info" >>> + >>> +PACKAGECONFIG ??= "manpages" >>> +PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native >>> xmlto-native" >>> + >>> +FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" >>> +FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" >>> + >>> +ASNEEDED = "" >>> -- >>> 2.25.0 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Wed Feb 19 14:41:44 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 14:41:44 +0000 Subject: [OE-core] [PATCH] perl: Fix makefile race causing configuration differences Message-ID: <20200219144144.121102-1-richard.purdie@linuxfoundation.org> Add a missing makefile dependency which can cause differences in configuration (submitted upstream). Signed-off-by: Richard Purdie --- .../recipes-devtools/perl/files/racefix.patch | 24 +++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/racefix.patch diff --git a/meta/recipes-devtools/perl/files/racefix.patch b/meta/recipes-devtools/perl/files/racefix.patch new file mode 100644 index 00000000000..bac42d26ae0 --- /dev/null +++ b/meta/recipes-devtools/perl/files/racefix.patch @@ -0,0 +1,24 @@ +In our builds Config_heavy.pl sometimes has lines: +cwarnflags=XXX +ccstdflags=XXX +and sometimes does not. +The reason is that this information is pulled from cflags by configpm and yet +there is no dependency in the Makefile. Add one to fix this. + +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89] +RP 2020/2/19 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/Makefile +=================================================================== +--- perl-5.30.1.orig/Makefile ++++ perl-5.30.1/Makefile +@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD) + git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X + ./miniperl_top make_patchnum.pl + +-lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \ ++lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \ + lib/Config_git.pl Porting/Glossary | miniperl$X + ./miniperl_top configpm + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index b37f175f973..4869012b1a2 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -22,6 +22,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://determinism.patch \ + file://racefix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- 2.25.0 From auh at auh.yoctoproject.org Wed Feb 19 14:45:36 2020 From: auh at auh.yoctoproject.org (auh at auh.yoctoproject.org) Date: Wed, 19 Feb 2020 06:45:36 -0800 (PST) Subject: [OE-core] [AUH] Upgrade status: 2020-02-19 Message-ID: <20200219144536.0F739440003@auh.yoctoproject.org> Recipe upgrade statistics: * Succeeded: 50 gstreamer1.0-plugins-good, 1.16.2, Anuj Mittal libsolv, 0.7.11, Anuj Mittal libcap, 2.32, Yi Zhao bison, 3.5.2, Chen Qi nss, 3.50, Armin Kuster meson, 0.53.1, Alexander Kanavin screen, 4.8.0, Anuj Mittal libmodule-build-perl, 0.4231, Tim Orling gstreamer1.0-plugins-base, 1.16.2, Anuj Mittal libarchive, 3.4.2, Otavio Salvador vala, 0.46.6, Alexander Kanavin python3-git, 3.0.7, Oleksandr Kravchuk libpcre, 8.44, Yi Zhao p11-kit, 0.23.20, Alexander Kanavin stress-ng, 0.11.00, Anuj Mittal util-linux, 2.35.1, Chen Qi bluez5, 5.53, Anuj Mittal liberror-perl, 0.17029, Tim Orling epiphany, 3.34.4, Alexander Kanavin gstreamer1.0-omx, 1.16.2, Anuj Mittal gstreamer1.0-rtsp-server, 1.16.2, Anuj Mittal lttng-tools, 2.11.2, Richard Purdie ncurses, 6.2, Hongxu Jia python3-docutils, 0.16, Oleksandr Kravchuk gstreamer1.0-libav, 1.16.2, Anuj Mittal gstreamer1.0-plugins-ugly, 1.16.2, Anuj Mittal bind, 9.11.15, Armin Kuster piglit, 1.0-new-commits-available, Ross Burton gstreamer1.0-python, 1.16.2, Anuj Mittal virglrenderer, 0.8.2, Alexander Kanavin dnf, 4.2.18, Alexander Kanavin vulkan-headers, 1.2.131.1, Anuj Mittal python3-gitdb, 3.0.0, Oleksandr Kravchuk gstreamer1.0-plugins-bad, 1.16.2, Anuj Mittal libxkbcommon, 0.10.0, Armin Kuster linux-firmware, 20200117-new-commits-available, Otavio Salvador python3-mako, 1.1.1, Oleksandr Kravchuk gnutls, 3.6.12, Armin Kuster unifdef, 2.12, Ross Burton libsecret, 0.20.1, Alexander Kanavin at-spi2-core, 2.34.0, Anuj Mittal python3-setuptools, 45.2.0, Oleksandr Kravchuk asciidoc, 8.6.10, Yi Zhao libgpg-error, 1.37, Hongxu Jia libxcrypt-compat, 4.4.13, Khem Raj createrepo-c, 0.15.7, Alexander Kanavin ninja, 1.10.0, Khem Raj gstreamer1.0, 1.16.2, Anuj Mittal man-pages, 5.05, Hongxu Jia gstreamer1.0-vaapi, 1.16.2, Anuj Mittal * Failed (devtool error): 16 binutils, 2.34, Khem Raj rpm, 4.15.1, Mark Hatle nfs-utils, 2.4.3, Robert Yang apt, 1.9.9, An?bal Lim?n make, 4.3, Robert Yang mc, 4.8.24, Ross Burton sysklogd, 2.1.1, Chen Qi atk, 2.34.1, Anuj Mittal build-compare, 2019.08.14-new-commits-available, Paul Eggleton systemd-boot, 244.3, Chen Qi babeltrace, 2.0.1, Alexander Kanavin e2fsprogs, 1.45.5, Robert Yang ltp, 20200120, Yi Zhao libinput, 1.15.1, Ross Burton gmp, 6.2.0, Khem Raj nspr, 4.25, Armin Kuster * Failed(do_compile): 20 acpica, 20200214, Ross Burton cmake, 3.16.4, Pascal Bach python3-numpy, 1.18.1, Oleksandr Kravchuk mesa, 19.3.4, Otavio Salvador vulkan-demos, git-new-commits-available, Ross Burton xkeyboard-config, 2.29, Armin Kuster vulkan-tools, 1.2.131.1, Anuj Mittal pulseaudio, 13.99.1, Tanu Kaskinen psplash, 0.1-new-commits-available, Yi Zhao vulkan-loader, 1.2.131.2, Anuj Mittal connman, 1.38, Changhyeok Bae git, 2.25.0, Robert Yang gst-validate, 1.16.2, Anuj Mittal libxcrypt, 4.4.13, Khem Raj shadow, 4.8.1, Chen Qi at-spi2-atk, 2.34.1, Anuj Mittal go, 1.13.8, Khem Raj python3-scons, 3.1.2, Tim Orling libdnf, 0.43.1, Alexander Kanavin go-runtime, 1.13.8, Khem Raj TOTAL: attempted=86 succeeded=50(58.14%) failed=36(41.86%) Recipe upgrade statistics per Maintainer: Chen Qi Add an option to avoid builds depending on the presence of setcap from the host system. Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0/capfix.patch | 37 +++++++++++++++++++ .../gstreamer/gstreamer1.0_1.16.1.bb | 2 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch new file mode 100644 index 00000000000..7ca3d5ad4a6 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch @@ -0,0 +1,37 @@ +Currently gstreamer configuration depends on whether setcap is found on the host +system. Turn this into a configure option to make builds deterinistic. + +RP 2020/2/19 +Signed-off-by: Richard Purdie +Upstream-Status: Pending + +Index: gstreamer-1.16.1/libs/gst/helpers/meson.build +=================================================================== +--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build ++++ gstreamer-1.16.1/libs/gst/helpers/meson.build +@@ -73,7 +73,12 @@ if have_ptp + endif + endif + +- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ setcap_feature = get_option('setcap') ++ if setcap_feature.disabled() ++ setcap = find_program('dontexist', required : false) ++ else ++ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) ++ endif + + # user/group to change to in gst-ptp-helper + ptp_helper_setuid_user = get_option('ptp-helper-setuid-user') +Index: gstreamer-1.16.1/meson_options.txt +=================================================================== +--- gstreamer-1.16.1.orig/meson_options.txt ++++ gstreamer-1.16.1/meson_options.txt +@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va + option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') + option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') + option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') ++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap') + + # Common feature options + option('examples', type : 'feature', value : 'auto', yield : true) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb index 6b8a5a0eb01..68f5ca649fe 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb @@ -21,6 +21,7 @@ SRC_URI = " \ file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0003-meson-Add-valgrind-feature.patch \ file://0004-meson-Add-option-for-installed-tests.patch \ + file://capfix.patch \ " SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" @@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion" PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled" +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap" # TODO: put this in a gettext.bbclass patch def gettext_oemeson(d): -- 2.25.0 From jonathan.rajotte-julien at efficios.com Wed Feb 19 15:27:20 2020 From: jonathan.rajotte-julien at efficios.com (Jonathan Rajotte-Julien) Date: Wed, 19 Feb 2020 10:27:20 -0500 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: References: <20200218132054.20341-1-wallinux@gmail.com> Message-ID: <20200219152720.GM17818@joraj-alpa> On Wed, Feb 19, 2020 at 11:06:12AM +0100, Anders Wallin wrote: > Hi Alex, > > I think it's better to use babeltrace2 since it's a new version of > babeltrace. > The dist packages uses babeltrace2 and the main application/program is > called babeltrace2. > > Jonatan; Do you have any comment on the naming? Me? Don't care much about the naming. The major issue here is the dependency for ptest of lttng-tools that depends on a "babeltrace" executable and not on the "babeltrace2" executable. Currently on our CI we create a symlink from "babeltrace2" to "babeltrace". This is something we plan on addressing shortly. Cheers From richard.purdie at linuxfoundation.org Wed Feb 19 15:38:08 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 15:38:08 +0000 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: <20200219152720.GM17818@joraj-alpa> References: <20200218132054.20341-1-wallinux@gmail.com> <20200219152720.GM17818@joraj-alpa> Message-ID: <143f590b688ed8166a702873275c16f3c7217d52.camel@linuxfoundation.org> On Wed, 2020-02-19 at 10:27 -0500, Jonathan Rajotte-Julien wrote: > On Wed, Feb 19, 2020 at 11:06:12AM +0100, Anders Wallin wrote: > > Hi Alex, > > > > I think it's better to use babeltrace2 since it's a new version of > > babeltrace. > > The dist packages uses babeltrace2 and the main application/program > > is > > called babeltrace2. > > > > Jonatan; Do you have any comment on the naming? > > Me? > > Don't care much about the naming. The major issue here is the > dependency for > ptest of lttng-tools that depends on a "babeltrace" executable and > not on the > "babeltrace2" executable. Currently on our CI we create a symlink > from > "babeltrace2" to "babeltrace". This is something we plan on > addressing shortly. Let me try a different question. What is the ultimate intent here? Will babeltrace and babeltrace2 coexist in the future or do you plan to rename babeltrace2 -> babeltrace at some point? There are some things where the namespaces are quite specific (python vs python3, gtk(+) 2/3/4, qt) but they're fairly few and far between. If babeltrace2 will replace babeltrace and become babeltrace, we probably want to keep PN as babeltrace. If it will be known as babeltrace2 always, we probably change PN. Cheers, Richard From alex.kanavin at gmail.com Wed Feb 19 15:41:32 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 16:41:32 +0100 Subject: [OE-core] [PATCH] gstreamer: Fix reproducibility issue around libcap In-Reply-To: <20200219152355.123718-1-richard.purdie@linuxfoundation.org> References: <20200219152355.123718-1-richard.purdie@linuxfoundation.org> Message-ID: On Wed, 19 Feb 2020 at 16:24, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap" > I think this should also depend on whatever native recipe provides the setcap binary, so we don't depend on host setcap at all? Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Wed Feb 19 15:45:10 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 15:45:10 +0000 Subject: [OE-core] [PATCH] gstreamer: Fix reproducibility issue around libcap In-Reply-To: References: <20200219152355.123718-1-richard.purdie@linuxfoundation.org> Message-ID: <466b4fa9156bab24bdd059f09f5006a7ab40c372.camel@linuxfoundation.org> On Wed, 2020-02-19 at 16:41 +0100, Alexander Kanavin wrote: > On Wed, 19 Feb 2020 at 16:24, Richard Purdie < > richard.purdie at linuxfoundation.org> wrote: > > +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,- > > Dsetcap=disabled,libcap" > > I think this should also depend on whatever native recipe provides > the setcap binary, so we don't depend on host setcap at all? Right, it needs libcap-native too, good point. I'll tweak. Cheers, Richard From akuster808 at gmail.com Wed Feb 19 15:46:08 2020 From: akuster808 at gmail.com (akuster808) Date: Wed, 19 Feb 2020 07:46:08 -0800 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: References: <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> <444185BB2F013F4E92378F99BCF8A58BC9AF9CBD@ALA-MBD.corp.ad.wrs.com> <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> <9b99752af2094590137fdaacf6668f170b34158c.camel@linuxfoundation.org> <41e8a2902bc8594a17f0afa1744f04a6facd5316.camel@intel.com> Message-ID: On 2/18/20 7:49 AM, Richard Purdie wrote: > On Tue, 2020-02-18 at 15:43 +0000, Mittal, Anuj wrote: >> On Tue, 2020-02-18 at 15:35 +0000, Richard Purdie wrote: >>> On Tue, 2020-02-18 at 10:28 -0500, Chet Ramey wrote: >>>> On 2/17/20 9:46 PM, Huo, De wrote: >>>>> I applied the patch to fix CVE defect CVE-2019-18276. >>>> That's not exactly an answer to the question of who produced the >>>> patch. >>>> If that patch is the one causing failures when it's applied, >>>> doesn't it >>>> make sense to go back to the person who produced it and ask them >>>> to >>>> update it if necessary? >>> Its likely a general CVE patch where both configure and >>> configure.ac >>> are patched. For OE, we can drop the configure part since we >>> reautoconf >>> the code. Its therefore the OE port of the patch which is likely at >>> fault. >>> >>> Someone just needs to remove that section of the patch. >> There are other issues with this patch which should also be fixed I >> think. It has been marked as a Backport while it is not one. The >> patch >> includes changes that are irrelevant to the CVE. And, it should have >> gone to master first. > I shall await guidance from you/Armin then. We should revert the commit. Ill send a patch. - Armin > > Cheers, > > Richard > From mark.hatle at kernel.crashing.org Wed Feb 19 15:46:30 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Wed, 19 Feb 2020 09:46:30 -0600 Subject: [OE-core] oe-core recipe for defining directories in / In-Reply-To: <20200219102908.cpe7lxm3v64ff2hf@qschulz> References: <20200219102908.cpe7lxm3v64ff2hf@qschulz> Message-ID: On 2/19/20 4:29 AM, Quentin Schulz wrote: > Hi JH, > > On Wed, Feb 19, 2020 at 09:12:08PM +1100, JH wrote: >> Hi, >> >> Which recipe defines all directories in "/"? I need to make a bbapand >> to add directories to /. >> > > None. Or all of them, depends on how one sees it. He is correct, this is shared between all package users. But with that said, there is a base filesystem package and an associated 'syncing' file for all other users. The is a recipe called 'base-files', it builds up the core filesystem infrastructure, as well as puts down a few basic files that all filesystems need. The 'syncing' file is a corresponding file to used to coordinate permissions between all recipes: meta/files/fs-perms.txt. fs-perms.txt is always consulted when building any recipe to ensure that all common directory, permissions, owners and groups get a common configuration. If you are going to bbappend to base-files then you should also to add to fs-perms.txt (you can do this, like a bbappend, by adding your own file to your own layer and updating the variable 'FILESYSTEM_PERMS_TABLES' in one of your global configuration files (usually your distro configuration file.) but, this isn't the recommended way... If the directories you are adding are custom to your product, I would recommend creating a new package to manage this, as well as a custom fs-perms.txt/FILESYSTEM_PERMS_TABLE entry to coordinate it between recipes that use this new custom directory structure. (If only one recipe uses that directory, then all of the overhead is simply not needed! You only need this if multiple recipes are sharing a common directory structure.) --Mark > You just create a directory in do_install of a recipe. > > You then make sure this directory is part of a package by checking it's > in one of the recipe's generated packages's FILES_. > > Quentin > From jonathan.rajotte-julien at efficios.com Wed Feb 19 15:56:26 2020 From: jonathan.rajotte-julien at efficios.com (Jonathan Rajotte-Julien) Date: Wed, 19 Feb 2020 10:56:26 -0500 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: <143f590b688ed8166a702873275c16f3c7217d52.camel@linuxfoundation.org> References: <20200218132054.20341-1-wallinux@gmail.com> <20200219152720.GM17818@joraj-alpa> <143f590b688ed8166a702873275c16f3c7217d52.camel@linuxfoundation.org> Message-ID: <20200219155626.GN17818@joraj-alpa> > Let me try a different question. What is the ultimate intent here? > > Will babeltrace and babeltrace2 coexist in the future or do you plan to > rename babeltrace2 -> babeltrace at some point? We plan on deprecating Babeltrace 1.X in the long term but Babeltrace 2 and Babeltrace 1 will always co-exist. > > There are some things where the namespaces are quite specific (python > vs python3, gtk(+) 2/3/4, qt) but they're fairly few and far between. > > If babeltrace2 will replace babeltrace and become babeltrace, we > probably want to keep PN as babeltrace. If it will be known as > babeltrace2 always, we probably change PN. Babeltrace 2 executable will be forever named babeltrace2. Hope this clear up this part a bit. -- Jonathan Rajotte-Julien EfficiOS From alex.kanavin at gmail.com Wed Feb 19 16:02:37 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 17:02:37 +0100 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: <20200219155626.GN17818@joraj-alpa> References: <20200218132054.20341-1-wallinux@gmail.com> <20200219152720.GM17818@joraj-alpa> <143f590b688ed8166a702873275c16f3c7217d52.camel@linuxfoundation.org> <20200219155626.GN17818@joraj-alpa> Message-ID: On Wed, 19 Feb 2020 at 16:56, Jonathan Rajotte-Julien < jonathan.rajotte-julien at efficios.com> wrote: > > There are some things where the namespaces are quite specific (python > > vs python3, gtk(+) 2/3/4, qt) but they're fairly few and far between. > > > > If babeltrace2 will replace babeltrace and become babeltrace, we > > probably want to keep PN as babeltrace. If it will be known as > > babeltrace2 always, we probably change PN. > > Babeltrace 2 executable will be forever named babeltrace2. > > Hope this clear up this part a bit. > Right, then I'm fine with naming the recipe babeltrace2. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Wed Feb 19 16:30:41 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 16:30:41 +0000 Subject: [OE-core] [meta-oe][PATCH v3] iproute2: add devlink support to iproute2 In-Reply-To: <20200219003801.15549-1-scott.branden@broadcom.com> References: <20200219003801.15549-1-scott.branden@broadcom.com> Message-ID: On Tue, 2020-02-18 at 16:38 -0800, Scott Branden via Openembedded-core wrote: > Add devlink support to iproute2 recipe. > > Signed-off-by: Scott Branden > --- > .../iproute2/iproute2.inc | 34 +++++++++++++------ > 1 file changed, 23 insertions(+), 11 deletions(-) > Doesn't build: https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/1822 (and a ton more) Cheers, Richard From raj.khem at gmail.com Wed Feb 19 17:20:42 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 19 Feb 2020 09:20:42 -0800 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: On Wed, Feb 19, 2020 at 1:45 AM Alexander Kanavin wrote: > > On Tue, 18 Feb 2020 at 02:56, Khem Raj wrote: >> >> >>> but I'll get to it, or you are welcome to try and report. >>> Mips can be either fixed like suggested, or be a specific exception. >>> >>> For the rest of the targets, I see that you have extended the fbdev fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone is using them to run weston (not to mention how painfully slow that would be), and so it would just be wasteful to test or fix them. >> >> >> We should be only applying tested part debugging these breakages is very hard so when we know it will break we should be careful as with this patch > > > I have tested these things now: > > 1. Switching mips from cirrus to std vga works fine, as long as xorg.conf is also deleted (it's written specifically for cirrus and isn't working or needed with std vga). Both weston and sato boot and look right. I'll send a patch for it. > > 2. Switching weston to kms backend degrades performance to unusable level, as neither kvm nor virtio/virgl are available for non-x86 qemu, and kms backend is using software renderer in mesa. So fbdev is the only realistic option there. But for x86 qemu kms is still viable. I'm not sure how to best configure it though. copy qemuall/weston.ini new folders qemux86 and qemux86-64 and point to backend it should be using. > > Alex From alex.kanavin at gmail.com Wed Feb 19 18:06:12 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 19:06:12 +0100 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-5-alex.kanavin@gmail.com> Message-ID: Will that take precedence over qemuall though? Sounds brittle. Another option is to make the fbdev configuration specific to mips and arm, as using kms does not need a configuration at all. Alex On Wed 19. Feb 2020 at 18.21, Khem Raj wrote: > On Wed, Feb 19, 2020 at 1:45 AM Alexander Kanavin > wrote: > > > > On Tue, 18 Feb 2020 at 02:56, Khem Raj wrote: > >> > >> > >>> but I'll get to it, or you are welcome to try and report. > >>> Mips can be either fixed like suggested, or be a specific exception. > >>> > >>> For the rest of the targets, I see that you have extended the fbdev > fallback to qemuall only on Jan 9 this year. So it's very unlikely anyone > is using them to run weston (not to mention how painfully slow that would > be), and so it would just be wasteful to test or fix them. > >> > >> > >> We should be only applying tested part debugging these breakages is > very hard so when we know it will break we should be careful as with this > patch > > > > > > I have tested these things now: > > > > 1. Switching mips from cirrus to std vga works fine, as long as > xorg.conf is also deleted (it's written specifically for cirrus and isn't > working or needed with std vga). Both weston and sato boot and look right. > I'll send a patch for it. > > > > 2. Switching weston to kms backend degrades performance to unusable > level, as neither kvm nor virtio/virgl are available for non-x86 qemu, and > kms backend is using software renderer in mesa. So fbdev is the only > realistic option there. But for x86 qemu kms is still viable. I'm not sure > how to best configure it though. > > copy qemuall/weston.ini new folders qemux86 and qemux86-64 and point > to backend it should be using. > > > > > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Wed Feb 19 18:09:41 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 19 Feb 2020 10:09:41 -0800 Subject: [OE-core] [PATCH] binutils: Upgrade to 2.34 release Message-ID: <20200219180941.3829153-1-raj.khem@gmail.com> Details of changelog [1] [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 38 +- ....33.bb => binutils-cross-canadian_2.34.bb} | 0 ...33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...s-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...ssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 ...s-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...o-not-generate-linker-script-directo.patch | 4 +- ...k-Search-for-alternative-ld.so.conf.patch} | 75 +- ...den-the-regexp-for-SH-architectures.patch} | 8 +- ...05-Point-scripts-location-to-libdir.patch} | 10 +- ...RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- ...l-2.4.patch => 0007-Use-libtool-2.4.patch} | 1248 +++++++++-------- ...tro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...system-directories-when-cross-linki.patch} | 42 +- ...-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...-default-emulation-for-mips64-linux.patch} | 23 +- ...> 0012-Add-support-for-Netlogic-XLP.patch} | 89 +- ...ct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ... => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...> 0015-sync-with-OE-libtool-changes.patch} | 2 +- ...86_64-pep-for-producing-EFI-binarie.patch} | 20 +- .../binutils/binutils/CVE-2019-17450.patch | 94 -- .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 2 +- 25 files changed, 871 insertions(+), 894 deletions(-) rename meta/recipes-devtools/binutils/{binutils-2.33.inc => binutils-2.34.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.33.bb => binutils-cross-canadian_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.33.bb => binutils-cross-testsuite_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.33.bb => binutils-cross_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} (100%) rename meta/recipes-devtools/binutils/binutils/{nativesdk-relocation.patch => 0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch} (56%) rename meta/recipes-devtools/binutils/binutils/{0003-configure-widen-the-regexp-for-SH-architectures.patch => 0004-configure-widen-the-regexp-for-SH-architectures.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0004-Point-scripts-location-to-libdir.patch => 0005-Point-scripts-location-to-libdir.patch} (83%) rename meta/recipes-devtools/binutils/binutils/{0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch => 0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} (51%) rename meta/recipes-devtools/binutils/binutils/{0006-Use-libtool-2.4.patch => 0007-Use-libtool-2.4.patch} (97%) rename meta/recipes-devtools/binutils/binutils/{0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (87%) rename meta/recipes-devtools/binutils/binutils/{0008-warn-for-uses-of-system-directories-when-cross-linki.patch => 0009-warn-for-uses-of-system-directories-when-cross-linki.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (96%) rename meta/recipes-devtools/binutils/binutils/{0010-Change-default-emulation-for-mips64-linux.patch => 0011-Change-default-emulation-for-mips64-linux.patch} (80%) rename meta/recipes-devtools/binutils/binutils/{0011-Add-support-for-Netlogic-XLP.patch => 0012-Add-support-for-Netlogic-XLP.patch} (83%) rename meta/recipes-devtools/binutils/binutils/{0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0013-Detect-64-bit-MIPS-targets.patch => 0014-Detect-64-bit-MIPS-targets.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0014-sync-with-OE-libtool-changes.patch => 0015-sync-with-OE-libtool-changes.patch} (97%) rename meta/recipes-devtools/binutils/binutils/{0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch => 0016-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch} (80%) delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/{binutils_2.33.bb => binutils_2.34.bb} (94%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index f7f25cae93..7e94ec5d4b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "10.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.33%" +BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc similarity index 54% rename from meta/recipes-devtools/binutils/binutils-2.33.inc rename to meta/recipes-devtools/binutils/binutils-2.34.inc index 84a9ec8fc3..642f3aacc6 100644 --- a/meta/recipes-devtools/binutils/binutils-2.33.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -14,35 +14,33 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.33, please make sure there is no trailing .0, so +# When upgrading to 2.35, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.33.1" -CVE_VERSION = "2.33" +PV = "2.34" +CVE_VERSION = "2.34" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_33-branch" +BRANCH ?= "binutils-2_34-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" +SRCREV ?= "e2b46ba142d9901897d8189422f0bcc28e5660b8" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ - file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ - file://0004-Point-scripts-location-to-libdir.patch \ - file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0006-Use-libtool-2.4.patch \ - file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ - file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0010-Change-default-emulation-for-mips64-linux.patch \ - file://0011-Add-support-for-Netlogic-XLP.patch \ - file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0013-Detect-64-bit-MIPS-targets.patch \ - file://0014-sync-with-OE-libtool-changes.patch \ - file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-17450.patch \ - file://CVE-2019-17451.patch \ + file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ + file://0005-Point-scripts-location-to-libdir.patch \ + file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0011-Change-default-emulation-for-mips64-linux.patch \ + file://0012-Add-support-for-Netlogic-XLP.patch \ + file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0014-Detect-64-bit-MIPS-targets.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ + file://0016-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 3a9461bf4a..93096d8583 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,6 +1,6 @@ -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 +From aad3066ba21dfa2ccbbe8801d27f9f126d2977e0 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 8 Dec 2019 00:31:35 -0800 +Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk @@ -18,23 +18,23 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index cb2b081e9e..db2e9fd569 100755 +index 03392d265c..435689ea14 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " - ( echo "/* Script for ld -r: link without relocation */" + ( echo "/* Script for -r */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " - ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" + ( echo "/* Script for -Ur */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu @@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index f9f0f7d402..9e469dca86 100644 +index 0b8b32a440..ee6b71075d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 1b499a4504..8fa38834d8 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 +From c6595ed64bbb766f8e775d8ec6e498ca708e7a20 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories @@ -22,7 +22,7 @@ Signed-off-by: Khem Raj 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index c90f38a63c..97ad1a24d6 100755 +index 435689ea14..cff8a1467f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch similarity index 56% rename from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch rename to meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 408f7d18b7..1579209fc2 100644 --- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,10 @@ -We need binutils to look at our ld.so.conf file within the SDK to ensure +From 1c0c1933d600bba07a5ffa9afcec799d8a8a9aa3 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 19 Feb 2020 09:51:16 -0800 +Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK + installation + +We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. We therefore pass in the directory to the code using a define, then add @@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the gcc internal paths. This ensures that ld works correctly in our buildtools tarball. -Standard sysroot relocation doesn't work since we're not in a sysroot, +Standard sysroot relocation doesn't work since we're not in a sysroot, we want to use both the host system and SDK libs. Signed-off-by: Richard Purdie 2020/1/17 Upstream-Status: Inappropriate [OE specific tweak] -Index: git/ld/Makefile.am -=================================================================== ---- git.orig/ld/Makefile.am -+++ git/ld/Makefile.am -@@ -36,7 +36,8 @@ am__skipyacc = +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 3 ++- + ld/Makefile.in | 3 ++- + ld/ldelf.c | 2 +- + ld/ldmain.c | 1 + + ld/ldmain.h | 1 + + 5 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 4a9b8404b7..1c132d3ce4 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -27,12 +42,12 @@ Index: git/ld/Makefile.am WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) -Index: git/ld/Makefile.in -=================================================================== ---- git.orig/ld/Makefile.in -+++ git/ld/Makefile.in -@@ -546,7 +546,8 @@ am__skiplex = - am__skipyacc = +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 46d9b14077..e453bc1b33 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz + ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ @@ -41,24 +56,24 @@ Index: git/ld/Makefile.in AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @ENABLE_PLUGINS_FALSE at PLUGIN_C = -Index: git/ld/emultempl/elf32.em -=================================================================== ---- git.orig/ld/emultempl/elf32.em -+++ git/ld/emultempl/elf32.em -@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c +diff --git a/ld/ldelf.c b/ld/ldelf.c +index 2e27cf48a8..a095d6aac5 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, info.path = NULL; info.len = info.alloc = 0; -- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", +- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); - if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) + if (!ldelf_parse_ld_so_conf (&info, tmppath)) { -Index: git/ld/ldmain.c -=================================================================== ---- git.orig/ld/ldmain.c -+++ git/ld/ldmain.c -@@ -68,6 +68,7 @@ char *program_name; +diff --git a/ld/ldmain.c b/ld/ldmain.c +index c4af10f4e9..da1ad17763 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; @@ -66,10 +81,10 @@ Index: git/ld/ldmain.c /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; -Index: git/ld/ldmain.h -=================================================================== ---- git.orig/ld/ldmain.h -+++ git/ld/ldmain.h +diff --git a/ld/ldmain.h b/ld/ldmain.h +index 0f05821d1e..54c36a94ce 100644 +--- a/ld/ldmain.h ++++ b/ld/ldmain.h @@ -23,6 +23,7 @@ extern char *program_name; diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch rename to meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch index 4a6b107126..1fb94c0d96 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -1,4 +1,4 @@ -From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 +From 06055c548063b61ac5124911936d59f4ac08cbf4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:07:33 +0000 Subject: [PATCH] configure: widen the regexp for SH architectures @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 6a9719f609..001523eebf 100755 +index 91dc42f6c7..7c1b747e7c 100755 --- a/configure +++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in +@@ -3915,7 +3915,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -27,7 +27,7 @@ index 6a9719f609..001523eebf 100755 sh*-*-elf) ;; diff --git a/gprof/configure b/gprof/configure -index cbb3aced46..b5eabceb77 100755 +index c23692e5c3..eb04fdcc89 100755 --- a/gprof/configure +++ b/gprof/configure @@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch similarity index 83% rename from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch rename to meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 8318bd3899..29abf9ff20 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 +From 0aea6c1021b1fd33163416203b360611a489b4fe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index ddc7a78368..6fa7bf2583 100644 +index 1c132d3ce4..8d82cf2e16 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -63,7 +63,7 @@ endif +@@ -64,7 +64,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fdf06128b2..5c108b9e05 100644 +index e453bc1b33..2dcd72f809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch similarity index 51% rename from meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch rename to meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 214ae06344..3672644c76 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 +From c576d7d02314a8702aaea23a8275f8252e03427f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:27:17 +0000 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty @@ -10,21 +10,23 @@ Upstream-Status: Pending Signed-off-by: Chris Chimelis Signed-off-by: Khem Raj --- - ld/emultempl/elf32.em | 4 ++++ + ld/ldelf.c | 4 ++++ 1 file changed, 4 insertions(+) ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment < Date: Sun, 14 Feb 2016 17:04:07 +0000 Subject: [PATCH] Use libtool 2.4 @@ -25,6 +25,8 @@ Signed-off-by: Khem Raj zlib/configure | 1320 ++++++++++++++----- 14 files changed, 9940 insertions(+), 3705 deletions(-) +diff --git a/bfd/configure b/bfd/configure +index 7c0708e2f8..1e9e7b2711 100755 --- a/bfd/configure +++ b/bfd/configure @@ -704,6 +704,9 @@ OTOOL @@ -74,7 +76,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u +@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -210,7 +212,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli +@@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -224,6 +226,8 @@ Signed-off-by: Khem Raj + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -445,7 +449,7 @@ Signed-off-by: Khem Raj + + + - ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -454,7 +458,7 @@ Signed-off-by: Khem Raj + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ++ +int +main () +{ @@ -487,11 +491,11 @@ Signed-off-by: Khem Raj +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else @@ -547,7 +551,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() +@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -569,7 +573,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7426,6 +7757,20 @@ else +@@ -7426,6 +7757,16 @@ else $as_echo "ok" >&6; } fi @@ -583,17 +587,20 @@ Signed-off-by: Khem Raj + + + -+ -+ -+ -+ -@@ -7445,6 +7790,41 @@ fi +@@ -7442,6 +7783,45 @@ fi ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -626,12 +633,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - # Check whether --enable-libtool-lock was given. + @@ -7653,6 +8033,123 @@ esac need_locks="$enable_libtool_lock" @@ -793,7 +797,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio +@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -806,7 +810,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio +@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -967,7 +971,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -1025,7 +1029,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -1103,7 +1107,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -1112,7 +1116,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -1121,7 +1125,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -1130,7 +1134,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -1188,7 +1192,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -1197,7 +1201,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -1347,7 +1351,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= +@@ -14564,7 +15219,7 @@ SHARED_LDFLAGS= if test "$enable_shared" = "yes"; then x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` if test -n "$x"; then @@ -1356,7 +1360,7 @@ Signed-off-by: Khem Raj fi case "${host}" in -@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -17186,13 +17841,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -1377,7 +1381,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -17207,14 +17869,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -1396,7 +1400,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -17247,12 +17912,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -1410,7 +1414,7 @@ Signed-off-by: Khem Raj file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17298,8 +17963,13 @@ reload_flag \ +@@ -17307,8 +17972,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1424,7 +1428,7 @@ Signed-off-by: Khem Raj STRIP \ RANLIB \ CC \ -@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -17318,12 +17988,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -1440,7 +1444,7 @@ Signed-off-by: Khem Raj DSYMUTIL \ NMEDIT \ LIPO \ -@@ -17330,7 +18002,6 @@ no_undefined_flag \ +@@ -17339,7 +18011,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1448,7 +1452,7 @@ Signed-off-by: Khem Raj exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -17366,6 +18037,7 @@ module_cmds \ +@@ -17375,6 +18046,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1456,7 +1460,7 @@ Signed-off-by: Khem Raj postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18154,7 +18826,8 @@ $as_echo X"$file" | +@@ -18163,7 +18835,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -1466,7 +1470,7 @@ Signed-off-by: Khem Raj # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL +@@ -18266,19 +18939,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1510,7 +1514,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -18308,6 +19004,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -1523,7 +1527,7 @@ Signed-off-by: Khem Raj # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -18317,6 +19019,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1533,7 +1537,7 @@ Signed-off-by: Khem Raj # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -18422,12 +19127,12 @@ with_gcc=$GCC +@@ -18431,12 +19136,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1549,7 +1553,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath +@@ -18523,9 +19228,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1559,7 +1563,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms +@@ -18541,6 +19243,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1569,7 +1573,7 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -18573,210 +19278,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -1771,9 +1775,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -1931,18 +1941,17 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/bfd/configure.ac b/bfd/configure.ac +index af4d4b8c13..a521738244 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -290,7 +290,7 @@ changequote(,)dnl +@@ -296,7 +296,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -1951,9 +1960,11 @@ Signed-off-by: Khem Raj fi case "${host}" in +diff --git a/binutils/configure b/binutils/configure +index a8dfd4bd68..ab5f13ab2e 100755 --- a/binutils/configure +++ b/binutils/configure -@@ -689,8 +689,11 @@ OTOOL +@@ -690,8 +690,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -1965,7 +1976,7 @@ Signed-off-by: Khem Raj OBJDUMP LN_S NM -@@ -807,6 +810,7 @@ enable_static +@@ -808,6 +811,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -1973,16 +1984,16 @@ Signed-off-by: Khem Raj enable_libtool_lock enable_plugins enable_largefile -@@ -1483,6 +1487,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] +@@ -1487,6 +1491,8 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-debuginfod Enable debuginfo lookups with debuginfod + (auto/yes/no) + --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-system-zlib use installed libz --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5457,8 +5463,8 @@ esac +@@ -5461,8 +5467,8 @@ esac @@ -1993,7 +2004,7 @@ Signed-off-by: Khem Raj -@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5502,7 +5508,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -2002,7 +2013,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u +@@ -6188,8 +6194,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -2013,7 +2024,7 @@ Signed-off-by: Khem Raj && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6234,6 +6240,80 @@ esac +@@ -6238,6 +6244,80 @@ esac @@ -2094,7 +2105,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6250,6 +6330,11 @@ case $reload_flag in +@@ -6254,6 +6334,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -2106,7 +2117,7 @@ Signed-off-by: Khem Raj darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6418,7 +6503,8 @@ mingw* | pw32*) +@@ -6422,7 +6507,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -2116,7 +2127,7 @@ Signed-off-by: Khem Raj lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6572,6 +6658,21 @@ esac +@@ -6576,6 +6662,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -2138,7 +2149,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli +@@ -6591,9 +6692,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -2303,7 +2314,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6605,7 +6859,7 @@ do +@@ -6609,7 +6863,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2312,7 +2323,7 @@ Signed-off-by: Khem Raj $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } +@@ -6629,11 +6883,15 @@ $as_echo "no" >&6; } fi @@ -2331,7 +2342,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6645,7 +6903,7 @@ do +@@ -6649,7 +6907,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2340,7 +2351,7 @@ Signed-off-by: Khem Raj $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6664,6 +6922,10 @@ else +@@ -6668,6 +6926,10 @@ else $as_echo "no" >&6; } fi @@ -2351,7 +2362,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; +@@ -6679,12 +6941,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -2366,7 +2377,7 @@ Signed-off-by: Khem Raj -@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6696,6 +6956,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -2431,7 +2442,7 @@ Signed-off-by: Khem Raj if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7026,8 +7344,8 @@ esac +@@ -7030,8 +7348,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -2442,7 +2453,7 @@ Signed-off-by: Khem Raj # Handle CRLF in mingw tool chain opt_cr= -@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do +@@ -7067,6 +7385,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -2450,7 +2461,7 @@ Signed-off-by: Khem Raj # Check to see that the pipe works correctly. pipe_works=no -@@ -7104,6 +7423,18 @@ _LT_EOF +@@ -7108,6 +7427,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -2469,7 +2480,7 @@ Signed-off-by: Khem Raj #ifdef __cplusplus extern "C" { #endif -@@ -7115,7 +7446,7 @@ _LT_EOF +@@ -7119,7 +7450,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -2478,7 +2489,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() +@@ -7145,8 +7476,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -2489,7 +2500,7 @@ Signed-off-by: Khem Raj LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7152,8 +7483,8 @@ _LT_EOF +@@ -7156,8 +7487,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -2500,7 +2511,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7190,6 +7521,18 @@ else +@@ -7194,6 +7525,21 @@ else $as_echo "ok" >&6; } fi @@ -2516,13 +2527,18 @@ Signed-off-by: Khem Raj + + + ++ ++ ++ -@@ -7211,6 +7554,43 @@ fi +@@ -7210,6 +7556,40 @@ fi ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -2555,15 +2571,10 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7417,6 +7797,123 @@ esac + + + +@@ -7421,6 +7801,123 @@ esac need_locks="$enable_libtool_lock" @@ -2687,7 +2698,7 @@ Signed-off-by: Khem Raj case $host_os in rhapsody* | darwin*) -@@ -7980,6 +8477,8 @@ _LT_EOF +@@ -7984,6 +8481,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -2696,7 +2707,7 @@ Signed-off-by: Khem Raj cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8175,7 +8674,8 @@ fi +@@ -8179,7 +8678,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -2706,7 +2717,7 @@ Signed-off-by: Khem Raj -@@ -8264,7 +8764,7 @@ aix3*) +@@ -8268,7 +8768,7 @@ aix3*) esac # Global variables: @@ -2715,7 +2726,7 @@ Signed-off-by: Khem Raj can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8562,8 +9062,6 @@ fi +@@ -8566,8 +9066,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -2724,7 +2735,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio +@@ -8733,6 +9231,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -2737,7 +2748,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio +@@ -8795,7 +9299,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -2746,7 +2757,7 @@ Signed-off-by: Khem Raj lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8848,13 +9352,17 @@ case $host_os in +@@ -8852,13 +9356,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -2770,7 +2781,7 @@ Signed-off-by: Khem Raj # # Check to make sure the PIC flag actually works. -@@ -8915,6 +9423,11 @@ fi +@@ -8919,6 +9427,11 @@ fi @@ -2782,7 +2793,7 @@ Signed-off-by: Khem Raj # # Check to make sure the static flag actually works. # -@@ -9265,7 +9778,8 @@ _LT_EOF +@@ -9269,7 +9782,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -2792,7 +2803,7 @@ Signed-off-by: Khem Raj if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9364,12 +9878,12 @@ _LT_EOF +@@ -9368,12 +9882,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -2807,7 +2818,7 @@ Signed-off-by: Khem Raj fi ;; esac -@@ -9383,8 +9897,8 @@ _LT_EOF +@@ -9387,8 +9901,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -2818,7 +2829,7 @@ Signed-off-by: Khem Raj fi ;; -@@ -9402,8 +9916,8 @@ _LT_EOF +@@ -9406,8 +9920,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2829,7 +2840,7 @@ Signed-off-by: Khem Raj else ld_shlibs=no fi -@@ -9449,8 +9963,8 @@ _LT_EOF +@@ -9453,8 +9967,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2840,7 +2851,7 @@ Signed-off-by: Khem Raj else ld_shlibs=no fi -@@ -9580,7 +10094,13 @@ _LT_EOF +@@ -9584,7 +10098,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -2855,7 +2866,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -9593,22 +10113,29 @@ main () +@@ -9597,22 +10117,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2898,7 +2909,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9624,7 +10151,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -2913,7 +2924,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -9633,22 +10166,29 @@ main () +@@ -9637,22 +10170,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2956,7 +2967,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9697,20 +10237,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -3034,7 +3045,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9771,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -3043,7 +3054,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9779,7 +10362,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -3052,7 +3063,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9795,7 +10378,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -3061,7 +3072,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9819,10 +10402,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -3074,7 +3085,7 @@ Signed-off-by: Khem Raj ;; esac else -@@ -9897,23 +10480,36 @@ fi +@@ -9901,23 +10484,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -3119,7 +3130,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10002,7 +10598,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -3128,7 +3139,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10021,9 +10617,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -3140,7 +3151,7 @@ Signed-off-by: Khem Raj else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10599,8 +11195,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -3152,7 +3163,7 @@ Signed-off-by: Khem Raj library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10633,13 +11230,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -3225,7 +3236,7 @@ Signed-off-by: Khem Raj # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10727,7 +11382,7 @@ haiku*) +@@ -10731,7 +11386,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3234,16 +3245,16 @@ Signed-off-by: Khem Raj hardcode_into_libs=yes ;; -@@ -11523,7 +12178,7 @@ else +@@ -11527,7 +12182,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11526 "configure" +-#line 11530 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11567,10 +12222,10 @@ else +@@ -11571,10 +12226,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3256,16 +3267,16 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11629,7 +12284,7 @@ else +@@ -11633,7 +12288,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11632 "configure" +-#line 11636 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11673,10 +12328,10 @@ else +@@ -11677,10 +12332,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3278,7 +3289,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -16024,13 +16679,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -3299,7 +3310,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -16045,14 +16707,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -3318,7 +3329,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -16085,12 +16750,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -3332,7 +3343,7 @@ Signed-off-by: Khem Raj file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16057,8 +16722,13 @@ reload_flag \ +@@ -16145,8 +16810,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3346,7 +3357,7 @@ Signed-off-by: Khem Raj STRIP \ RANLIB \ CC \ -@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16156,12 +16826,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -3362,7 +3373,7 @@ Signed-off-by: Khem Raj DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16089,7 +16761,6 @@ no_undefined_flag \ +@@ -16177,7 +16849,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3370,7 +3381,7 @@ Signed-off-by: Khem Raj exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16125,6 +16796,7 @@ module_cmds \ +@@ -16213,6 +16884,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3378,7 +3389,7 @@ Signed-off-by: Khem Raj postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16891,7 +17563,8 @@ $as_echo X"$file" | +@@ -16979,7 +17651,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -3388,7 +3399,7 @@ Signed-off-by: Khem Raj # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL +@@ -17082,19 +17755,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3432,7 +3443,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -17124,6 +17820,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -3445,7 +3456,7 @@ Signed-off-by: Khem Raj # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17133,6 +17835,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3455,7 +3466,7 @@ Signed-off-by: Khem Raj # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17159,12 +17864,12 @@ with_gcc=$GCC +@@ -17247,12 +17952,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3471,7 +3482,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath +@@ -17339,9 +18044,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3481,7 +3492,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms +@@ -17357,6 +18059,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3491,7 +3502,7 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17389,210 +18094,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -3693,9 +3704,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -3853,15 +3870,14 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/gas/configure b/gas/configure +index 60c1a055ae..0e0ce4c0e2 100755 --- a/gas/configure +++ b/gas/configure @@ -681,8 +681,11 @@ OTOOL @@ -3913,7 +3929,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u +@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -4049,7 +4065,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli +@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4063,9 +4079,7 @@ Signed-off-by: Khem Raj + + + - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -4206,7 +4220,9 @@ Signed-off-by: Khem Raj + + + -+if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -4389,7 +4405,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() +@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -4411,7 +4427,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7010,6 +7341,19 @@ else +@@ -7010,6 +7341,21 @@ else $as_echo "ok" >&6; } fi @@ -4428,13 +4444,17 @@ Signed-off-by: Khem Raj + + + ++ ++ -@@ -7030,6 +7374,42 @@ fi +@@ -7026,6 +7372,40 @@ fi ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -4467,13 +4487,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : + + @@ -7237,6 +7617,123 @@ esac need_locks="$enable_libtool_lock" @@ -4635,7 +4651,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio +@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -4648,7 +4664,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio +@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -4809,7 +4825,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -4867,7 +4883,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -4945,7 +4961,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -4954,7 +4970,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -4963,7 +4979,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -4972,7 +4988,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -5030,7 +5046,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -5039,7 +5055,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -5189,7 +5205,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -5210,7 +5226,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -5229,7 +5245,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -5343,7 +5359,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -5604,9 +5620,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -5764,15 +5786,14 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/gprof/configure b/gprof/configure +index eb04fdcc89..2b70d84298 100755 --- a/gprof/configure +++ b/gprof/configure @@ -662,8 +662,11 @@ OTOOL @@ -5824,7 +5845,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u +@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -5972,7 +5993,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli +@@ -6257,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5986,6 +6007,8 @@ Signed-off-by: Khem Raj + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -6178,7 +6201,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;; +@@ -6347,16 +6604,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -6190,13 +6213,17 @@ Signed-off-by: Khem Raj -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} - - - -@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if test "${lt_cv_ar_at_file+set}" = set; then : @@ -6209,7 +6236,7 @@ Signed-off-by: Khem Raj +int +main () +{ -+ + + ; + return 0; +} @@ -6235,29 +6262,22 @@ Signed-off-by: Khem Raj + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 + + + @@ -6698,8 +7011,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -6305,7 +6325,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() +@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -6327,7 +6347,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6862,6 +7188,17 @@ else +@@ -6862,6 +7188,18 @@ else $as_echo "ok" >&6; } fi @@ -6342,13 +6362,18 @@ Signed-off-by: Khem Raj + + + ++ -@@ -6883,6 +7220,44 @@ fi +@@ -6878,6 +7216,43 @@ fi ++ ++ ++ ++ + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } @@ -6382,14 +6407,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; + + + @@ -7089,6 +7464,123 @@ esac need_locks="$enable_libtool_lock" @@ -6551,7 +6571,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio +@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -6564,7 +6584,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio +@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -6725,7 +6745,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -6783,7 +6803,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -6861,7 +6881,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -6870,7 +6890,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -6879,7 +6899,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -6888,7 +6908,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -6946,7 +6966,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -6955,7 +6975,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -7087,7 +7107,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -7108,7 +7128,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -7127,7 +7147,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -7241,7 +7261,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -7502,9 +7522,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -7662,18 +7688,17 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/ld/configure b/ld/configure +index 811134a503..f432f4637d 100755 --- a/ld/configure +++ b/ld/configure -@@ -688,8 +688,11 @@ OTOOL +@@ -691,8 +691,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -7685,7 +7710,7 @@ Signed-off-by: Khem Raj OBJDUMP LN_S NM -@@ -816,6 +819,7 @@ enable_static +@@ -819,6 +822,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -7693,7 +7718,7 @@ Signed-off-by: Khem Raj enable_libtool_lock enable_plugins enable_largefile -@@ -1508,6 +1512,8 @@ Optional Packages: +@@ -1512,6 +1516,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -7701,8 +7726,8 @@ Signed-off-by: Khem Raj + (or the compiler's sysroot if not specified). --with-lib-path=dir1:dir2... set default LIB_PATH --with-sysroot=DIR Search for usr/lib et al within DIR. - -@@ -5960,8 +5966,8 @@ esac + --with-system-zlib use installed libz +@@ -5965,8 +5971,8 @@ esac @@ -7713,7 +7738,7 @@ Signed-off-by: Khem Raj -@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -6006,7 +6012,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -7722,7 +7747,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u +@@ -6692,8 +6698,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7733,7 +7758,7 @@ Signed-off-by: Khem Raj && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6737,6 +6743,80 @@ esac +@@ -6742,6 +6748,80 @@ esac @@ -7814,7 +7839,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6753,6 +6833,11 @@ case $reload_flag in +@@ -6758,6 +6838,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -7826,7 +7851,7 @@ Signed-off-by: Khem Raj darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6921,7 +7006,8 @@ mingw* | pw32*) +@@ -6926,7 +7011,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7836,7 +7861,7 @@ Signed-off-by: Khem Raj lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -7075,6 +7161,21 @@ esac +@@ -7080,6 +7166,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -7858,7 +7883,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli +@@ -7095,9 +7196,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8023,7 +8048,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -7108,7 +7362,7 @@ do +@@ -7113,7 +7367,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8032,7 +8057,7 @@ Signed-off-by: Khem Raj $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; } +@@ -7133,11 +7387,15 @@ $as_echo "no" >&6; } fi @@ -8051,7 +8076,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7148,7 +7406,7 @@ do +@@ -7153,7 +7411,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8060,7 +8085,7 @@ Signed-off-by: Khem Raj $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7167,6 +7425,10 @@ else +@@ -7172,6 +7430,10 @@ else $as_echo "no" >&6; } fi @@ -8071,7 +8096,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;; +@@ -7183,12 +7445,12 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8084,10 +8109,11 @@ Signed-off-by: Khem Raj +: ${AR=ar} +: ${AR_FLAGS=cru} + ++ -@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -7198,6 +7460,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -8147,11 +8173,10 @@ Signed-off-by: Khem Raj + + + -+ + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -7529,8 +7847,8 @@ esac +@@ -7534,8 +7852,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -8162,7 +8187,7 @@ Signed-off-by: Khem Raj # Handle CRLF in mingw tool chain opt_cr= -@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do +@@ -7571,6 +7889,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -8170,7 +8195,7 @@ Signed-off-by: Khem Raj # Check to see that the pipe works correctly. pipe_works=no -@@ -7607,6 +7926,18 @@ _LT_EOF +@@ -7612,6 +7931,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -8189,7 +8214,7 @@ Signed-off-by: Khem Raj #ifdef __cplusplus extern "C" { #endif -@@ -7618,7 +7949,7 @@ _LT_EOF +@@ -7623,7 +7954,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8198,7 +8223,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup() +@@ -7649,8 +7980,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8209,7 +8234,7 @@ Signed-off-by: Khem Raj LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7655,8 +7986,8 @@ _LT_EOF +@@ -7660,8 +7991,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8220,7 +8245,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7693,6 +8024,13 @@ else +@@ -7698,6 +8029,19 @@ else $as_echo "ok" >&6; } fi @@ -8231,10 +8256,16 @@ Signed-off-by: Khem Raj + nm_file_list_spec='@' +fi + ++ ++ ++ ++ ++ ++ -@@ -7714,6 +8052,48 @@ fi +@@ -7714,6 +8058,42 @@ fi @@ -8242,7 +8273,6 @@ Signed-off-by: Khem Raj + + + -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -8275,15 +8305,10 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7920,6 +8300,123 @@ esac + + + +@@ -7925,6 +8305,123 @@ esac need_locks="$enable_libtool_lock" @@ -8407,7 +8432,7 @@ Signed-off-by: Khem Raj case $host_os in rhapsody* | darwin*) -@@ -8483,6 +8980,8 @@ _LT_EOF +@@ -8488,6 +8985,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -8416,7 +8441,7 @@ Signed-off-by: Khem Raj cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8551,6 +9050,16 @@ done +@@ -8556,6 +9055,16 @@ done @@ -8433,7 +8458,7 @@ Signed-off-by: Khem Raj # Set options -@@ -8679,7 +9188,8 @@ fi +@@ -8684,7 +9193,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -8443,7 +8468,7 @@ Signed-off-by: Khem Raj -@@ -8768,7 +9278,7 @@ aix3*) +@@ -8773,7 +9283,7 @@ aix3*) esac # Global variables: @@ -8452,7 +8477,7 @@ Signed-off-by: Khem Raj can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9066,8 +9576,6 @@ fi +@@ -9071,8 +9581,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8461,7 +8486,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio +@@ -9238,6 +9746,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8474,7 +8499,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio +@@ -9300,7 +9814,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8483,7 +8508,7 @@ Signed-off-by: Khem Raj lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9352,13 +9866,17 @@ case $host_os in +@@ -9357,13 +9871,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8507,7 +8532,7 @@ Signed-off-by: Khem Raj # # Check to make sure the PIC flag actually works. -@@ -9419,6 +9937,11 @@ fi +@@ -9424,6 +9942,11 @@ fi @@ -8519,7 +8544,7 @@ Signed-off-by: Khem Raj # # Check to make sure the static flag actually works. # -@@ -9769,7 +10292,8 @@ _LT_EOF +@@ -9774,7 +10297,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8529,7 +8554,7 @@ Signed-off-by: Khem Raj if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9868,12 +10392,12 @@ _LT_EOF +@@ -9873,12 +10397,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8544,7 +8569,7 @@ Signed-off-by: Khem Raj fi ;; esac -@@ -9887,8 +10411,8 @@ _LT_EOF +@@ -9892,8 +10416,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8555,7 +8580,7 @@ Signed-off-by: Khem Raj fi ;; -@@ -9906,8 +10430,8 @@ _LT_EOF +@@ -9911,8 +10435,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8566,7 +8591,7 @@ Signed-off-by: Khem Raj else ld_shlibs=no fi -@@ -9953,8 +10477,8 @@ _LT_EOF +@@ -9958,8 +10482,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8577,7 +8602,7 @@ Signed-off-by: Khem Raj else ld_shlibs=no fi -@@ -10084,7 +10608,13 @@ _LT_EOF +@@ -10089,7 +10613,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8592,7 +8617,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -10097,22 +10627,29 @@ main () +@@ -10102,22 +10632,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8635,7 +8660,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10129,7 +10666,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -8650,7 +8675,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -10137,22 +10680,29 @@ main () +@@ -10142,22 +10685,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8693,10 +8718,11 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10201,21 +10751,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. +- # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. @@ -8711,6 +8737,7 @@ Signed-off-by: Khem Raj - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes ++ # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC @@ -8771,7 +8798,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10276,7 +10869,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8780,7 +8807,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10284,7 +10877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8789,7 +8816,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10300,7 +10893,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8798,7 +8825,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10324,10 +10917,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8811,7 +8838,7 @@ Signed-off-by: Khem Raj ;; esac else -@@ -10401,23 +10994,36 @@ fi +@@ -10406,23 +10999,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -8856,7 +8883,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10507,7 +11113,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -8865,7 +8892,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10526,9 +11132,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -8877,7 +8904,7 @@ Signed-off-by: Khem Raj else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11104,8 +11710,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -8889,7 +8916,7 @@ Signed-off-by: Khem Raj library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11138,13 +11745,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -8962,7 +8989,7 @@ Signed-off-by: Khem Raj # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -11231,7 +11896,7 @@ haiku*) +@@ -11236,7 +11901,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -8971,16 +8998,16 @@ Signed-off-by: Khem Raj hardcode_into_libs=yes ;; -@@ -12027,7 +12692,7 @@ else +@@ -12032,7 +12697,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12030 "configure" +-#line 12035 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12071,10 +12736,10 @@ else +@@ -12076,10 +12741,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -8993,16 +9020,16 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12133,7 +12798,7 @@ else +@@ -12138,7 +12803,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12136 "configure" +-#line 12141 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12177,10 +12842,10 @@ else +@@ -12182,10 +12847,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9015,7 +9042,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12572,6 +13237,7 @@ $RM -r conftest* +@@ -12577,6 +13242,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -9023,7 +9050,7 @@ Signed-off-by: Khem Raj lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12589,6 +13255,7 @@ $RM -r conftest* +@@ -12594,6 +13260,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9031,7 +9058,7 @@ Signed-off-by: Khem Raj compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil +@@ -12876,7 +13543,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9046,7 +9073,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -12884,22 +13557,29 @@ main () +@@ -12889,22 +13562,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9089,7 +9116,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12917,7 +13597,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -9104,7 +9131,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -12925,22 +13611,29 @@ main () +@@ -12930,22 +13616,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9147,7 +9174,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12988,29 +13681,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9246,7 +9273,7 @@ Signed-off-by: Khem Raj darwin* | rhapsody*) -@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13116,7 +13855,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9255,7 +9282,7 @@ Signed-off-by: Khem Raj else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13187,10 +13926,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9268,7 +9295,7 @@ Signed-off-by: Khem Raj ;; esac fi -@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13231,9 +13970,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9280,7 +9307,7 @@ Signed-off-by: Khem Raj fi fi link_all_deplibs_CXX=yes -@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13303,20 +14042,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9305,7 +9332,7 @@ Signed-off-by: Khem Raj ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13511,7 +14250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -9314,7 +9341,7 @@ Signed-off-by: Khem Raj ;; esac -@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13557,7 +14296,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9323,7 +9350,7 @@ Signed-off-by: Khem Raj # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13598,9 +14337,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -9335,7 +9362,7 @@ Signed-off-by: Khem Raj # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13730,6 +14469,13 @@ private: +@@ -13735,6 +14474,13 @@ private: }; _LT_EOF @@ -9349,7 +9376,7 @@ Signed-off-by: Khem Raj if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13748,7 +14494,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9358,7 +9385,7 @@ Signed-off-by: Khem Raj -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13757,13 +14503,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9385,7 +9412,7 @@ Signed-off-by: Khem Raj # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13783,8 +14538,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9396,7 +9423,7 @@ Signed-off-by: Khem Raj *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -13815,6 +14572,7 @@ else +@@ -13820,6 +14577,7 @@ else fi $RM -f confest.$objext @@ -9404,7 +9431,7 @@ Signed-off-by: Khem Raj # PORTME: override above test on systems where it is broken case $host_os in -@@ -13850,7 +14608,7 @@ linux*) +@@ -13855,7 +14613,7 @@ linux*) solaris*) case $cc_basename in @@ -9413,7 +9440,7 @@ Signed-off-by: Khem Raj # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13915,8 +14673,6 @@ fi +@@ -13920,8 +14678,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9422,7 +9449,7 @@ Signed-off-by: Khem Raj # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio +@@ -14026,6 +14782,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9434,7 +9461,7 @@ Signed-off-by: Khem Raj dgux*) case $cc_basename in ec++*) -@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio +@@ -14178,7 +14939,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9443,7 +9470,7 @@ Signed-off-by: Khem Raj # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -14238,10 +14999,17 @@ case $host_os in +@@ -14243,10 +15004,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9464,7 +9491,7 @@ Signed-off-by: Khem Raj # # Check to make sure the PIC flag actually works. -@@ -14299,6 +15067,8 @@ fi +@@ -14304,6 +15072,8 @@ fi @@ -9473,7 +9500,7 @@ Signed-off-by: Khem Raj # # Check to make sure the static flag actually works. # -@@ -14476,6 +15246,7 @@ fi +@@ -14481,6 +15251,7 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -9481,7 +9508,7 @@ Signed-off-by: Khem Raj case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil +@@ -14495,15 +15266,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9507,7 +9534,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14766,8 +15542,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9519,7 +9546,7 @@ Signed-off-by: Khem Raj library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14799,13 +15576,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9592,7 +9619,7 @@ Signed-off-by: Khem Raj # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -14891,7 +15726,7 @@ haiku*) +@@ -14896,7 +15731,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9601,7 +9628,7 @@ Signed-off-by: Khem Raj hardcode_into_libs=yes ;; -@@ -15350,6 +16185,7 @@ fi +@@ -15355,6 +16190,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9609,7 +9636,7 @@ Signed-off-by: Khem Raj LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -18477,13 +19313,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -9630,7 +9657,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -18498,14 +19341,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -9649,7 +9676,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -18538,12 +19384,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -9663,7 +9690,7 @@ Signed-off-by: Khem Raj file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi +@@ -18582,8 +19428,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -9673,7 +9700,7 @@ Signed-off-by: Khem Raj lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har +@@ -18610,12 +19456,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -9687,7 +9714,7 @@ Signed-off-by: Khem Raj file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18625,8 +19471,13 @@ reload_flag \ +@@ -18653,8 +19499,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9701,7 +9728,7 @@ Signed-off-by: Khem Raj STRIP \ RANLIB \ CC \ -@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -18664,12 +19515,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -9717,7 +9744,7 @@ Signed-off-by: Khem Raj DSYMUTIL \ NMEDIT \ LIPO \ -@@ -18657,7 +19510,6 @@ no_undefined_flag \ +@@ -18685,7 +19538,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9725,7 +9752,7 @@ Signed-off-by: Khem Raj exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -18679,8 +19531,8 @@ LD_CXX \ +@@ -18707,8 +19559,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9735,7 +9762,7 @@ Signed-off-by: Khem Raj lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \ +@@ -18720,7 +19572,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9743,7 +9770,7 @@ Signed-off-by: Khem Raj exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -18726,6 +19577,7 @@ module_cmds \ +@@ -18754,6 +19605,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9751,7 +9778,7 @@ Signed-off-by: Khem Raj postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \ +@@ -18768,7 +19620,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9761,7 +9788,7 @@ Signed-off-by: Khem Raj case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19505,7 +20358,8 @@ $as_echo X"$file" | +@@ -19533,7 +20386,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -9771,7 +9798,7 @@ Signed-off-by: Khem Raj # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL +@@ -19636,19 +20490,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9815,7 +9842,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -19678,6 +20555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -9828,7 +9855,7 @@ Signed-off-by: Khem Raj # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -19687,6 +20570,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -9838,7 +9865,7 @@ Signed-off-by: Khem Raj # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19773,12 +20659,12 @@ with_gcc=$GCC +@@ -19801,12 +20687,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -9854,7 +9881,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath +@@ -19893,9 +20779,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -9864,7 +9891,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms +@@ -19911,6 +20794,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -9874,7 +9901,7 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -19957,210 +20843,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -10076,9 +10103,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -10236,16 +10269,13 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX +@@ -20188,12 +21033,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10261,7 +10291,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -20280,9 +21125,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10271,7 +10301,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -20298,6 +21140,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10281,6 +10311,8 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1,7 +1,8 @@ @@ -10322,7 +10354,7 @@ Signed-off-by: Khem Raj AC_SUBST(LIBTOOL)dnl _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl @@ -10345,7 +10377,7 @@ Signed-off-by: Khem Raj can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. @@ -10450,7 +10482,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH @@ -10703,7 +10735,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], @@ -10831,7 +10863,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -10865,7 +10897,7 @@ Signed-off-by: Khem Raj _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) @@ -10950,7 +10982,7 @@ Signed-off-by: Khem Raj # # Check to make sure the static flag actually works. # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl @@ -11272,7 +11304,7 @@ Signed-off-by: Khem Raj if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -11280,7 +11312,7 @@ Signed-off-by: Khem Raj lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -11288,7 +11320,7 @@ Signed-off-by: Khem Raj compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -11297,7 +11329,7 @@ Signed-off-by: Khem Raj _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. @@ -11306,7 +11338,7 @@ Signed-off-by: Khem Raj _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) @@ -11405,7 +11437,7 @@ Signed-off-by: Khem Raj darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then ;; *) if test "$GXX" = yes; then @@ -11414,7 +11446,7 @@ Signed-off-by: Khem Raj else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -11427,7 +11459,7 @@ Signed-off-by: Khem Raj ;; esac fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -11439,7 +11471,7 @@ Signed-off-by: Khem Raj fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -11464,7 +11496,7 @@ Signed-off-by: Khem Raj ;; *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -11473,7 +11505,7 @@ Signed-off-by: Khem Raj ;; esac -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in @@ -11482,7 +11514,7 @@ Signed-off-by: Khem Raj # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -11494,7 +11526,7 @@ Signed-off-by: Khem Raj # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC @@ -11702,7 +11734,7 @@ Signed-off-by: Khem Raj ])# _LT_LANG_RC_CONFIG -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) @@ -11729,7 +11761,7 @@ Signed-off-by: Khem Raj && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES @@ -11827,31 +11859,6 @@ Signed-off-by: Khem Raj -{ - func_len_result=${#1} -} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and @@ -11868,22 +11875,23 @@ Signed-off-by: Khem Raj +test 0 -eq $? || _lt_function_replace_fail=: +]) --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () -{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi -} +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- @@ -11907,24 +11915,45 @@ Signed-off-by: Khem Raj + esac + func_basename_result="${1##*/}"]) --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) -+ + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) -+ + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; @@ -11972,7 +12001,9 @@ Signed-off-by: Khem Raj + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ + +-_LT_EOF +-esac + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ @@ -11986,17 +12017,14 @@ Signed-off-by: Khem Raj + test 0 -eq $? || _lt_function_replace_fail=: +fi --_LT_EOF --esac +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () @@ -12082,6 +12110,8 @@ Signed-off-by: Khem Raj +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -1,10 +1,9 @@ @@ -12513,7 +12543,31 @@ Signed-off-by: Khem Raj +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi -+ + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac + exit $EXIT_MISMATCH + fi +} @@ -12543,7 +12597,9 @@ Signed-off-by: Khem Raj + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac -+ + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do + + +# Option defaults: @@ -12559,34 +12615,8 @@ Signed-off-by: Khem Raj +opt_verbose=: +opt_silent=false +opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do ++ ++ +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ @@ -12830,13 +12860,13 @@ Signed-off-by: Khem Raj - fi -} - -- --## ----------- ## --## Main. ## --## ----------- ## + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" +-## ----------- ## +-## Main. ## +-## ----------- ## +- -$opt_help || { - # Sanity checks first: - func_check_version_match @@ -13557,7 +13587,7 @@ Signed-off-by: Khem Raj "") # Generic help is extracted from the usage comments # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes @@ -13568,7 +13598,7 @@ Signed-off-by: Khem Raj -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." ;; *) @@ -13670,7 +13700,7 @@ Signed-off-by: Khem Raj + do + if test -d "$opt"; then + func_append libdirs " $opt" -+ + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" @@ -13690,7 +13720,7 @@ Signed-off-by: Khem Raj + else + sysroot_cmd= + fi - ++ + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do @@ -14102,7 +14132,7 @@ Signed-off-by: Khem Raj lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; @@ -14631,7 +14661,7 @@ Signed-off-by: Khem Raj */ EOF cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) @@ -14658,7 +14688,7 @@ Signed-off-by: Khem Raj void *xmalloc (size_t num); char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); @@ -14986,7 +15016,7 @@ Signed-off-by: Khem Raj vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, } void @@ -15024,7 +15054,7 @@ Signed-off-by: Khem Raj { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) void lt_update_exe_path (const char *name, const char *value) { @@ -15037,7 +15067,7 @@ Signed-off-by: Khem Raj if (name && *name && value && *value) { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { @@ -17310,6 +17340,8 @@ Signed-off-by: Khem Raj if test -n "$exec_cmd"; then eval exec "$exec_cmd" +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 --- a/ltoptions.m4 +++ b/ltoptions.m4 @@ -8,7 +8,7 @@ @@ -17321,6 +17353,8 @@ Signed-off-by: Khem Raj # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 --- a/ltversion.m4 +++ b/ltversion.m4 @@ -7,17 +7,17 @@ @@ -17347,6 +17381,8 @@ Signed-off-by: Khem Raj _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 --- a/lt~obsolete.m4 +++ b/lt~obsolete.m4 @@ -7,7 +7,7 @@ @@ -17358,6 +17394,8 @@ Signed-off-by: Khem Raj # These exist entirely to fool aclocal when bootstrapping libtool. # +diff --git a/opcodes/configure b/opcodes/configure +index 4723dcdc1e..223e14af28 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -680,6 +680,9 @@ OTOOL @@ -17407,7 +17445,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u +@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -17543,7 +17581,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli +@@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -17557,6 +17595,8 @@ Signed-off-by: Khem Raj + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -17756,7 +17796,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;; +@@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -17769,13 +17809,16 @@ Signed-off-by: Khem Raj +: ${AR=ar} +: ${AR_FLAGS=cru} + - - - -@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -17788,7 +17831,7 @@ Signed-off-by: Khem Raj +int +main () +{ -+ + + ; + return 0; +} @@ -17814,28 +17857,22 @@ Signed-off-by: Khem Raj + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + + @@ -6972,8 +7290,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -17883,7 +17920,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() +@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -17905,7 +17942,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7136,6 +7467,14 @@ else +@@ -7136,6 +7467,16 @@ else $as_echo "ok" >&6; } fi @@ -17917,13 +17954,18 @@ Signed-off-by: Khem Raj +fi + + ++ ++ -@@ -7157,6 +7496,47 @@ fi +@@ -7152,6 +7493,45 @@ fi ++ ++ ++ + + + @@ -17960,14 +18002,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; + + + @@ -7363,6 +7743,123 @@ esac need_locks="$enable_libtool_lock" @@ -18129,7 +18166,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio +@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -18142,7 +18179,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio +@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -18303,7 +18340,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -18361,7 +18398,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -18439,7 +18476,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -18448,7 +18485,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -18457,7 +18494,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -18466,7 +18503,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -18524,7 +18561,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -18533,7 +18570,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -18692,7 +18729,7 @@ Signed-off-by: Khem Raj fi case "${host}" in -@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -18713,7 +18750,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -13777,14 +14439,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -18732,7 +18769,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -18746,7 +18783,7 @@ Signed-off-by: Khem Raj file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13878,8 +14543,13 @@ reload_flag \ +@@ -13877,8 +14542,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -18760,7 +18797,7 @@ Signed-off-by: Khem Raj STRIP \ RANLIB \ CC \ -@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13888,12 +14558,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -18776,7 +18813,7 @@ Signed-off-by: Khem Raj DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13910,7 +14582,6 @@ no_undefined_flag \ +@@ -13909,7 +14581,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -18784,7 +18821,7 @@ Signed-off-by: Khem Raj exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13946,6 +14617,7 @@ module_cmds \ +@@ -13945,6 +14616,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -18792,7 +18829,7 @@ Signed-off-by: Khem Raj postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14711,7 +15383,8 @@ $as_echo X"$file" | +@@ -14710,7 +15382,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -18802,7 +18839,7 @@ Signed-off-by: Khem Raj # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -18846,7 +18883,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -14855,6 +15551,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -18859,7 +18896,7 @@ Signed-off-by: Khem Raj # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -18869,7 +18906,7 @@ Signed-off-by: Khem Raj # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14979,12 +15684,12 @@ with_gcc=$GCC +@@ -14978,12 +15683,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -18885,7 +18922,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath +@@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -18895,7 +18932,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms +@@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -18905,7 +18942,7 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -15120,210 +15825,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -19107,9 +19144,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -19267,15 +19310,14 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index 00be9c88be..11c9e33e8c 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -170,7 +170,7 @@ changequote(,)dnl @@ -19287,6 +19329,8 @@ Signed-off-by: Khem Raj fi case "${host}" in +diff --git a/zlib/configure b/zlib/configure +index 041cbdbf71..19d605fc85 100755 --- a/zlib/configure +++ b/zlib/configure @@ -646,8 +646,11 @@ OTOOL @@ -19338,7 +19382,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u +@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -19474,7 +19518,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli +@@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -19488,6 +19532,8 @@ Signed-off-by: Khem Raj + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -19688,7 +19734,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; +@@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -19700,13 +19746,17 @@ Signed-off-by: Khem Raj -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -19719,7 +19769,7 @@ Signed-off-by: Khem Raj +int +main () +{ -+ + + ; + return 0; +} @@ -19745,29 +19795,22 @@ Signed-off-by: Khem Raj + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 + + + @@ -5846,8 +6165,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -19815,7 +19858,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() +@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -19837,7 +19880,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6010,6 +6342,18 @@ else +@@ -6010,6 +6342,19 @@ else $as_echo "ok" >&6; } fi @@ -19853,13 +19896,17 @@ Signed-off-by: Khem Raj + + + ++ -@@ -6031,6 +6375,42 @@ fi +@@ -6027,6 +6372,41 @@ fi ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -19892,13 +19939,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : + + @@ -6241,6 +6621,123 @@ esac need_locks="$enable_libtool_lock" @@ -20060,7 +20103,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio +@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -20073,7 +20116,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio +@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -20234,7 +20277,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -20292,7 +20335,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -20370,7 +20413,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -20379,7 +20422,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -20388,7 +20431,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -20397,7 +20440,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -20458,7 +20501,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -20467,7 +20510,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -20617,7 +20660,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -20638,7 +20681,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -20657,7 +20700,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -20771,7 +20814,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -21032,9 +21075,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -21192,11 +21241,8 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch similarity index 87% rename from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch rename to meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 5a195054f6..bfab66e637 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 +From f83e86af1dd564997eecb688a6a3064fa01c3ad8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 0be45b4ae8..4817616bb2 100644 +index fe738d0db4..27d818f253 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -365,7 +365,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch rename to meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index 655cc375a9..445b2abc51 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 +From c573c8472678ac0eda411f2ec94d1213fbe49957 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -59,9 +59,11 @@ Signed-off-by: Khem Raj ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 86 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) +diff --git a/ld/config.in b/ld/config.in +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -74,9 +76,11 @@ Signed-off-by: Khem Raj /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION +diff --git a/ld/configure b/ld/configure +index f432f4637d..a9da3c115e 100755 --- a/ld/configure +++ b/ld/configure -@@ -827,6 +827,7 @@ with_lib_path +@@ -830,6 +830,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -84,7 +88,7 @@ Signed-off-by: Khem Raj enable_gold enable_got enable_compressed_debug_sections -@@ -1491,6 +1492,8 @@ Optional Features: +@@ -1495,6 +1496,8 @@ Optional Features: --disable-largefile omit support for large files --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -93,7 +97,7 @@ Signed-off-by: Khem Raj --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16619,6 +16622,19 @@ fi +@@ -16624,6 +16627,19 @@ fi @@ -113,6 +117,8 @@ Signed-off-by: Khem Raj # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in +diff --git a/ld/configure.ac b/ld/configure.ac +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -132,9 +138,11 @@ Signed-off-by: Khem Raj dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -149,9 +157,11 @@ Signed-off-by: Khem Raj /* Big or little endian as set on command line. */ enum endian_enum endian; +diff --git a/ld/ld.texi b/ld/ld.texi +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -170,9 +180,11 @@ Signed-off-by: Khem Raj @end table @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -196,6 +208,8 @@ Signed-off-by: Khem Raj } /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -150,6 +150,8 @@ enum option_values @@ -207,9 +221,11 @@ Signed-off-by: Khem Raj }; /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index da1ad17763..12d0b07d8a 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -274,6 +274,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -218,9 +234,11 @@ Signed-off-by: Khem Raj /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 3d15cc491d..0e8b4f2b7a 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -235,7 +253,7 @@ Signed-off-by: Khem Raj }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) +@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch similarity index 96% rename from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch rename to meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index e63d278bcd..e4866bd841 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 +From 546dac0fa4dd75faedbdee341eb760eb89b98bf2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch similarity index 80% rename from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch rename to meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index e6b50dbcde..baf9891cc7 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 +From d955e4bf86aa95f2343bd104d9d481d78bc09339 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:44:14 +0000 Subject: [PATCH] Change default emulation for mips64*-*-linux @@ -13,9 +13,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index b96931f52e..847f9f0ba9 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -915,12 +915,12 @@ case "${targ}" in +@@ -911,12 +911,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -32,21 +34,24 @@ Signed-off-by: Khem Raj ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 23194e357f..f4f0eaf9b2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip - mips*-*-vxworks*) targ_emul=elf32ebmipvxworks - targ_extra_emuls="elf32elmipvxworks" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; +@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" +mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" +mips64*-*-linux-*) targ_emul=elf64btsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; mips*el-*-linux-*) targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch similarity index 83% rename from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch rename to meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index b710752245..28c9e65e84 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,4 +1,4 @@ -From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 +From bc4556085ab31f09b6555dff7fe1a4360f6f5cfc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:06:19 +0000 Subject: [PATCH] Add support for Netlogic XLP @@ -33,9 +33,11 @@ Signed-off-by: Mark Hatle opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- 14 files changed, 62 insertions(+), 21 deletions(-) +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index fa3a9746b6..5078024fd5 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch +@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -43,6 +45,8 @@ Signed-off-by: Mark Hatle /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; +diff --git a/bfd/archures.c b/bfd/archures.c +index 232103817c..b2b3b8c124 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -53,9 +57,11 @@ Signed-off-by: Mark Hatle .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 7c13bc8c91..2e453c50c1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2125,6 +2125,7 @@ enum bfd_architecture +@@ -1568,6 +1568,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -63,9 +69,11 @@ Signed-off-by: Mark Hatle #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 847f9f0ba9..a12707f827 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -898,6 +898,11 @@ case "${targ}" in +@@ -894,6 +894,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -77,9 +85,11 @@ Signed-off-by: Mark Hatle mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index 802acb45f1..fd9ec4c0ad 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c -@@ -107,7 +107,8 @@ enum +@@ -108,7 +108,8 @@ enum I_mipsocteon3, I_xlr, I_interaptiv_mr2, @@ -89,16 +99,18 @@ Signed-off-by: Mark Hatle }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), +@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) }; /* The default architecture is mips:3000, but with a machine number of +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index d7e3aed3b6..7baeee9ee3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -111,7 +123,7 @@ Signed-off-by: Mark Hatle default: switch (flags & EF_MIPS_ARCH) { -@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -122,7 +134,7 @@ Signed-off-by: Mark Hatle case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension +@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -130,9 +142,11 @@ Signed-off-by: Mark Hatle /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6b5bebe743..d15a7828db 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, +@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -140,6 +154,8 @@ Signed-off-by: Mark Hatle case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index fc6898834e..2c7151ccdb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -158,7 +174,7 @@ Signed-off-by: Mark Hatle ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c +@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -167,6 +183,8 @@ Signed-off-by: Mark Hatle /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, +diff --git a/gas/configure b/gas/configure +index 0e0ce4c0e2..09c23e9c6a 100755 --- a/gas/configure +++ b/gas/configure @@ -13377,6 +13377,9 @@ _ACEOF @@ -179,6 +197,8 @@ Signed-off-by: Mark Hatle mipstx39 | mipstx39el) mips_cpu=r3900 ;; +diff --git a/include/elf/mips.h b/include/elf/mips.h +index d116b036b6..dceeb3f156 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -189,9 +209,11 @@ Signed-off-by: Mark Hatle #define E_MIPS_MACH_OCTEON2 0x008d0000 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index fd031f3758..a96a44df84 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table +@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -200,7 +222,7 @@ Signed-off-by: Mark Hatle /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table +@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -208,7 +230,7 @@ Signed-off-by: Mark Hatle /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas +@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -218,20 +240,25 @@ Signed-off-by: Mark Hatle default: return FALSE; } +diff --git a/ld/configure.tgt b/ld/configure.tgt +index f4f0eaf9b2..0da3eca19c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; + targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" + ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip -+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ++ ;; mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 755bbe294b..ce22ef683a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ +@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -250,6 +277,8 @@ Signed-off-by: Mark Hatle /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 5270aeefa8..d17dc78cd7 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -260,7 +289,7 @@ Signed-off-by: Mark Hatle #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op +@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -268,7 +297,7 @@ Signed-off-by: Mark Hatle /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op +@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -283,7 +312,7 @@ Signed-off-by: Mark Hatle /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op +@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -291,7 +320,7 @@ Signed-off-by: Mark Hatle {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op +@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, @@ -300,7 +329,7 @@ Signed-off-by: Mark Hatle {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op +@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -313,7 +342,7 @@ Signed-off-by: Mark Hatle {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op +@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -322,7 +351,7 @@ Signed-off-by: Mark Hatle {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op +@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -338,7 +367,7 @@ Signed-off-by: Mark Hatle {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op +@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -347,7 +376,7 @@ Signed-off-by: Mark Hatle {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op +@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch rename to meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index f686763594..211f66ce26 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 +From 283fbdb658af7c310c1fc477dd8ec572cca5de50 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index b56fe3e21a..696fe83a7b 100644 +index 7ef91d819b..145953d3c4 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch rename to meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index 493b05026d..737d748d2c 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,4 +1,4 @@ -From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 +From 06b3f6172eada20dd555e2bd2b34b7c055334033 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 11:42:03 -0700 Subject: [PATCH] Detect 64-bit MIPS targets @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index 3e066edaa8..caf130ceda 100644 +index aa7ec552ae..470515062e 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch similarity index 97% rename from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch rename to meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index ae5915d39b..7a3f7ee3b1 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 +From d23818d123461e6ebb90a6fac071cc9080bdd9ab Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0016-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch similarity index 80% rename from meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch rename to meta/recipes-devtools/binutils/binutils/0016-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch index d25ce61626..c5a118a29a 100644 --- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +++ b/meta/recipes-devtools/binutils/binutils/0016-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch @@ -1,4 +1,4 @@ -From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001 +From 6658cad55384865d6795cbe436c7361a67d1ed95 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 29 Nov 2018 17:46:40 -0800 Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on @@ -19,9 +19,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index a12707f827..17f4cc5bea 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -694,7 +694,7 @@ case "${targ}" in +@@ -690,7 +690,7 @@ case "${targ}" in ;; x86_64-*-linux-*) targ_defvec=x86_64_elf64_vec @@ -30,17 +32,19 @@ Signed-off-by: Khem Raj want64=true ;; x86_64-*-nacl*) +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 0da3eca19c..8d0b4b885d 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x - tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; +@@ -938,8 +938,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x86_64 + tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` + ;; x86_64-*-linux-*) targ_emul=elf_x86_64 - targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" - targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" + targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" + targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" + targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; - i[3-7]86-*-redox*) targ_emul=elf_i386 - targ_extra_emuls=elf_x86_64 ;; + tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` + ;; + x86_64-*-redox*) targ_emul=elf_x86_64 diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch deleted file mode 100644 index ce5b9f392d..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 00:07:29 +1030 -Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17450, so backport it to master and zeus. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79] -CVE: CVE-2019-17450 -Signed-off-by: Trevor Gamblin - - PR 25078 - * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add - recur_count. Error on recur_count reaching 100 rather than - info_ptr matching orig_info_ptr. Adjust calls. - ---- - bfd/dwarf2.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod - struct dwarf2_debug *); - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1fe05d310e..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 10:47:13 +1030 -Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17451, so backport it to master and zeus. - -Upstream-Status: Backport -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848] -CVE: CVE-2019-17451 -Signed-off-by: Trevor Gamblin - - -Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 -and ffffd5555453b140 result in a total size of 1. Reading the first -section of course overflows the buffer and tramples on other memory. - - PR 25070 - * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of - total_size calculation. ---- - bfd/dwarf2.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb similarity index 94% rename from meta/recipes-devtools/binutils/binutils_2.33.bb rename to meta/recipes-devtools/binutils/binutils_2.34.bb index 8bd2bf778c..eecad1863c 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.34.bb @@ -51,7 +51,7 @@ do_install_class-native () { PACKAGE_BEFORE_PN += "libbfd" FILES_libbfd = "${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " +SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- 2.25.1 From patchwork at patchwork.openembedded.org Wed Feb 19 18:32:29 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 19 Feb 2020 18:32:29 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_binutils?= =?utf-8?q?=3A_Upgrade_to_2=2E34_release?= In-Reply-To: <20200219180941.3829153-1-raj.khem@gmail.com> References: <20200219180941.3829153-1-raj.khem@gmail.com> Message-ID: <20200219183229.2274.90987@do> == Series Details == Series: binutils: Upgrade to 2.34 release Revision: 1 URL : https://patchwork.openembedded.org/series/22759/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at b649cf5c09) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From raj.khem at gmail.com Wed Feb 19 18:37:57 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 19 Feb 2020 10:37:57 -0800 Subject: [OE-core] [PATCH 05/10] weston-init: use the drm backend rather than fbdev one In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> Message-ID: <30085196-1dc5-d64e-73ca-416f52291a9e@gmail.com> On 2/19/20 10:06 AM, Alexander Kanavin wrote: > Will that take precedence over qemuall though? Sounds brittle. Another > option is to make the fbdev configuration specific to mips and arm, as > using kms does not need a configuration at all. > I think it will. arch specific overrides should come before generic ones. > Alex > > On Wed 19. Feb 2020 at 18.21, Khem Raj > wrote: > > On Wed, Feb 19, 2020 at 1:45 AM Alexander Kanavin > > wrote: > > > > On Tue, 18 Feb 2020 at 02:56, Khem Raj > wrote: > >> > >> > >>> but I'll get to it, or you are welcome to try and report. > >>> Mips can be either fixed like suggested, or be a specific > exception. > >>> > >>> For the rest of the targets, I see that you have extended the > fbdev fallback to qemuall only on Jan 9 this year. So it's very > unlikely anyone is using them to run weston (not to mention how > painfully slow that would be), and so it would just be wasteful to > test or fix them. > >> > >> > >> We should be only applying tested part debugging these breakages > is very hard so when we know it will break we should be careful as > with this patch > > > > > > I have tested these things now: > > > > 1. Switching mips from cirrus to std vga works fine, as long as > xorg.conf is also deleted (it's written specifically for cirrus and > isn't working or needed with std vga). Both weston and sato boot and > look right. I'll send a patch for it. > > > > 2. Switching weston to kms backend degrades performance to > unusable level, as neither kvm nor virtio/virgl are available for > non-x86 qemu, and kms backend is using software renderer in mesa. So > fbdev is the only realistic option there. But for x86 qemu kms is > still viable. I'm not sure how to best configure it though. > > copy qemuall/weston.ini new folders qemux86 and qemux86-64 and point > to backend it should be using. > > > > > Alex > From richard.purdie at linuxfoundation.org Wed Feb 19 18:38:15 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 18:38:15 +0000 Subject: [OE-core] [PATCH 1/3] selftest/context: Avoid tracebacks from tests using multiprocessing Message-ID: <20200219183817.130495-1-richard.purdie@linuxfoundation.org> We can see tracebacks where the SIGTERM handler catches things it shouldn't. Avoid exit(1) unless we're the process that it was intended for. [YOCTO #13664] Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index c4eb5d614eb..3d3b19c6e80 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -280,11 +280,15 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc def _signal_clean_handler(self, signum, frame): - sys.exit(1) + if self.ourpid == os.getpid(): + sys.exit(1) def run(self, logger, args): self._process_args(logger, args) + # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf + # but don't interfer with other processes + self.ourpid = os.getpid() signal.signal(signal.SIGTERM, self._signal_clean_handler) rc = None -- 2.25.0 From richard.purdie at linuxfoundation.org Wed Feb 19 18:38:16 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 18:38:16 +0000 Subject: [OE-core] [PATCH 2/3] oeqa/selftest: Startardise seperate builddir for concurrent and non-concurrent selftest In-Reply-To: <20200219183817.130495-1-richard.purdie@linuxfoundation.org> References: <20200219183817.130495-1-richard.purdie@linuxfoundation.org> Message-ID: <20200219183817.130495-2-richard.purdie@linuxfoundation.org> Currently oe-selftest reuses the current build directory and the concurrent version run with -j does not. Standardise and use a separate new build directory in both cases. This will lead to simpler code and more reliable user run tests. Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 12 +++-- meta/lib/oeqa/core/utils/concurrencytest.py | 35 ++------------- meta/lib/oeqa/selftest/context.py | 50 +++++++++++++++++++++ 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 14fc6a54f4b..16320af1157 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -72,6 +72,9 @@ class OETestContext(object): modules_required, **kwargs) self.suites = self.loader.discover() + def prepareSuite(self, suites, processes): + return suites + def runTests(self, processes=None, skips=[]): self.runner = self.runnerClass(self, descriptions=False, verbosity=2) @@ -79,14 +82,9 @@ class OETestContext(object): self.skipTests(skips) self._run_start_time = time.time() - if processes: - from oeqa.core.utils.concurrencytest import ConcurrentTestSuite - - concurrent_suite = ConcurrentTestSuite(self.suites, processes) - result = self.runner.run(concurrent_suite) - else: + if not processes: self.runner.buffer = True - result = self.runner.run(self.suites) + result = self.runner.run(self.prepareSuite(self.suites, processes)) self._run_end_time = time.time() return result diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 0d9c01e6d45..fac59f765ac 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -177,9 +177,10 @@ class dummybuf(object): # class ConcurrentTestSuite(unittest.TestSuite): - def __init__(self, suite, processes): + def __init__(self, suite, processes, setupfunc): super(ConcurrentTestSuite, self).__init__([suite]) self.processes = processes + self.setupfunc = setupfunc def run(self, result): tests, totaltests = fork_for_tests(self.processes, self) @@ -272,37 +273,7 @@ def fork_for_tests(concurrency_num, suite): stream = os.fdopen(c2pwrite, 'wb', 1) os.close(c2pread) - # Create a new separate BUILDDIR for each group of tests - if 'BUILDDIR' in os.environ: - builddir = os.environ['BUILDDIR'] - newbuilddir = builddir + "-st-" + str(ourpid) - newselftestdir = newbuilddir + "/meta-selftest" - - bb.utils.mkdirhier(newbuilddir) - oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") - oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") - oe.path.copytree(selftestdir, newselftestdir) - - for e in os.environ: - if builddir in os.environ[e]: - os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - - os.chdir(newbuilddir) - - for t in process_suite: - if not hasattr(t, "tc"): - continue - cp = t.tc.config_paths - for p in cp: - if selftestdir in cp[p] and newselftestdir not in cp[p]: - cp[p] = cp[p].replace(selftestdir, newselftestdir) - if builddir in cp[p] and newbuilddir not in cp[p]: - cp[p] = cp[p].replace(builddir, newbuilddir) + (builddir, newbuilddir) = suite.setupfunc("-st-" + str(ourpid), selftestdir, process_suite) # Leave stderr and stdout open so we can see test noise # Close stdin so that the child goes away if it decides to diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 3d3b19c6e80..2cb6c763852 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -10,11 +10,13 @@ import glob import sys import importlib import signal +import subprocess from shutil import copyfile from random import choice import oeqa import oe +import bb.utils from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun, OEQATestNotFound @@ -29,6 +31,54 @@ class OESelftestTestContext(OETestContext): self.custommachine = None self.config_paths = config_paths + def setup_builddir(self, suffix, selftestdir, suite): + builddir = os.environ['BUILDDIR'] + if not selftestdir: + selftestdir = get_test_layer() + newbuilddir = builddir + suffix + newselftestdir = newbuilddir + "/meta-selftest" + + if os.path.exists(newbuilddir): + self.logger.error("Build directory %s already exists, aborting") + sys.exit(1) + + bb.utils.mkdirhier(newbuilddir) + oe.path.copytree(builddir + "/conf", newbuilddir + "/conf") + oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") + oe.path.copytree(selftestdir, newselftestdir) + + for e in os.environ: + if builddir in os.environ[e]: + os.environ[e] = os.environ[e].replace(builddir, newbuilddir) + + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + + os.chdir(newbuilddir) + + for t in suite: + if not hasattr(t, "tc"): + continue + cp = t.tc.config_paths + for p in cp: + if selftestdir in cp[p] and newselftestdir not in cp[p]: + cp[p] = cp[p].replace(selftestdir, newselftestdir) + if builddir in cp[p] and newbuilddir not in cp[p]: + cp[p] = cp[p].replace(builddir, newbuilddir) + + return (builddir, newbuilddir) + + def prepareSuite(self, suites, processes): + if processes: + from oeqa.core.utils.concurrencytest import ConcurrentTestSuite + + return ConcurrentTestSuite(suites, processes, self.setup_builddir) + else: + self.setup_builddir("-st", None, suites) + return suites + def runTests(self, processes=None, machine=None, skips=[]): if machine: self.custommachine = machine -- 2.25.0 From richard.purdie at linuxfoundation.org Wed Feb 19 18:38:17 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 18:38:17 +0000 Subject: [OE-core] [PATCH 3/3] oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: <20200219183817.130495-1-richard.purdie@linuxfoundation.org> References: <20200219183817.130495-1-richard.purdie@linuxfoundation.org> Message-ID: <20200219183817.130495-3-richard.purdie@linuxfoundation.org> Now selftest is using its own copied build directory, we can stop worrying about copying files around as backup, and drop the SIGTERM handler to try and restore them, simplifying the code. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/case.py | 30 +------------------- meta/lib/oeqa/selftest/context.py | 47 ++----------------------------- 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index ac3308d8a44..dcad4f76ecd 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -6,7 +6,6 @@ import sys import os -import shutil import glob import errno from unittest.util import safe_repr @@ -30,9 +29,7 @@ class OESelftestTestCase(OETestCase): cls.builddir = cls.tc.config_paths['builddir'] cls.localconf_path = cls.tc.config_paths['localconf'] - cls.localconf_backup = cls.tc.config_paths['localconf_class_backup'] cls.local_bblayers_path = cls.tc.config_paths['bblayers'] - cls.local_bblayers_backup = cls.tc.config_paths['bblayers_class_backup'] cls.testinc_path = os.path.join(cls.tc.config_paths['builddir'], "conf/selftest.inc") @@ -43,8 +40,7 @@ class OESelftestTestCase(OETestCase): cls._track_for_cleanup = [ cls.testinc_path, cls.testinc_bblayers_path, - cls.machineinc_path, cls.localconf_backup, - cls.local_bblayers_backup] + cls.machineinc_path] cls.add_include() @@ -102,30 +98,6 @@ class OESelftestTestCase(OETestCase): def setUp(self): super(OESelftestTestCase, self).setUp() os.chdir(self.builddir) - # Check if local.conf or bblayers.conf files backup exists - # from a previous failed test and restore them - if os.path.isfile(self.localconf_backup) or os.path.isfile( - self.local_bblayers_backup): - self.logger.debug("\ -Found a local.conf and/or bblayers.conf backup from a previously aborted test.\ -Restoring these files now, but tests should be re-executed from a clean environment\ -to ensure accurate results.") - try: - shutil.copyfile(self.localconf_backup, self.localconf_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - try: - shutil.copyfile(self.local_bblayers_backup, - self.local_bblayers_path) - except OSError as e: - if e.errno != errno.ENOENT: - raise - else: - # backup local.conf and bblayers.conf - shutil.copyfile(self.localconf_path, self.localconf_backup) - shutil.copyfile(self.local_bblayers_path, self.local_bblayers_backup) - self.logger.debug("Creating local.conf and bblayers.conf backups.") # we don't know what the previous test left around in config or inc files # if it failed so we need a fresh start try: diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 2cb6c763852..0ab6462bbf8 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -9,9 +9,7 @@ import time import glob import sys import importlib -import signal import subprocess -from shutil import copyfile from random import choice import oeqa @@ -185,26 +183,10 @@ class OESelftestTestContextExecutor(OETestContextExecutor): builddir = os.environ.get("BUILDDIR") self.tc_kwargs['init']['config_paths'] = {} - self.tc_kwargs['init']['config_paths']['testlayer_path'] = \ - get_test_layer() + self.tc_kwargs['init']['config_paths']['testlayer_path'] = get_test_layer() self.tc_kwargs['init']['config_paths']['builddir'] = builddir - self.tc_kwargs['init']['config_paths']['localconf'] = \ - os.path.join(builddir, "conf/local.conf") - self.tc_kwargs['init']['config_paths']['localconf_backup'] = \ - os.path.join(builddir, "conf/local.conf.orig") - self.tc_kwargs['init']['config_paths']['localconf_class_backup'] = \ - os.path.join(builddir, "conf/local.conf.bk") - self.tc_kwargs['init']['config_paths']['bblayers'] = \ - os.path.join(builddir, "conf/bblayers.conf") - self.tc_kwargs['init']['config_paths']['bblayers_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.orig") - self.tc_kwargs['init']['config_paths']['bblayers_class_backup'] = \ - os.path.join(builddir, "conf/bblayers.conf.bk") - - copyfile(self.tc_kwargs['init']['config_paths']['localconf'], - self.tc_kwargs['init']['config_paths']['localconf_backup']) - copyfile(self.tc_kwargs['init']['config_paths']['bblayers'], - self.tc_kwargs['init']['config_paths']['bblayers_backup']) + self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") + self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") def tag_filter(tags): if args.exclude_tags: @@ -329,18 +311,9 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return rc - def _signal_clean_handler(self, signum, frame): - if self.ourpid == os.getpid(): - sys.exit(1) - def run(self, logger, args): self._process_args(logger, args) - # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf - # but don't interfer with other processes - self.ourpid = os.getpid() - signal.signal(signal.SIGTERM, self._signal_clean_handler) - rc = None try: if args.machine: @@ -369,20 +342,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor): rc = self._internal_run(logger, args) finally: config_paths = self.tc_kwargs['init']['config_paths'] - if os.path.exists(config_paths['localconf_backup']): - copyfile(config_paths['localconf_backup'], - config_paths['localconf']) - os.remove(config_paths['localconf_backup']) - - if os.path.exists(config_paths['bblayers_backup']): - copyfile(config_paths['bblayers_backup'], - config_paths['bblayers']) - os.remove(config_paths['bblayers_backup']) - - if os.path.exists(config_paths['localconf_class_backup']): - os.remove(config_paths['localconf_class_backup']) - if os.path.exists(config_paths['bblayers_class_backup']): - os.remove(config_paths['bblayers_class_backup']) output_link = os.path.join(os.path.dirname(args.output_log), "%s-results.log" % self.name) -- 2.25.0 From richard.purdie at linuxfoundation.org Wed Feb 19 18:55:04 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 18:55:04 +0000 Subject: [OE-core] bash: Fix CVE-2019-18276 In-Reply-To: References: <4f09ab13-9571-3464-2fc3-334bc91b9c09@case.edu> <444185BB2F013F4E92378F99BCF8A58BC9AF9CBD@ALA-MBD.corp.ad.wrs.com> <99d34efd-3a68-0b05-0e15-fbfd360a2f2a@case.edu> <9b99752af2094590137fdaacf6668f170b34158c.camel@linuxfoundation.org> <41e8a2902bc8594a17f0afa1744f04a6facd5316.camel@intel.com> Message-ID: On Wed, 2020-02-19 at 07:46 -0800, akuster808 wrote: > > On 2/18/20 7:49 AM, Richard Purdie wrote: > > On Tue, 2020-02-18 at 15:43 +0000, Mittal, Anuj wrote: > > > On Tue, 2020-02-18 at 15:35 +0000, Richard Purdie wrote: > > > > > > > > Someone just needs to remove that section of the patch. > > > There are other issues with this patch which should also be fixed > > > I > > > think. It has been marked as a Backport while it is not one. The > > > patch > > > includes changes that are irrelevant to the CVE. And, it should > > > have > > > gone to master first. > > I shall await guidance from you/Armin then. > > We should revert the commit. Ill send a patch. Anuj sent it, I've merged it to zeus. Open questions: Should we ship 3.0.2 rc2? Did this patch cause this regression: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13795 Cheers, Richard From raj.khem at gmail.com Wed Feb 19 19:27:57 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 19 Feb 2020 11:27:57 -0800 Subject: [OE-core] [PATCH V2] binutils: Upgrade to 2.34 release Message-ID: <20200219192757.4194194-1-raj.khem@gmail.com> Details of changelog [1] Removing bfd/ld patch to ebale pe targets instead use specific emulations via --enable-targets for x86_64 Re-arrange/forward-port patches and upgrade libctf configure to libtool 2.4 patch [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html Signed-off-by: Khem Raj Cc: Christopher Clark --- v2: Fix libtool patch and drop EFI patch for configure option meta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ....33.bb => binutils-cross-canadian_2.34.bb} | 0 ...33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...s-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...ssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 2 + ...s-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...o-not-generate-linker-script-directo.patch | 4 +- ...k-Search-for-alternative-ld.so.conf.patch} | 75 +- ...den-the-regexp-for-SH-architectures.patch} | 8 +- ...05-Point-scripts-location-to-libdir.patch} | 10 +- ...RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- ...l-2.4.patch => 0007-Use-libtool-2.4.patch} | 3505 ++++++++++++++--- ...tro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...system-directories-when-cross-linki.patch} | 42 +- ...-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...-default-emulation-for-mips64-linux.patch} | 23 +- ...> 0012-Add-support-for-Netlogic-XLP.patch} | 89 +- ...ct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ... => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...> 0015-sync-with-OE-libtool-changes.patch} | 2 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 2 +- 26 files changed, 3087 insertions(+), 962 deletions(-) rename meta/recipes-devtools/binutils/{binutils-2.33.inc => binutils-2.34.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.33.bb => binutils-cross-canadian_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.33.bb => binutils-cross-testsuite_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.33.bb => binutils-cross_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} (100%) rename meta/recipes-devtools/binutils/binutils/{nativesdk-relocation.patch => 0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch} (56%) rename meta/recipes-devtools/binutils/binutils/{0003-configure-widen-the-regexp-for-SH-architectures.patch => 0004-configure-widen-the-regexp-for-SH-architectures.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0004-Point-scripts-location-to-libdir.patch => 0005-Point-scripts-location-to-libdir.patch} (83%) rename meta/recipes-devtools/binutils/binutils/{0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch => 0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} (51%) rename meta/recipes-devtools/binutils/binutils/{0006-Use-libtool-2.4.patch => 0007-Use-libtool-2.4.patch} (88%) rename meta/recipes-devtools/binutils/binutils/{0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (87%) rename meta/recipes-devtools/binutils/binutils/{0008-warn-for-uses-of-system-directories-when-cross-linki.patch => 0009-warn-for-uses-of-system-directories-when-cross-linki.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (96%) rename meta/recipes-devtools/binutils/binutils/{0010-Change-default-emulation-for-mips64-linux.patch => 0011-Change-default-emulation-for-mips64-linux.patch} (80%) rename meta/recipes-devtools/binutils/binutils/{0011-Add-support-for-Netlogic-XLP.patch => 0012-Add-support-for-Netlogic-XLP.patch} (83%) rename meta/recipes-devtools/binutils/binutils/{0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0013-Detect-64-bit-MIPS-targets.patch => 0014-Detect-64-bit-MIPS-targets.patch} (91%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch rename meta/recipes-devtools/binutils/binutils/{0014-sync-with-OE-libtool-changes.patch => 0015-sync-with-OE-libtool-changes.patch} (97%) delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/{binutils_2.33.bb => binutils_2.34.bb} (94%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index f7f25cae93..7e94ec5d4b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "10.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.33%" +BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc similarity index 54% rename from meta/recipes-devtools/binutils/binutils-2.33.inc rename to meta/recipes-devtools/binutils/binutils-2.34.inc index 84a9ec8fc3..2808a1ac56 100644 --- a/meta/recipes-devtools/binutils/binutils-2.33.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -14,35 +14,32 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.33, please make sure there is no trailing .0, so +# When upgrading to 2.35, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.33.1" -CVE_VERSION = "2.33" +PV = "2.34" +CVE_VERSION = "2.34" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_33-branch" +BRANCH ?= "binutils-2_34-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" +SRCREV ?= "e2b46ba142d9901897d8189422f0bcc28e5660b8" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ - file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ - file://0004-Point-scripts-location-to-libdir.patch \ - file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0006-Use-libtool-2.4.patch \ - file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ - file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0010-Change-default-emulation-for-mips64-linux.patch \ - file://0011-Add-support-for-Netlogic-XLP.patch \ - file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0013-Detect-64-bit-MIPS-targets.patch \ - file://0014-sync-with-OE-libtool-changes.patch \ - file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-17450.patch \ - file://CVE-2019-17451.patch \ + file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ + file://0005-Point-scripts-location-to-libdir.patch \ + file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0011-Change-default-emulation-for-mips64-linux.patch \ + file://0012-Add-support-for-Netlogic-XLP.patch \ + file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0014-Detect-64-bit-MIPS-targets.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a4b9aa586d..79102fe7f7 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -80,6 +80,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${LDGOLD} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " + LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 3a9461bf4a..fb9e4963bf 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,6 +1,6 @@ -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 +From 0a8dc3e04fdffbd0d371f26ee219bd856065e378 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 8 Dec 2019 00:31:35 -0800 +Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk @@ -18,23 +18,23 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index cb2b081e9e..db2e9fd569 100755 +index 03392d265c..435689ea14 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " - ( echo "/* Script for ld -r: link without relocation */" + ( echo "/* Script for -r */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " - ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" + ( echo "/* Script for -Ur */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu @@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index f9f0f7d402..9e469dca86 100644 +index 0b8b32a440..ee6b71075d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 1b499a4504..dc289ac153 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 +From beafbdf677968a357d8f65851f040b1f4b7d58d8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories @@ -22,7 +22,7 @@ Signed-off-by: Khem Raj 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index c90f38a63c..97ad1a24d6 100755 +index 435689ea14..cff8a1467f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch similarity index 56% rename from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch rename to meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 408f7d18b7..cceeacaa3c 100644 --- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,10 @@ -We need binutils to look at our ld.so.conf file within the SDK to ensure +From 8d0486b4e833cce54bdcaa49e9fbf4588bf66f6c Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 19 Feb 2020 09:51:16 -0800 +Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK + installation + +We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. We therefore pass in the directory to the code using a define, then add @@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the gcc internal paths. This ensures that ld works correctly in our buildtools tarball. -Standard sysroot relocation doesn't work since we're not in a sysroot, +Standard sysroot relocation doesn't work since we're not in a sysroot, we want to use both the host system and SDK libs. Signed-off-by: Richard Purdie 2020/1/17 Upstream-Status: Inappropriate [OE specific tweak] -Index: git/ld/Makefile.am -=================================================================== ---- git.orig/ld/Makefile.am -+++ git/ld/Makefile.am -@@ -36,7 +36,8 @@ am__skipyacc = +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 3 ++- + ld/Makefile.in | 3 ++- + ld/ldelf.c | 2 +- + ld/ldmain.c | 1 + + ld/ldmain.h | 1 + + 5 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 4a9b8404b7..1c132d3ce4 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -27,12 +42,12 @@ Index: git/ld/Makefile.am WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) -Index: git/ld/Makefile.in -=================================================================== ---- git.orig/ld/Makefile.in -+++ git/ld/Makefile.in -@@ -546,7 +546,8 @@ am__skiplex = - am__skipyacc = +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 46d9b14077..e453bc1b33 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz + ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ @@ -41,24 +56,24 @@ Index: git/ld/Makefile.in AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @ENABLE_PLUGINS_FALSE at PLUGIN_C = -Index: git/ld/emultempl/elf32.em -=================================================================== ---- git.orig/ld/emultempl/elf32.em -+++ git/ld/emultempl/elf32.em -@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c +diff --git a/ld/ldelf.c b/ld/ldelf.c +index 2e27cf48a8..a095d6aac5 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, info.path = NULL; info.len = info.alloc = 0; -- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", +- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); - if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) + if (!ldelf_parse_ld_so_conf (&info, tmppath)) { -Index: git/ld/ldmain.c -=================================================================== ---- git.orig/ld/ldmain.c -+++ git/ld/ldmain.c -@@ -68,6 +68,7 @@ char *program_name; +diff --git a/ld/ldmain.c b/ld/ldmain.c +index c4af10f4e9..da1ad17763 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; @@ -66,10 +81,10 @@ Index: git/ld/ldmain.c /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; -Index: git/ld/ldmain.h -=================================================================== ---- git.orig/ld/ldmain.h -+++ git/ld/ldmain.h +diff --git a/ld/ldmain.h b/ld/ldmain.h +index 0f05821d1e..54c36a94ce 100644 +--- a/ld/ldmain.h ++++ b/ld/ldmain.h @@ -23,6 +23,7 @@ extern char *program_name; diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch rename to meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch index 4a6b107126..31cecdd94d 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -1,4 +1,4 @@ -From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 +From 0d89fcb9b79071aa65229c575e97bedb387beab5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:07:33 +0000 Subject: [PATCH] configure: widen the regexp for SH architectures @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 6a9719f609..001523eebf 100755 +index 91dc42f6c7..7c1b747e7c 100755 --- a/configure +++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in +@@ -3915,7 +3915,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -27,7 +27,7 @@ index 6a9719f609..001523eebf 100755 sh*-*-elf) ;; diff --git a/gprof/configure b/gprof/configure -index cbb3aced46..b5eabceb77 100755 +index c23692e5c3..eb04fdcc89 100755 --- a/gprof/configure +++ b/gprof/configure @@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch similarity index 83% rename from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch rename to meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 8318bd3899..f8e7e28796 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 +From 16142108c885e753398102fd9bf6ec54eaddd843 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index ddc7a78368..6fa7bf2583 100644 +index 1c132d3ce4..8d82cf2e16 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -63,7 +63,7 @@ endif +@@ -64,7 +64,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fdf06128b2..5c108b9e05 100644 +index e453bc1b33..2dcd72f809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch similarity index 51% rename from meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch rename to meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 214ae06344..9df0b402f2 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 +From 15b89ac55201aea6cf5cb486307c837f2ac072b5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:27:17 +0000 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty @@ -10,21 +10,23 @@ Upstream-Status: Pending Signed-off-by: Chris Chimelis Signed-off-by: Khem Raj --- - ld/emultempl/elf32.em | 4 ++++ + ld/ldelf.c | 4 ++++ 1 file changed, 4 insertions(+) ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment < Date: Sun, 14 Feb 2016 17:04:07 +0000 Subject: [PATCH] Use libtool 2.4 @@ -15,6 +15,7 @@ Signed-off-by: Khem Raj gas/configure | 1320 ++++++++++++++----- gprof/configure | 1321 ++++++++++++++----- ld/configure | 1695 ++++++++++++++++++------ + libctf/configure | 1516 ++++++++++++++++------ libtool.m4 | 1080 +++++++++++----- ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- ltoptions.m4 | 2 +- @@ -23,8 +24,10 @@ Signed-off-by: Khem Raj opcodes/configure | 1322 ++++++++++++++----- opcodes/configure.ac | 2 +- zlib/configure | 1320 ++++++++++++++----- - 14 files changed, 9940 insertions(+), 3705 deletions(-) + 15 files changed, 11030 insertions(+), 4131 deletions(-) +diff --git a/bfd/configure b/bfd/configure +index 7c0708e2f8..1e9e7b2711 100755 --- a/bfd/configure +++ b/bfd/configure @@ -704,6 +704,9 @@ OTOOL @@ -74,7 +77,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u +@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -210,7 +213,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli +@@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -224,6 +227,8 @@ Signed-off-by: Khem Raj + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -445,7 +450,7 @@ Signed-off-by: Khem Raj + + + - ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -454,7 +459,7 @@ Signed-off-by: Khem Raj + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ++ +int +main () +{ @@ -487,11 +492,11 @@ Signed-off-by: Khem Raj +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else @@ -547,7 +552,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() +@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -569,7 +574,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7426,6 +7757,20 @@ else +@@ -7426,6 +7757,16 @@ else $as_echo "ok" >&6; } fi @@ -583,17 +588,20 @@ Signed-off-by: Khem Raj + + + -+ -+ -+ -+ -@@ -7445,6 +7790,41 @@ fi +@@ -7442,6 +7783,45 @@ fi ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -626,12 +634,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - # Check whether --enable-libtool-lock was given. + @@ -7653,6 +8033,123 @@ esac need_locks="$enable_libtool_lock" @@ -793,7 +798,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio +@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -806,7 +811,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio +@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -967,7 +972,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -1025,7 +1030,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -1103,7 +1108,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -1112,7 +1117,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -1121,7 +1126,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -1130,7 +1135,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -1188,7 +1193,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -1197,7 +1202,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -1347,7 +1352,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= +@@ -14564,7 +15219,7 @@ SHARED_LDFLAGS= if test "$enable_shared" = "yes"; then x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` if test -n "$x"; then @@ -1356,7 +1361,7 @@ Signed-off-by: Khem Raj fi case "${host}" in -@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -17186,13 +17841,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -1377,7 +1382,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -17207,14 +17869,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -1396,7 +1401,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -17247,12 +17912,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -1410,7 +1415,7 @@ Signed-off-by: Khem Raj file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17298,8 +17963,13 @@ reload_flag \ +@@ -17307,8 +17972,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1424,7 +1429,7 @@ Signed-off-by: Khem Raj STRIP \ RANLIB \ CC \ -@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -17318,12 +17988,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -1440,7 +1445,7 @@ Signed-off-by: Khem Raj DSYMUTIL \ NMEDIT \ LIPO \ -@@ -17330,7 +18002,6 @@ no_undefined_flag \ +@@ -17339,7 +18011,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1448,7 +1453,7 @@ Signed-off-by: Khem Raj exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -17366,6 +18037,7 @@ module_cmds \ +@@ -17375,6 +18046,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1456,7 +1461,7 @@ Signed-off-by: Khem Raj postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18154,7 +18826,8 @@ $as_echo X"$file" | +@@ -18163,7 +18835,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -1466,7 +1471,7 @@ Signed-off-by: Khem Raj # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL +@@ -18266,19 +18939,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1510,7 +1515,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -18308,6 +19004,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -1523,7 +1528,7 @@ Signed-off-by: Khem Raj # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -18317,6 +19019,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1533,7 +1538,7 @@ Signed-off-by: Khem Raj # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -18422,12 +19127,12 @@ with_gcc=$GCC +@@ -18431,12 +19136,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1549,7 +1554,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath +@@ -18523,9 +19228,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1559,7 +1564,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms +@@ -18541,6 +19243,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1569,7 +1574,7 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -18573,210 +19278,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -1771,9 +1776,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -1931,18 +1942,17 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/bfd/configure.ac b/bfd/configure.ac +index af4d4b8c13..a521738244 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -290,7 +290,7 @@ changequote(,)dnl +@@ -296,7 +296,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -1951,9 +1961,11 @@ Signed-off-by: Khem Raj fi case "${host}" in +diff --git a/binutils/configure b/binutils/configure +index a8dfd4bd68..ab5f13ab2e 100755 --- a/binutils/configure +++ b/binutils/configure -@@ -689,8 +689,11 @@ OTOOL +@@ -690,8 +690,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -1965,7 +1977,7 @@ Signed-off-by: Khem Raj OBJDUMP LN_S NM -@@ -807,6 +810,7 @@ enable_static +@@ -808,6 +811,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -1973,16 +1985,16 @@ Signed-off-by: Khem Raj enable_libtool_lock enable_plugins enable_largefile -@@ -1483,6 +1487,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] +@@ -1487,6 +1491,8 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-debuginfod Enable debuginfo lookups with debuginfod + (auto/yes/no) + --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-system-zlib use installed libz --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5457,8 +5463,8 @@ esac +@@ -5461,8 +5467,8 @@ esac @@ -1993,7 +2005,7 @@ Signed-off-by: Khem Raj -@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5502,7 +5508,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -2002,7 +2014,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u +@@ -6188,8 +6194,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -2013,7 +2025,7 @@ Signed-off-by: Khem Raj && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6234,6 +6240,80 @@ esac +@@ -6238,6 +6244,80 @@ esac @@ -2094,7 +2106,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6250,6 +6330,11 @@ case $reload_flag in +@@ -6254,6 +6334,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -2106,7 +2118,7 @@ Signed-off-by: Khem Raj darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6418,7 +6503,8 @@ mingw* | pw32*) +@@ -6422,7 +6507,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -2116,7 +2128,7 @@ Signed-off-by: Khem Raj lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6572,6 +6658,21 @@ esac +@@ -6576,6 +6662,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -2138,7 +2150,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli +@@ -6591,9 +6692,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -2303,7 +2315,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6605,7 +6859,7 @@ do +@@ -6609,7 +6863,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2312,7 +2324,7 @@ Signed-off-by: Khem Raj $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } +@@ -6629,11 +6883,15 @@ $as_echo "no" >&6; } fi @@ -2331,7 +2343,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6645,7 +6903,7 @@ do +@@ -6649,7 +6907,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2340,7 +2352,7 @@ Signed-off-by: Khem Raj $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6664,6 +6922,10 @@ else +@@ -6668,6 +6926,10 @@ else $as_echo "no" >&6; } fi @@ -2351,7 +2363,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; +@@ -6679,12 +6941,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -2366,7 +2378,7 @@ Signed-off-by: Khem Raj -@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6696,6 +6956,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -2431,7 +2443,7 @@ Signed-off-by: Khem Raj if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7026,8 +7344,8 @@ esac +@@ -7030,8 +7348,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -2442,7 +2454,7 @@ Signed-off-by: Khem Raj # Handle CRLF in mingw tool chain opt_cr= -@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do +@@ -7067,6 +7385,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -2450,7 +2462,7 @@ Signed-off-by: Khem Raj # Check to see that the pipe works correctly. pipe_works=no -@@ -7104,6 +7423,18 @@ _LT_EOF +@@ -7108,6 +7427,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -2469,7 +2481,7 @@ Signed-off-by: Khem Raj #ifdef __cplusplus extern "C" { #endif -@@ -7115,7 +7446,7 @@ _LT_EOF +@@ -7119,7 +7450,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -2478,7 +2490,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() +@@ -7145,8 +7476,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -2489,7 +2501,7 @@ Signed-off-by: Khem Raj LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7152,8 +7483,8 @@ _LT_EOF +@@ -7156,8 +7487,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -2500,7 +2512,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7190,6 +7521,18 @@ else +@@ -7194,6 +7525,21 @@ else $as_echo "ok" >&6; } fi @@ -2516,13 +2528,18 @@ Signed-off-by: Khem Raj + + + ++ ++ ++ -@@ -7211,6 +7554,43 @@ fi +@@ -7210,6 +7556,40 @@ fi ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -2555,15 +2572,10 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7417,6 +7797,123 @@ esac + + + +@@ -7421,6 +7801,123 @@ esac need_locks="$enable_libtool_lock" @@ -2687,7 +2699,7 @@ Signed-off-by: Khem Raj case $host_os in rhapsody* | darwin*) -@@ -7980,6 +8477,8 @@ _LT_EOF +@@ -7984,6 +8481,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -2696,7 +2708,7 @@ Signed-off-by: Khem Raj cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8175,7 +8674,8 @@ fi +@@ -8179,7 +8678,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -2706,7 +2718,7 @@ Signed-off-by: Khem Raj -@@ -8264,7 +8764,7 @@ aix3*) +@@ -8268,7 +8768,7 @@ aix3*) esac # Global variables: @@ -2715,7 +2727,7 @@ Signed-off-by: Khem Raj can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8562,8 +9062,6 @@ fi +@@ -8566,8 +9066,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -2724,7 +2736,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio +@@ -8733,6 +9231,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -2737,7 +2749,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio +@@ -8795,7 +9299,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -2746,7 +2758,7 @@ Signed-off-by: Khem Raj lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8848,13 +9352,17 @@ case $host_os in +@@ -8852,13 +9356,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -2770,7 +2782,7 @@ Signed-off-by: Khem Raj # # Check to make sure the PIC flag actually works. -@@ -8915,6 +9423,11 @@ fi +@@ -8919,6 +9427,11 @@ fi @@ -2782,7 +2794,7 @@ Signed-off-by: Khem Raj # # Check to make sure the static flag actually works. # -@@ -9265,7 +9778,8 @@ _LT_EOF +@@ -9269,7 +9782,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -2792,7 +2804,7 @@ Signed-off-by: Khem Raj if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9364,12 +9878,12 @@ _LT_EOF +@@ -9368,12 +9882,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -2807,7 +2819,7 @@ Signed-off-by: Khem Raj fi ;; esac -@@ -9383,8 +9897,8 @@ _LT_EOF +@@ -9387,8 +9901,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -2818,7 +2830,7 @@ Signed-off-by: Khem Raj fi ;; -@@ -9402,8 +9916,8 @@ _LT_EOF +@@ -9406,8 +9920,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2829,7 +2841,7 @@ Signed-off-by: Khem Raj else ld_shlibs=no fi -@@ -9449,8 +9963,8 @@ _LT_EOF +@@ -9453,8 +9967,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2840,7 +2852,7 @@ Signed-off-by: Khem Raj else ld_shlibs=no fi -@@ -9580,7 +10094,13 @@ _LT_EOF +@@ -9584,7 +10098,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -2855,7 +2867,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -9593,22 +10113,29 @@ main () +@@ -9597,22 +10117,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2898,7 +2910,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9624,7 +10151,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -2913,7 +2925,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -9633,22 +10166,29 @@ main () +@@ -9637,22 +10170,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2956,7 +2968,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9697,20 +10237,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -3034,7 +3046,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9771,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -3043,7 +3055,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9779,7 +10362,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -3052,7 +3064,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9795,7 +10378,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -3061,7 +3073,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9819,10 +10402,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -3074,7 +3086,7 @@ Signed-off-by: Khem Raj ;; esac else -@@ -9897,23 +10480,36 @@ fi +@@ -9901,23 +10484,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -3119,7 +3131,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10002,7 +10598,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -3128,7 +3140,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10021,9 +10617,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -3140,7 +3152,7 @@ Signed-off-by: Khem Raj else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10599,8 +11195,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -3152,7 +3164,7 @@ Signed-off-by: Khem Raj library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10633,13 +11230,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -3225,7 +3237,7 @@ Signed-off-by: Khem Raj # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10727,7 +11382,7 @@ haiku*) +@@ -10731,7 +11386,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3234,16 +3246,16 @@ Signed-off-by: Khem Raj hardcode_into_libs=yes ;; -@@ -11523,7 +12178,7 @@ else +@@ -11527,7 +12182,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11526 "configure" +-#line 11530 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11567,10 +12222,10 @@ else +@@ -11571,10 +12226,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3256,16 +3268,16 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11629,7 +12284,7 @@ else +@@ -11633,7 +12288,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11632 "configure" +-#line 11636 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11673,10 +12328,10 @@ else +@@ -11677,10 +12332,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3278,7 +3290,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -16024,13 +16679,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -3299,7 +3311,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -16045,14 +16707,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -3318,7 +3330,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -16085,12 +16750,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -3332,7 +3344,7 @@ Signed-off-by: Khem Raj file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16057,8 +16722,13 @@ reload_flag \ +@@ -16145,8 +16810,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3346,7 +3358,7 @@ Signed-off-by: Khem Raj STRIP \ RANLIB \ CC \ -@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16156,12 +16826,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -3362,7 +3374,7 @@ Signed-off-by: Khem Raj DSYMUTIL \ NMEDIT \ LIPO \ -@@ -16089,7 +16761,6 @@ no_undefined_flag \ +@@ -16177,7 +16849,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3370,7 +3382,7 @@ Signed-off-by: Khem Raj exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -16125,6 +16796,7 @@ module_cmds \ +@@ -16213,6 +16884,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3378,7 +3390,7 @@ Signed-off-by: Khem Raj postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16891,7 +17563,8 @@ $as_echo X"$file" | +@@ -16979,7 +17651,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -3388,7 +3400,7 @@ Signed-off-by: Khem Raj # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL +@@ -17082,19 +17755,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3432,7 +3444,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -17124,6 +17820,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -3445,7 +3457,7 @@ Signed-off-by: Khem Raj # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17133,6 +17835,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3455,7 +3467,7 @@ Signed-off-by: Khem Raj # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17159,12 +17864,12 @@ with_gcc=$GCC +@@ -17247,12 +17952,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3471,7 +3483,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath +@@ -17339,9 +18044,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3481,7 +3493,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms +@@ -17357,6 +18059,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3491,7 +3503,7 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17389,210 +18094,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -3693,9 +3705,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -3853,15 +3871,14 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/gas/configure b/gas/configure +index 60c1a055ae..0e0ce4c0e2 100755 --- a/gas/configure +++ b/gas/configure @@ -681,8 +681,11 @@ OTOOL @@ -3913,7 +3930,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u +@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -4049,7 +4066,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli +@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4063,9 +4080,7 @@ Signed-off-by: Khem Raj + + + - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -4206,7 +4221,9 @@ Signed-off-by: Khem Raj + + + -+if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -4389,7 +4406,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() +@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -4411,7 +4428,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7010,6 +7341,19 @@ else +@@ -7010,6 +7341,21 @@ else $as_echo "ok" >&6; } fi @@ -4428,13 +4445,17 @@ Signed-off-by: Khem Raj + + + ++ ++ -@@ -7030,6 +7374,42 @@ fi +@@ -7026,6 +7372,40 @@ fi ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -4467,13 +4488,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : + + @@ -7237,6 +7617,123 @@ esac need_locks="$enable_libtool_lock" @@ -4635,7 +4652,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio +@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -4648,7 +4665,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio +@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -4809,7 +4826,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -4867,7 +4884,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -4945,7 +4962,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -4954,7 +4971,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -4963,7 +4980,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -4972,7 +4989,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -5030,7 +5047,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -5039,7 +5056,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -5189,7 +5206,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -5210,7 +5227,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -5229,7 +5246,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -5343,7 +5360,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -5604,9 +5621,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -5764,15 +5787,14 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/gprof/configure b/gprof/configure +index eb04fdcc89..2b70d84298 100755 --- a/gprof/configure +++ b/gprof/configure @@ -662,8 +662,11 @@ OTOOL @@ -5824,7 +5846,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u +@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -5972,7 +5994,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli +@@ -6257,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5986,6 +6008,8 @@ Signed-off-by: Khem Raj + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -6178,7 +6202,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;; +@@ -6347,16 +6604,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -6190,13 +6214,17 @@ Signed-off-by: Khem Raj -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} - - - -@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if test "${lt_cv_ar_at_file+set}" = set; then : @@ -6209,7 +6237,7 @@ Signed-off-by: Khem Raj +int +main () +{ -+ + + ; + return 0; +} @@ -6235,29 +6263,22 @@ Signed-off-by: Khem Raj + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 + + + @@ -6698,8 +7011,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -6305,7 +6326,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() +@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -6327,7 +6348,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6862,6 +7188,17 @@ else +@@ -6862,6 +7188,18 @@ else $as_echo "ok" >&6; } fi @@ -6342,13 +6363,18 @@ Signed-off-by: Khem Raj + + + ++ -@@ -6883,6 +7220,44 @@ fi +@@ -6878,6 +7216,43 @@ fi ++ ++ ++ ++ + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } @@ -6382,14 +6408,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; + + + @@ -7089,6 +7464,123 @@ esac need_locks="$enable_libtool_lock" @@ -6551,7 +6572,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio +@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -6564,7 +6585,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio +@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -6725,7 +6746,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -6783,7 +6804,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -6861,7 +6882,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -6870,7 +6891,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -6879,7 +6900,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -6888,7 +6909,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -6946,7 +6967,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -6955,7 +6976,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -7087,7 +7108,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -7108,7 +7129,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -7127,7 +7148,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -7241,7 +7262,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -7502,9 +7523,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -7662,18 +7689,17 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/ld/configure b/ld/configure +index 811134a503..f432f4637d 100755 --- a/ld/configure +++ b/ld/configure -@@ -688,8 +688,11 @@ OTOOL +@@ -691,8 +691,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -7685,7 +7711,7 @@ Signed-off-by: Khem Raj OBJDUMP LN_S NM -@@ -816,6 +819,7 @@ enable_static +@@ -819,6 +822,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -7693,7 +7719,7 @@ Signed-off-by: Khem Raj enable_libtool_lock enable_plugins enable_largefile -@@ -1508,6 +1512,8 @@ Optional Packages: +@@ -1512,6 +1516,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -7701,8 +7727,8 @@ Signed-off-by: Khem Raj + (or the compiler's sysroot if not specified). --with-lib-path=dir1:dir2... set default LIB_PATH --with-sysroot=DIR Search for usr/lib et al within DIR. - -@@ -5960,8 +5966,8 @@ esac + --with-system-zlib use installed libz +@@ -5965,8 +5971,8 @@ esac @@ -7713,7 +7739,7 @@ Signed-off-by: Khem Raj -@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -6006,7 +6012,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -7722,7 +7748,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u +@@ -6692,8 +6698,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7733,7 +7759,7 @@ Signed-off-by: Khem Raj && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6737,6 +6743,80 @@ esac +@@ -6742,6 +6748,80 @@ esac @@ -7814,7 +7840,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6753,6 +6833,11 @@ case $reload_flag in +@@ -6758,6 +6838,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -7826,7 +7852,7 @@ Signed-off-by: Khem Raj darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6921,7 +7006,8 @@ mingw* | pw32*) +@@ -6926,7 +7011,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7836,7 +7862,7 @@ Signed-off-by: Khem Raj lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -7075,6 +7161,21 @@ esac +@@ -7080,6 +7166,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -7858,7 +7884,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli +@@ -7095,9 +7196,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8023,7 +8049,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -7108,7 +7362,7 @@ do +@@ -7113,7 +7367,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8032,7 +8058,7 @@ Signed-off-by: Khem Raj $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; } +@@ -7133,11 +7387,15 @@ $as_echo "no" >&6; } fi @@ -8051,7 +8077,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7148,7 +7406,7 @@ do +@@ -7153,7 +7411,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -8060,7 +8086,7 @@ Signed-off-by: Khem Raj $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7167,6 +7425,10 @@ else +@@ -7172,6 +7430,10 @@ else $as_echo "no" >&6; } fi @@ -8071,7 +8097,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;; +@@ -7183,12 +7445,12 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8084,10 +8110,11 @@ Signed-off-by: Khem Raj +: ${AR=ar} +: ${AR_FLAGS=cru} + ++ -@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -7198,6 +7460,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -8147,11 +8174,10 @@ Signed-off-by: Khem Raj + + + -+ + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -7529,8 +7847,8 @@ esac +@@ -7534,8 +7852,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -8162,7 +8188,7 @@ Signed-off-by: Khem Raj # Handle CRLF in mingw tool chain opt_cr= -@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do +@@ -7571,6 +7889,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -8170,7 +8196,7 @@ Signed-off-by: Khem Raj # Check to see that the pipe works correctly. pipe_works=no -@@ -7607,6 +7926,18 @@ _LT_EOF +@@ -7612,6 +7931,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -8189,7 +8215,7 @@ Signed-off-by: Khem Raj #ifdef __cplusplus extern "C" { #endif -@@ -7618,7 +7949,7 @@ _LT_EOF +@@ -7623,7 +7954,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -8198,7 +8224,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup() +@@ -7649,8 +7980,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8209,7 +8235,7 @@ Signed-off-by: Khem Raj LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7655,8 +7986,8 @@ _LT_EOF +@@ -7660,8 +7991,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -8220,7 +8246,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7693,6 +8024,13 @@ else +@@ -7698,6 +8029,19 @@ else $as_echo "ok" >&6; } fi @@ -8231,10 +8257,16 @@ Signed-off-by: Khem Raj + nm_file_list_spec='@' +fi + ++ ++ ++ ++ ++ ++ -@@ -7714,6 +8052,48 @@ fi +@@ -7714,6 +8058,42 @@ fi @@ -8242,7 +8274,6 @@ Signed-off-by: Khem Raj + + + -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -8275,15 +8306,10 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7920,6 +8300,123 @@ esac + + + +@@ -7925,6 +8305,123 @@ esac need_locks="$enable_libtool_lock" @@ -8407,7 +8433,7 @@ Signed-off-by: Khem Raj case $host_os in rhapsody* | darwin*) -@@ -8483,6 +8980,8 @@ _LT_EOF +@@ -8488,6 +8985,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -8416,7 +8442,7 @@ Signed-off-by: Khem Raj cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8551,6 +9050,16 @@ done +@@ -8556,6 +9055,16 @@ done @@ -8433,7 +8459,7 @@ Signed-off-by: Khem Raj # Set options -@@ -8679,7 +9188,8 @@ fi +@@ -8684,7 +9193,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -8443,7 +8469,7 @@ Signed-off-by: Khem Raj -@@ -8768,7 +9278,7 @@ aix3*) +@@ -8773,7 +9283,7 @@ aix3*) esac # Global variables: @@ -8452,7 +8478,7 @@ Signed-off-by: Khem Raj can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9066,8 +9576,6 @@ fi +@@ -9071,8 +9581,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -8461,7 +8487,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio +@@ -9238,6 +9746,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8474,7 +8500,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio +@@ -9300,7 +9814,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8483,7 +8509,7 @@ Signed-off-by: Khem Raj lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -9352,13 +9866,17 @@ case $host_os in +@@ -9357,13 +9871,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -8507,7 +8533,7 @@ Signed-off-by: Khem Raj # # Check to make sure the PIC flag actually works. -@@ -9419,6 +9937,11 @@ fi +@@ -9424,6 +9942,11 @@ fi @@ -8519,7 +8545,7 @@ Signed-off-by: Khem Raj # # Check to make sure the static flag actually works. # -@@ -9769,7 +10292,8 @@ _LT_EOF +@@ -9774,7 +10297,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8529,7 +8555,7 @@ Signed-off-by: Khem Raj if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9868,12 +10392,12 @@ _LT_EOF +@@ -9873,12 +10397,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -8544,7 +8570,7 @@ Signed-off-by: Khem Raj fi ;; esac -@@ -9887,8 +10411,8 @@ _LT_EOF +@@ -9892,8 +10416,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -8555,7 +8581,7 @@ Signed-off-by: Khem Raj fi ;; -@@ -9906,8 +10430,8 @@ _LT_EOF +@@ -9911,8 +10435,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8566,7 +8592,7 @@ Signed-off-by: Khem Raj else ld_shlibs=no fi -@@ -9953,8 +10477,8 @@ _LT_EOF +@@ -9958,8 +10482,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -8577,7 +8603,7 @@ Signed-off-by: Khem Raj else ld_shlibs=no fi -@@ -10084,7 +10608,13 @@ _LT_EOF +@@ -10089,7 +10613,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8592,7 +8618,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -10097,22 +10627,29 @@ main () +@@ -10102,22 +10632,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8635,7 +8661,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10129,7 +10666,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -8650,7 +8676,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -10137,22 +10680,29 @@ main () +@@ -10142,22 +10685,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -8693,10 +8719,11 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10201,21 +10751,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. +- # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. @@ -8711,6 +8738,7 @@ Signed-off-by: Khem Raj - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes ++ # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC @@ -8771,7 +8799,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10276,7 +10869,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8780,7 +8808,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10284,7 +10877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8789,7 +8817,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10300,7 +10893,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8798,7 +8826,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10324,10 +10917,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8811,7 +8839,7 @@ Signed-off-by: Khem Raj ;; esac else -@@ -10401,23 +10994,36 @@ fi +@@ -10406,23 +10999,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -8856,7 +8884,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10507,7 +11113,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -8865,7 +8893,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10526,9 +11132,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -8877,7 +8905,7 @@ Signed-off-by: Khem Raj else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11104,8 +11710,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -8889,7 +8917,7 @@ Signed-off-by: Khem Raj library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -11138,13 +11745,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -8962,7 +8990,7 @@ Signed-off-by: Khem Raj # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -11231,7 +11896,7 @@ haiku*) +@@ -11236,7 +11901,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -8971,16 +8999,16 @@ Signed-off-by: Khem Raj hardcode_into_libs=yes ;; -@@ -12027,7 +12692,7 @@ else +@@ -12032,7 +12697,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12030 "configure" +-#line 12035 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12071,10 +12736,10 @@ else +@@ -12076,10 +12741,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -8993,16 +9021,16 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12133,7 +12798,7 @@ else +@@ -12138,7 +12803,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12136 "configure" +-#line 12141 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12177,10 +12842,10 @@ else +@@ -12182,10 +12847,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -9015,7 +9043,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12572,6 +13237,7 @@ $RM -r conftest* +@@ -12577,6 +13242,7 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -9023,7 +9051,7 @@ Signed-off-by: Khem Raj lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -12589,6 +13255,7 @@ $RM -r conftest* +@@ -12594,6 +13260,7 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -9031,7 +9059,7 @@ Signed-off-by: Khem Raj compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil +@@ -12876,7 +13543,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9046,7 +9074,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -12884,22 +13557,29 @@ main () +@@ -12889,22 +13562,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9089,7 +9117,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12917,7 +13597,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -9104,7 +9132,7 @@ Signed-off-by: Khem Raj /* end confdefs.h. */ int -@@ -12925,22 +13611,29 @@ main () +@@ -12930,22 +13616,29 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -9147,7 +9175,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12988,29 +13681,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9246,7 +9274,7 @@ Signed-off-by: Khem Raj darwin* | rhapsody*) -@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13116,7 +13855,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9255,7 +9283,7 @@ Signed-off-by: Khem Raj else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13187,10 +13926,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9268,7 +9296,7 @@ Signed-off-by: Khem Raj ;; esac fi -@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13231,9 +13970,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9280,7 +9308,7 @@ Signed-off-by: Khem Raj fi fi link_all_deplibs_CXX=yes -@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13303,20 +14042,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9305,7 +9333,7 @@ Signed-off-by: Khem Raj ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13511,7 +14250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -9314,7 +9342,7 @@ Signed-off-by: Khem Raj ;; esac -@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13557,7 +14296,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9323,7 +9351,7 @@ Signed-off-by: Khem Raj # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13598,9 +14337,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -9335,7 +9363,7 @@ Signed-off-by: Khem Raj # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -13730,6 +14469,13 @@ private: +@@ -13735,6 +14474,13 @@ private: }; _LT_EOF @@ -9349,7 +9377,7 @@ Signed-off-by: Khem Raj if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13748,7 +14494,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9358,7 +9386,7 @@ Signed-off-by: Khem Raj -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13757,13 +14503,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9385,7 +9413,7 @@ Signed-off-by: Khem Raj # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13783,8 +14538,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9396,7 +9424,7 @@ Signed-off-by: Khem Raj *.$objext) # This assumes that the test object file only shows up # once in the compiler output. -@@ -13815,6 +14572,7 @@ else +@@ -13820,6 +14577,7 @@ else fi $RM -f confest.$objext @@ -9404,7 +9432,7 @@ Signed-off-by: Khem Raj # PORTME: override above test on systems where it is broken case $host_os in -@@ -13850,7 +14608,7 @@ linux*) +@@ -13855,7 +14613,7 @@ linux*) solaris*) case $cc_basename in @@ -9413,7 +9441,7 @@ Signed-off-by: Khem Raj # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13915,8 +14673,6 @@ fi +@@ -13920,8 +14678,6 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9422,7 +9450,7 @@ Signed-off-by: Khem Raj # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio +@@ -14026,6 +14782,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9434,7 +9462,7 @@ Signed-off-by: Khem Raj dgux*) case $cc_basename in ec++*) -@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio +@@ -14178,7 +14939,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9443,7 +9471,7 @@ Signed-off-by: Khem Raj # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' -@@ -14238,10 +14999,17 @@ case $host_os in +@@ -14243,10 +15004,17 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9464,7 +9492,7 @@ Signed-off-by: Khem Raj # # Check to make sure the PIC flag actually works. -@@ -14299,6 +15067,8 @@ fi +@@ -14304,6 +15072,8 @@ fi @@ -9473,7 +9501,7 @@ Signed-off-by: Khem Raj # # Check to make sure the static flag actually works. # -@@ -14476,6 +15246,7 @@ fi +@@ -14481,6 +15251,7 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -9481,7 +9509,7 @@ Signed-off-by: Khem Raj case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil +@@ -14495,15 +15266,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9507,7 +9535,7 @@ Signed-off-by: Khem Raj { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14766,8 +15542,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -9519,7 +9547,7 @@ Signed-off-by: Khem Raj library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -14799,13 +15576,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -9592,7 +9620,7 @@ Signed-off-by: Khem Raj # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -14891,7 +15726,7 @@ haiku*) +@@ -14896,7 +15731,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -9601,7 +9629,7 @@ Signed-off-by: Khem Raj hardcode_into_libs=yes ;; -@@ -15350,6 +16185,7 @@ fi +@@ -15355,6 +16190,7 @@ fi fi # test -n "$compiler" CC=$lt_save_CC @@ -9609,7 +9637,7 @@ Signed-off-by: Khem Raj LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -18477,13 +19313,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -9630,7 +9658,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -18498,14 +19341,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -9649,7 +9677,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -18538,12 +19384,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -9663,7 +9691,7 @@ Signed-off-by: Khem Raj file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi +@@ -18582,8 +19428,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -9673,7 +9701,7 @@ Signed-off-by: Khem Raj lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har +@@ -18610,12 +19456,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -9687,7 +9715,7 @@ Signed-off-by: Khem Raj file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18625,8 +19471,13 @@ reload_flag \ +@@ -18653,8 +19499,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -9701,7 +9729,7 @@ Signed-off-by: Khem Raj STRIP \ RANLIB \ CC \ -@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -18664,12 +19515,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -9717,7 +9745,7 @@ Signed-off-by: Khem Raj DSYMUTIL \ NMEDIT \ LIPO \ -@@ -18657,7 +19510,6 @@ no_undefined_flag \ +@@ -18685,7 +19538,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -9725,7 +9753,7 @@ Signed-off-by: Khem Raj exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -18679,8 +19531,8 @@ LD_CXX \ +@@ -18707,8 +19559,8 @@ LD_CXX \ reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ @@ -9735,7 +9763,7 @@ Signed-off-by: Khem Raj lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ -@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \ +@@ -18720,7 +19572,6 @@ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ @@ -9743,7 +9771,7 @@ Signed-off-by: Khem Raj exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ -@@ -18726,6 +19577,7 @@ module_cmds \ +@@ -18754,6 +19605,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -9751,7 +9779,7 @@ Signed-off-by: Khem Raj postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \ +@@ -18768,7 +19620,8 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ @@ -9761,7 +9789,7 @@ Signed-off-by: Khem Raj case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19505,7 +20358,8 @@ $as_echo X"$file" | +@@ -19533,7 +20386,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -9771,7 +9799,7 @@ Signed-off-by: Khem Raj # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL +@@ -19636,19 +20490,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -9815,7 +9843,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -19678,6 +20555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -9828,7 +9856,7 @@ Signed-off-by: Khem Raj # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -19687,6 +20570,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -9838,7 +9866,7 @@ Signed-off-by: Khem Raj # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -19773,12 +20659,12 @@ with_gcc=$GCC +@@ -19801,12 +20687,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -9854,7 +9882,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath +@@ -19893,9 +20779,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -9864,7 +9892,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms +@@ -19911,6 +20794,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -9874,7 +9902,7 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -19957,210 +20843,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -10076,9 +10104,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -10236,16 +10270,13 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX +@@ -20188,12 +21033,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX @@ -10261,7 +10292,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX -@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX +@@ -20280,9 +21125,6 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX @@ -10271,7 +10302,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX -@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX +@@ -20298,6 +21140,9 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX @@ -10281,34 +10312,2232 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT +diff --git a/libctf/configure b/libctf/configure +index e5493b3169..35c7bb07a6 100755 +--- a/libctf/configure ++++ b/libctf/configure +@@ -663,6 +663,8 @@ OTOOL + LIPO + NMEDIT + DSYMUTIL ++MANIFEST_TOOL ++DLLTOOL + OBJDUMP + LN_S + NM +@@ -694,7 +696,6 @@ am__nodep + AMDEPBACKSLASH + AMDEP_FALSE + AMDEP_TRUE +-am__quote + am__include + DEPDIR + am__untar +@@ -767,7 +768,8 @@ PACKAGE_VERSION + PACKAGE_TARNAME + PACKAGE_NAME + PATH_SEPARATOR +-SHELL' ++SHELL ++am__quote' + ac_subst_files='' + ac_user_opts=' + enable_option_checking +@@ -778,6 +780,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld ++with_libtool_sysroot + enable_libtool_lock + enable_largefile + enable_werror_always +@@ -1436,6 +1439,8 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified). + --with-system-zlib use installed libz + + Some influential environment variables: +@@ -3622,7 +3627,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h + + +-am__api_version='1.15' ++am__api_version='1.16' + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -4048,45 +4053,45 @@ DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" + +- +-am_make=${MAKE-make} +-cat > confinc << 'END' ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 ++$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } ++cat > confinc.mk << 'END' + am__doit: +- @echo this is the am__doit target ++ @echo this is the am__doit target >confinc.out + .PHONY: am__doit + END +-# If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +-$as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# Ignore all kinds of additional output from 'make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD ++# BSD make does it like this. ++echo '.include "confinc.mk" # ignored' > confmf.BSD ++# Other make implementations (GNU, Solaris 10, AIX) do it like this. ++echo 'include confinc.mk # ignored' > confmf.GNU ++_am_result=no ++for s in GNU BSD; do ++ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 ++ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ case $?:`cat confinc.out 2>/dev/null` in #( ++ '0:this is the am__doit target') : ++ case $s in #( ++ BSD) : ++ am__include='.include' am__quote='"' ;; #( ++ *) : ++ am__include='include' am__quote='' ;; ++esac ;; #( ++ *) : + ;; +- esac +-fi +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +-$as_echo "$_am_result" >&6; } +-rm -f confinc confmf ++esac ++ if test "$am__include" != "#"; then ++ _am_result="yes ($s style)" ++ break ++ fi ++done ++rm -f confinc.* confmf.* ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 ++$as_echo "${_am_result}" >&6; } + + # Check whether --enable-dependency-tracking was given. + if test "${enable_dependency_tracking+set}" = set; then : +@@ -4198,8 +4203,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + + # For better backward compatibility. To be removed once Automake 1.9.x + # dies out for good. For more background, see: +-# +-# ++# ++# + mkdir_p='$(MKDIR_P)' + + # We need awk for the "check" target (and possibly the TAP driver). The +@@ -4378,7 +4383,7 @@ END + Aborting the configuration process, to ensure you take notice of the issue. + + You can download and install GNU coreutils to get an 'rm' implementation +-that behaves properly: . ++that behaves properly: . + + If you want to complete the configuration process using your problematic + 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +@@ -5324,8 +5329,8 @@ esac + + + +-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293' + + + +@@ -5436,7 +5441,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 + $as_echo_n "checking how to print strings... " >&6; } + # Test print first, because it will be a builtin if present. +-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' + elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then +@@ -6122,8 +6127,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -6172,6 +6177,80 @@ esac + + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if ${lt_cv_to_host_file_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if ${lt_cv_to_tool_file_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } + if ${lt_cv_ld_reload_flag+:} false; then : +@@ -6188,6 +6267,11 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -6356,7 +6440,8 @@ mingw* | pw32*) + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +@@ -6510,6 +6595,21 @@ esac + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -6525,9 +6625,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_DLLTOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++ + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_prog_AR+:} false; then : +@@ -6543,7 +6796,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -6563,11 +6816,15 @@ $as_echo "no" >&6; } + fi + + ++ test -n "$AR" && break ++ done + fi +-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then + ac_ct_AR=$AR +- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_prog_ac_ct_AR+:} false; then : +@@ -6583,7 +6840,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -6602,6 +6859,10 @@ else + $as_echo "no" >&6; } + fi + ++ ++ test -n "$ac_ct_AR" && break ++done ++ + if test "x$ac_ct_AR" = x; then + AR="false" + else +@@ -6613,12 +6874,10 @@ ac_tool_warned=yes ;; + esac + AR=$ac_ct_AR + fi +-else +- AR="$ac_cv_prog_AR" + fi + +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru} + + + +@@ -6630,6 +6889,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if ${lt_cv_ar_at_file+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; } ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++ ++ ++ ++ ++ ++ ++ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +@@ -6964,8 +7281,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -7001,6 +7318,7 @@ for ac_symprfx in "" "_"; do + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -7042,6 +7360,18 @@ _LT_EOF + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -7053,7 +7383,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT_DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -7079,8 +7409,8 @@ static const void *lt_preloaded_setup() { + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 +@@ -7090,8 +7420,8 @@ _LT_EOF + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi +@@ -7128,6 +7458,19 @@ else + $as_echo "ok" >&6; } + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++ ++ ++ ++ + + + +@@ -7144,6 +7487,42 @@ fi + + + ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; ++else ++ with_libtool_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } + + + +@@ -7349,11 +7728,128 @@ sparc*-*solaris*) + ;; + esac + fi +- rm -rf conftest* +- ;; ++ rm -rf conftest* ++ ;; ++esac ++ ++need_locks="$enable_libtool_lock" ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; + esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if ${lt_cv_path_mainfest_tool+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ + +-need_locks="$enable_libtool_lock" + + + case $host_os in +@@ -7918,6 +8414,8 @@ _LT_EOF + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 ++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF + int main() { return 0;} + _LT_EOF +@@ -8083,7 +8581,8 @@ fi + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool" + + + +@@ -8172,7 +8671,7 @@ aix3*) + esac + + # Global variables: +-ofile=libtool ++ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, +@@ -8470,8 +8969,6 @@ fi + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' +@@ -8637,6 +9134,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -8699,7 +9202,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; +@@ -8756,13 +9259,17 @@ case $host_os in + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +- + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if ${lt_cv_prog_compiler_pic+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + + # + # Check to make sure the PIC flag actually works. +@@ -8823,6 +9330,11 @@ fi + + + ++ ++ ++ ++ ++ + # + # Check to make sure the static flag actually works. + # +@@ -9173,7 +9685,8 @@ _LT_EOF + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -9272,12 +9785,12 @@ _LT_EOF + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' +- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -9291,8 +9804,8 @@ _LT_EOF + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -9310,8 +9823,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -9357,8 +9870,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -9488,7 +10001,13 @@ _LT_EOF + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath_+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -9501,22 +10020,29 @@ main () + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +@@ -9528,7 +10054,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath_+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -9541,22 +10073,29 @@ main () + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, +@@ -9601,20 +10140,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -9675,7 +10257,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no +@@ -9683,7 +10265,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hpux9*) + if test "$GCC" = yes; then +- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -9699,7 +10281,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -9723,10 +10305,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -9805,23 +10387,36 @@ fi + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if ${lt_cv_irix_exported_symbol+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-int foo(void) {} ++int foo (void) { return 0; } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +@@ -9906,7 +10501,7 @@ rm -f core conftest.err conftest.$ac_objext \ + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' +@@ -9925,9 +10520,9 @@ rm -f core conftest.err conftest.$ac_objext \ + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -10503,8 +11098,9 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -10537,13 +11133,71 @@ cygwin* | mingw* | pw32* | cegcc*) + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -10635,7 +11289,7 @@ haiku*) + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +@@ -11431,7 +12085,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11434 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11475,10 +12129,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -11537,7 +12191,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11540 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11581,10 +12235,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -13956,7 +14610,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # + # INIT-COMMANDS + # +-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" ++AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" + + + # The HP-UX ksh and POSIX shell print the target directory to stdout +@@ -13994,13 +14648,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' + lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' + lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' + lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' + reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' + reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' + OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' + deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' + file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' ++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' + AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' + AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' ++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' + STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' + RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' + old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +@@ -14015,14 +14676,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de + lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' ++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' + objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' + MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' + lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' + lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' + lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' + lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' + need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' ++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' + DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' + NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' + LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +@@ -14055,12 +14719,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q + hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' + inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' + link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' + always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' + export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' + exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' + include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' + prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' ++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' + file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' + variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' + need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +@@ -14115,8 +14779,13 @@ reload_flag \ + OBJDUMP \ + deplibs_check_method \ + file_magic_cmd \ ++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \ + AR \ + AR_FLAGS \ ++archiver_list_spec \ + STRIP \ + RANLIB \ + CC \ +@@ -14126,12 +14795,14 @@ lt_cv_sys_global_symbol_pipe \ + lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++nm_file_list_spec \ + lt_prog_compiler_no_builtin_flag \ +-lt_prog_compiler_wl \ + lt_prog_compiler_pic \ ++lt_prog_compiler_wl \ + lt_prog_compiler_static \ + lt_cv_prog_compiler_c_o \ + need_locks \ ++MANIFEST_TOOL \ + DSYMUTIL \ + NMEDIT \ + LIPO \ +@@ -14147,7 +14818,6 @@ no_undefined_flag \ + hardcode_libdir_flag_spec \ + hardcode_libdir_flag_spec_ld \ + hardcode_libdir_separator \ +-fix_srcfile_path \ + exclude_expsyms \ + include_expsyms \ + file_list_spec \ +@@ -14183,6 +14853,7 @@ module_cmds \ + module_expsym_cmds \ + export_symbols_cmds \ + prelink_cmds \ ++postlink_cmds \ + postinstall_cmds \ + postuninstall_cmds \ + finish_cmds \ +@@ -14829,29 +15500,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac ++ # TODO: see whether this extra hack can be removed once we start ++ # requiring Autoconf 2.70 or later. ++ case $CONFIG_FILES in #( ++ *\'*) : ++ eval set x "$CONFIG_FILES" ;; #( ++ *) : ++ set x $CONFIG_FILES ;; #( ++ *) : ++ ;; ++esac + shift +- for mf ++ # Used to flag and report bootstrapping failures. ++ am_rc=0 ++ for am_mf + do + # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named 'Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line ++ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile which includes ++ # dependency-tracking related rules and includes. ++ # Grep'ing the whole file directly is not great: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`$as_dirname -- "$mf" || +-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$mf" : 'X\(//\)[^/]' \| \ +- X"$mf" : 'X\(//\)$' \| \ +- X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$mf" | ++ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ ++ || continue ++ am_dirpart=`$as_dirname -- "$am_mf" || ++$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$am_mf" : 'X\(//\)[^/]' \| \ ++ X"$am_mf" : 'X\(//\)$' \| \ ++ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$am_mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -14869,53 +15546,48 @@ $as_echo X"$mf" | + q + } + s/.*/./; q'` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running 'make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "$am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`$as_dirname -- "$file" || +-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$file" : 'X\(//\)[^/]' \| \ +- X"$file" : 'X\(//\)$' \| \ +- X"$file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ ++ am_filepart=`$as_basename -- "$am_mf" || ++$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$am_mf" : 'X\(//\)$' \| \ ++ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$am_mf" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } +- /^X\(\/\/\)$/{ ++ /^X\/\(\/\/\)$/{ + s//\1/ + q + } +- /^X\(\/\).*/{ ++ /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +- as_dir=$dirpart/$fdir; as_fn_mkdir_p +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done ++ { echo "$as_me:$LINENO: cd "$am_dirpart" \ ++ && sed -e '/# am--include-marker/d' "$am_filepart" \ ++ | $MAKE -f - am--depfiles" >&5 ++ (cd "$am_dirpart" \ ++ && sed -e '/# am--include-marker/d' "$am_filepart" \ ++ | $MAKE -f - am--depfiles) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } || am_rc=$? + done ++ if test $am_rc -ne 0; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "Something went wrong bootstrapping makefile fragments ++ for automatic dependency tracking. Try re-running configure with the ++ '--disable-dependency-tracking' option to at least be able to build ++ the package (albeit without support for automatic dependency tracking). ++See \`config.log' for more details" "$LINENO" 5; } ++ fi ++ { am_dirpart=; unset am_dirpart;} ++ { am_filepart=; unset am_filepart;} ++ { am_mf=; unset am_mf;} ++ { am_rc=; unset am_rc;} ++ rm -f conftest-deps.mk + } + ;; + "libtool":C) +@@ -14939,7 +15611,8 @@ $as_echo X"$file" | + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -15042,19 +15715,42 @@ SP2NL=$lt_lt_SP2NL + # turn newlines into spaces. + NL2SP=$lt_lt_NL2SP + ++# convert \$build file names to \$host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert \$build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++ + # An object symbol dumper. + OBJDUMP=$lt_OBJDUMP + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method + +-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic". + file_magic_cmd=$lt_file_magic_cmd + ++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++ + # The archiver. + AR=$lt_AR ++ ++# Flags to create an archive. + AR_FLAGS=$lt_AR_FLAGS + ++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++ + # A symbol stripping program. + STRIP=$lt_STRIP + +@@ -15084,6 +15780,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + # Transform the output of nm in a C name address pair when lib prefix is needed. + global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + ++# Specify filename containing input files for \$NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++ + # The name of the directory that contains temporary libtool files. + objdir=$objdir + +@@ -15093,6 +15795,9 @@ MAGIC_CMD=$MAGIC_CMD + # Must we lock files when doing compilation? + need_locks=$lt_need_locks + ++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++ + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. + DSYMUTIL=$lt_DSYMUTIL + +@@ -15207,12 +15912,12 @@ with_gcc=$GCC + # Compiler flag to turn off builtin functions. + no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +- + # Additional compiler flags for building library objects. + pic_flag=$lt_lt_prog_compiler_pic + ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++ + # Compiler flag to prevent dynamic linking. + link_static_flag=$lt_lt_prog_compiler_static + +@@ -15299,9 +16004,6 @@ inherit_rpath=$inherit_rpath + # Whether libtool must link a program against all its dependency libraries. + link_all_deplibs=$link_all_deplibs + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +- + # Set to "yes" if exported symbols are required. + always_export_symbols=$always_export_symbols + +@@ -15317,6 +16019,9 @@ include_expsyms=$lt_include_expsyms + # Commands necessary for linking programs (against libraries) with templates. + prelink_cmds=$lt_prelink_cmds + ++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++ + # Specify filename containing input files. + file_list_spec=$lt_file_list_spec + +@@ -15349,210 +16054,169 @@ ltmain="$ac_aux_dir/ltmain.sh" + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=\$2" +-} +-_LT_EOF +- ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=\$$1\$2" +-} +- +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi ++ ++ ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1,7 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -10,7 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 56 LT_INIT ++# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -10322,7 +12551,7 @@ Signed-off-by: Khem Raj AC_SUBST(LIBTOOL)dnl _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl @@ -10345,7 +12574,7 @@ Signed-off-by: Khem Raj can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. @@ -10450,7 +12679,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH @@ -10703,7 +12932,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], @@ -10831,7 +13060,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -10865,7 +13094,7 @@ Signed-off-by: Khem Raj _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) @@ -10950,7 +13179,7 @@ Signed-off-by: Khem Raj # # Check to make sure the static flag actually works. # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl @@ -11272,7 +13501,7 @@ Signed-off-by: Khem Raj if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -11280,7 +13509,7 @@ Signed-off-by: Khem Raj lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -11288,7 +13517,7 @@ Signed-off-by: Khem Raj compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -11297,7 +13526,7 @@ Signed-off-by: Khem Raj _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. @@ -11306,7 +13535,7 @@ Signed-off-by: Khem Raj _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) @@ -11405,7 +13634,7 @@ Signed-off-by: Khem Raj darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then ;; *) if test "$GXX" = yes; then @@ -11414,7 +13643,7 @@ Signed-off-by: Khem Raj else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -11427,7 +13656,7 @@ Signed-off-by: Khem Raj ;; esac fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -11439,7 +13668,7 @@ Signed-off-by: Khem Raj fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -11464,7 +13693,7 @@ Signed-off-by: Khem Raj ;; *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -11473,7 +13702,7 @@ Signed-off-by: Khem Raj ;; esac -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in @@ -11482,7 +13711,7 @@ Signed-off-by: Khem Raj # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -11494,7 +13723,7 @@ Signed-off-by: Khem Raj # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC @@ -11702,7 +13931,7 @@ Signed-off-by: Khem Raj ])# _LT_LANG_RC_CONFIG -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) @@ -11729,7 +13958,7 @@ Signed-off-by: Khem Raj && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES @@ -11827,31 +14056,6 @@ Signed-off-by: Khem Raj -{ - func_len_result=${#1} -} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and @@ -11868,22 +14072,23 @@ Signed-off-by: Khem Raj +test 0 -eq $? || _lt_function_replace_fail=: +]) --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi -} +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- @@ -11907,24 +14112,45 @@ Signed-off-by: Khem Raj + esac + func_basename_result="${1##*/}"]) --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) -+ + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) -+ + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; @@ -11972,7 +14198,9 @@ Signed-off-by: Khem Raj + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ + +-_LT_EOF +-esac + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ @@ -11986,17 +14214,14 @@ Signed-off-by: Khem Raj + test 0 -eq $? || _lt_function_replace_fail=: +fi --_LT_EOF --esac +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () @@ -12082,6 +14307,8 @@ Signed-off-by: Khem Raj +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -1,10 +1,9 @@ @@ -12513,7 +14740,31 @@ Signed-off-by: Khem Raj +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi -+ + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac + exit $EXIT_MISMATCH + fi +} @@ -12543,7 +14794,9 @@ Signed-off-by: Khem Raj + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac -+ + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do + + +# Option defaults: @@ -12559,34 +14812,8 @@ Signed-off-by: Khem Raj +opt_verbose=: +opt_silent=false +opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do ++ ++ +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ @@ -12830,13 +15057,13 @@ Signed-off-by: Khem Raj - fi -} - -- --## ----------- ## --## Main. ## --## ----------- ## + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" +-## ----------- ## +-## Main. ## +-## ----------- ## +- -$opt_help || { - # Sanity checks first: - func_check_version_match @@ -13557,7 +15784,7 @@ Signed-off-by: Khem Raj "") # Generic help is extracted from the usage comments # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes @@ -13568,7 +15795,7 @@ Signed-off-by: Khem Raj -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." ;; *) @@ -13670,7 +15897,7 @@ Signed-off-by: Khem Raj + do + if test -d "$opt"; then + func_append libdirs " $opt" -+ + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" @@ -13690,7 +15917,7 @@ Signed-off-by: Khem Raj + else + sysroot_cmd= + fi - ++ + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do @@ -14102,7 +16329,7 @@ Signed-off-by: Khem Raj lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; @@ -14631,7 +16858,7 @@ Signed-off-by: Khem Raj */ EOF cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) @@ -14658,7 +16885,7 @@ Signed-off-by: Khem Raj void *xmalloc (size_t num); char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); @@ -14986,7 +17213,7 @@ Signed-off-by: Khem Raj vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, } void @@ -15024,7 +17251,7 @@ Signed-off-by: Khem Raj { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) void lt_update_exe_path (const char *name, const char *value) { @@ -15037,7 +17264,7 @@ Signed-off-by: Khem Raj if (name && *name && value && *value) { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { @@ -17310,6 +19537,8 @@ Signed-off-by: Khem Raj if test -n "$exec_cmd"; then eval exec "$exec_cmd" +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 --- a/ltoptions.m4 +++ b/ltoptions.m4 @@ -8,7 +8,7 @@ @@ -17321,6 +19550,8 @@ Signed-off-by: Khem Raj # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 --- a/ltversion.m4 +++ b/ltversion.m4 @@ -7,17 +7,17 @@ @@ -17347,6 +19578,8 @@ Signed-off-by: Khem Raj _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 --- a/lt~obsolete.m4 +++ b/lt~obsolete.m4 @@ -7,7 +7,7 @@ @@ -17358,6 +19591,8 @@ Signed-off-by: Khem Raj # These exist entirely to fool aclocal when bootstrapping libtool. # +diff --git a/opcodes/configure b/opcodes/configure +index 4723dcdc1e..223e14af28 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -680,6 +680,9 @@ OTOOL @@ -17407,7 +19642,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u +@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -17543,7 +19778,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli +@@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -17557,6 +19792,8 @@ Signed-off-by: Khem Raj + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -17756,7 +19993,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;; +@@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -17769,13 +20006,16 @@ Signed-off-by: Khem Raj +: ${AR=ar} +: ${AR_FLAGS=cru} + - - - -@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -17788,7 +20028,7 @@ Signed-off-by: Khem Raj +int +main () +{ -+ + + ; + return 0; +} @@ -17814,28 +20054,22 @@ Signed-off-by: Khem Raj + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + + @@ -6972,8 +7290,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -17883,7 +20117,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() +@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -17905,7 +20139,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7136,6 +7467,14 @@ else +@@ -7136,6 +7467,16 @@ else $as_echo "ok" >&6; } fi @@ -17917,13 +20151,18 @@ Signed-off-by: Khem Raj +fi + + ++ ++ -@@ -7157,6 +7496,47 @@ fi +@@ -7152,6 +7493,45 @@ fi ++ ++ ++ + + + @@ -17960,14 +20199,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; + + + @@ -7363,6 +7743,123 @@ esac need_locks="$enable_libtool_lock" @@ -18129,7 +20363,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio +@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -18142,7 +20376,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio +@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -18303,7 +20537,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -18361,7 +20595,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -18439,7 +20673,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -18448,7 +20682,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -18457,7 +20691,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -18466,7 +20700,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -18524,7 +20758,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -18533,7 +20767,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -18692,7 +20926,7 @@ Signed-off-by: Khem Raj fi case "${host}" in -@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -18713,7 +20947,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -13777,14 +14439,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -18732,7 +20966,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -18746,7 +20980,7 @@ Signed-off-by: Khem Raj file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13878,8 +14543,13 @@ reload_flag \ +@@ -13877,8 +14542,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -18760,7 +20994,7 @@ Signed-off-by: Khem Raj STRIP \ RANLIB \ CC \ -@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13888,12 +14558,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -18776,7 +21010,7 @@ Signed-off-by: Khem Raj DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13910,7 +14582,6 @@ no_undefined_flag \ +@@ -13909,7 +14581,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -18784,7 +21018,7 @@ Signed-off-by: Khem Raj exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13946,6 +14617,7 @@ module_cmds \ +@@ -13945,6 +14616,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -18792,7 +21026,7 @@ Signed-off-by: Khem Raj postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14711,7 +15383,8 @@ $as_echo X"$file" | +@@ -14710,7 +15382,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -18802,7 +21036,7 @@ Signed-off-by: Khem Raj # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -18846,7 +21080,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -14855,6 +15551,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -18859,7 +21093,7 @@ Signed-off-by: Khem Raj # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -18869,7 +21103,7 @@ Signed-off-by: Khem Raj # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -14979,12 +15684,12 @@ with_gcc=$GCC +@@ -14978,12 +15683,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -18885,7 +21119,7 @@ Signed-off-by: Khem Raj # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath +@@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -18895,7 +21129,7 @@ Signed-off-by: Khem Raj # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms +@@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -18905,7 +21139,7 @@ Signed-off-by: Khem Raj # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -15120,210 +15825,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? @@ -19107,9 +21341,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -19267,15 +21507,14 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index 00be9c88be..11c9e33e8c 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -170,7 +170,7 @@ changequote(,)dnl @@ -19287,6 +21526,8 @@ Signed-off-by: Khem Raj fi case "${host}" in +diff --git a/zlib/configure b/zlib/configure +index 041cbdbf71..19d605fc85 100755 --- a/zlib/configure +++ b/zlib/configure @@ -646,8 +646,11 @@ OTOOL @@ -19338,7 +21579,7 @@ Signed-off-by: Khem Raj test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u +@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -19474,7 +21715,7 @@ Signed-off-by: Khem Raj file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli +@@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -19488,6 +21729,8 @@ Signed-off-by: Khem Raj + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -19688,7 +21931,7 @@ Signed-off-by: Khem Raj if test "x$ac_ct_AR" = x; then AR="false" else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; +@@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -19700,13 +21943,17 @@ Signed-off-by: Khem Raj -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -19719,7 +21966,7 @@ Signed-off-by: Khem Raj +int +main () +{ -+ + + ; + return 0; +} @@ -19745,29 +21992,22 @@ Signed-off-by: Khem Raj + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 + + + @@ -5846,8 +6165,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -19815,7 +22055,7 @@ Signed-off-by: Khem Raj const char *name; void *address; } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() +@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -19837,7 +22077,7 @@ Signed-off-by: Khem Raj else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6010,6 +6342,18 @@ else +@@ -6010,6 +6342,19 @@ else $as_echo "ok" >&6; } fi @@ -19853,13 +22093,17 @@ Signed-off-by: Khem Raj + + + ++ -@@ -6031,6 +6375,42 @@ fi +@@ -6027,6 +6372,41 @@ fi ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -19892,13 +22136,9 @@ Signed-off-by: Khem Raj + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : + + @@ -6241,6 +6621,123 @@ esac need_locks="$enable_libtool_lock" @@ -20060,7 +22300,7 @@ Signed-off-by: Khem Raj if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio +@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -20073,7 +22313,7 @@ Signed-off-by: Khem Raj pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio +@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -20234,7 +22474,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -20292,7 +22532,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -20370,7 +22610,7 @@ Signed-off-by: Khem Raj ;; darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -20379,7 +22619,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -20388,7 +22628,7 @@ Signed-off-by: Khem Raj else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -20397,7 +22637,7 @@ Signed-off-by: Khem Raj else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -20458,7 +22698,7 @@ Signed-off-by: Khem Raj else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -20467,7 +22707,7 @@ Signed-off-by: Khem Raj hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -20617,7 +22857,7 @@ Signed-off-by: Khem Raj int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' @@ -20638,7 +22878,7 @@ Signed-off-by: Khem Raj STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -20657,7 +22897,7 @@ Signed-off-by: Khem Raj DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' @@ -20771,7 +23011,7 @@ Signed-off-by: Khem Raj # A symbol stripping program. STRIP=$lt_STRIP -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix @@ -21032,9 +23272,15 @@ Signed-off-by: Khem Raj -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -21192,11 +23438,8 @@ Signed-off-by: Khem Raj + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch similarity index 87% rename from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch rename to meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 5a195054f6..4190d0e091 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 +From d45e45b38aa2ed8fe4d6b9f6316c0c1f845c48c7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 0be45b4ae8..4817616bb2 100644 +index fe738d0db4..27d818f253 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -365,7 +365,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch rename to meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index 655cc375a9..b5a2218650 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 +From 7f42703a8df6c01f8b943ad38cdc446f197f4040 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -59,9 +59,11 @@ Signed-off-by: Khem Raj ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 86 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) +diff --git a/ld/config.in b/ld/config.in +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -74,9 +76,11 @@ Signed-off-by: Khem Raj /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION +diff --git a/ld/configure b/ld/configure +index f432f4637d..a9da3c115e 100755 --- a/ld/configure +++ b/ld/configure -@@ -827,6 +827,7 @@ with_lib_path +@@ -830,6 +830,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -84,7 +88,7 @@ Signed-off-by: Khem Raj enable_gold enable_got enable_compressed_debug_sections -@@ -1491,6 +1492,8 @@ Optional Features: +@@ -1495,6 +1496,8 @@ Optional Features: --disable-largefile omit support for large files --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -93,7 +97,7 @@ Signed-off-by: Khem Raj --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16619,6 +16622,19 @@ fi +@@ -16624,6 +16627,19 @@ fi @@ -113,6 +117,8 @@ Signed-off-by: Khem Raj # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in +diff --git a/ld/configure.ac b/ld/configure.ac +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -132,9 +138,11 @@ Signed-off-by: Khem Raj dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -149,9 +157,11 @@ Signed-off-by: Khem Raj /* Big or little endian as set on command line. */ enum endian_enum endian; +diff --git a/ld/ld.texi b/ld/ld.texi +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -170,9 +180,11 @@ Signed-off-by: Khem Raj @end table @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -196,6 +208,8 @@ Signed-off-by: Khem Raj } /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -150,6 +150,8 @@ enum option_values @@ -207,9 +221,11 @@ Signed-off-by: Khem Raj }; /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index da1ad17763..12d0b07d8a 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -274,6 +274,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -218,9 +234,11 @@ Signed-off-by: Khem Raj /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 3d15cc491d..0e8b4f2b7a 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -235,7 +253,7 @@ Signed-off-by: Khem Raj }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) +@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch similarity index 96% rename from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch rename to meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index e63d278bcd..2e53dcbeca 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 +From 856692934325497e30db46ed713ec4cc22ddb02a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch similarity index 80% rename from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch rename to meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index e6b50dbcde..ca205a5e2b 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 +From e3101954754db79eb937972d4d108c7f6e64ca0c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:44:14 +0000 Subject: [PATCH] Change default emulation for mips64*-*-linux @@ -13,9 +13,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index b96931f52e..847f9f0ba9 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -915,12 +915,12 @@ case "${targ}" in +@@ -911,12 +911,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -32,21 +34,24 @@ Signed-off-by: Khem Raj ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 23194e357f..f4f0eaf9b2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip - mips*-*-vxworks*) targ_emul=elf32ebmipvxworks - targ_extra_emuls="elf32elmipvxworks" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; +@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" +mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" +mips64*-*-linux-*) targ_emul=elf64btsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; mips*el-*-linux-*) targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch similarity index 83% rename from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch rename to meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index b710752245..ef2ae586ef 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,4 +1,4 @@ -From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 +From 9474f703e993f45e8082ade317af0b5f813ab74d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:06:19 +0000 Subject: [PATCH] Add support for Netlogic XLP @@ -33,9 +33,11 @@ Signed-off-by: Mark Hatle opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- 14 files changed, 62 insertions(+), 21 deletions(-) +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index fa3a9746b6..5078024fd5 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch +@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -43,6 +45,8 @@ Signed-off-by: Mark Hatle /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; +diff --git a/bfd/archures.c b/bfd/archures.c +index 232103817c..b2b3b8c124 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -53,9 +57,11 @@ Signed-off-by: Mark Hatle .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 7c13bc8c91..2e453c50c1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2125,6 +2125,7 @@ enum bfd_architecture +@@ -1568,6 +1568,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -63,9 +69,11 @@ Signed-off-by: Mark Hatle #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 847f9f0ba9..a12707f827 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -898,6 +898,11 @@ case "${targ}" in +@@ -894,6 +894,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -77,9 +85,11 @@ Signed-off-by: Mark Hatle mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index 802acb45f1..fd9ec4c0ad 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c -@@ -107,7 +107,8 @@ enum +@@ -108,7 +108,8 @@ enum I_mipsocteon3, I_xlr, I_interaptiv_mr2, @@ -89,16 +99,18 @@ Signed-off-by: Mark Hatle }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), +@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) }; /* The default architecture is mips:3000, but with a machine number of +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index d7e3aed3b6..7baeee9ee3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -111,7 +123,7 @@ Signed-off-by: Mark Hatle default: switch (flags & EF_MIPS_ARCH) { -@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -122,7 +134,7 @@ Signed-off-by: Mark Hatle case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension +@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -130,9 +142,11 @@ Signed-off-by: Mark Hatle /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6b5bebe743..d15a7828db 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, +@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -140,6 +154,8 @@ Signed-off-by: Mark Hatle case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index fc6898834e..2c7151ccdb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -158,7 +174,7 @@ Signed-off-by: Mark Hatle ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c +@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -167,6 +183,8 @@ Signed-off-by: Mark Hatle /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, +diff --git a/gas/configure b/gas/configure +index 0e0ce4c0e2..09c23e9c6a 100755 --- a/gas/configure +++ b/gas/configure @@ -13377,6 +13377,9 @@ _ACEOF @@ -179,6 +197,8 @@ Signed-off-by: Mark Hatle mipstx39 | mipstx39el) mips_cpu=r3900 ;; +diff --git a/include/elf/mips.h b/include/elf/mips.h +index d116b036b6..dceeb3f156 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -189,9 +209,11 @@ Signed-off-by: Mark Hatle #define E_MIPS_MACH_OCTEON2 0x008d0000 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index fd031f3758..a96a44df84 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table +@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -200,7 +222,7 @@ Signed-off-by: Mark Hatle /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table +@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -208,7 +230,7 @@ Signed-off-by: Mark Hatle /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas +@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -218,20 +240,25 @@ Signed-off-by: Mark Hatle default: return FALSE; } +diff --git a/ld/configure.tgt b/ld/configure.tgt +index f4f0eaf9b2..0da3eca19c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; + targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" + ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip -+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ++ ;; mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 755bbe294b..ce22ef683a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ +@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -250,6 +277,8 @@ Signed-off-by: Mark Hatle /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 5270aeefa8..d17dc78cd7 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -260,7 +289,7 @@ Signed-off-by: Mark Hatle #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op +@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -268,7 +297,7 @@ Signed-off-by: Mark Hatle /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op +@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -283,7 +312,7 @@ Signed-off-by: Mark Hatle /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op +@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -291,7 +320,7 @@ Signed-off-by: Mark Hatle {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op +@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, @@ -300,7 +329,7 @@ Signed-off-by: Mark Hatle {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op +@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -313,7 +342,7 @@ Signed-off-by: Mark Hatle {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op +@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -322,7 +351,7 @@ Signed-off-by: Mark Hatle {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op +@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -338,7 +367,7 @@ Signed-off-by: Mark Hatle {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op +@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -347,7 +376,7 @@ Signed-off-by: Mark Hatle {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op +@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch rename to meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index f686763594..2df5c7ed8b 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 +From 6d1b3ec255afabfcf2643976ddcfac69aa653871 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index b56fe3e21a..696fe83a7b 100644 +index 7ef91d819b..145953d3c4 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch rename to meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index 493b05026d..86453e392e 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,4 +1,4 @@ -From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 +From d24e2b973f2c713f0043b734629d2107bff1bc9c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 11:42:03 -0700 Subject: [PATCH] Detect 64-bit MIPS targets @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index 3e066edaa8..caf130ceda 100644 +index aa7ec552ae..470515062e 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch deleted file mode 100644 index d25ce61626..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Nov 2018 17:46:40 -0800 -Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on - x86-64 - -Add x86_64-pep emulation support to the set enabled for x86_64 targets -to enable the linker to produce Portable Executables for EFI binaries. - -Enables building the x86-64 EFI variant of the Xen hypervisor for -the OpenXT Project. - -Upstream-Status: Inappropriate [OE configuration specific] - -Signed-off-by: Christopher Clark -Signed-off-by: Khem Raj ---- - bfd/config.bfd | 2 +- - ld/configure.tgt | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -694,7 +694,7 @@ case "${targ}" in - ;; - x86_64-*-linux-*) - targ_defvec=x86_64_elf64_vec -- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" -+ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec" - want64=true - ;; - x86_64-*-nacl*) ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x - tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; - x86_64-*-linux-*) targ_emul=elf_x86_64 -- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" -- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" -+ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" -+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" -+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; - i[3-7]86-*-redox*) targ_emul=elf_i386 - targ_extra_emuls=elf_x86_64 ;; diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch similarity index 97% rename from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch rename to meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index ae5915d39b..02045d44ab 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 +From ae2041a2e542232cc41464f17e20834c7210e36d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch deleted file mode 100644 index ce5b9f392d..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 00:07:29 +1030 -Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17450, so backport it to master and zeus. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79] -CVE: CVE-2019-17450 -Signed-off-by: Trevor Gamblin - - PR 25078 - * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add - recur_count. Error on recur_count reaching 100 rather than - info_ptr matching orig_info_ptr. Adjust calls. - ---- - bfd/dwarf2.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod - struct dwarf2_debug *); - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1fe05d310e..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 10:47:13 +1030 -Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17451, so backport it to master and zeus. - -Upstream-Status: Backport -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848] -CVE: CVE-2019-17451 -Signed-off-by: Trevor Gamblin - - -Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 -and ffffd5555453b140 result in a total size of 1. Reading the first -section of course overflows the buffer and tramples on other memory. - - PR 25070 - * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of - total_size calculation. ---- - bfd/dwarf2.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb similarity index 94% rename from meta/recipes-devtools/binutils/binutils_2.33.bb rename to meta/recipes-devtools/binutils/binutils_2.34.bb index 8bd2bf778c..eecad1863c 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.34.bb @@ -51,7 +51,7 @@ do_install_class-native () { PACKAGE_BEFORE_PN += "libbfd" FILES_libbfd = "${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " +SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- 2.25.1 From patchwork at patchwork.openembedded.org Wed Feb 19 19:32:29 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 19 Feb 2020 19:32:29 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_binutils?= =?utf-8?q?=3A_Upgrade_to_2=2E34_release_=28rev2=29?= In-Reply-To: <20200219192757.4194194-1-raj.khem@gmail.com> References: <20200219192757.4194194-1-raj.khem@gmail.com> Message-ID: <20200219193229.2275.46238@do> == Series Details == Series: binutils: Upgrade to 2.34 release (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22759/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at b649cf5c09) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From alex.kanavin at gmail.com Wed Feb 19 19:47:40 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:40 +0100 Subject: [OE-core] [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Message-ID: <20200219194752.7967-1-alex.kanavin@gmail.com> The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW; specifying 'ptests-pkgs' also pulls in additional ptests that are specifically excluded from those lists due to causing issues with ptesting. (particularly bash-ptest is one such item) Signed-off-by: Alexander Kanavin --- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 85b5adbc69..58c257c49f 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc DESCRIPTION += "Also includes ptest packages." -IMAGE_FEATURES += "ptest-pkgs" - PROVIDES += "core-image-sato-ptest" # Also include ptests which may not otherwise be included in a sato image -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:41 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:41 +0100 Subject: [OE-core] [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-2-alex.kanavin@gmail.com> Also enabling wayland if x11 is not enabled is not necessarily the correct decision. Signed-off-by: Alexander Kanavin --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 3eb27a1550..153bc8db11 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:42 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:42 +0100 Subject: [OE-core] [PATCH 03/13] webkitgtk: unbreak wayland build In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-3-alex.kanavin@gmail.com> webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-webkit[1], which will hopefully adjust without a lot of trouble). [1] https://github.com/Igalia/meta-webkit/ Signed-off-by: Alexander Kanavin --- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb new file mode 100644 index 0000000000..346ca9b1d8 --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +# Workaround build issue with RPi userland EGL libraries. +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 153bc8db11..585723772e 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ libsecret \ " -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb new file mode 100644 index 0000000000..7db5806d9d --- /dev/null +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "WPE's backend based on a freedesktop.org stack." +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" + +DEPENDS_append_class-target = " wayland-native" + +inherit cmake + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" + -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:43 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:43 +0100 Subject: [OE-core] [PATCH 04/13] wayland: convert to meson build In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-4-alex.kanavin@gmail.com> Replace an autotools-specific .pc adjustment patch with a meson-specific one. Signed-off-by: Alexander Kanavin --- ...hardcode-the-path-to-wayland-scanner.patch | 26 +++++++++++++++ ...-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++ .../wayland/wayland/fixpathinpcfiles.patch | 32 ------------------- .../wayland/wayland_1.18.0.bb | 11 ++++--- 4 files changed, 59 insertions(+), 37 deletions(-) create mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch delete mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch new file mode 100644 index 0000000000..2199548bdf --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch @@ -0,0 +1,26 @@ +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 17 Feb 2020 21:46:18 +0100 +Subject: [PATCH] Do not hardcode the path to wayland-scanner + +This results in host contamination during builds. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 294aee0..7e410fa 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -49,7 +49,7 @@ pkgconfig.generate( + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'wayland_scanner=${bindir}/wayland-scanner' ++ 'wayland_scanner=wayland-scanner' + ], + filebase: 'wayland-scanner' + ) diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch new file mode 100644 index 0000000000..f98037a850 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch @@ -0,0 +1,27 @@ +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 16 Feb 2020 16:29:53 +0100 +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH + +Otherwise, meson attempts to use the target pkg-config and fails. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 3e8c9bf..294aee0 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,8 +55,7 @@ pkgconfig.generate( + ) + + if meson.is_cross_build() +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = find_program('wayland-scanner') + else + wayland_scanner_for_build = wayland_scanner + endif diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch deleted file mode 100644 index ad3526d984..0000000000 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix wayland-client and wayland-scanner pc files - -Upstream-Status: Pending - -Signed-off-by: Fabien Lahoudere - -Index: wayland-1.14.0/src/wayland-client.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-client.pc.in -+++ wayland-1.14.0/src/wayland-client.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --pkgdatadir=@datadir@/@PACKAGE@ -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ - libdir=@libdir@ - includedir=@includedir@ - -Index: wayland-1.14.0/src/wayland-scanner.pc.in -=================================================================== ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in -+++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - pkgdatadir=@datadir@/@PACKAGE@ --wayland_scanner=@bindir@/wayland-scanner -+wayland_scanner=wayland-scanner - - Name: Wayland Scanner - Description: Wayland scanner diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 7a3f075552..a702b3f6cc 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://fixpathinpcfiles.patch \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," -EXTRA_OECONF = "--disable-documentation --with-host-scanner" -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" # Wayland installs a M4 macro for other projects to use, which uses the target # pkg-config to find files. Replace pkg-config with pkg-config-native. -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:44 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:44 +0100 Subject: [OE-core] [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-5-alex.kanavin@gmail.com> The fbdev backend is not documented, and not the default; as the emulated hardware in qemu now supports DRM/KMS (both std and virtio), we should align with upstream default and vast majority of users. Empty init file will cause weston to default to the KMS backend. Note that 3D acceleration via virgl is not required; the backend renders fine via the software driver in mesa. However, kvm is more or less required to keep the UI responsive. Also, other qemu targets (mips and arm in particular) continue to use the fbdev backend, as in the absence of kvm, the performance of software GL paths falls to unacceptable level. Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini create mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini new file mode 100644 index 0000000000..e69de29bb2 -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:45 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:45 +0100 Subject: [OE-core] [PATCH 06/13] qemumips: use std vga instead of cirrus vga In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-6-alex.kanavin@gmail.com> This is what the upstream recommends nowadays: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ I have verified that both X and weston continue to boot and look right; however xorg.conf file needs to be removed as it is cirrus specific and doesn't work and isn't needed with std vga. Signed-off-by: Alexander Kanavin --- meta/conf/machine/include/qemuboot-mips.inc | 2 +- .../xserver-xf86-config/qemumips/xorg.conf | 39 ------------------- .../xserver-xf86-config/qemumips64/xorg.conf | 39 ------------------- 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index d44b96c18c..f1f7c2ae20 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc @@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND += "-device cirrus-vga" +QB_OPT_APPEND += "-vga std" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index 1d3c64f620..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 03b94dc3af..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null @@ -1,39 +0,0 @@ - -Section "Files" -EndSection - -Section "Device" - Identifier "Graphics Controller" - Driver "fbdev" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" - # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz - Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync - # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz - ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync - # 640x480 @ 72Hz (VESA) hsync: 37.9kHz - ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync - # 640x480 @ 75Hz (VESA) hsync: 37.5kHz - ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync - # 640x480 @ 85Hz (VESA) hsync: 43.3kHz - ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 16 - SubSection "Display" - Modes "640x480" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - Option "AllowEmptyInput" "no" -EndSection -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:46 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:46 +0100 Subject: [OE-core] [PATCH 07/13] createrepo-c: upgrade 0.15.5 -> 0.15.7 In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-7-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} (95%) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb similarity index 95% rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb index 9b6c89c348..c6a53ffece 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe" +SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a" S = "${WORKDIR}/git" -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:47 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:47 +0100 Subject: [OE-core] [PATCH 08/13] epiphany: upgrade 3.34.3.1 -> 3.34.4 In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-8-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-gnome/epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} (85%) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb similarity index 85% rename from meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb rename to meta/recipes-gnome/epiphany/epiphany_3.34.4.bb index 7e1573348e..ddb4c2794f 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a" -SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d" +SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" +SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:48 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:48 +0100 Subject: [OE-core] [PATCH 09/13] libsecret: upgrade 0.20.0 -> 0.20.1 In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-9-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...ection-Rename-internal-functions-to-.patch | 144 ------------------ ...ibsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) delete mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch rename meta/recipes-gnome/libsecret/{libsecret_0.20.0.bb => libsecret_0.20.1.bb} (81%) diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch deleted file mode 100644 index 269c12b010..0000000000 --- a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Tue, 14 Jan 2020 10:09:29 +0100 -Subject: [PATCH] secret-file-collection: Rename internal functions to avoid - conflicts - -As encrypt() is a standard POSIX function, its declaration had -conflict with our own. Let's be more verbose about naming of the -internal crypto functions. - -Fixes #35. - -Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8] -Signed-off-by: Alexander Kanavin ---- - libsecret/secret-file-collection.c | 38 +++++++++++++++--------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c -index 79863ea..8ffb542 100644 ---- a/libsecret/secret-file-collection.c -+++ b/libsecret/secret-file-collection.c -@@ -68,7 +68,7 @@ enum { - }; - - static gboolean --derive (SecretFileCollection *self) -+do_derive_key (SecretFileCollection *self) - { - const gchar *password; - gsize n_password; -@@ -93,9 +93,9 @@ derive (SecretFileCollection *self) - } - - static gboolean --calculate_mac (SecretFileCollection *self, -- const guint8 *value, gsize n_value, -- guint8 *buffer) -+do_calculate_mac (SecretFileCollection *self, -+ const guint8 *value, gsize n_value, -+ guint8 *buffer) - { - gcry_mac_hd_t hd; - gcry_error_t gcry; -@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self, - } - - static gboolean --decrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_decrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self, - } - - static gboolean --encrypt (SecretFileCollection *self, -- guint8 *data, -- gsize n_data) -+do_encrypt (SecretFileCollection *self, -+ guint8 *data, -+ gsize n_data) - { - gcry_cipher_hd_t hd; - gcry_error_t gcry; -@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object, - self->modified = g_date_time_new_now_utc (); - self->usage_count = 0; - -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object, - g_assert (n_data == salt_size); - - self->salt = g_bytes_new (data, n_data); -- if (!derive (self)) { -+ if (!do_derive_key (self)) { - g_task_return_new_error (task, - SECRET_ERROR, - SECRET_ERROR_PROTOCOL, -@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self, - GVariant *variant; - - value = g_hash_table_lookup (attributes, l->data); -- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { -+ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) { - g_list_free (keys); - return NULL; - } -@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) { -+ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) { - g_variant_unref (hashed_attribute); - return FALSE; - } -@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self, - g_variant_store (serialized_item, data); - g_variant_unref (serialized_item); - memset (data + n_data, n_padded - n_data, n_padded - n_data); -- if (!encrypt (self, data, n_padded)) { -+ if (!do_encrypt (self, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self, - return FALSE; - } - -- if (!calculate_mac (self, data, n_padded + IV_SIZE, -- data + n_padded + IV_SIZE)) { -+ if (!do_calculate_mac (self, data, n_padded + IV_SIZE, -+ data + n_padded + IV_SIZE)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - } - n_padded -= IV_SIZE + MAC_SIZE; - -- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { -+ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, -@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted, - return FALSE; - } - -- if (!decrypt (collection, data, n_padded)) { -+ if (!do_decrypt (collection, data, n_padded)) { - egg_secure_free (data); - g_set_error (error, - SECRET_ERROR, diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb similarity index 81% rename from meta/recipes-gnome/libsecret/libsecret_0.20.0.bb rename to meta/recipes-gnome/libsecret/libsecret_0.20.1.bb index aa3dfab581..72511af02d 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb @@ -13,9 +13,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch" -SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff" -SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43" +SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" +SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:49 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:49 +0100 Subject: [OE-core] [PATCH 10/13] meson: upgrade 0.53.0 -> 0.53.1 In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-10-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/meson/meson.inc | 4 ++-- .../meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +- ...0002-Support-building-allarch-recipes-again.patch | 2 +- .../meson/meson/0003-native_bindir.patch | 12 ++++++------ .../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0 ...sdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0 6 files changed, 10 insertions(+), 10 deletions(-) rename meta/recipes-devtools/meson/{meson_0.53.0.bb => meson_0.53.1.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} (100%) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index c0ce7d338b..d391c9cf29 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ " -SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6" -SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3" +SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04" +SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 74d5b4ca66..9ce31e5489 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001 +From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 1529ebe9fe..ce18660756 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001 +From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76c1aa9ac1..dc822fb1fc 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001 +From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index f17b9f2..b5c9c92 100644 +index 40e304c..4b687df 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -184,7 +184,7 @@ class Dependency: @@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args: List[str]) -> List[str]: + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) @@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index bdcc4a7..e2de847 100644 +index da411ef..856506a 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644 except MesonException: pass -@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.53.0.bb rename to meta/recipes-devtools/meson/meson_0.53.1.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:50 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:50 +0100 Subject: [OE-core] [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20 In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-11-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} (93%) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb similarity index 93% rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 19895ec269..26833ef431 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -9,7 +9,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:51 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:51 +0100 Subject: [OE-core] [PATCH 12/13] vala: upgrade 0.46.5 -> 0.46.6 In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-12-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} (57%) diff --git a/meta/recipes-devtools/vala/vala_0.46.5.bb b/meta/recipes-devtools/vala/vala_0.46.6.bb similarity index 57% rename from meta/recipes-devtools/vala/vala_0.46.5.bb rename to meta/recipes-devtools/vala/vala_0.46.6.bb index 9233d109dd..66f620384c 100644 --- a/meta/recipes-devtools/vala/vala_0.46.5.bb +++ b/meta/recipes-devtools/vala/vala_0.46.6.bb @@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df" -SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d" +SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5" +SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a" -- 2.25.0 From alex.kanavin at gmail.com Wed Feb 19 19:47:52 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 20:47:52 +0100 Subject: [OE-core] [PATCH 13/13] virglrenderer: upgrade 0.8.1 -> 0.8.2 In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> Message-ID: <20200219194752.7967-13-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} (94%) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb similarity index 94% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb index 133618844a..1046b8504f 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm mesa libepoxy" -SRCREV = "66c57963aaf09a1c41056bd2a001da1d51957a14" +SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ file://0001-meson.build-use-python3-directly-for-python.patch \ -- 2.25.0 From scott.branden at broadcom.com Wed Feb 19 20:39:42 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Wed, 19 Feb 2020 12:39:42 -0800 Subject: [OE-core] [meta-oe][PATCH v3] iproute2: add devlink support to iproute2 In-Reply-To: References: <20200219003801.15549-1-scott.branden@broadcom.com> Message-ID: <4ddfcc5b-0a9c-bddf-445f-ea4fcd9381ca@broadcom.com> Sorry,? I will compile test when making simple changes suggested by others from now. New version being submitted. On 2020-02-19 8:30 a.m., Richard Purdie wrote: > On Tue, 2020-02-18 at 16:38 -0800, Scott Branden via Openembedded-core wrote: >> Add devlink support to iproute2 recipe. >> >> Signed-off-by: Scott Branden >> --- >> .../iproute2/iproute2.inc | 34 +++++++++++++------ >> 1 file changed, 23 insertions(+), 11 deletions(-) >> > Doesn't build: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/1822 > > (and a ton more) > > Cheers, > > Richard > From scott.branden at broadcom.com Wed Feb 19 20:41:03 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Wed, 19 Feb 2020 12:41:03 -0800 Subject: [OE-core] [meta-oe][PATCH v4] iproute2: add devlink support to iproute2 Message-ID: <20200219204103.14617-1-scott.branden@broadcom.com> Add devlink support to iproute2 recipe. Signed-off-by: Scott Branden --- .../iproute2/iproute2.inc | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index fc31b8444e..403d264308 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,12 +15,19 @@ inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc elf" +PACKAGECONFIG ??= "tipc elf devlink" PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," +PACKAGECONFIG[devlink] = ",,libmnl," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "\ + CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_INCDIR} \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ + SBINDIR='${base_sbindir}' \ + LIBDIR='${libdir}' \ +" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -39,14 +46,18 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc \ - ${PN}-lnstat \ - ${PN}-ifstat \ - ${PN}-genl \ - ${PN}-rtacct \ - ${PN}-nstat \ - ${PN}-ss \ - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "\ + ${PN}-devlink \ + ${PN}-genl \ + ${PN}-ifstat \ + ${PN}-lnstat \ + ${PN}-nstat \ + ${PN}-rtacct \ + ${PN}-ss \ + ${PN}-tc \ + ${PN}-tipc \ +" + FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ @@ -58,6 +69,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct" FILES_${PN}-nstat = "${base_sbindir}/nstat" FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-tipc = "${base_sbindir}/tipc" +FILES_${PN}-devlink = "${base_sbindir}/devlink" ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" -- 2.17.1 From pjtexier at koncepto.io Wed Feb 19 21:08:11 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Wed, 19 Feb 2020 22:08:11 +0100 Subject: [OE-core] [PATCH] libubootenv: bump to revision ba952d0 Message-ID: <1582146491-20965-1-git-send-email-pjtexier@koncepto.io> This includes following changes: ba952d0 BUG: variable lists not released in close() 690f868 Variables are not removed when loading from file 9e3586a Make sure there's no file descriptor leakage in case of error 03647c4 Check config file defines a non-zero Sector size 3b2d4f1 Check environment size from fw_env.config Signed-off-by: Pierre-Jean Texier --- meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index f5b6059..ac49b68 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b36 SECTION = "libs" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" S = "${WORKDIR}/git" -- 2.7.4 From alex.kanavin at gmail.com Wed Feb 19 21:17:06 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 19 Feb 2020 22:17:06 +0100 Subject: [OE-core] [PATCH] libubootenv: bump to revision ba952d0 In-Reply-To: <1582146491-20965-1-git-send-email-pjtexier@koncepto.io> References: <1582146491-20965-1-git-send-email-pjtexier@koncepto.io> Message-ID: If PV doesn't change, package managers will not be able to update this properly. You need to set it to something like 0.2+git${SRCPV} Alex On Wed, 19 Feb 2020 at 22:08, Pierre-Jean Texier via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > This includes following changes: > > ba952d0 BUG: variable lists not released in close() > 690f868 Variables are not removed when loading from file > 9e3586a Make sure there's no file descriptor leakage in case of error > 03647c4 Check config file defines a non-zero Sector size > 3b2d4f1 Check environment size from fw_env.config > > Signed-off-by: Pierre-Jean Texier > --- > meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb > b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb > index f5b6059..ac49b68 100644 > --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb > +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb > @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = > "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b36 > SECTION = "libs" > > SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" > -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" > +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" > > S = "${WORKDIR}/git" > > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From sbabic at denx.de Wed Feb 19 21:19:37 2020 From: sbabic at denx.de (Stefano Babic) Date: Wed, 19 Feb 2020 22:19:37 +0100 Subject: [OE-core] [PATCH] libubootenv: bump to revision ba952d0 In-Reply-To: <1582146491-20965-1-git-send-email-pjtexier@koncepto.io> References: <1582146491-20965-1-git-send-email-pjtexier@koncepto.io> Message-ID: Hallo Jean-Pierre, On 19/02/20 22:08, Pierre-Jean Texier wrote: > This includes following changes: > > ba952d0 BUG: variable lists not released in close() > 690f868 Variables are not removed when loading from file > 9e3586a Make sure there's no file descriptor leakage in case of error > 03647c4 Check config file defines a non-zero Sector size > 3b2d4f1 Check environment size from fw_env.config > > Signed-off-by: Pierre-Jean Texier > --- > meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb > index f5b6059..ac49b68 100644 > --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb > +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb > @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b36 > SECTION = "libs" > > SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" > -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" > +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" > > S = "${WORKDIR}/git" > > Acked-by: Stefano Babic Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== From richard.purdie at linuxfoundation.org Wed Feb 19 21:27:52 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 21:27:52 +0000 Subject: [OE-core] [PATCH] lttng-tools: upgrade 2.11.0 -> 2.11.2 Message-ID: <20200219212752.135948-1-richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie --- .../lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/lttng/{lttng-tools_2.11.0.bb => lttng-tools_2.11.2.bb} (98%) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb similarity index 98% rename from meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb index 9cb896314b8..36a19ec18d8 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.11.2.bb @@ -36,8 +36,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-regression-disable-the-tools-live-tests.patch \ " -SRC_URI[md5sum] = "e6c23244a36e2a09783d03a362eb63cb" -SRC_URI[sha256sum] = "dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc" +SRC_URI[md5sum] = "68ed78f7fa4235477ea577e48b3cd245" +SRC_URI[sha256sum] = "936477305b25f65c5dd22db9161287d30a309ce868b6180857b1fd1fb5e6a56b" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd -- 2.25.0 From pjtexier at koncepto.io Wed Feb 19 21:27:59 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Wed, 19 Feb 2020 22:27:59 +0100 Subject: [OE-core] [PATCH] libubootenv: bump to revision ba952d0 In-Reply-To: References: <1582146491-20965-1-git-send-email-pjtexier@koncepto.io> Message-ID: Hi Alex, Le 19/02/2020 ? 22:17, Alexander Kanavin a ?crit?: > If PV doesn't change, package managers will not be able to update this > properly. You need to set it to something like 0.2+git${SRCPV} Sure, you're indeed right. I will send a v2. Thanks ! -- Pierre-Jean Texier Embedded Linux Engineer https://koncepto.io From pjtexier at koncepto.io Wed Feb 19 21:37:12 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Wed, 19 Feb 2020 22:37:12 +0100 Subject: [OE-core] [PATCH v2] libubootenv: bump to revision ba952d0 Message-ID: <1582148232-25284-1-git-send-email-pjtexier@koncepto.io> This includes following changes: ba952d0 BUG: variable lists not released in close() 690f868 Variables are not removed when loading from file 9e3586a Make sure there's no file descriptor leakage in case of error 03647c4 Check config file defines a non-zero Sector size 3b2d4f1 Check environment size from fw_env.config Signed-off-by: Pierre-Jean Texier Acked-by: Stefano Babic --- changes v1 -> v2 - introduce PV variable (suggested by Alexander Kanavin) meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb index f5b6059..7a7ec4c 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb @@ -11,8 +11,9 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" +PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "879c0731fa0725785b9fa4499bbf6aacd04ee4c2" +SRCREV = "ba952d05ec9ab16029816a06d956bac7fb4e9832" S = "${WORKDIR}/git" -- 2.7.4 From richard.purdie at linuxfoundation.org Wed Feb 19 21:43:03 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 21:43:03 +0000 Subject: [OE-core] [PATCH] local.conf.sample.extended: Document how to limit parallel fetch tasks Message-ID: <20200219214303.138067-1-richard.purdie@linuxfoundation.org> [YOCTO #13235] Signed-off-by: Richard Purdie --- meta/conf/local.conf.sample.extended | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index fcf4a9b7c1a..443b4e83f9a 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -23,6 +23,14 @@ # # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would # be appropriate for example. +# +# Some users are behind firewalls or use servers where the number of parallel connections +# is limited. In such cases you can limit the number of fetch tasks which run in parallel by +# setting the option below, in this case limiting to a maximum of 4 fetch tasks in parallel: +# +#do_fetch[number_threads] = "4" +# + #DISTRO_FEATURES = "alsa bluetooth ext2 irda ipv4 ipv6 pcmcia usbgadget usbhost wifi nfs zeroconf pci" -- 2.25.0 From armccurdy at gmail.com Wed Feb 19 22:05:19 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Wed, 19 Feb 2020 14:05:19 -0800 Subject: [OE-core] [PATCH] local.conf.sample.extended: Document how to limit parallel fetch tasks In-Reply-To: <20200219214303.138067-1-richard.purdie@linuxfoundation.org> References: <20200219214303.138067-1-richard.purdie@linuxfoundation.org> Message-ID: On Wed, Feb 19, 2020 at 1:43 PM Richard Purdie wrote: > > [YOCTO #13235] > > Signed-off-by: Richard Purdie > --- > meta/conf/local.conf.sample.extended | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended > index fcf4a9b7c1a..443b4e83f9a 100644 > --- a/meta/conf/local.conf.sample.extended > +++ b/meta/conf/local.conf.sample.extended > @@ -23,6 +23,14 @@ > # > # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would > # be appropriate for example. > +# > +# Some users are behind firewalls or use servers where the number of parallel connections > +# is limited. In such cases you can limit the number of fetch tasks which run in parallel by > +# setting the option below, in this case limiting to a maximum of 4 fetch tasks in parallel: > +# > +#do_fetch[number_threads] = "4" How does this interact with BB_NUMBER_THREADS? If, for example, both are set to 4 does it mean there could be 4 fetch threads and 4 compile threads running in parallel? A related issue when the number of parallel connections is limited is parsing a large number of AUTOREV recipes. From what I remember the workaround for that was to set BB_NUMBER_PARSE_THREADS. Maybe that should be documented in local.conf.sample.extended too? Perhaps even better would be to define a single new variable which limits the number of parallel connections in both cases? > +# > + > > #DISTRO_FEATURES = "alsa bluetooth ext2 irda ipv4 ipv6 pcmcia usbgadget usbhost wifi nfs zeroconf pci" > > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Wed Feb 19 22:08:37 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 22:08:37 +0000 Subject: [OE-core] [PATCH] local.conf.sample.extended: Document how to limit parallel fetch tasks Message-ID: <20200219220837.139051-1-richard.purdie@linuxfoundation.org> [YOCTO #13235] Signed-off-by: Richard Purdie --- meta/conf/local.conf.sample.extended | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index fcf4a9b7c1a..443b4e83f9a 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -23,6 +23,14 @@ # # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would # be appropriate for example. +# +# Some users are behind firewalls or use servers where the number of parallel connections +# is limited. In such cases you can limit the number of fetch tasks which run in parallel by +# setting the option below, in this case limiting to a maximum of 4 fetch tasks in parallel: +# +#do_fetch[number_threads] = "4" +# + #DISTRO_FEATURES = "alsa bluetooth ext2 irda ipv4 ipv6 pcmcia usbgadget usbhost wifi nfs zeroconf pci" -- 2.25.0 From richard.purdie at linuxfoundation.org Wed Feb 19 22:13:56 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 22:13:56 +0000 Subject: [OE-core] [PATCH] distro_alias: Fix typos Message-ID: <20200219221356.139495-1-richard.purdie@linuxfoundation.org> [YOCTO #13433] Signed-off-by: Richard Purdie --- meta/conf/distro/include/distro_alias.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index e314642b9c3..79ebcaee299 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -15,7 +15,7 @@ DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core" DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk" DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT" -DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debina=bjam" +DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debian=bjam" DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool" DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez Opensuse=bluez" DISTRO_PN_ALIAS_pn-bootchart2 = "Fedora=bootchart2 Opensuse=bootchart" @@ -130,7 +130,7 @@ DISTRO_PN_ALIAS_pn-initramfs-live-install = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-efi = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-efi-testfs = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-testfs = "OE-Core" -DISTRO_PN_ALIAS_pn-initscripts = "Fedora=initscripts Mandravia=initscripts" +DISTRO_PN_ALIAS_pn-initscripts = "Fedora=initscripts Mandriva=initscripts" DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" -- 2.25.0 From peter.kjellerstedt at axis.com Wed Feb 19 22:26:11 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Wed, 19 Feb 2020 22:26:11 +0000 Subject: [OE-core] [PATCH 3/3] oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: <20200219183817.130495-3-richard.purdie@linuxfoundation.org> References: <20200219183817.130495-1-richard.purdie@linuxfoundation.org> <20200219183817.130495-3-richard.purdie@linuxfoundation.org> Message-ID: > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org On Behalf Of Richard Purdie > Sent: den 19 februari 2020 19:38 > To: openembedded-core at lists.openembedded.org > Subject: [OE-core] [PATCH 3/3] oeqa/selftest: Drop 'backup' code and SIGTERM handler > > Now selftest is using its own copied build directory, we can stop worrying about > copying files around as backup, and drop the SIGTERM handler to try and restore > them, simplifying the code. > > Signed-off-by: Richard Purdie > --- > meta/lib/oeqa/selftest/case.py | 30 +------------------- > meta/lib/oeqa/selftest/context.py | 47 ++----------------------------- > 2 files changed, 4 insertions(+), 73 deletions(-) [cut] > @@ -329,18 +311,9 @@ class > OESelftestTestContextExecutor(OETestContextExecutor): > > return rc > > - def _signal_clean_handler(self, signum, frame): > - if self.ourpid == os.getpid(): > - sys.exit(1) > - > def run(self, logger, args): > self._process_args(logger, args) > > - # Setup a SIGTERM handler to allow restoration of files like local.conf and bblayers.conf > - # but don't interfer with other processes > - self.ourpid = os.getpid() > - signal.signal(signal.SIGTERM, self._signal_clean_handler) > - What's the point of the first patch in this series, when you just remove it all again here in the third patch? > rc = None > try: > if args.machine: //Peter From richard.purdie at linuxfoundation.org Wed Feb 19 22:28:29 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 22:28:29 +0000 Subject: [OE-core] [PATCH 3/3] oeqa/selftest: Drop 'backup' code and SIGTERM handler In-Reply-To: References: <20200219183817.130495-1-richard.purdie@linuxfoundation.org> <20200219183817.130495-3-richard.purdie@linuxfoundation.org> Message-ID: On Wed, 2020-02-19 at 22:26 +0000, Peter Kjellerstedt wrote: > > -----Original Message----- > > From: openembedded-core-bounces at lists.openembedded.org < > > openembedded-core-bounces at lists.openembedded.org> On Behalf Of > > Richard Purdie > > Sent: den 19 februari 2020 19:38 > > To: openembedded-core at lists.openembedded.org > > Subject: [OE-core] [PATCH 3/3] oeqa/selftest: Drop 'backup' code > > and SIGTERM handler > > > > Now selftest is using its own copied build directory, we can stop > > worrying about > > copying files around as backup, and drop the SIGTERM handler to try > > and restore > > them, simplifying the code. > > > > Signed-off-by: Richard Purdie > > --- > > meta/lib/oeqa/selftest/case.py | 30 +------------------- > > meta/lib/oeqa/selftest/context.py | 47 ++------------------------- > > ---- > > 2 files changed, 4 insertions(+), 73 deletions(-) > > [cut] > > > @@ -329,18 +311,9 @@ class > > OESelftestTestContextExecutor(OETestContextExecutor): > > > > return rc > > > > - def _signal_clean_handler(self, signum, frame): > > - if self.ourpid == os.getpid(): > > - sys.exit(1) > > - > > def run(self, logger, args): > > self._process_args(logger, args) > > > > - # Setup a SIGTERM handler to allow restoration of files > > like local.conf and bblayers.conf > > - # but don't interfer with other processes > > - self.ourpid = os.getpid() > > - signal.signal(signal.SIGTERM, self._signal_clean_handler) > > - > > What's the point of the first patch in this series, when you just > remove it all again here in the third patch? The bug affects stable series builds as well as master. We're probably unlikely to accept 2/3 or 3/3 into stable builds? I therefore wrote it as a series, just in case the stable maintainers do pick up 1/3 which I'd figured out before writing 2/3 and 3/3. Cheers, Richard From patchwork at patchwork.openembedded.org Wed Feb 19 22:32:19 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 19 Feb 2020 22:32:19 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_local=2Eco?= =?utf-8?q?nf=2Esample=2Eextended=3A_Document_how_to_limit_parallel_fetch_?= =?utf-8?q?tasks_=28rev2=29?= In-Reply-To: <20200219220837.139051-1-richard.purdie@linuxfoundation.org> References: <20200219220837.139051-1-richard.purdie@linuxfoundation.org> Message-ID: <20200219223219.2273.38936@do> == Series Details == Series: local.conf.sample.extended: Document how to limit parallel fetch tasks (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22768/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 8f29d82202) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From patchwork at patchwork.openembedded.org Wed Feb 19 22:32:20 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 19 Feb 2020 22:32:20 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_distro=5Fa?= =?utf-8?q?lias=3A_Fix_typos?= In-Reply-To: <20200219221356.139495-1-richard.purdie@linuxfoundation.org> References: <20200219221356.139495-1-richard.purdie@linuxfoundation.org> Message-ID: <20200219223220.2277.87274@do> == Series Details == Series: distro_alias: Fix typos Revision: 1 URL : https://patchwork.openembedded.org/series/22770/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 8f29d82202) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From raj.khem at gmail.com Wed Feb 19 22:42:39 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 19 Feb 2020 14:42:39 -0800 Subject: [OE-core] [PATCH v3] binutils: Upgrade to 2.34 release Message-ID: <20200219224239.3662791-1-raj.khem@gmail.com> Details of changelog [1] Removing bfd/ld patch to ebale pe targets instead use specific emulations via --enable-targets for x86_64 Re-arrange/forward-port patches and upgrade libctf configure to libtool 2.4 patch rpaths are no longer emitted into elfedit/readelf therefore no need of chrpath anymore Instead of pre-generating configure scripts and house them in libtool patch, generate them during configure. This also ensures that we do not patch configure directly but rather the sources which generate it Package newly added libctf library [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html Signed-off-by: Khem Raj Cc: Christopher Clark --- v2: Fix libtool patch and drop EFI patch for configure option v3: Make libtool patch not generate configure, fix packaging meta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ....33.bb => binutils-cross-canadian_2.34.bb} | 0 ...33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...s-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...ssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...s-crosssdk-Generate-relocatable-SDKs.patch | 21 +- ...o-not-generate-linker-script-directo.patch | 10 +- ...k-Search-for-alternative-ld.so.conf.patch} | 78 +- ...iden-the-regexp-for-SH-architectures.patch | 44 - ...iden-the-regexp-for-SH-architectures.patch | 44 + ...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 35 - ...05-Point-scripts-location-to-libdir.patch} | 15 +- ...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 41 + .../binutils/0006-Use-libtool-2.4.patch | 21203 ---------------- .../binutils/0007-Use-libtool-2.4.patch | 7118 ++++++ ...tro-compiler-point-to-the-wrong-ins.patch} | 13 +- ...system-directories-when-cross-linki.patch} | 45 +- ...-in-libtool-when-sysroot-is-enabled.patch} | 7 +- ...-default-emulation-for-mips64-linux.patch} | 28 +- ...> 0012-Add-support-for-Netlogic-XLP.patch} | 117 +- ...ct-assembling-for-ppc-wait-mnemonic.patch} | 9 +- ... => 0014-Detect-64-bit-MIPS-targets.patch} | 9 +- ...x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...> 0015-sync-with-OE-libtool-changes.patch} | 7 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- 29 files changed, 7476 insertions(+), 21623 deletions(-) rename meta/recipes-devtools/binutils/{binutils-2.33.inc => binutils-2.34.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.33.bb => binutils-cross-canadian_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.33.bb => binutils-cross-testsuite_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.33.bb => binutils-cross_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} (100%) rename meta/recipes-devtools/binutils/binutils/{nativesdk-relocation.patch => 0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch} (56%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch rename meta/recipes-devtools/binutils/binutils/{0004-Point-scripts-location-to-libdir.patch => 0005-Point-scripts-location-to-libdir.patch} (78%) create mode 100644 meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch rename meta/recipes-devtools/binutils/binutils/{0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (79%) rename meta/recipes-devtools/binutils/binutils/{0008-warn-for-uses-of-system-directories-when-cross-linki.patch => 0009-warn-for-uses-of-system-directories-when-cross-linki.patch} (85%) rename meta/recipes-devtools/binutils/binutils/{0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0010-Change-default-emulation-for-mips64-linux.patch => 0011-Change-default-emulation-for-mips64-linux.patch} (77%) rename meta/recipes-devtools/binutils/binutils/{0011-Add-support-for-Netlogic-XLP.patch => 0012-Add-support-for-Netlogic-XLP.patch} (81%) rename meta/recipes-devtools/binutils/binutils/{0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (85%) rename meta/recipes-devtools/binutils/binutils/{0013-Detect-64-bit-MIPS-targets.patch => 0014-Detect-64-bit-MIPS-targets.patch} (86%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch rename meta/recipes-devtools/binutils/binutils/{0014-sync-with-OE-libtool-changes.patch => 0015-sync-with-OE-libtool-changes.patch} (95%) delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/{binutils_2.33.bb => binutils_2.34.bb} (91%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 82530f5e7b..e957e3a9bb 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.33%" +BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc similarity index 54% rename from meta/recipes-devtools/binutils/binutils-2.33.inc rename to meta/recipes-devtools/binutils/binutils-2.34.inc index 84a9ec8fc3..2808a1ac56 100644 --- a/meta/recipes-devtools/binutils/binutils-2.33.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -14,35 +14,32 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.33, please make sure there is no trailing .0, so +# When upgrading to 2.35, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.33.1" -CVE_VERSION = "2.33" +PV = "2.34" +CVE_VERSION = "2.34" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_33-branch" +BRANCH ?= "binutils-2_34-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" +SRCREV ?= "e2b46ba142d9901897d8189422f0bcc28e5660b8" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ - file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ - file://0004-Point-scripts-location-to-libdir.patch \ - file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0006-Use-libtool-2.4.patch \ - file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ - file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0010-Change-default-emulation-for-mips64-linux.patch \ - file://0011-Add-support-for-Netlogic-XLP.patch \ - file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0013-Detect-64-bit-MIPS-targets.patch \ - file://0014-sync-with-OE-libtool-changes.patch \ - file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-17450.patch \ - file://CVE-2019-17451.patch \ + file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ + file://0005-Point-scripts-location-to-libdir.patch \ + file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0011-Change-default-emulation-for-mips64-linux.patch \ + file://0012-Add-support-for-Netlogic-XLP.patch \ + file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0014-Detect-64-bit-MIPS-targets.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a4b9aa586d..b070d85e15 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -13,17 +13,12 @@ LICENSE = "GPLv3" DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" -# -# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath -# -DEPENDS_append_class-target = " chrpath-replacement-native" -EXTRANATIVEPATH_append_class-target = " chrpath-native" - inherit autotools gettext multilib_header texinfo FILES_${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ - ${libdir}/lib*-*.so \ + ${libdir}/lib*.so.* \ + ${libdir}/lib*-${PV}*.so \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" @@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ ${includedir} \ ${libdir}/*.la \ ${libdir}/libbfd.so \ + ${libdir}/libctf.so \ + ${libdir}/libctf-nobfd.so \ ${libdir}/libopcodes.so" # Rather than duplicating multiple entries for these, make one @@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${LDGOLD} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " + LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" @@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" do_configure[vardeps] += "MULTIARCH" do_configure () { - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" + (for d in . bfd binutils gas gold gprof ld libctf opcodes; do + cd ${S}/$d + autoconf + rm -rf autom4te.cache + done + cd ${S} + gnu-configize) + oe_runconf # # must prime config.cache to ensure the build of libiberty @@ -123,10 +129,6 @@ do_configure () { done } -do_compile_append_class-target() { - chrpath -d ${B}/binutils/elfedit - chrpath -d ${B}/binutils/readelf -} do_install () { autotools_do_install diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 3a9461bf4a..a36c259711 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,7 +1,7 @@ -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 +From 9caa0964b6f50411d1b4520a31461cd0a87810fd Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 8 Dec 2019 00:31:35 -0800 -Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs +Date: Mon, 2 Mar 2015 01:58:54 +0000 +Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries @@ -18,23 +18,23 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index cb2b081e9e..db2e9fd569 100755 +index 03392d265c..435689ea14 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " - ( echo "/* Script for ld -r: link without relocation */" + ( echo "/* Script for -r */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " - ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" + ( echo "/* Script for -Ur */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu @@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index f9f0f7d402..9e469dca86 100644 +index 0b8b32a440..ee6b71075d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then @@ -57,3 +57,6 @@ index f9f0f7d402..9e469dca86 100644 fi if test -z "$PLT"; then IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 1b499a4504..f71c425ba6 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,7 +1,8 @@ -From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 +From 0427b3691e544051c208ea9bac9a7fb3accccba7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 -Subject: [PATCH] binutils-cross: Do not generate linker script directories +Subject: [PATCH 02/15] binutils-cross: Do not generate linker script + directories We don't place target libraries within ${exec_prefix}, we'd always place these within the target sysroot within the standard library directories. Worse, the @@ -22,7 +23,7 @@ Signed-off-by: Khem Raj 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index c90f38a63c..97ad1a24d6 100755 +index 435689ea14..cff8a1467f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() @@ -57,3 +58,6 @@ index c90f38a63c..97ad1a24d6 100755 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then libs=${NATIVE_LIB_DIRS} if [ "x${NATIVE}" = "xyes" ] ; then +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch similarity index 56% rename from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch rename to meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 408f7d18b7..2a826f5c42 100644 --- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,10 @@ -We need binutils to look at our ld.so.conf file within the SDK to ensure +From 3465d8085de4dd0137e690e99cee63aec7df011a Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 19 Feb 2020 09:51:16 -0800 +Subject: [PATCH 03/15] binutils-nativesdk: Search for alternative ld.so.conf + in SDK installation + +We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. We therefore pass in the directory to the code using a define, then add @@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the gcc internal paths. This ensures that ld works correctly in our buildtools tarball. -Standard sysroot relocation doesn't work since we're not in a sysroot, +Standard sysroot relocation doesn't work since we're not in a sysroot, we want to use both the host system and SDK libs. Signed-off-by: Richard Purdie 2020/1/17 Upstream-Status: Inappropriate [OE specific tweak] -Index: git/ld/Makefile.am -=================================================================== ---- git.orig/ld/Makefile.am -+++ git/ld/Makefile.am -@@ -36,7 +36,8 @@ am__skipyacc = +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 3 ++- + ld/Makefile.in | 3 ++- + ld/ldelf.c | 2 +- + ld/ldmain.c | 1 + + ld/ldmain.h | 1 + + 5 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 4a9b8404b7..1c132d3ce4 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -27,12 +42,12 @@ Index: git/ld/Makefile.am WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) -Index: git/ld/Makefile.in -=================================================================== ---- git.orig/ld/Makefile.in -+++ git/ld/Makefile.in -@@ -546,7 +546,8 @@ am__skiplex = - am__skipyacc = +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 46d9b14077..e453bc1b33 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz + ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ @@ -41,24 +56,24 @@ Index: git/ld/Makefile.in AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @ENABLE_PLUGINS_FALSE at PLUGIN_C = -Index: git/ld/emultempl/elf32.em -=================================================================== ---- git.orig/ld/emultempl/elf32.em -+++ git/ld/emultempl/elf32.em -@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c +diff --git a/ld/ldelf.c b/ld/ldelf.c +index 2e27cf48a8..a095d6aac5 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, info.path = NULL; info.len = info.alloc = 0; -- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", +- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); - if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) + if (!ldelf_parse_ld_so_conf (&info, tmppath)) { -Index: git/ld/ldmain.c -=================================================================== ---- git.orig/ld/ldmain.c -+++ git/ld/ldmain.c -@@ -68,6 +68,7 @@ char *program_name; +diff --git a/ld/ldmain.c b/ld/ldmain.c +index c4af10f4e9..da1ad17763 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; @@ -66,10 +81,10 @@ Index: git/ld/ldmain.c /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; -Index: git/ld/ldmain.h -=================================================================== ---- git.orig/ld/ldmain.h -+++ git/ld/ldmain.h +diff --git a/ld/ldmain.h b/ld/ldmain.h +index 0f05821d1e..54c36a94ce 100644 +--- a/ld/ldmain.h ++++ b/ld/ldmain.h @@ -23,6 +23,7 @@ extern char *program_name; @@ -78,3 +93,6 @@ Index: git/ld/ldmain.h extern char *ld_canon_sysroot; extern int ld_canon_sysroot_len; extern FILE *saved_script_handle; +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch deleted file mode 100644 index 4a6b107126..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ /dev/null @@ -1,44 +0,0 @@ -From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 01:07:33 +0000 -Subject: [PATCH] configure: widen the regexp for SH architectures - -gprof needs to know about uclibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - configure | 2 +- - gprof/configure | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 6a9719f609..001523eebf 100755 ---- a/configure -+++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/gprof/configure b/gprof/configure -index cbb3aced46..b5eabceb77 100755 ---- a/gprof/configure -+++ b/gprof/configure -@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch new file mode 100644 index 0000000000..8f155af2b5 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -0,0 +1,44 @@ +From 57451f32d025e92ef48f9efff4541933bc465b27 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:07:33 +0000 +Subject: [PATCH 04/15] configure: widen the regexp for SH architectures + +gprof needs to know about uclibc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 91dc42f6c7..7c1b747e7c 100755 +--- a/configure ++++ b/configure +@@ -3915,7 +3915,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 4bd869a63a..7187b34dfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1159,7 +1159,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch deleted file mode 100644 index 214ae06344..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 01:27:17 +0000 -Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty - -for cases where -rpath isn't specified. debian (#151024) - -Upstream-Status: Pending - -Signed-off-by: Chris Chimelis -Signed-off-by: Khem Raj ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch similarity index 78% rename from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch rename to meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 8318bd3899..d618fc44b3 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,7 +1,7 @@ -From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 +From 63806906fdfbebffb36ca8bfef1ecfb0c995222a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 -Subject: [PATCH] Point scripts location to libdir +Subject: [PATCH 05/15] Point scripts location to libdir Upstream-Status: Inappropriate [debian patch] @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index ddc7a78368..6fa7bf2583 100644 +index 1c132d3ce4..8d82cf2e16 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -63,7 +63,7 @@ endif +@@ -64,7 +64,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fdf06128b2..5c108b9e05 100644 +index e453bc1b33..2dcd72f809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -37,3 +37,6 @@ index fdf06128b2..5c108b9e05 100644 BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch new file mode 100644 index 0000000000..b0a1500a22 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -0,0 +1,41 @@ +From 6013ef00770e47ba30cbce9a567fc4ee3d1da20e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:27:17 +0000 +Subject: [PATCH 06/15] Only generate an RPATH entry if LD_RUN_PATH is not + empty + +for cases where -rpath isn't specified. debian (#151024) + +Upstream-Status: Pending + +Signed-off-by: Chris Chimelis +Signed-off-by: Khem Raj +--- + ld/ldelf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ld/ldelf.c b/ld/ldelf.c +index a095d6aac5..a2455a8793 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -1229,6 +1229,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, + && command_line.rpath == NULL) + { + path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((path) && (strlen (path) == 0)) ++ path = NULL; + if (path + && ldelf_search_needed (path, &n, force, + is_linux, elfsize)) +@@ -1573,6 +1575,8 @@ ldelf_before_allocation (char *audit, char *depaudit, + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch deleted file mode 100644 index 135eb8877c..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +++ /dev/null @@ -1,21203 +0,0 @@ -From 9cebc65f222dfd4e0b3072b53f46ffcf328e9fe4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH] Use libtool 2.4 - -get libtool sysroot support - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - bfd/configure | 1322 ++++++++++++++----- - bfd/configure.ac | 2 +- - binutils/configure | 1320 ++++++++++++++----- - gas/configure | 1320 ++++++++++++++----- - gprof/configure | 1321 ++++++++++++++----- - ld/configure | 1695 ++++++++++++++++++------ - libtool.m4 | 1080 +++++++++++----- - ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- - ltoptions.m4 | 2 +- - ltversion.m4 | 12 +- - lt~obsolete.m4 | 2 +- - opcodes/configure | 1322 ++++++++++++++----- - opcodes/configure.ac | 2 +- - zlib/configure | 1320 ++++++++++++++----- - 14 files changed, 9940 insertions(+), 3705 deletions(-) - ---- a/bfd/configure -+++ b/bfd/configure -@@ -704,6 +704,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -822,6 +825,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1504,6 +1508,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-mmap try using mmap for BFD input files if available - --with-separate-debug-dir=DIR - Look for global separate debug info in DIR -@@ -5693,8 +5699,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6470,6 +6476,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6486,6 +6566,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6654,7 +6739,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6808,6 +6894,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6841,7 +7095,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6881,7 +7139,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6900,6 +7158,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a - -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi - - - -@@ -7262,8 +7580,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7340,6 +7659,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7351,7 +7682,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7388,8 +7719,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7426,6 +7757,20 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7445,6 +7790,41 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - - - # Check whether --enable-libtool-lock was given. -@@ -7653,6 +8033,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8216,6 +8713,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8380,7 +8879,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8469,7 +8969,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8767,8 +9267,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9053,13 +9557,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9120,6 +9628,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9470,7 +9983,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9569,12 +10083,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9588,8 +10102,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9607,8 +10121,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9654,8 +10168,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9785,7 +10299,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9798,22 +10318,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9838,22 +10371,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10102,23 +10685,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10932,7 +11587,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11728,7 +12383,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11731 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11772,10 +12427,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11834,7 +12489,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11837 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11878,10 +12533,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= - if test "$enable_shared" = "yes"; then - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17298,8 +17963,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -17330,7 +18002,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -17366,6 +18037,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18154,7 +18826,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -18422,12 +19127,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -290,7 +290,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/binutils/configure -+++ b/binutils/configure -@@ -689,8 +689,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -807,6 +810,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1483,6 +1487,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-system-zlib use installed libz - --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5457,8 +5463,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6234,6 +6240,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6250,6 +6330,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6418,7 +6503,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6572,6 +6658,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6605,7 +6859,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6645,7 +6903,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6664,6 +6922,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7026,8 +7344,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7104,6 +7423,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7115,7 +7446,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7152,8 +7483,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7190,6 +7521,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -7211,6 +7554,43 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7417,6 +7797,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7980,6 +8477,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8175,7 +8674,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8264,7 +8764,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8562,8 +9062,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8848,13 +9352,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8915,6 +9423,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9265,7 +9778,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9364,12 +9878,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9383,8 +9897,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9402,8 +9916,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9449,8 +9963,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9580,7 +10094,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9593,22 +10113,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9633,22 +10166,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9897,23 +10480,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10727,7 +11382,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11523,7 +12178,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11526 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11567,10 +12222,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11629,7 +12284,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11632 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11673,10 +12328,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16057,8 +16722,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16089,7 +16761,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16125,6 +16796,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16891,7 +17563,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17159,12 +17864,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gas/configure -+++ b/gas/configure -@@ -681,8 +681,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -799,6 +802,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1490,6 +1494,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-cpu=CPU default cpu variant is CPU (currently only supported - on ARC) - --with-system-zlib use installed libz -@@ -5277,8 +5283,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6054,6 +6060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6070,6 +6150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6238,7 +6323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6392,6 +6478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6425,7 +6679,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6465,7 +6723,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6484,6 +6742,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6846,8 +7164,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6924,6 +7243,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6935,7 +7266,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6972,8 +7303,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7010,6 +7341,19 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7030,6 +7374,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -7237,6 +7617,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7800,6 +8297,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7995,7 +8494,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8084,7 +8584,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8382,8 +8882,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8668,13 +9172,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8735,6 +9243,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9085,7 +9598,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9184,12 +9698,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9203,8 +9717,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9222,8 +9736,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9269,8 +9783,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9400,7 +9914,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9413,22 +9933,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9453,22 +9986,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9717,23 +10300,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10547,7 +11202,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11343,7 +11998,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11346 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11387,10 +12042,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11449,7 +12104,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11452 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11493,10 +12148,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16049,8 +16714,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16081,7 +16753,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16117,6 +16788,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16890,7 +17562,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17158,12 +17863,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gprof/configure -+++ b/gprof/configure -@@ -662,8 +662,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -780,6 +783,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1442,6 +1446,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5124,8 +5130,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5901,6 +5907,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5917,6 +5997,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6085,7 +6170,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --linux-uclibc*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -- ;; -- - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -6244,6 +6325,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6276,8 +6525,8 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6336,6 +6589,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6698,8 +7011,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6735,6 +7048,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6776,6 +7090,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6787,7 +7113,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6824,8 +7150,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6862,6 +7188,17 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ - - - -@@ -6883,6 +7220,44 @@ fi - - - -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7089,6 +7464,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7652,6 +8144,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7847,7 +8341,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7936,7 +8431,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8234,8 +8729,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8520,13 +9019,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8587,6 +9090,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8937,7 +9445,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9036,12 +9545,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9055,8 +9564,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9074,8 +9583,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9121,8 +9630,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9252,7 +9761,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9265,22 +9780,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9305,22 +9833,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9569,23 +10147,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10301,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10399,7 +11049,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11239,10 +11889,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11345,10 +11995,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13435,8 +14095,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13446,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13467,7 +14134,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13503,6 +14169,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14268,7 +14935,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14536,12 +15236,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -14678,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/ld/configure -+++ b/ld/configure -@@ -688,8 +688,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -816,6 +819,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1508,6 +1512,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-lib-path=dir1:dir2... set default LIB_PATH - --with-sysroot=DIR Search for usr/lib et al within DIR. - -@@ -5960,8 +5966,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6737,6 +6743,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6753,6 +6833,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6921,7 +7006,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -7075,6 +7161,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -7108,7 +7362,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7148,7 +7406,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7167,6 +7425,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -7529,8 +7847,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7607,6 +7926,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7618,7 +7949,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7655,8 +7986,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7693,6 +8024,13 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - - - -@@ -7714,6 +8052,48 @@ fi - - - -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7920,6 +8300,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8483,6 +8980,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8551,6 +9050,16 @@ done - - - -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+ -+ -+ - - - # Set options -@@ -8679,7 +9188,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8768,7 +9278,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9066,8 +9576,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9352,13 +9866,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9419,6 +9937,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9769,7 +10292,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9868,12 +10392,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9887,8 +10411,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9906,8 +10430,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9953,8 +10477,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10084,7 +10608,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10097,22 +10627,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10137,22 +10680,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10401,23 +10994,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -11231,7 +11896,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -12027,7 +12692,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12030 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12071,10 +12736,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12133,7 +12798,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12136 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12177,10 +12842,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12572,6 +13237,7 @@ $RM -r conftest* - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -12589,6 +13255,7 @@ $RM -r conftest* - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do -@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12884,22 +13557,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12925,22 +13611,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX=' ' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=yes -+ file_list_spec_CXX='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' -+ enable_shared_with_static_runtimes_CXX=yes -+ # Don't use ranlib -+ old_postinstall_cmds_CXX='chmod 644 $oldlib' -+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - - -@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - *) - if test "$GXX" = yes; then -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes -@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -13730,6 +14469,13 @@ private: - }; - _LT_EOF - -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -13815,6 +14572,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - case $host_os in -@@ -13850,7 +14608,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13915,8 +14673,6 @@ fi - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' -@@ -14238,10 +14999,17 @@ case $host_os in - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - - # - # Check to make sure the PIC flag actually works. -@@ -14299,6 +15067,8 @@ fi - - - -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -14476,6 +15246,7 @@ fi - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -+ ;; -+ esac -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 - $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -14891,7 +15726,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -15350,6 +16185,7 @@ fi - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi - compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' - GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' - archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har - hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' - inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' - link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' - always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' - exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' - file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' - compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18625,8 +19471,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -18657,7 +19510,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -18679,8 +19531,8 @@ LD_CXX \ - reload_flag_CXX \ - compiler_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_wl_CXX \ - lt_prog_compiler_static_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - export_dynamic_flag_spec_CXX \ -@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX \ - file_list_spec_CXX \ -@@ -18726,6 +19577,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -+prelink_cmds_CXX \ -+postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19505,7 +20358,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -19773,12 +20659,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic_CXX - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static_CXX - -@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs_CXX - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path_CXX -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX - -@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds_CXX - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds_CXX -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec_CXX - ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - AC_SUBST(LIBTOOL)dnl - - _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable - dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl - m4_require([_LT_CMD_RELOAD])dnl - m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_WITH_SYSROOT])dnl - - _LT_CONFIG_LIBTOOL_INIT([ - # See if we are running on zsh, and set the options which allow our -@@ -199,7 +205,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -746,15 +752,12 @@ _LT_EOF - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -- _LT_PROG_XSI_SHELLFNS -+ _LT_PROG_REPLACE_SHELLFNS - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ], -@@ -980,6 +983,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - fi - ]) - --# _LT_SYS_MODULE_PATH_AIX --# ----------------------- -+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -+# ---------------------------------- - # Links a minimal program and checks the executable - # for the system default hardcoded library path. In most cases, - # this is /usr/lib:/lib, but when the MPI compilers are used - # the location of the communication and MPI libs are included too. - # If we don't find anything, use the default library path according - # to the aix ld manual. -+# Store the results from the different compilers for each TAGNAME. -+# Allow to override them for all tags through lt_cv_aix_libpath. - m4_defun([_LT_SYS_MODULE_PATH_AIX], - [m4_require([_LT_DECL_SED])dnl --AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -+ lt_aix_libpath_sed='[ -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }]' -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi],[]) -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ fi -+ ]) -+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -+fi - ])# _LT_SYS_MODULE_PATH_AIX - - -@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - - AC_MSG_CHECKING([how to print strings]) - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr - ])# _LT_PROG_ECHO_BACKSLASH - - -+# _LT_WITH_SYSROOT -+# ---------------- -+AC_DEFUN([_LT_WITH_SYSROOT], -+[AC_MSG_CHECKING([for sysroot]) -+AC_ARG_WITH([libtool-sysroot], -+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified).], -+[], [with_libtool_sysroot=no]) -+ -+dnl lt_sysroot will always be passed unquoted. We quote it here -+dnl in case the user passed a directory name. -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ AC_MSG_RESULT([${with_libtool_sysroot}]) -+ AC_MSG_ERROR([The sysroot must be an absolute path.]) -+ ;; -+esac -+ -+ AC_MSG_RESULT([${lt_sysroot:-no}]) -+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -+[dependent libraries, and in which our libraries should be installed.])]) -+ - # _LT_ENABLE_LOCK - # --------------- - m4_defun([_LT_ENABLE_LOCK], -@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" - ])# _LT_ENABLE_LOCK - - -+# _LT_PROG_AR -+# ----------- -+m4_defun([_LT_PROG_AR], -+[AC_CHECK_TOOLS(AR, [ar], false) -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -+ [lt_cv_ar_at_file=no -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -+ [echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ ]) -+ ]) -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+_LT_DECL([], [archiver_list_spec], [1], -+ [How to feed a file listing to the archiver]) -+])# _LT_PROG_AR -+ -+ - # _LT_CMD_OLD_ARCHIVE - # ------------------- - m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1]) -+[_LT_PROG_AR - - AC_CHECK_TOOL(STRIP, strip, :) - test -z "$STRIP" && STRIP=: -@@ -1623,7 +1705,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" -+[#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -1667,10 +1749,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -2342,7 +2483,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -2950,6 +3091,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -3016,7 +3162,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -3167,6 +3314,21 @@ tpf*) - ;; - esac - ]) -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli - _LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) - _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) -+ [Command to use when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [file_magic_glob], [1], -+ [How to find potential files when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [want_nocaseglob], [1], -+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) - ])# _LT_CHECK_MAGIC_METHOD - - -@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AM_PROG_NM], []) - dnl AC_DEFUN([AC_PROG_NM], []) - -+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+# -------------------------------- -+# how to determine the name of the shared library -+# associated with a specific link library. -+# -- PORTME fill in with the dynamic library characteristics -+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+m4_require([_LT_DECL_DLLTOOL]) -+AC_CACHE_CHECK([how to associate runtime and link libraries], -+lt_cv_sharedlib_from_linklib_cmd, -+[lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+]) -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+ -+ -+# _LT_PATH_MANIFEST_TOOL -+# ---------------------- -+# locate the manifest tool -+m4_defun([_LT_PATH_MANIFEST_TOOL], -+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -+ [lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL -+ - - # LT_LIB_M - # -------- -@@ -3403,8 +3630,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -3473,6 +3701,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT@&t at _DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT@&t at _DLSYM_CONST -+#else -+# define LT@&t at _DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -3484,7 +3724,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT@&t at _DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -@@ -3551,6 +3791,13 @@ else - AC_MSG_RESULT(ok) - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([], [nm_file_list_spec], [1], -+ [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS - - -@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)= - --AC_MSG_CHECKING([for $compiler option to produce PIC]) - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4172,9 +4432,11 @@ case $host_os in - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; - esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+ -+AC_CACHE_CHECK([for $compiler option to produce PIC], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - - # - # Check to make sure the PIC flag actually works. -@@ -4193,6 +4455,8 @@ fi - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - # - # Check to make sure the static flag actually works. - # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog - m4_defun([_LT_LINKER_SHLIBS], - [AC_REQUIRE([LT_PATH_LD])dnl - AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_DECL_SED])dnl -@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -+ ;; -+ esac -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4411,7 +4682,8 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4510,12 +4782,12 @@ _LT_EOF - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4529,8 +4801,8 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -4548,8 +4820,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4595,8 +4867,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4726,7 +4998,7 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else -@@ -4737,7 +5009,7 @@ _LT_EOF - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -4781,20 +5053,63 @@ _LT_EOF - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4828,7 +5143,7 @@ _LT_EOF - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4836,7 +5151,7 @@ _LT_EOF - - hpux9*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -4852,7 +5167,7 @@ _LT_EOF - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -4876,10 +5191,10 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -4926,16 +5241,31 @@ _LT_EOF - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- ) -- LDFLAGS="$save_LDFLAGS" -+ # This should be the same for all languages, so no per-tag cache variable. -+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], -+ [lt_cv_irix_exported_symbol], -+ [save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], -+ [C++], [[int foo (void) { return 0; }]], -+ [Fortran 77], [[ -+ subroutine foo -+ end]], -+ [Fortran], [[ -+ subroutine foo -+ end]])])], -+ [lt_cv_irix_exported_symbol=yes], -+ [lt_cv_irix_exported_symbol=no]) -+ LDFLAGS="$save_LDFLAGS"]) -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -5020,7 +5350,7 @@ _LT_EOF - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -@@ -5039,9 +5369,9 @@ _LT_EOF - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], - to runtime path list]) - _LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) --_LT_TAGDECL([], [fix_srcfile_path], [1], -- [Fix the shell variable $srcfile for the compiler]) - _LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) - _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) - _LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [postlink_cmds], [2], -+ [Commands necessary for finishing linking programs]) - _LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) - dnl FIXME: Not yet implemented -@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" - m4_defun([_LT_LANG_CXX_CONFIG], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - *) - if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -6445,6 +6825,29 @@ AC_LANG_POP - ])# _LT_LANG_CXX_CONFIG - - -+# _LT_FUNC_STRIPNAME_CNF -+# ---------------------- -+# func_stripname_cnf prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# -+# This function is identical to the (non-XSI) version of func_stripname, -+# except this one can be used by m4 code that may be executed by configure, -+# rather than the libtool script. -+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -+AC_REQUIRE([_LT_DECL_SED]) -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+])# _LT_FUNC_STRIPNAME_CNF -+ - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) - # --------------------------------- - # Figure out "hidden" library dependencies from verbose -@@ -6453,6 +6856,7 @@ AC_LANG_POP - # objects, libraries and library flags. - m4_defun([_LT_SYS_HIDDEN_LIBDEPS], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl - # Dependencies to place before and after the object being linked: - _LT_TAGVAR(predep_objects, $1)= - _LT_TAGVAR(postdep_objects, $1)= -@@ -6503,6 +6907,13 @@ public class foo { - }; - _LT_EOF - ]) -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - dnl Parse the compiler output and extract the necessary - dnl objects, libraries and library flags. - if AC_TRY_EVAL(ac_compile); then -@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -6586,6 +7008,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - m4_if([$1], [CXX], -@@ -6622,7 +7045,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} -+ CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then - - GCC=$lt_save_GCC - CC="$lt_save_CC" -+ CFLAGS="$lt_save_CFLAGS" - fi # test "$_lt_disable_F77" != yes - - AC_LANG_POP -@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} -+ CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - -@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then - fi # test -n "$compiler" - - GCC=$lt_save_GCC -- CC="$lt_save_CC" -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - fi # test "$_lt_disable_FC" != yes - - AC_LANG_POP -@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC="$CC" -+lt_save_CC=$CC -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC=yes - CC=${GCJ-"gcj"} -+CFLAGS=$GCJFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_TAGVAR(LD, $1)="$LD" -@@ -6992,7 +7423,8 @@ fi - AC_LANG_RESTORE - - GCC=$lt_save_GCC --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_GCJ_CONFIG - - -@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC= - CC=${RC-"windres"} -+CFLAGS= - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -7042,7 +7476,8 @@ fi - - GCC=$lt_save_GCC - AC_LANG_RESTORE --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_RC_CONFIG - - -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object - AC_SUBST([OBJDUMP]) - ]) - -+# _LT_DECL_DLLTOOL -+# ---------------- -+# Ensure DLLTOOL variable is set. -+m4_defun([_LT_DECL_DLLTOOL], -+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -+AC_SUBST([DLLTOOL]) -+]) - - # _LT_DECL_SED - # ------------ -@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -+# ------------------------------------------------------ -+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -+m4_defun([_LT_PROG_FUNCTION_REPLACE], -+[dnl { -+sed -e '/^$1 ()$/,/^} # $1 /c\ -+$1 ()\ -+{\ -+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -+# _LT_PROG_REPLACE_SHELLFNS -+# ------------------------- -+# Replace existing portable implementations of several shell functions with -+# equivalent extended shell implementations where those features are available.. -+m4_defun([_LT_PROG_REPLACE_SHELLFNS], -+[if test x"$xsi_shell" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -+ func_basename_result="${1##*/}"]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}"]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -+ func_split_long_opt_name=${1%%=*} -+ func_split_long_opt_arg=${1#*=}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac]) - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` --} -+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -+fi - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -+if test x"$lt_shell_append" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -+ func_quote_for_eval "${2}" -+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi - --_LT_EOF --esac -+if test x"$_lt_function_replace_fail" = x":"; then -+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -+fi -+]) - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -+# _LT_PATH_CONVERSION_FUNCTIONS -+# ----------------------------- -+# Determine which file name conversion functions should be used by -+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -+# for certain cross-compile configurations and native mingw. -+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_MSG_CHECKING([how to convert $build file names to $host format]) -+AC_CACHE_VAL(lt_cv_to_host_file_cmd, -+[case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac - ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -- --_LT_EOF -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac - ;; -- esac -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+]) -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], -+ [0], [convert $build file names to $host format])dnl -+ -+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -+[#assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac - ]) -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], -+ [0], [convert $build files to toolchain format])dnl -+])# _LT_PATH_CONVERSION_FUNCTIONS ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,10 +1,9 @@ --# Generated from ltmain.m4sh. - --# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# libtool (GNU libtool) 2.4 - # Written by Gordon Matzigkeit , 1996 - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -38,7 +37,6 @@ - # -n, --dry-run display commands without modifying any files - # --features display basic configuration information and exit - # --mode=MODE use operation mode MODE --# --no-finish let install mode avoid finish commands - # --preserve-dup-deps don't remove duplicate dependency libraries - # --quiet, --silent don't print informational messages - # --no-quiet, --no-silent -@@ -71,17 +69,19 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# $progname: (GNU libtool) 2.4 - # automake: $automake_version - # autoconf: $autoconf_version - # - # Report bugs to . -+# GNU libtool home page: . -+# General help using GNU software: . - - PROGRAM=libtool - PACKAGE=libtool --VERSION=2.2.7a --TIMESTAMP=" 1.3134 2009-11-29" --package_revision=1.3134 -+VERSION=2.4 -+TIMESTAMP="" -+package_revision=1.3293 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -106,9 +106,6 @@ _LTECHO_EOF' - } - - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -121,15 +118,13 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -- -- -- -- -- - # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh - # is ksh but when the shell is invoked as "sh" and the current value of - # the _XPG environment variable is not equal to 1 (one), the special -@@ -140,7 +135,7 @@ progpath="$0" - - - : ${CP="cp -f"} --: ${ECHO=$as_echo} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -149,7 +144,7 @@ progpath="$0" - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} -+: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -169,6 +164,27 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -183,17 +199,31 @@ basename="s,^.*/,," - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` --} -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation - --# Generated shell functions inserted here. - - # These SED scripts presuppose an absolute path with a trailing slash. - pathcar='s,^/\([^/]*\).*$,\1,' -@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -404,7 +443,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -430,14 +469,14 @@ func_echo_all () - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -656,19 +695,35 @@ func_show_eval_locale () - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -+ $opt_debug -+ - $SED -n '/(C)/!b go - :more - /\./!{ - N -- s/\n# // -+ s/\n# / / - b more - } - :go -@@ -685,7 +740,9 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/^# *-h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ -@@ -701,7 +758,10 @@ func_usage () - # unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -714,7 +774,11 @@ func_help () - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret -@@ -726,12 +790,39 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation -+ -+ -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation -+ -+exit_cmd=: - - - -@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. --# $mode is unset - nonopt= --execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - --opt_dry_run=false --opt_finish=: --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -- - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -850,130 +979,204 @@ func_enable_tag () - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi -+ -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac -+ -+ -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- --no-finish) opt_finish=false ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -- opt_verbose=false -+ opt_preserve_dup_deps=: - ;; -- -- --no-quiet|--no-silent) -- preserve_args="$preserve_args $opt" -- opt_silent=false -+ --features) -+ opt_features=: -+func_features - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -- opt_verbose=: -+func_append preserve_args " $opt" - ;; -- -- --no-verbose) preserve_args="$preserve_args $opt" -+ --no-verbose) - opt_verbose=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --help-all) opt_help=': help-all' ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi -+ -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) -@@ -981,82 +1184,44 @@ func_enable_tag () - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -- --## ----------- ## --## Main. ## --## ----------- ## -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - - -- # Darwin sucks -- eval "std_shrext=\"$shrext_cmds\"" -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1149,7 +1311,7 @@ func_execute_cmds () - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -@@ -1172,6 +1334,37 @@ func_source () - } - - -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} -+ -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} -+ - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1184,8 +1377,7 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1204,8 +1396,7 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1274,6 +1465,486 @@ EOF - } - } - -+ -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 -+ -+ -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 -+ -+ -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath -+ -+ -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 -+ -+ -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check -+ -+ -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check -+ -+ -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep -+ -+ -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -@@ -1314,12 +1985,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1340,15 +2011,14 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1364,8 +2034,7 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1496,17 +2165,16 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- if test -n "$fix_srcfile_path"; then -- eval "srcfile=\"$fix_srcfile_path\"" -- fi -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -1526,7 +2194,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1573,11 +2241,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1622,13 +2290,13 @@ compiler." - } - - $opt_help || { -- test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -@@ -1819,13 +2487,13 @@ if $opt_help; then - else - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done -@@ -1854,13 +2522,16 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -1882,7 +2553,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1907,10 +2578,10 @@ func_mode_execute () - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. -- if eval test -z \"\$$shlibpath_var\"; then -- eval $shlibpath_var=\$dir -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" - else -- eval $shlibpath_var=\$dir:\$$shlibpath_var -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - -@@ -1939,8 +2610,7 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1972,22 +2642,59 @@ func_mode_execute () - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libdirs="$nonopt" -+ libs= -+ libdirs= - admincmds= - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi - -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -1997,7 +2704,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -2006,53 +2713,55 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval "flag=\"$hardcode_libdir_flag_spec\"" -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo - -- echo "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- echo "pages." -- ;; -- *) -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- echo "----------------------------------------------------------------------" -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" -+ fi - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -2077,7 +2786,7 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; -@@ -2097,7 +2806,7 @@ func_mode_install () - do - arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -2135,11 +2844,11 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi -- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -2151,7 +2860,7 @@ func_mode_install () - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" -- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - -@@ -2209,10 +2918,13 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -2226,23 +2938,30 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$libdir" -+ destlibdir=$func_stripname_result -+ -+ func_stripname '' '/' "$destdir" -+ s_destdir=$func_stripname_result -+ - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2315,7 +3034,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2503,7 +3222,7 @@ func_mode_install () - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - -- if test -n "$current_libdirs" && $opt_finish; then -+ if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -@@ -2512,7 +3231,7 @@ func_mode_install () - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2559,6 +3278,18 @@ extern \"C\" { - #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" - #endif - -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2570,21 +3301,22 @@ extern \"C\" { - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { -- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { -- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - -@@ -2593,23 +3325,23 @@ extern \"C\" { - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols -- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" -+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$export_symbols" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { -- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" -- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$nlist" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } -@@ -2620,10 +3352,52 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- $ECHO ": $name " >> "$nlist" -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen . -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2661,26 +3435,9 @@ typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -- -- echo >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist -+extern LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist -+LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2796,9 +3553,11 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -- win32_nmres=`$NM -f posix -A "$1" | -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ -@@ -2827,6 +3586,131 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2917,7 +3801,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +3816,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -@@ -3014,7 +3898,110 @@ func_fallback_echo () - _LTECHO_EOF' - } - ECHO=\"$qECHO\" -- fi\ -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` -@@ -3078,7 +4065,7 @@ _LTECHO_EOF' - - # relink executable if necessary - if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" -@@ -3102,6 +4089,18 @@ _LTECHO_EOF' - - if test -f \"\$progdir/\$program\"; then" - -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -3116,35 +4115,10 @@ _LTECHO_EOF' - " - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. -@@ -3158,166 +4132,6 @@ fi\ - } - - --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_result=`cygpath -w "$1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result= -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path -- --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_stripname : : "$1" -- func_to_host_pathlist_tmp1=$func_stripname_result -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- func_to_host_pathlist_result=` -- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_append func_to_host_pathlist_result ";$func_to_host_path_result" -- fi -- fi -- fi -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result"; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_append func_to_host_pathlist_result ";" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist -- - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout - # Must ONLY be called from within func_mode_link because -@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined LT_DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); - void lt_update_exe_path (const char *name, const char *value); -@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); - EOF - - cat <"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3706,7 +4529,9 @@ EOF - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3728,7 +4553,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3762,8 +4587,8 @@ check_executable (const char *path) - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3780,8 +4605,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4222,7 +5078,7 @@ EOF - func_win32_import_lib_p () - { - $opt_debug -- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -@@ -4401,9 +5257,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4427,7 +5283,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4446,7 +5302,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4475,7 +5331,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4487,7 +5343,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4557,12 +5413,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4574,28 +5430,28 @@ func_mode_link () - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4686,15 +5542,16 @@ func_mode_link () - ;; - - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -4706,10 +5563,16 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "*) ;; -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" - ;; - esac - case $host in -@@ -4718,12 +5581,12 @@ func_mode_link () - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4747,7 +5610,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4758,9 +5621,6 @@ func_mode_link () - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; -- *-*-linux*) -- test "X$arg" = "X-lc" && continue -- ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -@@ -4770,7 +5630,7 @@ func_mode_link () - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4782,8 +5642,8 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -4791,12 +5651,12 @@ func_mode_link () - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4863,13 +5723,17 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4922,8 +5786,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4938,9 +5802,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4968,24 +5832,27 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -- # -tp=* Portland pgcc target processor selection -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4997,7 +5864,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -5028,7 +5895,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -5040,7 +5907,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -5085,24 +5952,25 @@ func_mode_link () - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -+ func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; -@@ -5127,7 +5995,7 @@ func_mode_link () - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -- eval "arg=\"$export_dynamic_flag_spec\"" -+ eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi -@@ -5144,11 +6012,13 @@ func_mode_link () - else - shlib_search_path= - fi -- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" -- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -5169,12 +6039,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -5187,9 +6057,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5256,8 +6126,9 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -+ func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$lib" ;; -+ *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library -@@ -5267,7 +6138,7 @@ func_mode_link () - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5288,11 +6159,11 @@ func_mode_link () - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5377,7 +6248,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5390,7 +6261,8 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5404,7 +6276,8 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5415,17 +6288,21 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) lib="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -5488,11 +6365,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5538,7 +6415,7 @@ func_mode_link () - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -@@ -5546,8 +6423,8 @@ func_mode_link () - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5558,20 +6435,20 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done - continue - fi # $pass = conv -@@ -5579,9 +6456,15 @@ func_mode_link () - - # Get the name of the library we link against. - linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -5598,9 +6481,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5622,14 +6505,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5637,12 +6520,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5653,20 +6536,46 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5684,7 +6593,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5697,7 +6606,8 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5708,12 +6618,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5728,7 +6638,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5740,7 +6650,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5749,7 +6659,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5774,12 +6684,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5814,7 +6724,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5823,7 +6733,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5835,7 +6745,7 @@ func_mode_link () - shift - realname="$1" - shift -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" -@@ -5848,7 +6758,7 @@ func_mode_link () - versuffix="-$major" - ;; - esac -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -5877,7 +6787,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5933,7 +6843,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5955,7 +6865,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5969,13 +6879,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5989,7 +6899,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -6001,12 +6911,12 @@ func_mode_link () - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -+ add_dir="-L$lt_sysroot$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -6083,27 +6993,33 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then -@@ -6113,8 +7029,10 @@ func_mode_link () - case $deplib in - -L*) path="$deplib" ;; - *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -6130,7 +7048,7 @@ func_mode_link () - case $host in - *-*-darwin*) - depdepl= -- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp -@@ -6141,8 +7059,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -6152,7 +7070,7 @@ func_mode_link () - ;; - esac - else -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ -@@ -6192,7 +7110,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6205,7 +7123,7 @@ func_mode_link () - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order -- eval tmp_libs=\$$var -+ eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so -@@ -6250,13 +7168,13 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done -- eval $var=\$tmp_libs -+ eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs -@@ -6269,7 +7187,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6310,7 +7228,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6319,8 +7237,8 @@ func_mode_link () - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ -@@ -6330,8 +7248,8 @@ func_mode_link () - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result -@@ -6346,7 +7264,7 @@ func_mode_link () - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6544,7 +7462,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6612,10 +7530,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6631,7 +7549,7 @@ func_mode_link () - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6642,7 +7560,7 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` -@@ -6659,10 +7577,11 @@ func_mode_link () - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6676,7 +7595,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6686,7 +7605,7 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - -@@ -6698,7 +7617,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6715,7 +7634,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6764,18 +7683,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6789,7 +7708,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6807,18 +7726,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6840,7 +7759,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6857,15 +7776,27 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6885,10 +7816,10 @@ EOF - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done -- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6913,7 +7844,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6929,20 +7860,20 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6967,7 +7898,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -7071,7 +8002,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7081,10 +8012,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -7101,10 +8032,12 @@ EOF - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -7113,18 +8046,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- dep_rpath="$dep_rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -7133,40 +8066,38 @@ EOF - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then -- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else -- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done -- eval $runpath_var=\$rpath\$$runpath_var -- export $runpath_var -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then -- eval $shlibpath_var=\$shlibpath\$$shlibpath_var -- export $shlibpath_var -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. -- eval "shared_ext=\"$shrext_cmds\"" -- eval "library_names=\"$library_names_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -7178,7 +8109,7 @@ EOF - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -@@ -7189,7 +8120,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7220,13 +8151,45 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -7248,7 +8211,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7260,7 +8223,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7270,7 +8233,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7286,43 +8249,43 @@ EOF - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval "flag=\"$thread_safe_flag_spec\"" -- linker_flags="$linker_flags $flag" -+ eval flag=\"$thread_safe_flag_spec\" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -- eval "test_cmds=\"$module_expsym_cmds\"" -+ eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else -- eval "test_cmds=\"$module_cmds\"" -+ eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval "test_cmds=\"$archive_expsym_cmds\"" -+ eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else -- eval "test_cmds=\"$archive_cmds\"" -+ eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi -@@ -7366,10 +8329,13 @@ EOF - echo 'INPUT (' > $output - for obj in $save_libobjs - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output -- delfiles="$delfiles $output" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7383,15 +8349,17 @@ EOF - fi - for obj - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext -- eval "test_cmds=\"$reload_cmds\"" -+ eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -7411,12 +8379,12 @@ EOF - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist -- eval "concat_cmds=\"$reload_cmds\"" -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 -@@ -7433,11 +8401,11 @@ EOF - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" -+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7450,9 +8418,9 @@ EOF - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" -+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - -@@ -7471,7 +8439,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7492,7 +8460,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7504,7 +8472,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7515,7 +8483,7 @@ EOF - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the -@@ -7539,23 +8507,23 @@ EOF - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. -- eval "cmds=\"\$cmds~\$RM $delfiles\"" -+ eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" -@@ -7564,7 +8532,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7576,8 +8544,8 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then -@@ -7656,17 +8624,20 @@ EOF - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - -@@ -7690,7 +8661,7 @@ EOF - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" -- # $opt_dry_run || echo timestamp > $libobj || exit $? -+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - -@@ -7740,8 +8711,8 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi -@@ -7761,7 +8732,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7771,17 +8742,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7789,7 +8760,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7808,18 +8779,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7828,12 +8799,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7842,7 +8813,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - -@@ -7859,18 +8830,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7878,7 +8849,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - -@@ -7921,6 +8892,12 @@ EOF - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7943,7 +8920,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7951,7 +8928,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7966,6 +8943,13 @@ EOF - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7999,6 +8983,12 @@ EOF - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -8096,7 +9086,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -8104,10 +9094,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -8118,10 +9108,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -8139,7 +9129,7 @@ EOF - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -8163,18 +9153,28 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -- eval "cmds=\"$old_archive_cmds\"" -+ eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -8189,7 +9189,7 @@ EOF - do - last_oldobj=$obj - done -- eval "test_cmds=\"$old_archive_cmds\"" -+ eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -8208,7 +9208,7 @@ EOF - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi -@@ -8216,9 +9216,9 @@ EOF - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then -- eval "cmds=\"\$concat_cmds\"" -+ eval cmds=\"\$concat_cmds\" - else -- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi -@@ -8268,12 +9268,23 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" -+ ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8284,12 +9295,14 @@ EOF - *.la) - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8303,10 +9316,11 @@ EOF - # the library: - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -@@ -8318,7 +9332,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8327,7 +9341,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi -@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8432,9 +9446,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8443,24 +9457,23 @@ func_mode_uninstall () - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8486,18 +9499,17 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8525,19 +9537,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8547,7 +9559,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8556,7 +9568,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8564,12 +9576,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8577,7 +9589,6 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8589,16 +9600,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" ---- a/ltoptions.m4 -+++ b/ltoptions.m4 -@@ -8,7 +8,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 6 ltoptions.m4 -+# serial 7 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ---- a/ltversion.m4 -+++ b/ltversion.m4 -@@ -7,17 +7,17 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# Generated from ltversion.in. -+# @configure_input@ - --# serial 3134 ltversion.m4 -+# serial 3293 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.7a]) --m4_define([LT_PACKAGE_REVISION], [1.3134]) -+m4_define([LT_PACKAGE_VERSION], [2.4]) -+m4_define([LT_PACKAGE_REVISION], [1.3293]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.7a' --macro_revision='1.3134' -+[macro_version='2.4' -+macro_revision='1.3293' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) ---- a/lt~obsolete.m4 -+++ b/lt~obsolete.m4 -@@ -7,7 +7,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 4 lt~obsolete.m4 -+# serial 5 lt~obsolete.m4 - - # These exist entirely to fool aclocal when bootstrapping libtool. - # ---- a/opcodes/configure -+++ b/opcodes/configure -@@ -680,6 +680,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -798,6 +801,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_targets - enable_werror -@@ -1462,6 +1466,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5403,8 +5409,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6180,6 +6186,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6196,6 +6276,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6364,7 +6449,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6518,6 +6604,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6551,7 +6805,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6591,7 +6849,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6610,6 +6868,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -6972,8 +7290,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7050,6 +7369,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7061,7 +7392,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7098,8 +7429,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7136,6 +7467,14 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ - - - -@@ -7157,6 +7496,47 @@ fi - - - -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7363,6 +7743,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7926,6 +8423,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8091,7 +8590,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8180,7 +8680,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8478,8 +8978,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8764,13 +9268,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8831,6 +9339,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9181,7 +9694,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9280,12 +9794,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9299,8 +9813,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9318,8 +9832,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9365,8 +9879,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9496,7 +10010,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9509,22 +10029,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9549,22 +10082,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9813,23 +10396,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10643,7 +11298,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11439,7 +12094,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11442 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11483,10 +12138,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11545,7 +12200,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11548 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11589,10 +12244,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then - # since libbfd may not pull in the entirety of libiberty. - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13878,8 +14543,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13910,7 +14582,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13946,6 +14617,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14711,7 +15383,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14979,12 +15684,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -170,7 +170,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/zlib/configure -+++ b/zlib/configure -@@ -646,8 +646,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -774,6 +777,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_host_shared - ' -@@ -1428,6 +1432,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -4147,8 +4153,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5054,6 +5060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5070,6 +5150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5238,7 +5323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -5392,6 +5478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -5425,7 +5680,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -5465,7 +5724,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5484,6 +5743,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -5846,8 +6165,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -5924,6 +6244,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -5935,7 +6267,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5972,8 +6304,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6010,6 +6342,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -6031,6 +6375,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -6241,6 +6621,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -6807,6 +7304,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7269,7 +7768,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7358,7 +7858,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7656,8 +8156,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -7942,13 +8446,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8009,6 +8517,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8359,7 +8872,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8458,12 +8972,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -8477,8 +8991,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -8496,8 +9010,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8543,8 +9057,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8674,7 +9188,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8690,22 +9210,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8733,22 +9266,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -8997,26 +9580,39 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- if test x$gcc_no_link = xyes; then -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -9830,7 +10485,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -10644,7 +11299,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10647 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10688,10 +11343,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10750,7 +11405,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10753 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10794,10 +11449,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12388,8 +13053,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -12420,7 +13092,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -12456,6 +13127,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -13054,7 +13726,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -13322,12 +14027,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch new file mode 100644 index 0000000000..82906026a9 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch @@ -0,0 +1,7118 @@ +From c0ec70962bffb56b563475f539e8175ea97d7eb1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Feb 2016 17:04:07 +0000 +Subject: [PATCH 07/15] Use libtool 2.4 + +get libtool sysroot support + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + bfd/configure.ac | 2 +- + libtool.m4 | 1080 +++++++++++------ + ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- + ltoptions.m4 | 2 +- + ltversion.m4 | 12 +- + lt~obsolete.m4 | 2 +- + 6 files changed, 2717 insertions(+), 1306 deletions(-) + +diff --git a/bfd/configure.ac b/bfd/configure.ac +index af4d4b8c13..a521738244 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -296,7 +296,7 @@ changequote(,)dnl + x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` + changequote([,])dnl + if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" + fi + + case "${host}" in +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1,7 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -10,7 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 56 LT_INIT ++# serial 57 LT_INIT + + + # LT_PREREQ(VERSION) +@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool" + AC_SUBST(LIBTOOL)dnl + + _LT_SETUP +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl + dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl + m4_require([_LT_CMD_RELOAD])dnl + m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl + m4_require([_LT_CMD_OLD_ARCHIVE])dnl + m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_WITH_SYSROOT])dnl + + _LT_CONFIG_LIBTOOL_INIT([ + # See if we are running on zsh, and set the options which allow our +@@ -199,7 +205,7 @@ aix3*) + esac + + # Global variables: +-ofile=libtool ++ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +@@ -746,15 +752,12 @@ _LT_EOF + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +- _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ], +@@ -980,6 +983,8 @@ _LT_EOF + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD ++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD ++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF + int main() { return 0;} + _LT_EOF +@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], + fi + ]) + +-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ---------------------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. ++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath. + m4_defun([_LT_SYS_MODULE_PATH_AIX], + [m4_require([_LT_DECL_SED])dnl +-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi + ])# _LT_SYS_MODULE_PATH_AIX + + +@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + + AC_MSG_CHECKING([how to print strings]) + # Test print first, because it will be a builtin if present. +-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' + elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) + ])# _LT_PROG_ECHO_BACKSLASH + + ++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([libtool-sysroot], ++[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_libtool_sysroot=no]) ++ ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_libtool_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac ++ ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) ++ + # _LT_ENABLE_LOCK + # --------------- + m4_defun([_LT_ENABLE_LOCK], +@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" + ])# _LT_ENABLE_LOCK + + ++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++ + # _LT_CMD_OLD_ARCHIVE + # ------------------- + m4_defun([_LT_CMD_OLD_ARCHIVE], +-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR + + AC_CHECK_TOOL(STRIP, strip, :) + test -z "$STRIP" && STRIP=: +@@ -1623,7 +1705,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-[#line __oline__ "configure" ++[#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -1667,10 +1749,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -2342,7 +2483,7 @@ haiku*) + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +@@ -2950,6 +3091,11 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -3016,7 +3162,8 @@ mingw* | pw32*) + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +@@ -3167,6 +3314,21 @@ tpf*) + ;; + esac + ]) ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + _LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) + _LT_DECL([], [file_magic_cmd], [1], +- [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + ])# _LT_CHECK_MAGIC_METHOD + + +@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([AM_PROG_NM], []) + dnl AC_DEFUN([AC_PROG_NM], []) + ++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++ + + # LT_LIB_M + # -------- +@@ -3403,8 +3630,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -3473,6 +3701,18 @@ _LT_EOF + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t at _DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t at _DLSYM_CONST ++#else ++# define LT@&t at _DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -3484,7 +3724,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT@&t at _DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi +@@ -3551,6 +3791,13 @@ else + AC_MSG_RESULT(ok) + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) + _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], + _LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM]) + ]) # _LT_CMD_GLOBAL_SYMBOLS + + +@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)= + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) + m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + dgux*) + case $cc_basename in + ec++*) +@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ + ;; + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +@@ -4172,9 +4432,11 @@ case $host_os in + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; + esac +-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) ++ ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + + # + # Check to make sure the PIC flag actually works. +@@ -4193,6 +4455,8 @@ fi + _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) + # + # Check to make sure the static flag actually works. + # +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + m4_defun([_LT_LINKER_SHLIBS], + [AC_REQUIRE([LT_PATH_LD])dnl + AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_DECL_SED])dnl +@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. +@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; ++ ;; + cygwin* | mingw* | cegcc*) +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ ;; + esac +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -4411,7 +4682,8 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -4510,12 +4782,12 @@ _LT_EOF + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -4529,8 +4801,8 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -4548,8 +4820,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4595,8 +4867,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4726,7 +4998,7 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else +@@ -4737,7 +5009,7 @@ _LT_EOF + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -4781,20 +5053,63 @@ _LT_EOF + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -4828,7 +5143,7 @@ _LT_EOF + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4836,7 +5151,7 @@ _LT_EOF + + hpux9*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -4852,7 +5167,7 @@ _LT_EOF + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -4876,10 +5191,10 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -4926,16 +5241,31 @@ _LT_EOF + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ) +- LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +@@ -5020,7 +5350,7 @@ _LT_EOF + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +@@ -5039,9 +5369,9 @@ _LT_EOF + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], + to runtime path list]) + _LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler]) + _LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) + _LT_TAGDECL([], [export_symbols_cmds], [2], +@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) + _LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs]) + _LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) + dnl FIXME: Not yet implemented +@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" + m4_defun([_LT_LANG_CXX_CONFIG], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + + cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + *) + if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC +@@ -6445,6 +6825,29 @@ AC_LANG_POP + ])# _LT_LANG_CXX_CONFIG + + ++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++ + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- + # Figure out "hidden" library dependencies from verbose +@@ -6453,6 +6856,7 @@ AC_LANG_POP + # objects, libraries and library flags. + m4_defun([_LT_SYS_HIDDEN_LIBDEPS], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl + # Dependencies to place before and after the object being linked: + _LT_TAGVAR(predep_objects, $1)= + _LT_TAGVAR(postdep_objects, $1)= +@@ -6503,6 +6907,13 @@ public class foo { + }; + _LT_EOF + ]) ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++ + dnl Parse the compiler output and extract the necessary + dnl objects, libraries and library flags. + if AC_TRY_EVAL(ac_compile); then +@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. +@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then + test $p = "-R"; then + prev=$p + continue +- else +- prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. +@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. +@@ -6586,6 +7008,7 @@ else + fi + + $RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + + # PORTME: override above test on systems where it is broken + m4_if([$1], [CXX], +@@ -6622,7 +7045,7 @@ linux*) + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as +@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} ++ CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then + + GCC=$lt_save_GCC + CC="$lt_save_CC" ++ CFLAGS="$lt_save_CFLAGS" + fi # test "$_lt_disable_F77" != yes + + AC_LANG_POP +@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} ++ CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + +@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then + fi # test -n "$compiler" + + GCC=$lt_save_GCC +- CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + fi # test "$_lt_disable_FC" != yes + + AC_LANG_POP +@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC=yes + CC=${GCJ-"gcj"} ++CFLAGS=$GCJFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_TAGVAR(LD, $1)="$LD" +@@ -6992,7 +7423,8 @@ fi + AC_LANG_RESTORE + + GCC=$lt_save_GCC +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_GCJ_CONFIG + + +@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC= + CC=${RC-"windres"} ++CFLAGS= + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -7042,7 +7476,8 @@ fi + + GCC=$lt_save_GCC + AC_LANG_RESTORE +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_RC_CONFIG + + +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) + AC_SUBST([OBJDUMP]) + ]) + ++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++]) + + # _LT_DECL_SED + # ------------ +@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl + ])# _LT_CHECK_SHELL_FEATURES + + +-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++]) + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"]) + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}]) + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}]) + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac]) + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ ++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + +-_LT_EOF +-esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++]) + +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=\$[2]" +-} +-_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac + ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=\$$[1]\$[2]" +-} +- +-_LT_EOF ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac + ;; +- esac ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl ++ ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac + ]) ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1,10 +1,9 @@ +-# Generated from ltmain.m4sh. + +-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# libtool (GNU libtool) 2.4 + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +@@ -38,7 +37,6 @@ + # -n, --dry-run display commands without modifying any files + # --features display basic configuration information and exit + # --mode=MODE use operation mode MODE +-# --no-finish let install mode avoid finish commands + # --preserve-dup-deps don't remove duplicate dependency libraries + # --quiet, --silent don't print informational messages + # --no-quiet, --no-silent +@@ -71,17 +69,19 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# $progname: (GNU libtool) 2.4 + # automake: $automake_version + # autoconf: $autoconf_version + # + # Report bugs to . ++# GNU libtool home page: . ++# General help using GNU software: . + + PROGRAM=libtool + PACKAGE=libtool +-VERSION=2.2.7a +-TIMESTAMP=" 1.3134 2009-11-29" +-package_revision=1.3134 ++VERSION=2.4 ++TIMESTAMP="" ++package_revision=1.3293 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -106,9 +106,6 @@ _LTECHO_EOF' + } + + # NLS nuisances: We save the old values to restore during execute mode. +-# Only set LANG and LC_ALL to C if already set. +-# These must not be set unconditionally because not all systems understand +-# e.g. LANG=C (notably SCO). + lt_user_locale= + lt_safe_locale= + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +@@ -121,15 +118,13 @@ do + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" + done ++LC_ALL=C ++LANGUAGE=C ++export LANGUAGE LC_ALL + + $lt_unset CDPATH + + +- +- +- +- +- + # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh + # is ksh but when the shell is invoked as "sh" and the current value of + # the _XPG environment variable is not equal to 1 (one), the special +@@ -140,7 +135,7 @@ progpath="$0" + + + : ${CP="cp -f"} +-: ${ECHO=$as_echo} ++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} + : ${EGREP="/bin/grep -E"} + : ${FGREP="/bin/grep -F"} + : ${GREP="/bin/grep"} +@@ -149,7 +144,7 @@ progpath="$0" + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} ++: ${SED="/bin/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -169,6 +164,27 @@ IFS=" $lt_nl" + dirname="s,/[^/]*$,," + basename="s,^.*/,," + ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} # func_dirname may be replaced by extended shell implementation ++ ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} # func_basename may be replaced by extended shell implementation ++ ++ + # func_dirname_and_basename file append nondir_replacement + # perform func_basename and func_dirname in a single function + # call: +@@ -183,17 +199,31 @@ basename="s,^.*/,," + # those functions but instead duplicate the functionality here. + func_dirname_and_basename () + { +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +-} ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` ++} # func_dirname_and_basename may be replaced by extended shell implementation ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname may be replaced by extended shell implementation + +-# Generated shell functions inserted here. + + # These SED scripts presuppose an absolute path with a trailing slash. + pathcar='s,^/\([^/]*\).*$,\1,' +@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + # Same as above, but do not quote variable references. + double_quote_subst='s/\(["`\\]\)/\\\1/g' + ++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' ++ ++# Sed substitution that converts a w32 file name or path ++# which contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ + # Re-`\' parameter expansions in output of double_quote_subst that were + # `\'-ed in input to the same. If an odd number of `\' preceded a '$' + # in input to double_quote_subst, that '$' was protected from expansion. +@@ -404,7 +443,7 @@ opt_warning=: + # name if it has been set yet. + func_echo () + { +- $ECHO "$progname${mode+: }$mode: $*" ++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + } + + # func_verbose arg... +@@ -430,14 +469,14 @@ func_echo_all () + # Echo program name prefixed message to standard error. + func_error () + { +- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + } + + # func_warning arg... + # Echo program name prefixed warning message to standard error. + func_warning () + { +- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +@@ -656,19 +695,35 @@ func_show_eval_locale () + fi + } + +- +- ++# func_tr_sh ++# Turn $1 into a string suitable for a shell variable name. ++# Result is stored in $func_tr_sh_result. All characters ++# not in the set a-zA-Z0-9_ are replaced with '_'. Further, ++# if $1 begins with a digit, a '_' is prepended as well. ++func_tr_sh () ++{ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++} + + + # func_version + # Echo version message to standard output and exit. + func_version () + { ++ $opt_debug ++ + $SED -n '/(C)/!b go + :more + /\./!{ + N +- s/\n# // ++ s/\n# / / + b more + } + :go +@@ -685,7 +740,9 @@ func_version () + # Echo short help message to standard output and exit. + func_usage () + { +- $SED -n '/^# Usage:/,/^# *-h/ { ++ $opt_debug ++ ++ $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ +@@ -701,7 +758,10 @@ func_usage () + # unless 'noexit' is passed as argument. + func_help () + { ++ $opt_debug ++ + $SED -n '/^# Usage:/,/# Report bugs to/ { ++ :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* +@@ -714,7 +774,11 @@ func_help () + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p +- }' < "$progpath" ++ d ++ } ++ /^# .* home page:/b print ++ /^# General help using/b print ++ ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret +@@ -726,12 +790,39 @@ func_help () + # exit_cmd. + func_missing_arg () + { +- func_error "missing argument for $1" ++ $opt_debug ++ ++ func_error "missing argument for $1." + exit_cmd=exit + } + +-exit_cmd=: + ++# func_split_short_opt shortopt ++# Set func_split_short_opt_name and func_split_short_opt_arg shell ++# variables after splitting SHORTOPT after the 2nd character. ++func_split_short_opt () ++{ ++ my_sed_short_opt='1s/^\(..\).*$/\1/;q' ++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' ++ ++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` ++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` ++} # func_split_short_opt may be replaced by extended shell implementation ++ ++ ++# func_split_long_opt longopt ++# Set func_split_long_opt_name and func_split_long_opt_arg shell ++# variables after splitting LONGOPT at the `=' sign. ++func_split_long_opt () ++{ ++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' ++ my_sed_long_arg='1s/^--[^=]*=//' ++ ++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` ++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` ++} # func_split_long_opt may be replaced by extended shell implementation ++ ++exit_cmd=: + + + +@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" + magic_exe="%%%MAGIC EXE variable%%%" + + # Global variables. +-# $mode is unset + nonopt= +-execute_dlfiles= + preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" + extracted_archives= + extracted_serial=0 + +-opt_dry_run=false +-opt_finish=: +-opt_duplicate_deps=false +-opt_silent=false +-opt_debug=: +- + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. + exec_cmd= + ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "${1}=\$${1}\${2}" ++} # func_append may be replaced by extended shell implementation ++ ++# func_append_quoted var value ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++func_append_quoted () ++{ ++ func_quote_for_eval "${2}" ++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" ++} # func_append_quoted may be replaced by extended shell implementation ++ ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "${@}"` ++} # func_arith may be replaced by extended shell implementation ++ ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` ++} # func_len may be replaced by extended shell implementation ++ ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} # func_lo2o may be replaced by extended shell implementation ++ ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} # func_xform may be replaced by extended shell implementation ++ ++ + # func_fatal_configuration arg... + # Echo program name prefixed message to standard error, followed by + # a configuration failure hint, and exit. +@@ -850,130 +979,204 @@ func_enable_tag () + esac + } + +-# Parse options once, thoroughly. This comes as soon as possible in +-# the script to make things like `libtool --version' happen quickly. ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () + { ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++# Shorthand for --mode=foo, only valid as the first argument ++case $1 in ++clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++esac + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do ++ ++ ++# Option defaults: ++opt_debug=: ++opt_dry_run=false ++opt_config=false ++opt_preserve_dup_deps=false ++opt_features=false ++opt_finish=false ++opt_help=false ++opt_help_all=false ++opt_silent=: ++opt_verbose=: ++opt_silent=false ++opt_verbose=false ++ ++ ++# Parse options once, thoroughly. This comes as soon as possible in the ++# script to make things like `--version' happen as quickly as we can. ++{ ++ # this just eases exit handling ++ while test $# -gt 0; do + opt="$1" + shift +- + case $opt in +- --config) func_config ;; +- +- --debug) preserve_args="$preserve_args $opt" ++ --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" +- opt_debug='set -x' + $opt_debug + ;; +- +- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break +- execute_dlfiles="$execute_dlfiles $1" +- shift ++ --dry-run|--dryrun|-n) ++ opt_dry_run=: + ;; +- +- --dry-run | -n) opt_dry_run=: ;; +- --features) func_features ;; +- --finish) mode="finish" ;; +- --no-finish) opt_finish=false ;; +- +- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break +- case $1 in +- # Valid mode arguments: +- clean) ;; +- compile) ;; +- execute) ;; +- finish) ;; +- install) ;; +- link) ;; +- relink) ;; +- uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +- esac +- +- mode="$1" ++ --config) ++ opt_config=: ++func_config ++ ;; ++ --dlopen|-dlopen) ++ optarg="$1" ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$optarg" + shift + ;; +- + --preserve-dup-deps) +- opt_duplicate_deps=: ;; +- +- --quiet|--silent) preserve_args="$preserve_args $opt" +- opt_silent=: +- opt_verbose=false ++ opt_preserve_dup_deps=: + ;; +- +- --no-quiet|--no-silent) +- preserve_args="$preserve_args $opt" +- opt_silent=false ++ --features) ++ opt_features=: ++func_features + ;; +- +- --verbose| -v) preserve_args="$preserve_args $opt" ++ --finish) ++ opt_finish=: ++set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ --help) ++ opt_help=: ++ ;; ++ --help-all) ++ opt_help_all=: ++opt_help=': help-all' ++ ;; ++ --mode) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_mode="$optarg" ++case $optarg in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++esac ++ shift ++ ;; ++ --no-silent|--no-quiet) + opt_silent=false +- opt_verbose=: ++func_append preserve_args " $opt" + ;; +- +- --no-verbose) preserve_args="$preserve_args $opt" ++ --no-verbose) + opt_verbose=false ++func_append preserve_args " $opt" + ;; +- +- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break +- preserve_args="$preserve_args $opt $1" +- func_enable_tag "$1" # tagname is set here ++ --silent|--quiet) ++ opt_silent=: ++func_append preserve_args " $opt" ++ opt_verbose=false ++ ;; ++ --verbose|-v) ++ opt_verbose=: ++func_append preserve_args " $opt" ++opt_silent=false ++ ;; ++ --tag) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_tag="$optarg" ++func_append preserve_args " $opt $optarg" ++func_enable_tag "$optarg" + shift + ;; + ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ --version) func_version ;; ++ + # Separate optargs to long options: +- -dlopen=*|--mode=*|--tag=*) +- func_opt_split "$opt" +- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ --*=*) ++ func_split_long_opt "$opt" ++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + +- -\?|-h) func_usage ;; +- --help) opt_help=: ;; +- --help-all) opt_help=': help-all' ;; +- --version) func_version ;; +- +- -*) func_fatal_help "unrecognized option \`$opt'" ;; +- +- *) nonopt="$opt" +- break ++ # Separate non-argument short options: ++ -\?*|-h*|-n*|-v*) ++ func_split_short_opt "$opt" ++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} ++ shift + ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + ++ # Validate options: ++ ++ # save first non-option argument ++ if test "$#" -gt 0; then ++ nonopt="$opt" ++ shift ++ fi ++ ++ # preserve --debug ++ test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) +@@ -981,82 +1184,44 @@ func_enable_tag () + opt_duplicate_compiler_generated_deps=: + ;; + *) +- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + +- # Having warned about all mis-specified options, bail out if +- # anything was wrong. +- $exit_cmd $EXIT_FAILURE +-} ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match + +-# func_check_version_match +-# Ensure that we are using m4 macros, and libtool script from the same +-# release of libtool. +-func_check_version_match () +-{ +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from an older release. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- fi +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +-$progname: but the definition of this LT_INIT comes from revision $macro_revision. +-$progname: You should recreate aclocal.m4 with macros from revision $package_revision +-$progname: of $PACKAGE $VERSION and run autoconf again. +-_LT_EOF ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" + fi + +- exit $EXIT_MISMATCH +- fi +-} +- ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" + +-## ----------- ## +-## Main. ## +-## ----------- ## +- +-$opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" +- fi ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try \`$progname --help --mode=$opt_mode' for more information." ++ } + + +- # Darwin sucks +- eval "std_shrext=\"$shrext_cmds\"" ++ # Bail if the options were screwed ++ $exit_cmd $EXIT_FAILURE ++} + + +- # Only execute mode is allowed to have -dlopen flags. +- if test -n "$execute_dlfiles" && test "$mode" != execute; then +- func_error "unrecognized option \`-dlopen'" +- $ECHO "$help" 1>&2 +- exit $EXIT_FAILURE +- fi + +- # Change the help message to a mode-specific one. +- generic_help="$help" +- help="Try \`$progname --help --mode=$mode' for more information." +-} + ++## ----------- ## ++## Main. ## ++## ----------- ## + + # func_lalib_p file + # True iff FILE is a libtool `.la' library or `.lo' object file. +@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () + # temporary ltwrapper_script. + func_ltwrapper_scriptname () + { +- func_ltwrapper_scriptname_result="" +- if func_ltwrapper_executable_p "$1"; then +- func_dirname_and_basename "$1" "" "." +- func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +- fi ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + } + + # func_ltwrapper_p file +@@ -1149,7 +1311,7 @@ func_execute_cmds () + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +@@ -1172,6 +1334,37 @@ func_source () + } + + ++# func_resolve_sysroot PATH ++# Replace a leading = in PATH with a sysroot. Store the result into ++# func_resolve_sysroot_result ++func_resolve_sysroot () ++{ ++ func_resolve_sysroot_result=$1 ++ case $func_resolve_sysroot_result in ++ =*) ++ func_stripname '=' '' "$func_resolve_sysroot_result" ++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result ++ ;; ++ esac ++} ++ ++# func_replace_sysroot PATH ++# If PATH begins with the sysroot, replace it with = and ++# store the result into func_replace_sysroot_result. ++func_replace_sysroot () ++{ ++ case "$lt_sysroot:$1" in ++ ?*:"$lt_sysroot"*) ++ func_stripname "$lt_sysroot" '' "$1" ++ func_replace_sysroot_result="=$func_stripname_result" ++ ;; ++ *) ++ # Including no sysroot. ++ func_replace_sysroot_result=$1 ++ ;; ++ esac ++} ++ + # func_infer_tag arg + # Infer tagged configuration to use if any are available and + # if one wasn't chosen via the "--tag" command line option. +@@ -1184,8 +1377,7 @@ func_infer_tag () + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1204,8 +1396,7 @@ func_infer_tag () + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1274,6 +1465,486 @@ EOF + } + } + ++ ++################################################## ++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # ++################################################## ++ ++# func_convert_core_file_wine_to_w32 ARG ++# Helper function used by file name conversion functions when $build is *nix, ++# and $host is mingw, cygwin, or some other w32 environment. Relies on a ++# correctly configured wine environment available, with the winepath program ++# in $build's $PATH. ++# ++# ARG is the $build file name to be converted to w32 format. ++# Result is available in $func_convert_core_file_wine_to_w32_result, and will ++# be empty on error (or when ARG is empty) ++func_convert_core_file_wine_to_w32 () ++{ ++ $opt_debug ++ func_convert_core_file_wine_to_w32_result="$1" ++ if test -n "$1"; then ++ # Unfortunately, winepath does not exit with a non-zero error code, so we ++ # are forced to check the contents of stdout. On the other hand, if the ++ # command is not found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both error code of ++ # zero AND non-empty stdout, which explains the odd construction: ++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ func_convert_core_file_wine_to_w32_result= ++ fi ++ fi ++} ++# end: func_convert_core_file_wine_to_w32 ++ ++ ++# func_convert_core_path_wine_to_w32 ARG ++# Helper function used by path conversion functions when $build is *nix, and ++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly ++# configured wine environment available, with the winepath program in $build's ++# $PATH. Assumes ARG has no leading or trailing path separator characters. ++# ++# ARG is path to be converted from $build format to win32. ++# Result is available in $func_convert_core_path_wine_to_w32_result. ++# Unconvertible file (directory) names in ARG are skipped; if no directory names ++# are convertible, then the result may be empty. ++func_convert_core_path_wine_to_w32 () ++{ ++ $opt_debug ++ # unfortunately, winepath doesn't convert paths, only file names ++ func_convert_core_path_wine_to_w32_result="" ++ if test -n "$1"; then ++ oldIFS=$IFS ++ IFS=: ++ for func_convert_core_path_wine_to_w32_f in $1; do ++ IFS=$oldIFS ++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" ++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -z "$func_convert_core_path_wine_to_w32_result"; then ++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ else ++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" ++ fi ++ fi ++ done ++ IFS=$oldIFS ++ fi ++} ++# end: func_convert_core_path_wine_to_w32 ++ ++ ++# func_cygpath ARGS... ++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when ++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) ++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or ++# (2), returns the Cygwin file name or path in func_cygpath_result (input ++# file name or path is assumed to be in w32 format, as previously converted ++# from $build's *nix or MSYS format). In case (3), returns the w32 file name ++# or path in func_cygpath_result (input file name or path is assumed to be in ++# Cygwin format). Returns an empty string on error. ++# ++# ARGS are passed to cygpath, with the last one being the file name or path to ++# be converted. ++# ++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH ++# environment variable; do not put it in $PATH. ++func_cygpath () ++{ ++ $opt_debug ++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then ++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` ++ if test "$?" -ne 0; then ++ # on failure, ensure result is empty ++ func_cygpath_result= ++ fi ++ else ++ func_cygpath_result= ++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" ++ fi ++} ++#end: func_cygpath ++ ++ ++# func_convert_core_msys_to_w32 ARG ++# Convert file name or path ARG from MSYS format to w32 format. Return ++# result in func_convert_core_msys_to_w32_result. ++func_convert_core_msys_to_w32 () ++{ ++ $opt_debug ++ # awkward: cmd appends spaces to result ++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | ++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++} ++#end: func_convert_core_msys_to_w32 ++ ++ ++# func_convert_file_check ARG1 ARG2 ++# Verify that ARG1 (a file name in $build format) was converted to $host ++# format in ARG2. Otherwise, emit an error message, but continue (resetting ++# func_to_host_file_result to ARG1). ++func_convert_file_check () ++{ ++ $opt_debug ++ if test -z "$2" && test -n "$1" ; then ++ func_error "Could not determine host file name corresponding to" ++ func_error " \`$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_file_result="$1" ++ fi ++} ++# end func_convert_file_check ++ ++ ++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH ++# Verify that FROM_PATH (a path in $build format) was converted to $host ++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting ++# func_to_host_file_result to a simplistic fallback value (see below). ++func_convert_path_check () ++{ ++ $opt_debug ++ if test -z "$4" && test -n "$3"; then ++ func_error "Could not determine the host path corresponding to" ++ func_error " \`$3'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This is a deliberately simplistic "conversion" and ++ # should not be "improved". See libtool.info. ++ if test "x$1" != "x$2"; then ++ lt_replace_pathsep_chars="s|$1|$2|g" ++ func_to_host_path_result=`echo "$3" | ++ $SED -e "$lt_replace_pathsep_chars"` ++ else ++ func_to_host_path_result="$3" ++ fi ++ fi ++} ++# end func_convert_path_check ++ ++ ++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG ++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT ++# and appending REPL if ORIG matches BACKPAT. ++func_convert_path_front_back_pathsep () ++{ ++ $opt_debug ++ case $4 in ++ $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ ;; ++ esac ++ case $4 in ++ $2 ) func_append func_to_host_path_result "$3" ++ ;; ++ esac ++} ++# end func_convert_path_front_back_pathsep ++ ++ ++################################################## ++# $build to $host FILE NAME CONVERSION FUNCTIONS # ++################################################## ++# invoked via `$to_host_file_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# Result will be available in $func_to_host_file_result. ++ ++ ++# func_to_host_file ARG ++# Converts the file name ARG from $build format to $host format. Return result ++# in func_to_host_file_result. ++func_to_host_file () ++{ ++ $opt_debug ++ $to_host_file_cmd "$1" ++} ++# end func_to_host_file ++ ++ ++# func_to_tool_file ARG LAZY ++# converts the file name ARG from $build format to toolchain format. Return ++# result in func_to_tool_file_result. If the conversion in use is listed ++# in (the comma separated) LAZY, no conversion takes place. ++func_to_tool_file () ++{ ++ $opt_debug ++ case ,$2, in ++ *,"$to_tool_file_cmd",*) ++ func_to_tool_file_result=$1 ++ ;; ++ *) ++ $to_tool_file_cmd "$1" ++ func_to_tool_file_result=$func_to_host_file_result ++ ;; ++ esac ++} ++# end func_to_tool_file ++ ++ ++# func_convert_file_noop ARG ++# Copy ARG to func_to_host_file_result. ++func_convert_file_noop () ++{ ++ func_to_host_file_result="$1" ++} ++# end func_convert_file_noop ++ ++ ++# func_convert_file_msys_to_w32 ARG ++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_file_result. ++func_convert_file_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_w32 ++ ++ ++# func_convert_file_cygwin_to_w32 ARG ++# Convert file name ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_file_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use ++ # LT_CYGPATH in this case. ++ func_to_host_file_result=`cygpath -m "$1"` ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_cygwin_to_w32 ++ ++ ++# func_convert_file_nix_to_w32 ARG ++# Convert file name ARG from *nix to w32 format. Requires a wine environment ++# and a working winepath. Returns result in func_to_host_file_result. ++func_convert_file_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_file_wine_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_w32 ++ ++ ++# func_convert_file_msys_to_cygwin ARG ++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_file_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_cygwin ++ ++ ++# func_convert_file_nix_to_cygwin ARG ++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed ++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result ++# in func_to_host_file_result. ++func_convert_file_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. ++ func_convert_core_file_wine_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_cygwin ++ ++ ++############################################# ++# $build to $host PATH CONVERSION FUNCTIONS # ++############################################# ++# invoked via `$to_host_path_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# The result will be available in $func_to_host_path_result. ++# ++# Path separators are also converted from $build format to $host format. If ++# ARG begins or ends with a path separator character, it is preserved (but ++# converted to $host format) on output. ++# ++# All path conversion functions are named using the following convention: ++# file name conversion function : func_convert_file_X_to_Y () ++# path conversion function : func_convert_path_X_to_Y () ++# where, for any given $build/$host combination the 'X_to_Y' value is the ++# same. If conversion functions are added for new $build/$host combinations, ++# the two new functions must follow this pattern, or func_init_to_host_path_cmd ++# will break. ++ ++ ++# func_init_to_host_path_cmd ++# Ensures that function "pointer" variable $to_host_path_cmd is set to the ++# appropriate value, based on the value of $to_host_file_cmd. ++to_host_path_cmd= ++func_init_to_host_path_cmd () ++{ ++ $opt_debug ++ if test -z "$to_host_path_cmd"; then ++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" ++ to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ fi ++} ++ ++ ++# func_to_host_path ARG ++# Converts the path ARG from $build format to $host format. Return result ++# in func_to_host_path_result. ++func_to_host_path () ++{ ++ $opt_debug ++ func_init_to_host_path_cmd ++ $to_host_path_cmd "$1" ++} ++# end func_to_host_path ++ ++ ++# func_convert_path_noop ARG ++# Copy ARG to func_to_host_path_result. ++func_convert_path_noop () ++{ ++ func_to_host_path_result="$1" ++} ++# end func_convert_path_noop ++ ++ ++# func_convert_path_msys_to_w32 ARG ++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_path_result. ++func_convert_path_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ARG. MSYS ++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; ++ # and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_msys_to_w32 ++ ++ ++# func_convert_path_cygwin_to_w32 ARG ++# Convert path ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_path_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_cygwin_to_w32 ++ ++ ++# func_convert_path_nix_to_w32 ARG ++# Convert path ARG from *nix to w32 format. Requires a wine environment and ++# a working winepath. Returns result in func_to_host_file_result. ++func_convert_path_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_nix_to_w32 ++ ++ ++# func_convert_path_msys_to_cygwin ARG ++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_path_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_msys_to_cygwin ++ ++ ++# func_convert_path_nix_to_cygwin ARG ++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a ++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in ++# func_to_host_file_result. ++func_convert_path_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_nix_to_cygwin ++ ++ + # func_mode_compile arg... + func_mode_compile () + { +@@ -1314,12 +1985,12 @@ func_mode_compile () + ;; + + -pie | -fpie | -fPIE) +- pie_flag="$pie_flag $arg" ++ func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) +- later="$later $arg" ++ func_append later " $arg" + continue + ;; + +@@ -1340,15 +2011,14 @@ func_mode_compile () + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" +- func_quote_for_eval "$arg" +- lastarg="$lastarg $func_quote_for_eval_result" ++ func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. +- base_compile="$base_compile $lastarg" ++ func_append base_compile " $lastarg" + continue + ;; + +@@ -1364,8 +2034,7 @@ func_mode_compile () + esac # case $arg_mode + + # Aesthetically quote the previous argument. +- func_quote_for_eval "$lastarg" +- base_compile="$base_compile $func_quote_for_eval_result" ++ func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in +@@ -1496,17 +2165,16 @@ compiler." + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi +- removelist="$removelist $output_obj" ++ func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist +- removelist="$removelist $lockfile" ++ func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + +- if test -n "$fix_srcfile_path"; then +- eval "srcfile=\"$fix_srcfile_path\"" +- fi ++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 ++ srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + +@@ -1526,7 +2194,7 @@ compiler." + + if test -z "$output_obj"; then + # Place PIC objects in $objdir +- command="$command -o $lobj" ++ func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ +@@ -1573,11 +2241,11 @@ compiler." + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then +- command="$command -o $obj" ++ func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. +- command="$command$suppress_output" ++ func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + +@@ -1622,13 +2290,13 @@ compiler." + } + + $opt_help || { +- test "$mode" = compile && func_mode_compile ${1+"$@"} ++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + } + + func_mode_help () + { + # We need to display help for each of the modes. +- case $mode in ++ case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only ++ -prefer-pic try to build PIC objects only ++ -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." + ;; + + *) +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + +@@ -1819,13 +2487,13 @@ if $opt_help; then + else + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done +@@ -1854,13 +2522,16 @@ func_mode_execute () + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do ++ for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" +@@ -1882,7 +2553,7 @@ func_mode_execute () + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" ++ func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" +@@ -1907,10 +2578,10 @@ func_mode_execute () + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. +- if eval test -z \"\$$shlibpath_var\"; then +- eval $shlibpath_var=\$dir ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" + else +- eval $shlibpath_var=\$dir:\$$shlibpath_var ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + +@@ -1939,8 +2610,7 @@ func_mode_execute () + ;; + esac + # Quote arguments (to preserve shell metacharacters). +- func_quote_for_eval "$file" +- args="$args $func_quote_for_eval_result" ++ func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then +@@ -1972,22 +2642,59 @@ func_mode_execute () + fi + } + +-test "$mode" = execute && func_mode_execute ${1+"$@"} ++test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + + # func_mode_finish arg... + func_mode_finish () + { + $opt_debug +- libdirs="$nonopt" ++ libs= ++ libdirs= + admincmds= + +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done ++ for opt in "$nonopt" ${1+"$@"} ++ do ++ if test -d "$opt"; then ++ func_append libdirs " $opt" + ++ elif test -f "$opt"; then ++ if func_lalib_unsafe_p "$opt"; then ++ func_append libs " $opt" ++ else ++ func_warning "\`$opt' is not a valid libtool archive" ++ fi ++ ++ else ++ func_fatal_error "invalid argument \`$opt'" ++ fi ++ done ++ ++ if test -n "$libs"; then ++ if test -n "$lt_sysroot"; then ++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` ++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" ++ else ++ sysroot_cmd= ++ fi ++ ++ # Remove sysroot references ++ if $opt_dry_run; then ++ for lib in $libs; do ++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" ++ done ++ else ++ tmpdir=`func_mktempdir` ++ for lib in $libs; do ++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ ++ > $tmpdir/tmp-la ++ mv -f $tmpdir/tmp-la $lib ++ done ++ ${RM}r "$tmpdir" ++ fi ++ fi ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +@@ -1997,7 +2704,7 @@ func_mode_finish () + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" +- $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done +@@ -2006,53 +2713,55 @@ func_mode_finish () + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + +- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $ECHO " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval "flag=\"$hardcode_libdir_flag_spec\"" ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ echo "----------------------------------------------------------------------" ++ echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ echo ++ echo "If you ever happen to want to link against installed libraries" ++ echo "in a given directory, LIBDIR, you must either use libtool, and" ++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" + +- $ECHO " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $ECHO " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- echo ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ echo + +- echo "See any operating system documentation about shared libraries for" +- case $host in +- solaris2.[6789]|solaris2.1[0-9]) +- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" +- echo "pages." +- ;; +- *) +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- ;; +- esac +- echo "----------------------------------------------------------------------" ++ echo "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ echo "pages." ++ ;; ++ *) ++ echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ echo "----------------------------------------------------------------------" ++ fi + exit $EXIT_SUCCESS + } + +-test "$mode" = finish && func_mode_finish ${1+"$@"} ++test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + + # func_mode_install arg... +@@ -2077,7 +2786,7 @@ func_mode_install () + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" +- install_prog="$install_prog$func_quote_for_eval_result" ++ func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; +@@ -2097,7 +2806,7 @@ func_mode_install () + do + arg2= + if test -n "$dest"; then +- files="$files $dest" ++ func_append files " $dest" + dest=$arg + continue + fi +@@ -2135,11 +2844,11 @@ func_mode_install () + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" +- install_prog="$install_prog $func_quote_for_eval_result" ++ func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi +- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" ++ func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ +@@ -2151,7 +2860,7 @@ func_mode_install () + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" +- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" ++ func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + +@@ -2209,10 +2918,13 @@ func_mode_install () + case $file in + *.$libext) + # Do the static libraries later. +- staticlibs="$staticlibs $file" ++ func_append staticlibs " $file" + ;; + + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" +@@ -2226,23 +2938,30 @@ func_mode_install () + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; ++ *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; ++ *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" +- dir="$dir$objdir" ++ func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +@@ -2315,7 +3034,7 @@ func_mode_install () + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) +@@ -2503,7 +3222,7 @@ func_mode_install () + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + +- if test -n "$current_libdirs" && $opt_finish; then ++ if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' +@@ -2512,7 +3231,7 @@ func_mode_install () + fi + } + +-test "$mode" = install && func_mode_install ${1+"$@"} ++test "$opt_mode" = install && func_mode_install ${1+"$@"} + + + # func_generate_dlsyms outputname originator pic_p +@@ -2559,6 +3278,18 @@ extern \"C\" { + #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" + #endif + ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ + /* External symbol declarations for the compiler. */\ + " + +@@ -2570,21 +3301,22 @@ extern \"C\" { + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do +- func_verbose "extracting global C symbols from \`$progfile'" +- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 ++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" ++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { +- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + +@@ -2593,23 +3325,23 @@ extern \"C\" { + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols +- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$export_symbols" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { +- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" +- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$nlist" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } +@@ -2620,10 +3352,52 @@ extern \"C\" { + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" +- $opt_dry_run || { +- $ECHO ": $name " >> "$nlist" +- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" +- } ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ # if an import library, we need to obtain dlname ++ if func_win32_import_lib_p "$dlprefile"; then ++ func_tr_sh "$dlprefile" ++ eval "curr_lafile=\$libfile_$func_tr_sh_result" ++ dlprefile_dlbasename="" ++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then ++ # Use subshell, to avoid clobbering current variable values ++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` ++ if test -n "$dlprefile_dlname" ; then ++ func_basename "$dlprefile_dlname" ++ dlprefile_dlbasename="$func_basename_result" ++ else ++ # no lafile. user explicitly requested -dlpreopen . ++ $sharedlib_from_linklib_cmd "$dlprefile" ++ dlprefile_dlbasename=$sharedlib_from_linklib_result ++ fi ++ fi ++ $opt_dry_run || { ++ if test -n "$dlprefile_dlbasename" ; then ++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' ++ else ++ func_warning "Could not compute DLL name from $name" ++ eval '$ECHO ": $name " >> "$nlist"' ++ fi ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | ++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" ++ } ++ else # not an import lib ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ fi ++ ;; ++ *) ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ ;; ++ esac + done + + $opt_dry_run || { +@@ -2661,26 +3435,9 @@ typedef struct { + const char *name; + void *address; + } lt_dlsymlist; +-" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* DATA imports from DLLs on WIN32 con't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs. */" +- lt_dlsym_const= ;; +- *osf5*) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* This system does not cope well with relocations in const data */" +- lt_dlsym_const= ;; +- *) +- lt_dlsym_const=const ;; +- esac +- +- echo >> "$output_objdir/$my_dlsyms" "\ +-extern $lt_dlsym_const lt_dlsymlist ++extern LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[]; +-$lt_dlsym_const lt_dlsymlist ++LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[] = + {\ + { \"$my_originator\", (void *) 0 }," +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; +- *) symtab_cflags="$symtab_cflags $arg" ;; ++ *) func_append symtab_cflags " $arg" ;; + esac + done + +@@ -2796,9 +3553,11 @@ func_win32_libid () + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static +- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | +- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then +- win32_nmres=`$NM -f posix -A "$1" | ++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ +@@ -2827,6 +3586,131 @@ func_win32_libid () + $ECHO "$win32_libid_type" + } + ++# func_cygming_dll_for_implib ARG ++# ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib () ++{ ++ $opt_debug ++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` ++} ++ ++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs ++# ++# The is the core of a fallback implementation of a ++# platform-specific function to extract the name of the ++# DLL associated with the specified import library LIBNAME. ++# ++# SECTION_NAME is either .idata$6 or .idata$7, depending ++# on the platform and compiler that created the implib. ++# ++# Echos the name of the DLL associated with the ++# specified import library. ++func_cygming_dll_for_implib_fallback_core () ++{ ++ $opt_debug ++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` ++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | ++ $SED '/^Contents of section '"$match_literal"':/{ ++ # Place marker at beginning of archive member dllname section ++ s/.*/====MARK====/ ++ p ++ d ++ } ++ # These lines can sometimes be longer than 43 characters, but ++ # are always uninteresting ++ /:[ ]*file format pe[i]\{,1\}-/d ++ /^In archive [^:]*:/d ++ # Ensure marker is printed ++ /^====MARK====/p ++ # Remove all lines with less than 43 characters ++ /^.\{43\}/!d ++ # From remaining lines, remove first 43 characters ++ s/^.\{43\}//' | ++ $SED -n ' ++ # Join marker and all lines until next marker into a single line ++ /^====MARK====/ b para ++ H ++ $ b para ++ b ++ :para ++ x ++ s/\n//g ++ # Remove the marker ++ s/^====MARK====// ++ # Remove trailing dots and whitespace ++ s/[\. \t]*$// ++ # Print ++ /./p' | ++ # we now have a list, one entry per line, of the stringified ++ # contents of the appropriate section of all members of the ++ # archive which possess that section. Heuristic: eliminate ++ # all those which have a first or second character that is ++ # a '.' (that is, objdump's representation of an unprintable ++ # character.) This should work for all archives with less than ++ # 0x302f exports -- but will fail for DLLs whose name actually ++ # begins with a literal '.' or a single character followed by ++ # a '.'. ++ # ++ # Of those that remain, print the first one. ++ $SED -e '/^\./d;/^.\./d;q' ++} ++ ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ ++# func_cygming_dll_for_implib_fallback ARG ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# ++# This fallback implementation is for use when $DLLTOOL ++# does not support the --identify-strict option. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib_fallback () ++{ ++ $opt_debug ++ if func_cygming_gnu_implib_p "$1" ; then ++ # binutils import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` ++ elif func_cygming_ms_implib_p "$1" ; then ++ # ms-generated import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` ++ else ++ # unknown ++ sharedlib_from_linklib_result="" ++ fi ++} + + + # func_extract_an_archive dir oldlib +@@ -2917,7 +3801,7 @@ func_extract_archives () + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do +- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ +@@ -2932,7 +3816,7 @@ func_extract_archives () + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac +- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +@@ -3014,7 +3898,110 @@ func_fallback_echo () + _LTECHO_EOF' + } + ECHO=\"$qECHO\" +- fi\ ++ fi ++ ++# Very basic option parsing. These options are (a) specific to ++# the libtool wrapper, (b) are identical between the wrapper ++# /script/ and the wrapper /executable/ which is used only on ++# windows platforms, and (c) all begin with the string "--lt-" ++# (application programs are unlikely to have options which match ++# this pattern). ++# ++# There are only two supported options: --lt-debug and ++# --lt-dump-script. There is, deliberately, no --lt-help. ++# ++# The first argument to this parsing function should be the ++# script's $0 value, followed by "$@". ++lt_option_debug= ++func_parse_lt_options () ++{ ++ lt_script_arg0=\$0 ++ shift ++ for lt_opt ++ do ++ case \"\$lt_opt\" in ++ --lt-debug) lt_option_debug=1 ;; ++ --lt-dump-script) ++ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` ++ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. ++ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` ++ cat \"\$lt_dump_D/\$lt_dump_F\" ++ exit 0 ++ ;; ++ --lt-*) ++ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 ++ exit 1 ++ ;; ++ esac ++ done ++ ++ # Print the debug banner immediately: ++ if test -n \"\$lt_option_debug\"; then ++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 ++ fi ++} ++ ++# Used when --lt-debug. Prints its arguments to stdout ++# (redirection is the responsibility of the caller) ++func_lt_dump_args () ++{ ++ lt_dump_args_N=1; ++ for lt_arg ++ do ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" ++ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` ++ done ++} ++ ++# Core function for launching the target application ++func_exec_program_core () ++{ ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 ++ exit 1 ++} ++ ++# A function to encapsulate launching the target application ++# Strips options in the --lt-* namespace from \$@ and ++# launches target application with the remaining arguments. ++func_exec_program () ++{ ++ for lt_wr_arg ++ do ++ case \$lt_wr_arg in ++ --lt-*) ;; ++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; ++ esac ++ shift ++ done ++ func_exec_program_core \${1+\"\$@\"} ++} ++ ++ # Parse options ++ func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` +@@ -3078,7 +4065,7 @@ _LTECHO_EOF' + + # relink executable if necessary + if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" +@@ -3102,6 +4089,18 @@ _LTECHO_EOF' + + if test -f \"\$progdir/\$program\"; then" + ++ # fixup the dll searchpath if we need to. ++ # ++ # Fix the DLL searchpath if we need to. Do this before prepending ++ # to shlibpath, because on Windows, both are PATH and uninstalled ++ # libraries must come first. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi ++ + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ +@@ -3116,35 +4115,10 @@ _LTECHO_EOF' + " + fi + +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $ECHO "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" +- fi +- + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2* | *-cegcc*) +- $ECHO "\ +- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +-" +- ;; +- +- *) +- $ECHO "\ +- exec \"\$progdir/\$program\" \${1+\"\$@\"} +-" +- ;; +- esac +- $ECHO "\ +- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 +- exit 1 ++ func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. +@@ -3158,166 +4132,6 @@ fi\ + } + + +-# func_to_host_path arg +-# +-# Convert paths to host format when used with build tools. +-# Intended for use with "native" mingw (where libtool itself +-# is running under the msys shell), or in the following cross- +-# build environments: +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# where wine is equipped with the `winepath' executable. +-# In the native mingw case, the (msys) shell automatically +-# converts paths for any non-msys applications it launches, +-# but that facility isn't available from inside the cwrapper. +-# Similar accommodations are necessary for $host mingw and +-# $build cygwin. Calling this function does no harm for other +-# $host/$build combinations not listed above. +-# +-# ARG is the path (on $build) that should be converted to +-# the proper representation for $host. The result is stored +-# in $func_to_host_path_result. +-func_to_host_path () +-{ +- func_to_host_path_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- case $build in +- *mingw* ) # actually, msys +- # awkward: cmd appends spaces to result +- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_path_result=`cygpath -w "$1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # Unfortunately, winepath does not exit with a non-zero +- # error code, so we are forced to check the contents of +- # stdout. On the other hand, if the command is not +- # found, the shell will set an exit code of 127 and print +- # *an error message* to stdout. So we must check for both +- # error code of zero AND non-empty stdout, which explains +- # the odd construction: +- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` +- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then +- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- else +- # Allow warning below. +- func_to_host_path_result= +- fi +- ;; +- esac +- if test -z "$func_to_host_path_result" ; then +- func_error "Could not determine host path corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback: +- func_to_host_path_result="$1" +- fi +- ;; +- esac +- fi +-} +-# end: func_to_host_path +- +-# func_to_host_pathlist arg +-# +-# Convert pathlists to host format when used with build tools. +-# See func_to_host_path(), above. This function supports the +-# following $build/$host combinations (but does no harm for +-# combinations not listed here): +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# +-# Path separators are also converted from $build format to +-# $host format. If ARG begins or ends with a path separator +-# character, it is preserved (but converted to $host format) +-# on output. +-# +-# ARG is a pathlist (on $build) that should be converted to +-# the proper representation on $host. The result is stored +-# in $func_to_host_pathlist_result. +-func_to_host_pathlist () +-{ +- func_to_host_pathlist_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- # Remove leading and trailing path separator characters from +- # ARG. msys behavior is inconsistent here, cygpath turns them +- # into '.;' and ';.', and winepath ignores them completely. +- func_stripname : : "$1" +- func_to_host_pathlist_tmp1=$func_stripname_result +- case $build in +- *mingw* ) # Actually, msys. +- # Awkward: cmd appends spaces to result. +- func_to_host_pathlist_result=` +- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # unfortunately, winepath doesn't convert pathlists +- func_to_host_pathlist_result="" +- func_to_host_pathlist_oldIFS=$IFS +- IFS=: +- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do +- IFS=$func_to_host_pathlist_oldIFS +- if test -n "$func_to_host_pathlist_f" ; then +- func_to_host_path "$func_to_host_pathlist_f" +- if test -n "$func_to_host_path_result" ; then +- if test -z "$func_to_host_pathlist_result" ; then +- func_to_host_pathlist_result="$func_to_host_path_result" +- else +- func_append func_to_host_pathlist_result ";$func_to_host_path_result" +- fi +- fi +- fi +- done +- IFS=$func_to_host_pathlist_oldIFS +- ;; +- esac +- if test -z "$func_to_host_pathlist_result"; then +- func_error "Could not determine the host path(s) corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback. This may break if $1 contains DOS-style drive +- # specifications. The fix is not to complicate the expression +- # below, but for the user to provide a working wine installation +- # with winepath so that path translation in the cross-to-mingw +- # case works properly. +- lt_replace_pathsep_nix_to_dos="s|:|;|g" +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_replace_pathsep_nix_to_dos"` +- fi +- # Now, add the leading and trailing path separators back +- case "$1" in +- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" +- ;; +- esac +- case "$1" in +- *: ) func_append func_to_host_pathlist_result ";" +- ;; +- esac +- ;; +- esac +- fi +-} +-# end: func_to_host_pathlist +- + # func_emit_cwrapperexe_src + # emit the source code for a wrapper executable on stdout + # Must ONLY be called from within func_mode_link because +@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () + + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. +- +- Currently, it simply execs the wrapper *script* "$SHELL $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly. + */ + EOF + cat <<"EOF" +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + +-#undef LTWRAPPER_DEBUGPRINTF +-#if defined LT_DEBUGWRAPPER +-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +-static void +-ltwrapper_debugprintf (const char *fmt, ...) +-{ +- va_list args; +- va_start (args, fmt); +- (void) vfprintf (stderr, fmt, args); +- va_end (args); +-} ++#if defined(LT_DEBUGWRAPPER) ++static int lt_debug = 1; + #else +-# define LTWRAPPER_DEBUGPRINTF(args) ++static int lt_debug = 0; + #endif + +-const char *program_name = NULL; ++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + + void *xmalloc (size_t num); + char *xstrdup (const char *string); +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); + int make_executable (const char *path); + int check_executable (const char *path); + char *strendzap (char *str, const char *pat); +-void lt_fatal (const char *message, ...); ++void lt_debugprintf (const char *file, int line, const char *fmt, ...); ++void lt_fatal (const char *file, int line, const char *message, ...); ++static const char *nonnull (const char *s); ++static const char *nonempty (const char *s); + void lt_setenv (const char *name, const char *value); + char *lt_extend_str (const char *orig_value, const char *add, int to_end); + void lt_update_exe_path (const char *name, const char *value); +@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); + EOF + + cat <"))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", ++ nonnull (lt_argv_zero)); + for (i = 0; i < newargc; i++) + { +- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", ++ i, nonnull (newargz[i])); + } + + EOF +@@ -3706,7 +4529,9 @@ EOF + if (rval == -1) + { + /* failed to start process */ +- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) failed to launch target \"%s\": %s\n", ++ lt_argv_zero, nonnull (strerror (errno))); + return 127; + } + return rval; +@@ -3728,7 +4553,7 @@ xmalloc (size_t num) + { + void *p = (void *) malloc (num); + if (!p) +- lt_fatal ("Memory exhausted"); ++ lt_fatal (__FILE__, __LINE__, "memory exhausted"); + + return p; + } +@@ -3762,8 +4587,8 @@ check_executable (const char *path) + { + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3780,8 +4605,8 @@ make_executable (const char *path) + int rval = 0; + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) + int tmp_len; + char *concat_name; + +- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", +- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", ++ nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; +@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); +@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); +@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { +- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", +- tmp_pathspec)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "checking path component for symlinks: %s\n", ++ tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) +@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) + } + else + { +- char *errstr = strerror (errno); +- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ lt_fatal (__FILE__, __LINE__, ++ "error accessing file \"%s\": %s", ++ tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); +@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { +- lt_fatal ("Could not follow symlinks for %s", pathspec); ++ lt_fatal (__FILE__, __LINE__, ++ "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); + #endif +@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) + return str; + } + ++void ++lt_debugprintf (const char *file, int line, const char *fmt, ...) ++{ ++ va_list args; ++ if (lt_debug) ++ { ++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++ } ++} ++ + static void +-lt_error_core (int exit_status, const char *mode, ++lt_error_core (int exit_status, const char *file, ++ int line, const char *mode, + const char *message, va_list ap) + { +- fprintf (stderr, "%s: %s: ", program_name, mode); ++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, + } + + void +-lt_fatal (const char *message, ...) ++lt_fatal (const char *file, int line, const char *message, ...) + { + va_list ap; + va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); + } + ++static const char * ++nonnull (const char *s) ++{ ++ return s ? s : "(null)"; ++} ++ ++static const char * ++nonempty (const char *s) ++{ ++ return (s && !*s) ? "(empty)" : nonnull (s); ++} ++ + void + lt_setenv (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_setenv) setting '%s' to '%s'\n", ++ nonnull (name), nonnull (value)); + { + #ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) + void + lt_update_exe_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) + void + lt_update_lib_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4222,7 +5078,7 @@ EOF + func_win32_import_lib_p () + { + $opt_debug +- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in ++ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +@@ -4401,9 +5257,9 @@ func_mode_link () + ;; + *) + if test "$prev" = dlfiles; then +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $arg" + else +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $arg" + fi + prev= + continue +@@ -4427,7 +5283,7 @@ func_mode_link () + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; +@@ -4446,7 +5302,7 @@ func_mode_link () + moreargs= + for fil in `cat "$save_arg"` + do +-# moreargs="$moreargs $fil" ++# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + +@@ -4475,7 +5331,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -4487,7 +5343,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -4557,12 +5413,12 @@ func_mode_link () + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; +- *) rpath="$rpath $arg" ;; ++ *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; +- *) xrpath="$xrpath $arg" ;; ++ *) func_append xrpath " $arg" ;; + esac + fi + prev= +@@ -4574,28 +5430,28 @@ func_mode_link () + continue + ;; + weak) +- weak_libs="$weak_libs $arg" ++ func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) +- compiler_flags="$compiler_flags $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $wl$qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" +@@ -4686,15 +5542,16 @@ func_mode_link () + ;; + + -L*) +- func_stripname '-L' '' "$arg" +- dir=$func_stripname_result +- if test -z "$dir"; then ++ func_stripname "-L" '' "$arg" ++ if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +@@ -4706,10 +5563,16 @@ func_mode_link () + ;; + esac + case "$deplibs " in +- *" -L$dir "*) ;; ++ *" -L$dir "* | *" $arg "*) ++ # Will only happen for absolute or sysroot arguments ++ ;; + *) +- deplibs="$deplibs -L$dir" +- lib_search_path="$lib_search_path $dir" ++ # Preserve sysroot, but never include relative directories ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; ++ *) func_append deplibs " -L$dir" ;; ++ esac ++ func_append lib_search_path " $dir" + ;; + esac + case $host in +@@ -4718,12 +5581,12 @@ func_mode_link () + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; +- *) dllsearchpath="$dllsearchpath:$dir";; ++ *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -4747,7 +5610,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) +@@ -4758,9 +5621,6 @@ func_mode_link () + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; +- *-*-linux*) +- test "X$arg" = "X-lc" && continue +- ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +@@ -4770,7 +5630,7 @@ func_mode_link () + ;; + esac + fi +- deplibs="$deplibs $arg" ++ func_append deplibs " $arg" + continue + ;; + +@@ -4782,8 +5642,8 @@ func_mode_link () + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. +- -model|-arch|-isysroot) +- compiler_flags="$compiler_flags $arg" ++ -model|-arch|-isysroot|--sysroot) ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler +@@ -4791,12 +5651,12 @@ func_mode_link () + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; +@@ -4863,13 +5723,17 @@ func_mode_link () + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; ++ =*) ++ func_stripname '=' '' "$dir" ++ dir=$lt_sysroot$func_stripname_result ++ ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + continue + ;; +@@ -4922,8 +5786,8 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $func_quote_for_eval_result" +- compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ func_append arg " $func_quote_for_eval_result" ++ func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4938,9 +5802,9 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" +- linker_flags="$linker_flags $func_quote_for_eval_result" ++ func_append arg " $wl$func_quote_for_eval_result" ++ func_append compiler_flags " $wl$func_quote_for_eval_result" ++ func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4968,24 +5832,27 @@ func_mode_link () + arg="$func_quote_for_eval_result" + ;; + +- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args for GCC +- # -F/path gives path to uninstalled frameworks, gcc on darwin +- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC +- # @file GCC response files +- # -tp=* Portland pgcc target processor selection ++ # Flags to be passed through unchanged, with rationale: ++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler ++ # -r[0-9][0-9]* specify processor for the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler ++ # +DA*, +DD* enable 64-bit mode for the HP compiler ++ # -q* compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC ++ # -F/path path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC ++ # @file GCC response files ++ # -tp=* Portland pgcc target processor selection ++ # --sysroot=* for sysroot support ++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + continue + ;; + +@@ -4997,7 +5864,7 @@ func_mode_link () + + *.$objext) + # A standard object. +- objs="$objs $arg" ++ func_append objs " $arg" + ;; + + *.lo) +@@ -5028,7 +5895,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -5040,7 +5907,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -5085,24 +5952,25 @@ func_mode_link () + + *.$libext) + # An archive. +- deplibs="$deplibs $arg" +- old_deplibs="$old_deplibs $arg" ++ func_append deplibs " $arg" ++ func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + ++ func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else +- deplibs="$deplibs $arg" ++ func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; +@@ -5127,7 +5995,7 @@ func_mode_link () + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +- eval "arg=\"$export_dynamic_flag_spec\"" ++ eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi +@@ -5144,11 +6012,13 @@ func_mode_link () + else + shlib_search_path= + fi +- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" +- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" ++ func_to_tool_file "$output_objdir/" ++ tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + +@@ -5169,12 +6039,12 @@ func_mode_link () + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- libs="$libs $deplib" ++ func_append libs " $deplib" + done + + if test "$linkmode" = lib; then +@@ -5187,9 +6057,9 @@ func_mode_link () + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in +- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac +- pre_post_deps="$pre_post_deps $pre_post_dep" ++ func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= +@@ -5256,8 +6126,9 @@ func_mode_link () + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= ++ func_resolve_sysroot "$lib" + case $lib in +- *.la) func_source "$lib" ;; ++ *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library +@@ -5267,7 +6138,7 @@ func_mode_link () + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; +- *) deplibs="$deplibs $deplib" ;; ++ *) func_append deplibs " $deplib" ;; + esac + done + done +@@ -5288,11 +6159,11 @@ func_mode_link () + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- compiler_flags="$compiler_flags $deplib" ++ func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5377,7 +6248,7 @@ func_mode_link () + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5390,7 +6261,8 @@ func_mode_link () + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then +@@ -5404,7 +6276,8 @@ func_mode_link () + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" +@@ -5415,17 +6288,21 @@ func_mode_link () + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" +- dir=$func_stripname_result ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; +- *.la) lib="$deplib" ;; ++ *.la) ++ func_resolve_sysroot "$deplib" ++ lib=$func_resolve_sysroot_result ++ ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" +@@ -5488,11 +6365,11 @@ func_mode_link () + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. +- newdlprefiles="$newdlprefiles $deplib" ++ func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- newdlfiles="$newdlfiles $deplib" ++ func_append newdlfiles " $deplib" + fi + fi + continue +@@ -5538,7 +6415,7 @@ func_mode_link () + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; +- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi +@@ -5546,8 +6423,8 @@ func_mode_link () + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" +- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ test -n "$dlopen" && func_append dlfiles " $dlopen" ++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then +@@ -5558,20 +6435,20 @@ func_mode_link () + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. +- convenience="$convenience $ladir/$objdir/$old_library" +- old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ func_append convenience " $ladir/$objdir/$old_library" ++ func_append old_convenience " $ladir/$objdir/$old_library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done + continue + fi # $pass = conv +@@ -5579,9 +6456,15 @@ func_mode_link () + + # Get the name of the library we link against. + linklib= +- for l in $old_library $library_names; do +- linklib="$l" +- done ++ if test -n "$old_library" && ++ { test "$prefer_static_libs" = yes || ++ test "$prefer_static_libs,$installed" = "built,no"; }; then ++ linklib=$old_library ++ else ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi +@@ -5598,9 +6481,9 @@ func_mode_link () + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. +- dlprefiles="$dlprefiles $lib $dependency_libs" ++ func_append dlprefiles " $lib $dependency_libs" + else +- newdlfiles="$newdlfiles $lib" ++ func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen +@@ -5622,14 +6505,14 @@ func_mode_link () + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then +- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$libdir" +- absdir="$libdir" ++ dir="$lt_sysroot$libdir" ++ absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -5637,12 +6520,12 @@ func_mode_link () + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" +@@ -5653,20 +6536,46 @@ func_mode_link () + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi +- # Prefer using a static library (so that no silly _DYNAMIC symbols +- # are required to link). +- if test -n "$old_library"; then +- newdlprefiles="$newdlprefiles $dir/$old_library" +- # Keep a list of preopened convenience libraries to check +- # that they are being used correctly in the link pass. +- test -z "$libdir" && \ +- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" +- # Otherwise, use the dlname, so that lt_dlopen finds it. +- elif test -n "$dlname"; then +- newdlprefiles="$newdlprefiles $dir/$dlname" +- else +- newdlprefiles="$newdlprefiles $dir/$linklib" +- fi ++ case "$host" in ++ # special handling for platforms with PE-DLLs. ++ *cygwin* | *mingw* | *cegcc* ) ++ # Linker will automatically link against shared library if both ++ # static and shared are present. Therefore, ensure we extract ++ # symbols from the import library if a shared library is present ++ # (otherwise, the dlopen module name will be incorrect). We do ++ # this by putting the import library name into $newdlprefiles. ++ # We recover the dlopen module name by 'saving' the la file ++ # name in a special purpose variable, and (later) extracting the ++ # dlname from the la file. ++ if test -n "$dlname"; then ++ func_tr_sh "$dir/$linklib" ++ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" ++ func_append newdlprefiles " $dir/$linklib" ++ else ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ fi ++ ;; ++ * ) ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ func_append newdlprefiles " $dir/$dlname" ++ else ++ func_append newdlprefiles " $dir/$linklib" ++ fi ++ ;; ++ esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then +@@ -5684,7 +6593,7 @@ func_mode_link () + + + if test "$linkmode" = prog && test "$pass" != link; then +- newlib_search_path="$newlib_search_path $ladir" ++ func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no +@@ -5697,7 +6606,8 @@ func_mode_link () + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? +@@ -5708,12 +6618,12 @@ func_mode_link () + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... +@@ -5728,7 +6638,7 @@ func_mode_link () + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; +- *) temp_rpath="$temp_rpath$absdir:" ;; ++ *) func_append temp_rpath "$absdir:" ;; + esac + fi + +@@ -5740,7 +6650,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5749,7 +6659,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5774,12 +6684,12 @@ func_mode_link () + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; +@@ -5814,7 +6724,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5823,7 +6733,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5835,7 +6745,7 @@ func_mode_link () + shift + realname="$1" + shift +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" +@@ -5848,7 +6758,7 @@ func_mode_link () + versuffix="-$major" + ;; + esac +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -5877,7 +6787,7 @@ func_mode_link () + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + +- if test "$linkmode" = prog || test "$mode" != relink; then ++ if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= +@@ -5933,7 +6843,7 @@ func_mode_link () + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -5955,7 +6865,7 @@ func_mode_link () + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; +- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then +@@ -5969,13 +6879,13 @@ func_mode_link () + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + +- if test "$linkmode" = prog || test "$mode" = relink; then ++ if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= +@@ -5989,7 +6899,7 @@ func_mode_link () + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +@@ -6001,12 +6911,12 @@ func_mode_link () + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" ++ add_dir="-L$lt_sysroot$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -6083,27 +6993,33 @@ func_mode_link () + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; +- *) xrpath="$xrpath $temp_xrpath";; ++ *) func_append xrpath " $temp_xrpath";; + esac;; +- *) temp_deplibs="$temp_deplibs $libdir";; ++ *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + +- newlib_search_path="$newlib_search_path $absdir" ++ func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" +- if $opt_duplicate_deps ; then ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ func_resolve_sysroot "$func_stripname_result";; ++ *) func_resolve_sysroot "$deplib" ;; ++ esac ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $func_resolve_sysroot_result "*) ++ func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then +@@ -6113,8 +7029,10 @@ func_mode_link () + case $deplib in + -L*) path="$deplib" ;; + *.la) ++ func_resolve_sysroot "$deplib" ++ deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." +- dir="$func_dirname_result" ++ dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; +@@ -6130,7 +7048,7 @@ func_mode_link () + case $host in + *-*-darwin*) + depdepl= +- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp +@@ -6141,8 +7059,8 @@ func_mode_link () + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi +- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi +@@ -6152,7 +7070,7 @@ func_mode_link () + ;; + esac + else +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +@@ -6192,7 +7110,7 @@ func_mode_link () + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; +- *) lib_search_path="$lib_search_path $dir" ;; ++ *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= +@@ -6205,7 +7123,7 @@ func_mode_link () + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order +- eval tmp_libs=\$$var ++ eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so +@@ -6250,13 +7168,13 @@ func_mode_link () + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + done +- eval $var=\$tmp_libs ++ eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs +@@ -6269,7 +7187,7 @@ func_mode_link () + ;; + esac + if test -n "$i" ; then +- tmp_libs="$tmp_libs $i" ++ func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs +@@ -6310,7 +7228,7 @@ func_mode_link () + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" +- objs="$objs$old_deplibs" ++ func_append objs "$old_deplibs" + ;; + + lib) +@@ -6319,8 +7237,8 @@ func_mode_link () + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ +@@ -6330,8 +7248,8 @@ func_mode_link () + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result +@@ -6346,7 +7264,7 @@ func_mode_link () + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" +- libobjs="$libobjs $objs" ++ func_append libobjs " $objs" + fi + fi + +@@ -6544,7 +7462,7 @@ func_mode_link () + done + + # Make executables depend on our current version. +- verstring="$verstring:${current}.0" ++ func_append verstring ":${current}.0" + ;; + + qnx) +@@ -6612,10 +7530,10 @@ func_mode_link () + fi + + func_generate_dlsyms "$libname" "$libname" "yes" +- libobjs="$libobjs $symfileobj" ++ func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + +- if test "$mode" != relink; then ++ if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= +@@ -6631,7 +7549,7 @@ func_mode_link () + continue + fi + fi +- removelist="$removelist $p" ++ func_append removelist " $p" + ;; + *) ;; + esac +@@ -6642,7 +7560,7 @@ func_mode_link () + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then +- oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` +@@ -6659,10 +7577,11 @@ func_mode_link () + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do +- temp_xrpath="$temp_xrpath -R$libdir" ++ func_replace_sysroot "$libdir" ++ func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then +@@ -6676,7 +7595,7 @@ func_mode_link () + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; +- *) dlfiles="$dlfiles $lib" ;; ++ *) func_append dlfiles " $lib" ;; + esac + done + +@@ -6686,7 +7605,7 @@ func_mode_link () + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; +- *) dlprefiles="$dlprefiles $lib" ;; ++ *) func_append dlprefiles " $lib" ;; + esac + done + +@@ -6698,7 +7617,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. +@@ -6715,7 +7634,7 @@ func_mode_link () + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +- deplibs="$deplibs -lc" ++ func_append deplibs " -lc" + fi + ;; + esac +@@ -6764,18 +7683,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6789,7 +7708,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6807,18 +7726,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6840,7 +7759,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6857,15 +7776,27 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ if test -n "$file_magic_glob"; then ++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` ++ else ++ libnameglob=$libname ++ fi ++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ if test "$want_nocaseglob" = yes; then ++ shopt -s nocaseglob ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ $nocaseglob ++ else ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | +@@ -6885,10 +7816,10 @@ EOF + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done +- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6913,7 +7844,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -6929,20 +7860,20 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6967,7 +7898,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -7071,7 +8002,7 @@ EOF + *) + case " $deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7081,10 +8012,10 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" +@@ -7101,10 +8032,12 @@ EOF + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && rpath="$compile_rpath$rpath" ++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else +@@ -7113,18 +8046,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- dep_rpath="$dep_rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_apped perm_rpath " $libdir" ;; + esac + fi + done +@@ -7133,40 +8066,38 @@ EOF + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then +- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else +- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done +- eval $runpath_var=\$rpath\$$runpath_var +- export $runpath_var ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" +- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then +- eval $shlibpath_var=\$shlibpath\$$shlibpath_var +- export $shlibpath_var ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. +- eval "shared_ext=\"$shrext_cmds\"" +- eval "library_names=\"$library_names_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -7178,7 +8109,7 @@ EOF + linknames= + for link + do +- linknames="$linknames $link" ++ func_append linknames " $link" + done + + # Use standard objects if they are pic +@@ -7189,7 +8120,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" +- delfiles="$delfiles $export_symbols" ++ func_append delfiles " $export_symbols" + fi + + orig_export_symbols= +@@ -7220,13 +8151,45 @@ EOF + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do ++ for cmd1 in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" +- func_len " $cmd" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ # Take the normal branch if the nm_file_list_spec branch ++ # doesn't work or if tool conversion is not needed. ++ case $nm_file_list_spec~$to_tool_file_cmd in ++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) ++ try_normal_branch=yes ++ eval cmd=\"$cmd1\" ++ func_len " $cmd" ++ len=$func_len_result ++ ;; ++ *) ++ try_normal_branch=no ++ ;; ++ esac ++ if test "$try_normal_branch" = yes \ ++ && { test "$len" -lt "$max_cmd_len" \ ++ || test "$max_cmd_len" -le -1; } ++ then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ elif test -n "$nm_file_list_spec"; then ++ func_basename "$output" ++ output_la=$func_basename_result ++ save_libobjs=$libobjs ++ save_output=$output ++ output=${output_objdir}/${output_la}.nm ++ func_to_tool_file "$output" ++ libobjs=$nm_file_list_spec$func_to_tool_file_result ++ func_append delfiles " $output" ++ func_verbose "creating $NM input file list: $output" ++ for obj in $save_libobjs; do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > "$output" ++ eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' ++ output=$save_output ++ libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. +@@ -7248,7 +8211,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then +@@ -7260,7 +8223,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7270,7 +8233,7 @@ EOF + case " $convenience " in + *" $test_deplib "*) ;; + *) +- tmp_deplibs="$tmp_deplibs $test_deplib" ++ func_append tmp_deplibs " $test_deplib" + ;; + esac + done +@@ -7286,43 +8249,43 @@ EOF + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then +- eval "flag=\"$thread_safe_flag_spec\"" +- linker_flags="$linker_flags $flag" ++ eval flag=\"$thread_safe_flag_spec\" ++ func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval "test_cmds=\"$module_expsym_cmds\"" ++ eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else +- eval "test_cmds=\"$module_cmds\"" ++ eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval "test_cmds=\"$archive_expsym_cmds\"" ++ eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else +- eval "test_cmds=\"$archive_cmds\"" ++ eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi +@@ -7366,10 +8329,13 @@ EOF + echo 'INPUT (' > $output + for obj in $save_libobjs + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output +- delfiles="$delfiles $output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" +@@ -7383,15 +8349,17 @@ EOF + fi + for obj + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done +- delfiles="$delfiles $output" +- output=$firstobj\"$file_list_spec$output\" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext +- eval "test_cmds=\"$reload_cmds\"" ++ eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -7411,12 +8379,12 @@ EOF + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist +- eval "concat_cmds=\"$reload_cmds\"" ++ eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 +@@ -7433,11 +8401,11 @@ EOF + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi +- delfiles="$delfiles $output" ++ func_append delfiles " $output" + + else + output= +@@ -7450,9 +8418,9 @@ EOF + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + +@@ -7471,7 +8439,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7492,7 +8460,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then +@@ -7504,7 +8472,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7515,7 +8483,7 @@ EOF + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the +@@ -7539,23 +8507,23 @@ EOF + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. +- eval "cmds=\"\$cmds~\$RM $delfiles\"" ++ eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" +@@ -7564,7 +8532,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7576,8 +8544,8 @@ EOF + IFS="$save_ifs" + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then +@@ -7656,17 +8624,20 @@ EOF + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + ++ # If we're not building shared, we need to use non_pic_objs ++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++ + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + +@@ -7690,7 +8661,7 @@ EOF + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" +- # $opt_dry_run || echo timestamp > $libobj || exit $? ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + +@@ -7740,8 +8711,8 @@ EOF + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" ++ func_append compile_command " ${wl}-bind_at_load" ++ func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi +@@ -7761,7 +8732,7 @@ EOF + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7771,17 +8742,17 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + +- compile_command="$compile_command $compile_deplibs" +- finalize_command="$finalize_command $finalize_deplibs" ++ func_append compile_command " $compile_deplibs" ++ func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -7789,7 +8760,7 @@ EOF + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + fi +@@ -7808,18 +8779,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in +@@ -7828,12 +8799,12 @@ EOF + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; +- *) dllsearchpath="$dllsearchpath:$libdir";; ++ *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -7842,7 +8813,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + +@@ -7859,18 +8830,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; +- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done +@@ -7878,7 +8849,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + +@@ -7921,6 +8892,12 @@ EOF + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' +@@ -7943,7 +8920,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7951,7 +8928,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7966,6 +8943,13 @@ EOF + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' ++ ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + exit $EXIT_SUCCESS + fi + +@@ -7999,6 +8983,12 @@ EOF + + func_show_eval "$link_command" 'exit $?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output_objdir/$outputname" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Now create the wrapper script. + func_verbose "creating $output" + +@@ -8096,7 +9086,7 @@ EOF + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then +- oldobjs="$oldobjs $symfileobj" ++ func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" +@@ -8104,10 +9094,10 @@ EOF + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $addlibs +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. +@@ -8118,10 +9108,10 @@ EOF + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have +@@ -8139,7 +9129,7 @@ EOF + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= +@@ -8163,18 +9153,28 @@ EOF + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- oldobjs="$oldobjs $gentop/$newobj" ++ func_append oldobjs " $gentop/$newobj" + ;; +- *) oldobjs="$oldobjs $obj" ;; ++ *) func_append oldobjs " $obj" ;; + esac + done + fi +- eval "cmds=\"$old_archive_cmds\"" ++ eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds ++ elif test -n "$archiver_list_spec"; then ++ func_verbose "using command file archive linking..." ++ for obj in $oldobjs ++ do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > $output_objdir/$libname.libcmd ++ func_to_tool_file "$output_objdir/$libname.libcmd" ++ oldobjs=" $archiver_list_spec$func_to_tool_file_result" ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." +@@ -8189,7 +9189,7 @@ EOF + do + last_oldobj=$obj + done +- eval "test_cmds=\"$old_archive_cmds\"" ++ eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -8208,7 +9208,7 @@ EOF + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi +@@ -8216,9 +9216,9 @@ EOF + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then +- eval "cmds=\"\$concat_cmds\"" ++ eval cmds=\"\$concat_cmds\" + else +- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi +@@ -8268,12 +9268,23 @@ EOF + *.la) + func_basename "$deplib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ func_resolve_sysroot "$deplib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" +- newdependency_libs="$newdependency_libs $libdir/$name" ++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ++ ;; ++ -L*) ++ func_stripname -L '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; ++ -R*) ++ func_stripname -R '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -R$func_replace_sysroot_result" ++ ;; ++ *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" +@@ -8284,12 +9295,14 @@ EOF + *.la) + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` ++ + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlfiles="$newdlfiles $libdir/$name" ++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; +- *) newdlfiles="$newdlfiles $lib" ;; ++ *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" +@@ -8303,10 +9316,11 @@ EOF + # the library: + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlprefiles="$newdlprefiles $libdir/$name" ++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done +@@ -8318,7 +9332,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlfiles="$newdlfiles $abs" ++ func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= +@@ -8327,7 +9341,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlprefiles="$newdlprefiles $abs" ++ func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi +@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" + exit $EXIT_SUCCESS + } + +-{ test "$mode" = link || test "$mode" = relink; } && ++{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +@@ -8432,9 +9446,9 @@ func_mode_uninstall () + for arg + do + case $arg in +- -f) RM="$RM $arg"; rmforce=yes ;; +- -*) RM="$RM $arg" ;; +- *) files="$files $arg" ;; ++ -f) func_append RM " $arg"; rmforce=yes ;; ++ -*) func_append RM " $arg" ;; ++ *) func_append files " $arg" ;; + esac + done + +@@ -8443,24 +9457,23 @@ func_mode_uninstall () + + rmdirs= + +- origobjdir="$objdir" + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then +- objdir="$origobjdir" ++ odir="$objdir" + else +- objdir="$dir/$origobjdir" ++ odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" +- test "$mode" = uninstall && objdir="$dir" ++ test "$opt_mode" = uninstall && odir="$dir" + +- # Remember objdir for removal later, being careful to avoid duplicates +- if test "$mode" = clean; then ++ # Remember odir for removal later, being careful to avoid duplicates ++ if test "$opt_mode" = clean; then + case " $rmdirs " in +- *" $objdir "*) ;; +- *) rmdirs="$rmdirs $objdir" ;; ++ *" $odir "*) ;; ++ *) func_append rmdirs " $odir" ;; + esac + fi + +@@ -8486,18 +9499,17 @@ func_mode_uninstall () + + # Delete the libtool libraries and symlinks. + for n in $library_names; do +- rmfiles="$rmfiles $objdir/$n" ++ func_append rmfiles " $odir/$n" + done +- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ test -n "$old_library" && func_append rmfiles " $odir/$old_library" + +- case "$mode" in ++ case "$opt_mode" in + clean) +- case " $library_names " in +- # " " in the beginning catches empty $dlname ++ case " $library_names " in + *" $dlname "*) ;; +- *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac +- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then +@@ -8525,19 +9537,19 @@ func_mode_uninstall () + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then +- rmfiles="$rmfiles $dir/$pic_object" ++ func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then +- rmfiles="$rmfiles $dir/$non_pic_object" ++ func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) +- if test "$mode" = clean ; then ++ if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) +@@ -8547,7 +9559,7 @@ func_mode_uninstall () + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe +- rmfiles="$rmfiles $file" ++ func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. +@@ -8556,7 +9568,7 @@ func_mode_uninstall () + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result +- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename +@@ -8564,12 +9576,12 @@ func_mode_uninstall () + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then +- rmfiles="$rmfiles $objdir/lt-$name" ++ func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then +- rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi +@@ -8577,7 +9589,6 @@ func_mode_uninstall () + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done +- objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do +@@ -8589,16 +9600,16 @@ func_mode_uninstall () + exit $exit_status + } + +-{ test "$mode" = uninstall || test "$mode" = clean; } && ++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +-test -z "$mode" && { ++test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" + } + + test -z "$exec_cmd" && \ +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + + if test -n "$exec_cmd"; then + eval exec "$exec_cmd" +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 +@@ -8,7 +8,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 6 ltoptions.m4 ++# serial 7 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 +--- a/ltversion.m4 ++++ b/ltversion.m4 +@@ -7,17 +7,17 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# Generated from ltversion.in. ++# @configure_input@ + +-# serial 3134 ltversion.m4 ++# serial 3293 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) +-m4_define([LT_PACKAGE_REVISION], [1.3134]) ++m4_define([LT_PACKAGE_VERSION], [2.4]) ++m4_define([LT_PACKAGE_REVISION], [1.3293]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.7a' +-macro_revision='1.3134' ++[macro_version='2.4' ++macro_revision='1.3293' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 +--- a/lt~obsolete.m4 ++++ b/lt~obsolete.m4 +@@ -7,7 +7,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 4 lt~obsolete.m4 ++# serial 5 lt~obsolete.m4 + + # These exist entirely to fool aclocal when bootstrapping libtool. + # +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch similarity index 79% rename from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch rename to meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 5a195054f6..68fd4de24a 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,8 +1,8 @@ -From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 +From 641c5596e4050e1563b667776753d820306e46c4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 -Subject: [PATCH] don't let the distro compiler point to the wrong installation - location +Subject: [PATCH 08/15] don't let the distro compiler point to the wrong + installation location Thanks to RP for helping find the source code causing the issue. @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 0be45b4ae8..4817616bb2 100644 +index fe738d0db4..27d818f253 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -365,7 +365,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. @@ -30,3 +30,6 @@ index 0be45b4ae8..4817616bb2 100644 install_to_libdir: all if test -n "${target_header_dir}"; then \ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch similarity index 85% rename from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch rename to meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index 655cc375a9..2b4a76a339 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,7 +1,7 @@ -From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 +From e6d77e2221a8ac68e8bfd00faa25b0a1a08a6a09 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 -Subject: [PATCH] warn for uses of system directories when cross linking +Subject: [PATCH 09/15] warn for uses of system directories when cross linking 2008-07-02 Joseph Myers @@ -59,9 +59,11 @@ Signed-off-by: Khem Raj ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 86 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) +diff --git a/ld/config.in b/ld/config.in +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -74,9 +76,11 @@ Signed-off-by: Khem Raj /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION +diff --git a/ld/configure b/ld/configure +index 811134a503..f8c17c19ae 100755 --- a/ld/configure +++ b/ld/configure -@@ -827,6 +827,7 @@ with_lib_path +@@ -826,6 +826,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +97,7 @@ Signed-off-by: Khem Raj --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16619,6 +16622,19 @@ fi +@@ -15788,6 +15791,19 @@ fi @@ -113,6 +117,8 @@ Signed-off-by: Khem Raj # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in +diff --git a/ld/configure.ac b/ld/configure.ac +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -132,9 +138,11 @@ Signed-off-by: Khem Raj dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -149,9 +157,11 @@ Signed-off-by: Khem Raj /* Big or little endian as set on command line. */ enum endian_enum endian; +diff --git a/ld/ld.texi b/ld/ld.texi +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -170,9 +180,11 @@ Signed-off-by: Khem Raj @end table @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -196,6 +208,8 @@ Signed-off-by: Khem Raj } /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -150,6 +150,8 @@ enum option_values @@ -207,9 +221,11 @@ Signed-off-by: Khem Raj }; /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index da1ad17763..12d0b07d8a 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -274,6 +274,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -218,9 +234,11 @@ Signed-off-by: Khem Raj /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 3d15cc491d..0e8b4f2b7a 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -235,7 +253,7 @@ Signed-off-by: Khem Raj }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) +@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; @@ -249,3 +267,6 @@ Signed-off-by: Khem Raj break; } } +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch rename to meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index e63d278bcd..8629be42f5 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,7 +1,7 @@ -From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 +From cdc493f4b3a6cea022bde290623452b80beef8ab Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 -Subject: [PATCH] Fix rpath in libtool when sysroot is enabled +Subject: [PATCH 10/15] Fix rpath in libtool when sysroot is enabled Enabling sysroot support in libtool exposed a bug where the final library had an RPATH encoded into it which still pointed to the @@ -47,3 +47,6 @@ index 70e856e065..11ee684ccc 100644 if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch similarity index 77% rename from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch rename to meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index e6b50dbcde..3405bf5f36 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,7 +1,7 @@ -From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 +From 00865a6d1f81cd1b0a85462572b8a76ca0aa1673 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:44:14 +0000 -Subject: [PATCH] Change default emulation for mips64*-*-linux +Subject: [PATCH 11/15] Change default emulation for mips64*-*-linux we change the default emulations to be N64 instead of N32 @@ -13,9 +13,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index b96931f52e..847f9f0ba9 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -915,12 +915,12 @@ case "${targ}" in +@@ -911,12 +911,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -32,21 +34,27 @@ Signed-off-by: Khem Raj ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 23194e357f..f4f0eaf9b2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip - mips*-*-vxworks*) targ_emul=elf32ebmipvxworks - targ_extra_emuls="elf32elmipvxworks" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; +@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" +mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" +mips64*-*-linux-*) targ_emul=elf64btsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; mips*el-*-linux-*) targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch similarity index 81% rename from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch rename to meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index b710752245..29ec1fee8a 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,7 +1,7 @@ -From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 +From cf8662ab2b10440ea1ed2b15bdd10bbbbb0b8f6d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:06:19 +0000 -Subject: [PATCH] Add support for Netlogic XLP +Subject: [PATCH 12/15] Add support for Netlogic XLP Patch From: Nebu Philips @@ -26,16 +26,19 @@ Signed-off-by: Mark Hatle binutils/readelf.c | 1 + gas/config/tc-mips.c | 4 +++- gas/configure | 3 +++ + gas/configure.ac | 3 +++ include/elf/mips.h | 1 + include/opcode/mips.h | 6 ++++++ ld/configure.tgt | 3 +++ opcodes/mips-dis.c | 12 +++++------- opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- - 14 files changed, 62 insertions(+), 21 deletions(-) + 15 files changed, 65 insertions(+), 21 deletions(-) +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index fa3a9746b6..5078024fd5 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch +@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -43,6 +46,8 @@ Signed-off-by: Mark Hatle /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; +diff --git a/bfd/archures.c b/bfd/archures.c +index 232103817c..b2b3b8c124 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -53,9 +58,11 @@ Signed-off-by: Mark Hatle .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 7c13bc8c91..2e453c50c1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2125,6 +2125,7 @@ enum bfd_architecture +@@ -1568,6 +1568,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -63,9 +70,11 @@ Signed-off-by: Mark Hatle #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 847f9f0ba9..a12707f827 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -898,6 +898,11 @@ case "${targ}" in +@@ -894,6 +894,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -77,9 +86,11 @@ Signed-off-by: Mark Hatle mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index 802acb45f1..fd9ec4c0ad 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c -@@ -107,7 +107,8 @@ enum +@@ -108,7 +108,8 @@ enum I_mipsocteon3, I_xlr, I_interaptiv_mr2, @@ -89,16 +100,18 @@ Signed-off-by: Mark Hatle }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), +@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) }; /* The default architecture is mips:3000, but with a machine number of +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index d7e3aed3b6..7baeee9ee3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -111,7 +124,7 @@ Signed-off-by: Mark Hatle default: switch (flags & EF_MIPS_ARCH) { -@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -122,7 +135,7 @@ Signed-off-by: Mark Hatle case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension +@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -130,9 +143,11 @@ Signed-off-by: Mark Hatle /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6b5bebe743..d15a7828db 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, +@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -140,6 +155,8 @@ Signed-off-by: Mark Hatle case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index fc6898834e..2c7151ccdb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -158,7 +175,7 @@ Signed-off-by: Mark Hatle ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c +@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -167,18 +184,36 @@ Signed-off-by: Mark Hatle /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, +diff --git a/gas/configure b/gas/configure +index 60c1a055ae..59d6d11215 100755 --- a/gas/configure +++ b/gas/configure -@@ -13377,6 +13377,9 @@ _ACEOF +@@ -12722,6 +12722,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; + mipsisa64r2nlm | mipsisa64r2nlmel) -+ mips_cpu=xlp -+ ;; ++ mips_cpu=xlp ++ ;; mipstx39 | mipstx39el) mips_cpu=r3900 ;; +diff --git a/gas/configure.ac b/gas/configure.ac +index 6f32e55a1a..11c2e0d273 100644 +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -325,6 +325,9 @@ changequote([,])dnl + mipsisa64r6 | mipsisa64r6el) + mips_cpu=mips64r6 + ;; ++ mipsisa64r2nlm | mipsisa64r2nlmel) ++ mips_cpu=xlp ++ ;; + mipstx39 | mipstx39el) + mips_cpu=r3900 + ;; +diff --git a/include/elf/mips.h b/include/elf/mips.h +index d116b036b6..dceeb3f156 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -189,9 +224,11 @@ Signed-off-by: Mark Hatle #define E_MIPS_MACH_OCTEON2 0x008d0000 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index fd031f3758..a96a44df84 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table +@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -200,7 +237,7 @@ Signed-off-by: Mark Hatle /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table +@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -208,7 +245,7 @@ Signed-off-by: Mark Hatle /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas +@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -218,20 +255,25 @@ Signed-off-by: Mark Hatle default: return FALSE; } +diff --git a/ld/configure.tgt b/ld/configure.tgt +index f4f0eaf9b2..0da3eca19c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; + targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" + ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip -+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ++ ;; mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 755bbe294b..ce22ef683a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ +@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -250,6 +292,8 @@ Signed-off-by: Mark Hatle /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 5270aeefa8..d17dc78cd7 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -260,7 +304,7 @@ Signed-off-by: Mark Hatle #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op +@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -268,7 +312,7 @@ Signed-off-by: Mark Hatle /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op +@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -283,7 +327,7 @@ Signed-off-by: Mark Hatle /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op +@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -291,7 +335,7 @@ Signed-off-by: Mark Hatle {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op +@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, @@ -300,7 +344,7 @@ Signed-off-by: Mark Hatle {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op +@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -313,7 +357,7 @@ Signed-off-by: Mark Hatle {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op +@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -322,7 +366,7 @@ Signed-off-by: Mark Hatle {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op +@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -338,7 +382,7 @@ Signed-off-by: Mark Hatle {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op +@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -347,7 +391,7 @@ Signed-off-by: Mark Hatle {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op +@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, @@ -360,3 +404,6 @@ Signed-off-by: Mark Hatle {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch similarity index 85% rename from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch rename to meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index f686763594..34a4a3501e 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,7 +1,7 @@ -From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 +From b725402a441fced8a7312327a9ad4b0b2b880b3b Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 -Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic +Subject: [PATCH 13/15] fix the incorrect assembling for ppc wait mnemonic Signed-off-by: Zhenhua Luo @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index b56fe3e21a..696fe83a7b 100644 +index 7ef91d819b..145953d3c4 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { @@ -31,3 +31,6 @@ index b56fe3e21a..696fe83a7b 100644 {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch rename to meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index 493b05026d..692954596f 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,7 +1,7 @@ -From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 +From 0797e96beb297845934719b7b04b1d594b9b0adc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 11:42:03 -0700 -Subject: [PATCH] Detect 64-bit MIPS targets +Subject: [PATCH 14/15] Detect 64-bit MIPS targets Add mips64 target triplets and default to N64 @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index 3e066edaa8..caf130ceda 100644 +index aa7ec552ae..470515062e 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) @@ -45,3 +45,6 @@ index 3e066edaa8..caf130ceda 100644 mips*-*-*) targ_obj=mips targ_machine=EM_MIPS +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch deleted file mode 100644 index d25ce61626..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Nov 2018 17:46:40 -0800 -Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on - x86-64 - -Add x86_64-pep emulation support to the set enabled for x86_64 targets -to enable the linker to produce Portable Executables for EFI binaries. - -Enables building the x86-64 EFI variant of the Xen hypervisor for -the OpenXT Project. - -Upstream-Status: Inappropriate [OE configuration specific] - -Signed-off-by: Christopher Clark -Signed-off-by: Khem Raj ---- - bfd/config.bfd | 2 +- - ld/configure.tgt | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -694,7 +694,7 @@ case "${targ}" in - ;; - x86_64-*-linux-*) - targ_defvec=x86_64_elf64_vec -- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" -+ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec" - want64=true - ;; - x86_64-*-nacl*) ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x - tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; - x86_64-*-linux-*) targ_emul=elf_x86_64 -- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" -- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" -+ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" -+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" -+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; - i[3-7]86-*-redox*) targ_emul=elf_i386 - targ_extra_emuls=elf_x86_64 ;; diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch similarity index 95% rename from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch rename to meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index ae5915d39b..e637d2a128 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,7 +1,7 @@ -From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 +From 50209f5240ea8728203a00a13e5af6dcf614328e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 -Subject: [PATCH] sync with OE libtool changes +Subject: [PATCH 15/15] sync with OE libtool changes Apply these patches from our libtool patches as not only are redundant RPATHs a waste of space but they can cause incorrect linking when native packages are @@ -84,3 +84,6 @@ index 11ee684ccc..3b19ac1532 100644 fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in +-- +2.25.1 + diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch deleted file mode 100644 index ce5b9f392d..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 00:07:29 +1030 -Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17450, so backport it to master and zeus. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79] -CVE: CVE-2019-17450 -Signed-off-by: Trevor Gamblin - - PR 25078 - * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add - recur_count. Error on recur_count reaching 100 rather than - info_ptr matching orig_info_ptr. Adjust calls. - ---- - bfd/dwarf2.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod - struct dwarf2_debug *); - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1fe05d310e..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 10:47:13 +1030 -Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17451, so backport it to master and zeus. - -Upstream-Status: Backport -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848] -CVE: CVE-2019-17451 -Signed-off-by: Trevor Gamblin - - -Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 -and ffffd5555453b140 result in a total size of 1. Reading the first -section of course overflows the buffer and tramples on other memory. - - PR 25070 - * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of - total_size calculation. ---- - bfd/dwarf2.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb similarity index 91% rename from meta/recipes-devtools/binutils/binutils_2.33.bb rename to meta/recipes-devtools/binutils/binutils_2.34.bb index 8bd2bf778c..bfc9346822 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.34.bb @@ -49,9 +49,9 @@ do_install_class-native () { # Split out libbfd-*.so so including perf doesn't include extra stuff PACKAGE_BEFORE_PN += "libbfd" -FILES_libbfd = "${libdir}/libbfd-*.so" +FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " +SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- 2.25.1 From richard.purdie at linuxfoundation.org Wed Feb 19 22:53:29 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 22:53:29 +0000 Subject: [OE-core] [PATCH] scripts/combo-layer: Fix deprecation warning Message-ID: <20200219225329.145039-1-richard.purdie@linuxfoundation.org> Resolve: combo-layer:83: DeprecationWarning: This method will be removed in future versions. Use 'parser.read_file()' instead. Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 9b50e9873da..a634dd69d2a 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -80,7 +80,7 @@ class Configuration(object): logger.debug("Loading config file %s" % self.conffile) self.parser = configparser.ConfigParser() with open(self.conffile) as f: - self.parser.readfp(f) + self.parser.read_file(f) # initialize default values self.commit_msg_template = "Automatic commit to update last_revision" -- 2.25.0 From richard.purdie at linuxfoundation.org Wed Feb 19 23:16:40 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 23:16:40 +0000 Subject: [OE-core] [PATCH] local.conf.sample.extended: Document how to limit parallel fetch tasks In-Reply-To: References: <20200219214303.138067-1-richard.purdie@linuxfoundation.org> Message-ID: <9ef969cbe41ad90330b52b045eecaf8688fa18e4.camel@linuxfoundation.org> On Wed, 2020-02-19 at 14:05 -0800, Andre McCurdy wrote: > On Wed, Feb 19, 2020 at 1:43 PM Richard Purdie > wrote: > > [YOCTO #13235] > > > > Signed-off-by: Richard Purdie > > --- > > meta/conf/local.conf.sample.extended | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/meta/conf/local.conf.sample.extended > > b/meta/conf/local.conf.sample.extended > > index fcf4a9b7c1a..443b4e83f9a 100644 > > --- a/meta/conf/local.conf.sample.extended > > +++ b/meta/conf/local.conf.sample.extended > > @@ -23,6 +23,14 @@ > > # > > # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE > > = "-j 4" would > > # be appropriate for example. > > +# > > +# Some users are behind firewalls or use servers where the number > > of parallel connections > > +# is limited. In such cases you can limit the number of fetch > > tasks which run in parallel by > > +# setting the option below, in this case limiting to a maximum of > > 4 fetch tasks in parallel: > > +# > > +#do_fetch[number_threads] = "4" > > How does this interact with BB_NUMBER_THREADS? If, for example, both > are set to 4 does it mean there could be 4 fetch threads and 4 > compile threads running in parallel? BB_NUMBER_THREADS is an upper limit which includes fetch tasks. > A related issue when the number of parallel connections is limited is > parsing a large number of AUTOREV recipes. From what I remember the > workaround for that was to set BB_NUMBER_PARSE_THREADS. Maybe that > should be documented in local.conf.sample.extended too? Perhaps even > better would be to define a single new variable which limits the > number of parallel connections in both cases? I don't know how you'd implement a total number of connections limit from a code perspective :/. You'd probably need something like a make job server where you obtained tokens before making connections and I can see this becoming "fun" since you'd have to markup every code section where a network connection was made. We have a conflict between code complexity, maintainability, performance and functionality and I'm not sure the use case here warrants the complexity... Cheers, Richard From richard.purdie at linuxfoundation.org Wed Feb 19 23:52:17 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 19 Feb 2020 23:52:17 +0000 Subject: [OE-core] [PATCH 03/13] webkitgtk: unbreak wayland build In-Reply-To: <20200219194752.7967-3-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> <20200219194752.7967-3-alex.kanavin@gmail.com> Message-ID: <89165b4cb39fa5f4619079145b85f04a15920641.camel@linuxfoundation.org> On Wed, 2020-02-19 at 20:47 +0100, Alexander Kanavin wrote: > webkit nowadays requires a couple of supplementary libraries for > this, > so bring them in (courtesy of meta-webkit[1], which will hopefully > adjust without a lot of trouble). > > [1] https://github.com/Igalia/meta-webkit/ > > Signed-off-by: Alexander Kanavin https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/705 (missing MAINTAINERs) Cheers, Richard From armccurdy at gmail.com Thu Feb 20 00:10:08 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Wed, 19 Feb 2020 16:10:08 -0800 Subject: [OE-core] [PATCH] local.conf.sample.extended: Document how to limit parallel fetch tasks In-Reply-To: <9ef969cbe41ad90330b52b045eecaf8688fa18e4.camel@linuxfoundation.org> References: <20200219214303.138067-1-richard.purdie@linuxfoundation.org> <9ef969cbe41ad90330b52b045eecaf8688fa18e4.camel@linuxfoundation.org> Message-ID: On Wed, Feb 19, 2020 at 3:16 PM Richard Purdie wrote: > > On Wed, 2020-02-19 at 14:05 -0800, Andre McCurdy wrote: > > On Wed, Feb 19, 2020 at 1:43 PM Richard Purdie > > wrote: > > > [YOCTO #13235] > > > > > > Signed-off-by: Richard Purdie > > > --- > > > meta/conf/local.conf.sample.extended | 8 ++++++++ > > > 1 file changed, 8 insertions(+) > > > > > > diff --git a/meta/conf/local.conf.sample.extended > > > b/meta/conf/local.conf.sample.extended > > > index fcf4a9b7c1a..443b4e83f9a 100644 > > > --- a/meta/conf/local.conf.sample.extended > > > +++ b/meta/conf/local.conf.sample.extended > > > @@ -23,6 +23,14 @@ > > > # > > > # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE > > > = "-j 4" would > > > # be appropriate for example. > > > +# > > > +# Some users are behind firewalls or use servers where the number > > > of parallel connections > > > +# is limited. In such cases you can limit the number of fetch > > > tasks which run in parallel by > > > +# setting the option below, in this case limiting to a maximum of > > > 4 fetch tasks in parallel: > > > +# > > > +#do_fetch[number_threads] = "4" > > > > How does this interact with BB_NUMBER_THREADS? If, for example, both > > are set to 4 does it mean there could be 4 fetch threads and 4 > > compile threads running in parallel? > > BB_NUMBER_THREADS is an upper limit which includes fetch tasks. > > > A related issue when the number of parallel connections is limited is > > parsing a large number of AUTOREV recipes. From what I remember the > > workaround for that was to set BB_NUMBER_PARSE_THREADS. Maybe that > > should be documented in local.conf.sample.extended too? Perhaps even > > better would be to define a single new variable which limits the > > number of parallel connections in both cases? > > I don't know how you'd implement a total number of connections limit > from a code perspective :/. A single variable such as BB_MAX_CONNECTION_THREADS which, if defined, would set the limit for both do_fetch[number_threads] and BB_NUMBER_PARSE_THREADS ? > You'd probably need something like a make job server where you obtained > tokens before making connections and I can see this becoming "fun" > since you'd have to markup every code section where a network > connection was made. > > We have a conflict between code complexity, maintainability, > performance and functionality and I'm not sure the use case here > warrants the complexity... Of course. I just wanted to share it since it is a real world problem (I've seen a development team stumped for a few days before finding BB_NUMBER_PARSE_THREADS, which isn't nearly as well documented as BB_NUMBER_THREADS and PARALLEL_MAKE). A comment for BB_NUMBER_PARSE_THREADS in local.conf.sample.extended might have sped up that debugging process. From schnitzeltony at gmail.com Thu Feb 20 00:28:49 2020 From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=) Date: Thu, 20 Feb 2020 01:28:49 +0100 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection Message-ID: <20200220002849.9126-1-schnitzeltony@gmail.com> Enable if 'gobject-introspection-data' is in DISTRO_FEATURES. This is what gobject-introspection.bbclass does automatically for projects build with autotools and meson. It was checked: there are webkitgtk and libdnf inheriting gobject-introspection and cmake. Since libdnf cannot configure gir, webkitgtk seems the only project requiring gir-auto-enabling. So handle at recipe / no common magic at gobject-introspection.bbclass required. Signed-off-by: Andreas M?ller --- This patch applies on top of master-next/Alex's patches sent meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 585723772e..d5085620d2 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -39,6 +39,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'gobject-introspection', '' ,d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ libsecret \ @@ -46,6 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[gobject-introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" -- 2.21.0 From jupiter.hce at gmail.com Thu Feb 20 00:38:37 2020 From: jupiter.hce at gmail.com (JH) Date: Thu, 20 Feb 2020 11:38:37 +1100 Subject: [OE-core] You advice to append environment set up to local root shell profile Message-ID: Hi, I want to setup export LD_LIBRARY_PATH and export PATH to the /home/root shell profile, the oe-core base-files has a profile file, is it a right way to copy that file to my application layer, to extend it and to add new path to export LD_LIBRARY_PATH and export PATH? I'll handle it by a base-files_%.bbappend in my application layer. Thank you. Kind regards, - jh From jupiter.hce at gmail.com Thu Feb 20 01:16:30 2020 From: jupiter.hce at gmail.com (JH) Date: Thu, 20 Feb 2020 12:16:30 +1100 Subject: [OE-core] You advice to append environment set up to local root shell profile In-Reply-To: References: Message-ID: May be I should append to shells script. On 2/20/20, JH wrote: > Hi, > > I want to setup export LD_LIBRARY_PATH and export PATH to the > /home/root shell profile, the oe-core base-files has a profile file, > is it a right way to copy that file to my application layer, to extend > it and to add new path to export LD_LIBRARY_PATH and export PATH? I'll > handle it by a base-files_%.bbappend in my application layer. > > Thank you. > > Kind regards, > > - jh > From li.zhou at windriver.com Thu Feb 20 02:26:24 2020 From: li.zhou at windriver.com (Li Zhou) Date: Thu, 20 Feb 2020 10:26:24 +0800 Subject: [OE-core] [PATCH] lttng-modules: Check the pid_ns before using it because it may be NULL Message-ID: <1582165584-187223-1-git-send-email-li.zhou@windriver.com> Check the pid_ns before using it because it may be NULL to fix below issue: <1>[ 22.637196] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000080 <1>[ 22.645982] Mem abort info: <1>[ 22.648769] ESR = 0x96000007 <1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits <1>[ 22.657730] SET = 0, FnV = 0 <1>[ 22.660777] EA = 0, S1PTW = 0 <1>[ 22.663910] Data abort info: <1>[ 22.666784] ISV = 0, ISS = 0x00000007 <1>[ 22.670611] CM = 0, WnR = 0 <1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = 0000000012378f78 <1>[ 22.680180] [0000000000000080] pgd=000000007f023003, pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 <0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP <4>[ 22.690797] Modules linked in: adkNetD ncp lttng_ring_buffer_client_overwrite(C) lttng_ring_buffer_metadata_client(C) lttng_ring_buffer_client_discard(C) lttng_ring_buffer_client_mmap_overwrite(C) lttng_ring_buffer_client_mmap_discard(C) lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) lttng_clock(C) <0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = 0x000000005d27910f) <4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C 4.18.37-rt820-custom #1 <4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) <4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) <4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] <4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] <4>[ 22.690851] sp : ffffffc07fe57ad0 <4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 <4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 <4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 <4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 <4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 <4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe <4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 <4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f <4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 <4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f <4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 <4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 <4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 <4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 <4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 <4>[ 22.690896] Call trace: <4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] <4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] <4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] <4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] <4>[ 22.691026] compat_sys_ioctl+0x110/0x778 Signed-off-by: Li Zhou --- ...es-Check-the-pid_ns-before-using-it-becau.patch | 86 ++++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb | 2 + 2 files changed, 88 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch new file mode 100644 index 0000000..5306c79 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch @@ -0,0 +1,86 @@ +From 0c0072e005ce9d591518d1819a39264859132561 Mon Sep 17 00:00:00 2001 +From: Li Zhou +Date: Wed, 19 Feb 2020 11:14:38 +0800 +Subject: [PATCH] lttng-modules: Check the pid_ns before using it because it + may be NULL + +<1>[ 22.637196] Unable to handle kernel NULL pointer dereference at +virtual address 0000000000000080 +<1>[ 22.645982] Mem abort info: +<1>[ 22.648769] ESR = 0x96000007 +<1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits +<1>[ 22.657730] SET = 0, FnV = 0 +<1>[ 22.660777] EA = 0, S1PTW = 0 +<1>[ 22.663910] Data abort info: +<1>[ 22.666784] ISV = 0, ISS = 0x00000007 +<1>[ 22.670611] CM = 0, WnR = 0 +<1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = +0000000012378f78 +<1>[ 22.680180] [0000000000000080] pgd=000000007f023003, +pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 +<0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP +<4>[ 22.690797] Modules linked in: adkNetD ncp +lttng_ring_buffer_client_overwrite(C) +lttng_ring_buffer_metadata_client(C) lttng_ring_buffer_client_discard(C) +lttng_ring_buffer_client_mmap_overwrite(C) +lttng_ring_buffer_client_mmap_discard(C) +lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) +lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) +lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) +lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) lttng_clock(C) +<0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = +0x000000005d27910f) +<4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C +4.18.37-rt820-custom #1 +<4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) +<4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) +<4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] +<4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] +<4>[ 22.690851] sp : ffffffc07fe57ad0 +<4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 +<4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 +<4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 +<4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 +<4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 +<4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe +<4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 +<4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f +<4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 +<4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f +<4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 +<4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 +<4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 +<4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 +<4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 +<4>[ 22.690896] Call trace: +<4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] +<4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] +<4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] +<4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] +<4>[ 22.691026] compat_sys_ioctl+0x110/0x778 + +Signed-off-by: Liguang Li + +Upstream-Status: Pending + +Signed-off-by: Li Zhou +--- + lttng-statedump-impl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c +index 1c09e51..fb609e3 100644 +--- a/lttng-statedump-impl.c ++++ b/lttng-statedump-impl.c +@@ -397,7 +397,7 @@ void lttng_statedump_process_ns(struct lttng_session *session, + do { + trace_lttng_statedump_process_state(session, + p, type, mode, submode, status, pid_ns); +- pid_ns = pid_ns->parent; ++ pid_ns = pid_ns ? pid_ns->parent : NULL; + } while (pid_ns); + } + +-- +1.9.1 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb index c833ff7..cbd43e3 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb @@ -11,6 +11,7 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ + file://0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch \ " SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" @@ -36,6 +37,7 @@ DEFAULT_PREFERENCE_class-devupstream = "-1" SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ + file://0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch \ " SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" PV_class-devupstream = "2.11.1+git${SRCPV}" -- 1.9.1 From wangmy at cn.fujitsu.com Thu Feb 20 09:40:59 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 20 Feb 2020 01:40:59 -0800 Subject: [OE-core] [PATCH] libsolv: upgrade 0.7.10 -> 0.7.11 Message-ID: <1582191660-130760-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} (93%) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.11.bb similarity index 93% rename from meta/recipes-extended/libsolv/libsolv_0.7.10.bb rename to meta/recipes-extended/libsolv/libsolv_0.7.11.bb index 502f4e0e85..84349606f1 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.11.bb @@ -10,7 +10,7 @@ DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ " -SRCREV = "605dd2645ef899e2b7c95709476fb51e28d7e378" +SRCREV = "102ac552669181d3e43731aa275bdbbc7ddcb94c" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" -- 2.17.1 From wangmy at cn.fujitsu.com Thu Feb 20 09:41:00 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 20 Feb 2020 01:41:00 -0800 Subject: [OE-core] [PATCH] libxkbcommon: upgrade 0.9.1 -> 0.10.0 In-Reply-To: <1582191660-130760-1-git-send-email-wangmy@cn.fujitsu.com> References: <1582191660-130760-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1582191660-130760-2-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../{libxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.9.1.bb => libxkbcommon_0.10.0.bb} (88%) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb similarity index 88% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb index c147428a14..16d9c36eae 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb @@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "4662756fd73ab0ac9e32efdad8f807f6" -SRC_URI[sha256sum] = "d4c6aabf0a5c1fc616f8a6a65c8a818c03773b9a87da9fbc434da5acd1199be0" +SRC_URI[md5sum] = "2d9ad3a46b317138b5e72a91cf105451" +SRC_URI[sha256sum] = "57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" -- 2.17.1 From wangmy at cn.fujitsu.com Thu Feb 20 09:41:16 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 20 Feb 2020 01:41:16 -0800 Subject: [OE-core] [PATCH] man-pages: upgrade 5.04 -> 5.05 Message-ID: <1582191676-130817-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../man-pages/{man-pages_5.04.bb => man-pages_5.05.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/man-pages/{man-pages_5.04.bb => man-pages_5.05.bb} (87%) diff --git a/meta/recipes-extended/man-pages/man-pages_5.04.bb b/meta/recipes-extended/man-pages/man-pages_5.05.bb similarity index 87% rename from meta/recipes-extended/man-pages/man-pages_5.04.bb rename to meta/recipes-extended/man-pages/man-pages_5.05.bb index be456759fc..b95872eb4d 100644 --- a/meta/recipes-extended/man-pages/man-pages_5.04.bb +++ b/meta/recipes-extended/man-pages/man-pages_5.05.bb @@ -7,8 +7,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "14d33d3fe02577a33aab26eb75df39cb" -SRC_URI[sha256sum] = "8c6ab56b654a6dd00e3759279954a25fc68b258b8f493a75af55ea7b6401fdb2" +SRC_URI[md5sum] = "cdad5deb15117e60a6d9e3a6bdc035b5" +SRC_URI[sha256sum] = "43c33d2eea9ba989c18eef90298cf6d5521ff038deb51cda0ecd0fdc3cec2b7d" inherit manpages -- 2.17.1 From wangmy at cn.fujitsu.com Thu Feb 20 09:41:25 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 20 Feb 2020 01:41:25 -0800 Subject: [OE-core] [PATCH] mesa: upgrade 19.3.3 -> 19.3.4 Message-ID: <1582191685-130859-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- .../mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} | 0 meta/recipes-graphics/mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/mesa/{mesa-gl_19.3.3.bb => mesa-gl_19.3.4.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_19.3.3.bb => mesa_19.3.4.bb} (88%) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb diff --git a/meta/recipes-graphics/mesa/mesa_19.3.3.bb b/meta/recipes-graphics/mesa/mesa_19.3.4.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.3.bb rename to meta/recipes-graphics/mesa/mesa_19.3.4.bb index 7e0c5d6500..5f456c2429 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.3.bb +++ b/meta/recipes-graphics/mesa/mesa_19.3.4.bb @@ -9,8 +9,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "00010e0bb8f6641276ff6cb3e9386114" -SRC_URI[sha256sum] = "81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09" +SRC_URI[md5sum] = "09e7700d9af511384d131fb77b5802cb" +SRC_URI[sha256sum] = "1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- 2.17.1 From wangmy at cn.fujitsu.com Thu Feb 20 09:41:34 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 20 Feb 2020 01:41:34 -0800 Subject: [OE-core] [PATCH] nfs-utils: upgrade 2.4.2 -> 2.4.3 Message-ID: <1582191694-130901-1-git-send-email-wangmy@cn.fujitsu.com> 0001-Don-t-build-tools-with-CC_FOR_BUILD.patch Removed since it is included in 2.4.3. refresh the following patch: 0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch Signed-off-by: Wang Mingyu --- ...-Don-t-build-tools-with-CC_FOR_BUILD.patch | 40 ------------------- ...-fix-undefined-function-for-libnsm.a.patch | 12 ++++-- ...{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} | 5 +-- 3 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.4.2.bb => nfs-utils_2.4.3.bb} (96%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch deleted file mode 100644 index 23bc3eaf72..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 79019d976584c598f8d0a9d8de43c989946f974b Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Wed, 13 Feb 2019 09:28:07 +0100 -Subject: [PATCH] Don't build tools with CC_FOR_BUILD - -The tools are intended for the target not for the host. - -Upstream-Status: Pending - -Signed-off-by: Pascal Bach ---- - tools/locktest/Makefile.am | 1 - - tools/rpcgen/Makefile.am | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am -index 3156815..87d0bac 100644 ---- a/tools/locktest/Makefile.am -+++ b/tools/locktest/Makefile.am -@@ -1,6 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --CC=$(CC_FOR_BUILD) - LIBTOOL = @LIBTOOL@ --tag=CC - - noinst_PROGRAMS = testlk -diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am -index 8a9ec89..3e092c9 100644 ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -1,6 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --CC=$(CC_FOR_BUILD) - LIBTOOL = @LIBTOOL@ --tag=CC - - noinst_PROGRAMS = rpcgen --- -2.11.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch index fcb0e99b33..bd350144e3 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch @@ -28,10 +28,10 @@ Rebase it. Signed-off-by: Robert Yang --- support/misc/Makefile.am | 2 +- - support/misc/file.c | 111 --------------------------------------------------------------------------------------------------------------- + support/misc/file.c | 115 --------------------------------------------------------------------------------------------------------------- support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ support/nsm/Makefile.am | 2 +- - 4 files changed, 113 insertions(+), 113 deletions(-) + 4 files changed, 113 insertions(+), 117 deletions(-) diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am index f9993e3..8b0e9db 100644 @@ -48,10 +48,10 @@ index f9993e3..8b0e9db 100644 MAINTAINERCLEANFILES = Makefile.in diff --git a/support/misc/file.c b/support/misc/file.c deleted file mode 100644 -index e7c3819..0000000 +index 06f6bb2..0000000 --- a/support/misc/file.c +++ /dev/null -@@ -1,111 +0,0 @@ +@@ -1,115 +0,0 @@ -/* - * Copyright 2009 Oracle. All rights reserved. - * Copyright 2017 Red Hat, Inc. All rights reserved. @@ -72,6 +72,10 @@ index e7c3819..0000000 - * along with nfs-utils. If not, see . - */ - +-#ifdef HAVE_CONFIG_H +-#include +-#endif +- -#include - -#include diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb similarity index 96% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb index 6647d3428b..42a4ba3dbd 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb @@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://bugfix-adjust-statd-service-name.patch \ file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ - file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ file://clang-warnings.patch \ " -SRC_URI[md5sum] = "d427c6b3014e9a04e8498f0598b1c1b9" -SRC_URI[sha256sum] = "4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038" +SRC_URI[md5sum] = "06020c76f531ed97f3145514901e0e7c" +SRC_URI[sha256sum] = "af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. -- 2.17.1 From liwei.song at windriver.com Thu Feb 20 03:50:45 2020 From: liwei.song at windriver.com (Liwei Song) Date: Thu, 20 Feb 2020 11:50:45 +0800 Subject: [OE-core] [PATCH 1/1] util-linux: fix hwclock settimeofday error Message-ID: <20200220035045.5027-1-liwei.song@windriver.com> The change of settimeofday() systemcall since Glibc 2.31 will cause "hwclock -s" doesn't work with error: "hwclock: settimeofday() failed: Invalid argument" Backport a upstream patch to fix this issue. Signed-off-by: Liwei Song --- ...lock-fix-for-glibc-2.31-settimeofday.patch | 112 ++++++++++++++++++ .../util-linux/util-linux_2.34.bb | 1 + 2 files changed, 113 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch diff --git a/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch new file mode 100644 index 000000000000..0672c3546ae6 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch @@ -0,0 +1,112 @@ +From ee85d3967ea09b215fcea5efdd90bbbf5e74a681 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 19 Feb 2020 15:50:47 +0100 +Subject: [PATCH] hwclock: fix for glibc 2.31 settimeofday() + +glibc announce: + ... settimeofday can no longer be used to set the time and the offset + simultaneously. If both of its two arguments are non-null, the call + will fail (setting errno to EINVAL). + +It means we need to call settimeofday(NULL, tz) and settimeofday(tv, NULL). + +Unfortunately, settimeofday(NULL, tz) has very special warp-clock +semantic if used as the very first settimeofday() call. It means we +have to be sure that we do not touch warp-clock if we need only need +to modify system TZ. So, let's always call settimeofday(NULL, 0) +before settimeofday(NULL, tz) for UTC rtc mode when modify system TZ. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/ee85d3967ea09b215fcea5efdd90bbbf5e74a681] + +CC: J William Piggott +Signed-off-by: Karel Zak +Addresses: https://github.com/karelzak/util-linux/issues/957 +Signed-off-by: Liwei Song +--- + sys-utils/hwclock.c | 49 ++++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index e736da7179f8..16576bc186ff 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -658,6 +658,9 @@ display_time(struct timeval hwctime) + * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale. + * firsttime: locks the warp_clock function (initialized to 1 at boot). + * ++ * Note that very first settimeofday(NULL, tz) modifies warp-clock as well as ++ * system TZ. ++ * + * +---------------------------------------------------------------------------+ + * | op | RTC scale | settimeofday calls | + * |---------|-----------|-----------------------------------------------------| +@@ -675,41 +678,45 @@ set_system_clock(const struct hwclock_control *ctl, + struct tm broken; + int minuteswest; + int rc = 0; +- const struct timezone tz_utc = { 0 }; + + localtime_r(&newtime.tv_sec, &broken); + minuteswest = -get_gmtoff(&broken) / 60; + + if (ctl->verbose) { +- if (ctl->hctosys && !ctl->universal) +- printf(_("Calling settimeofday(NULL, %d) to set " +- "persistent_clock_is_local.\n"), minuteswest); +- if (ctl->systz && ctl->universal) ++ if (ctl->universal) + puts(_("Calling settimeofday(NULL, 0) " +- "to lock the warp function.")); ++ "to lock the warp function.")); ++ else ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "persistent_clock_is_local and " ++ "the kernel timezone.\n"), minuteswest); ++ ++ if (ctl->universal && minuteswest) ++ printf(_("Calling settimeofday(NULL, %d) to set " ++ "the kernel timezone.\n"), minuteswest); ++ + if (ctl->hctosys) +- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"), +- newtime.tv_sec, newtime.tv_usec, minuteswest); +- else { +- printf(_("Calling settimeofday(NULL, %d) "), minuteswest); +- if (ctl->universal) +- puts(_("to set the kernel timezone.")); +- else +- puts(_("to warp System time.")); +- } ++ printf(_("Calling settimeofday(%ld.%06ld, 0) to set " ++ "the kernel time.\n"), newtime.tv_sec, newtime.tv_usec); + } + + if (!ctl->testing) { ++ const struct timezone tz_utc = { 0 }; + const struct timezone tz = { minuteswest }; + +- if (ctl->hctosys && !ctl->universal) /* set PCIL */ ++ /* warp-clock */ ++ if (ctl->universal) ++ rc = settimeofday(NULL, &tz_utc); /* lock to UTC */ ++ else ++ rc = settimeofday(NULL, &tz); /* set PCIL and TZ */ ++ ++ /* set timezone */ ++ if (!rc && ctl->universal && minuteswest) + rc = settimeofday(NULL, &tz); +- if (ctl->systz && ctl->universal) /* lock warp_clock */ +- rc = settimeofday(NULL, &tz_utc); ++ ++ /* set time */ + if (!rc && ctl->hctosys) +- rc = settimeofday(&newtime, &tz); +- else if (!rc) +- rc = settimeofday(NULL, &tz); ++ rc = settimeofday(&newtime, NULL); + + if (rc) { + warn(_("settimeofday() failed")); +-- +2.17.1 + diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb index e9c2d80e902b..557449d140da 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.34.bb @@ -8,6 +8,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ + file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ " SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" -- 2.17.1 From wangmy at cn.fujitsu.com Thu Feb 20 12:19:06 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Thu, 20 Feb 2020 04:19:06 -0800 Subject: [OE-core] [PATCH] mc: upgrade 4.8.23 -> 4.8.24 Message-ID: <1582201146-2668-1-git-send-email-wangmy@cn.fujitsu.com> 0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch 0001-Add-option-to-control-configure-args.patch Removed since they are included in 4.8.24. Signed-off-by: Wang Mingyu --- ...Add-option-to-control-configure-args.patch | 99 ---------------- ...29-configure.ac-drop-bundled-gettext.patch | 110 ------------------ .../mc/{mc_4.8.23.bb => mc_4.8.24.bb} | 6 +- 3 files changed, 2 insertions(+), 213 deletions(-) delete mode 100644 meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch delete mode 100644 meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch rename meta/recipes-extended/mc/{mc_4.8.23.bb => mc_4.8.24.bb} (88%) diff --git a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch deleted file mode 100644 index e76aac8161..0000000000 --- a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Sat, 9 Nov 2019 20:01:48 -0600 -Subject: [PATCH] Add option to control configure args - -Embedding the configure time options into the executable can lead to -non-reproducible builds, since configure options often have embedded -paths. Add a configure time option to control if the configure args are -embedded so this can be disabled. - -Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031] -Signed-off-by: Joshua Watt ---- - configure.ac | 6 ++++++ - src/args.c | 6 ++++++ - src/textconf.c | 2 ++ - 3 files changed, 14 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 19d1a76be..a1948f6b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule - AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ - test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) - -+AC_ARG_ENABLE([configure-args], -+ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) -+if test "x$enable_configure_args" != xno; then -+ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) -+fi -+ - AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) - - AC_CONFIG_FILES( -diff --git a/src/args.c b/src/args.c -index baef1a1c8..f8dc24020 100644 ---- a/src/args.c -+++ b/src/args.c -@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE; - #endif /* ENABLE_SUBSHELL */ - static gboolean mc_args__show_datadirs = FALSE; - static gboolean mc_args__show_datadirs_extended = FALSE; -+#ifdef ENABLE_CONFIGURE_ARGS - static gboolean mc_args__show_configure_opts = FALSE; -+#endif - - static GOptionGroup *main_group; - -@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = { - NULL - }, - -+#ifdef ENABLE_CONFIGURE_ARGS - /* show configure options */ - { - "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, -@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = { - N_("Print configure options"), - NULL - }, -+#endif - - { - "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, -@@ -758,11 +762,13 @@ mc_args_show_info (void) - return FALSE; - } - -+#ifdef ENABLE_CONFIGURE_ARGS - if (mc_args__show_configure_opts) - { - show_configure_options (); - return FALSE; - } -+#endif - - return TRUE; - } -diff --git a/src/textconf.c b/src/textconf.c -index 1e0613e58..f39b9e028 100644 ---- a/src/textconf.c -+++ b/src/textconf.c -@@ -232,10 +232,12 @@ show_datadirs_extended (void) - - /* --------------------------------------------------------------------------------------------- */ - -+#ifdef ENABLE_CONFIGURE_ARGS - void - show_configure_options (void) - { - (void) printf ("%s\n", MC_CONFIGURE_ARGS); - } -+#endif - - /* --------------------------------------------------------------------------------------------- */ --- -2.23.0 - diff --git a/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch b/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch deleted file mode 100644 index 8f357378d0..0000000000 --- a/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 0d677a014a87b968d79eea2353ac4e342b0fd4ca Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Wed, 11 Sep 2019 22:58:18 +0100 -Subject: [PATCH] Ticket #3629: configure.ac: drop bundled gettext - -Bundled libintl did not support linking to internal static -libraries (libmc in our case): directly specified static -libraries are not pulled by libtool and are not usable for -dynamic libraries as PIC-related flags are not passed for -compilation. - -This renders bundled libintl library unusable. - -The change drops libintl bundling support and always relies -on external libintl (or falls back to disabled NLS). - -On a related note gettext-0.20 drops support for bundling -or libintl and this change will ease migration to newer version. - -The change is tested on x86_64-gentoo-linux-musl: mc builds -and links all tests successfully. A few tests fail for lack -of NLS support. - -Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395] -Signed-off-by: Sergei Trofimovich -Signed-off-by: Andrew Borodin -Signed-off-by: Alexander Kanavin ---- - Makefile.am | 2 +- - configure.ac | 5 +++-- - doc/doxygen.cfg | 2 +- - lib/Makefile.am | 2 +- - m4.include/mc-i18n.m4 | 5 ----- - 5 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ac05a83..f86f6ed 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - ## Process this file with automake to create Makefile.in. - AUTOMAKE_OPTIONS = 1.5 - --SUBDIRS = intl po lib src doc contrib misc -+SUBDIRS = po lib src doc contrib misc - - if HAVE_TESTS - SUBDIRS += tests -diff --git a/configure.ac b/configure.ac -index a1948f6..bbc9e71 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -272,7 +272,9 @@ dnl ############################################################################ - dnl Internationalization - dnl ############################################################################ - --AM_GNU_GETTEXT([no-libtool], [need-ngettext]) -+AC_CHECK_FUNCS([setlocale]) -+ -+AM_GNU_GETTEXT([external], [need-ngettext]) - AM_GNU_GETTEXT_VERSION([0.18.1]) - - mc_I18N -@@ -680,7 +682,6 @@ doc/hlp/pl/Makefile - doc/hlp/ru/Makefile - doc/hlp/sr/Makefile - --intl/Makefile - po/Makefile.in - ]) - -diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg -index 07bc973..1118062 100644 ---- a/doc/doxygen.cfg -+++ b/doc/doxygen.cfg -@@ -91,7 +91,7 @@ FILE_PATTERNS = *.c \ - RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO --EXCLUDE_PATTERNS = */intl/* */tests/* */.git/* -+EXCLUDE_PATTERNS = */tests/* */.git/* - EXCLUDE_SYMBOLS = - EXAMPLE_PATH = $(SRCDIR) - EXAMPLE_PATTERNS = -diff --git a/lib/Makefile.am b/lib/Makefile.am -index c448e2d..455f9dd 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -74,4 +74,4 @@ else - libmc_la_LIBADD += $(GLIB_LIBS) - endif - --libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL) -+libmc_la_LIBADD += $(PCRE_LIBS) -diff --git a/m4.include/mc-i18n.m4 b/m4.include/mc-i18n.m4 -index dd10d00..ec08324 100644 ---- a/m4.include/mc-i18n.m4 -+++ b/m4.include/mc-i18n.m4 -@@ -8,11 +8,6 @@ dnl @license GPL - dnl @copyright Free Software Foundation, Inc. - - AC_DEFUN([mc_I18N],[ -- -- if test "x$USE_INCLUDED_LIBINTL" = xyes; then -- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl" -- fi -- - dnl User visible support for charset conversion. - AC_ARG_ENABLE([charset], - AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@])) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.24.bb similarity index 88% rename from meta/recipes-extended/mc/mc_4.8.23.bb rename to meta/recipes-extended/mc/mc_4.8.24.bb index ead348b92e..7a68270dd2 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.24.bb @@ -9,12 +9,10 @@ RRECOMMENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ - file://0001-Add-option-to-control-configure-args.patch \ - file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ file://nomandate.patch \ " -SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" -SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" +SRC_URI[md5sum] = "2621de1fa9058a9c41a4248becc969f9" +SRC_URI[sha256sum] = "cfcc4d0546d0c3a88645a8bf71612ed36647ea3264d973b1f28183a0c84bae34" inherit autotools gettext pkgconfig -- 2.17.1 From wallinux at gmail.com Thu Feb 20 05:23:44 2020 From: wallinux at gmail.com (Anders Wallin) Date: Thu, 20 Feb 2020 06:23:44 +0100 Subject: [OE-core] [PATCH v2] babeltrace: added ptest Message-ID: <20200220052344.8294-1-wallinux@gmail.com> Signed-off-by: Anders Wallin --- .../distro/include/ptest-packagelists.inc | 1 + .../recipes-kernel/lttng/babeltrace/run-ptest | 9 ++ meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 82 ++++++++++++++++++- 3 files changed, 90 insertions(+), 2 deletions(-) create mode 100755 meta/recipes-kernel/lttng/babeltrace/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 23865ac3e1..752a0882dc 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -61,6 +61,7 @@ PTESTS_FAST = "\ #" PTESTS_SLOW = "\ + babeltrace-ptest \ busybox-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ diff --git a/meta/recipes-kernel/lttng/babeltrace/run-ptest b/meta/recipes-kernel/lttng/babeltrace/run-ptest new file mode 100755 index 0000000000..f4b7ce11e2 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh +# use target=recheck if you want to recheck failing tests +[ "$target" = "" ] && target=check + +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index b6b7653037..c050dc674d 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -7,14 +7,92 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5" +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \ + file://run-ptest \ + " SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF = "--disable-debug-info" ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk" + +addtask do_patch_ptest_path after do_patch before do_configure +do_patch_ptest_path () { + for f in $(grep -l -r abs_top_srcdir ${S}/tests); do + sed -i 's:\@abs_top_srcdir\@:${PTEST_PATH}:' ${f} + done + + for f in $(grep -l -r abs_top_builddir ${S}/tests); do + sed -i 's:\@abs_top_builddir\@:${PTEST_PATH}:' ${f} + done + for f in $(grep -l -r GREP ${S}/tests); do + sed -i 's:\@GREP\@:grep:' ${f} + done + + for f in $(grep -l -r SED ${S}/tests); do + sed -i 's:\@SED\@:sed:' ${f} + done +} + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + # Copy required files from source directory + for f in config/tap-driver.sh config/test-driver; do + install -D "${S}/$f" "${D}${PTEST_PATH}/$f" + done + install -d "$f" "${D}${PTEST_PATH}/tests/ctf-traces/" + cp -a ${S}/tests/ctf-traces/* ${D}${PTEST_PATH}/tests/ctf-traces/ + + # Copy the tests directory tree and the executables and + # Makefiles found within. + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + test -r "${B}/tests/$d/Makefile" && \ + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f + done + done + + install -D ${B}/formats/ctf/metadata/.libs/ctf-parser-test \ + ${D}${PTEST_PATH}/formats/ctf/metadata/ctf-parser-test + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ + sed -i \ + -e '/Makefile:/,/^$/d' \ + -e '/$(check_SCRIPTS)/s/^/#/' \ + -e '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Remove path to babeltrace. + for f in $(grep -l -r "^BABELTRACE_BIN" ${D}${PTEST_PATH}); do + sed -i 's:^BABELTRACE_BIN.*:BABELTRACE_BIN=/usr/bin/babeltrace:' ${f} + done + for f in $(grep -l -r "^BTBIN" ${D}${PTEST_PATH}); do + sed -i 's:^BTBIN.*:BTBIN=/usr/bin/babeltrace:' ${f} + done +} -- 2.25.0 From sangeeta.jain at intel.com Thu Feb 20 07:46:00 2020 From: sangeeta.jain at intel.com (Jain, Sangeeta) Date: Thu, 20 Feb 2020 07:46:00 +0000 Subject: [OE-core] Yocto Project Status WW07'20 In-Reply-To: <0b8a01d5e675$d2363e30$76a2ba90$@gmail.com> References: <0b8a01d5e675$d2363e30$76a2ba90$@gmail.com> Message-ID: Planned upcoming dot releases: * YP 2.7.3 built and in QA I didn't see any notification for this build. Am I missing something? Thanks, Sangeeta From: openembedded-core-bounces at lists.openembedded.org On Behalf Of sjolley.yp.pm at gmail.com Sent: Wednesday, 19 February, 2020 12:10 AM To: yocto at yoctoproject.org; openembedded-core at lists.openembedded.org Subject: [OE-core] Yocto Project Status WW07'20 Current Dev Position: YP 3.1 M3 Next Deadline: YP 3.1 M3 build date 2/24/2020 Next Team Meetings: * Bug Triage meeting Thursday Feb. 20th at 7:30am PDT (https://zoom.us/j/454367603) * Monthly Project Meeting Tuesday Mar. 3rd at 8am PDT (https://zoom.us/j/990892712) * Weekly Engineering Sync Tuesday Feb. 18th at 8am PDT (https://zoom.us/j/990892712) * Twitch - Next event is Tuesday Mar. 10th at 8am PDT (https://www.twitch.tv/yocto_project) Key Status/Updates: * The project recently updated its git hosting infrastructure and there were some issues encountered with the cgit http/https repository sharing. Those issues should now be resolved, apologies if they caused issues for anyone. The git:// protocol sharing was unaffected. * YP 3.0.2 rc2 is in QA with the report due soon. * We continue to see a small number of reproducibility issues with master which need resolving for green builds (in particular gstreamer and perl). * A significant memory usage issue was identified during bitbake parsing where memory usage would grow in each parser thread linearly per number of recipes parsed. This would therefore particularly affect large numbers of layers, multilibs and multiconfig. The fix has merged into bitbake along with the corresponding zeus and warrior branches. For one test case it reduced peak memory usage during parsing for 5 multiconfigs from 20GB to 2GB. * Warrior patches for 2.7.3 are out for review. * With the git infrastructure issue updated, we now have centos8 workers added to the autobuilder. * We are making various queued changes to the autobuilder configuration to fix bugs, improve efficiency and test coverage but this may result in some test result instability as we test and resolve issues. * We're collecting a list of companies, products and projects which use the Yocto Project on the wiki: https://wiki.yoctoproject.org/wiki/Project_Users Please add any you know are missing (or email Richard/Stephen who can add). * The triage team is worried about attendance at triage meetings and the project is finding it hard to find people to help fix bugs. If anyone is willing to work on bugs, assistance would be greatly appreciated. YP 3.1 Milestone Dates: * YP 3.1 M3 build date 2/24/2020 * YP 3.1 M3 release date 3/6/2020 * YP 3.1 M4 build date 3/30/2020 * YP 3.1 M4 release date 4/24/2020 Planned upcoming dot releases: * YP 2.7.3 built and in QA * YP 2.7.3 release date 2/21/2020 * YP 3.0.2 build date 2/3/2020 * YP 3.0.2 release date 2/14/2020 Tracking Metrics: * WDD 2710 (last week 2728) (https://wiki.yoctoproject.org/charts/combo.html) * Poky Patch Metrics * Total patches found: 1360 (last week 1361) * Patches in the Pending State: 546 (40%) [last week 547 (40%)] The Yocto Project's technical governance is through its Technical Steering Committee, more information is available at: https://wiki.yoctoproject.org/wiki/TSC The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status [If anyone has suggestions for other information you'd like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter.kjellerstedt at axis.com Thu Feb 20 08:07:34 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Thu, 20 Feb 2020 08:07:34 +0000 Subject: [OE-core] [PATCH v3] binutils: Upgrade to 2.34 release In-Reply-To: <20200219224239.3662791-1-raj.khem@gmail.com> References: <20200219224239.3662791-1-raj.khem@gmail.com> Message-ID: > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Khem Raj > Sent: den 19 februari 2020 23:43 > To: openembedded-core at lists.openembedded.org > Cc: Christopher Clark > Subject: [OE-core] [PATCH v3] binutils: Upgrade to 2.34 release > > Details of changelog [1] > > Removing bfd/ld patch to ebale pe targets instead use Change "ebale" to "enable". > specific emulations via --enable-targets for x86_64 > > Re-arrange/forward-port patches and upgrade libctf configure to libtool > 2.4 patch > > rpaths are no longer emitted into elfedit/readelf therefore no need of > chrpath anymore > > Instead of pre-generating configure scripts and house them in libtool > patch, generate them during configure. This also ensures that we do not > patch configure directly but rather the sources which generate it > > Package newly added libctf library > > [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html > > Signed-off-by: Khem Raj > Cc: Christopher Clark > --- > v2: Fix libtool patch and drop EFI patch for configure option > v3: Make libtool patch not generate configure, fix packaging [cut] > diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc > index a4b9aa586d..b070d85e15 100644 > --- a/meta/recipes-devtools/binutils/binutils.inc > +++ b/meta/recipes-devtools/binutils/binutils.inc > @@ -13,17 +13,12 @@ LICENSE = "GPLv3" > > DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" > > -# > -# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath > -# > -DEPENDS_append_class-target = " chrpath-replacement-native" > -EXTRANATIVEPATH_append_class-target = " chrpath-native" > - > inherit autotools gettext multilib_header texinfo > > FILES_${PN} = " \ > ${bindir}/${TARGET_PREFIX}* \ > - ${libdir}/lib*-*.so \ > + ${libdir}/lib*.so.* \ > + ${libdir}/lib*-${PV}*.so \ > ${prefix}/${TARGET_SYS}/bin/* \ > ${bindir}/embedspu" > > @@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ > ${includedir} \ > ${libdir}/*.la \ > ${libdir}/libbfd.so \ > + ${libdir}/libctf.so \ > + ${libdir}/libctf-nobfd.so \ > ${libdir}/libopcodes.so" > > # Rather than duplicating multiple entries for these, make one > @@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ > ${LDGOLD} \ > mailto:${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" > > +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " > + > LDGOLD_class-native = "" > LDGOLD_class-crosssdk = "" > LDGOLD ?= "mailto:${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" > @@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" > MULTIARCH := "mailto:${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" > do_configure[vardeps] += "MULTIARCH" > do_configure () { > - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" > + (for d in . bfd binutils gas gold gprof ld libctf opcodes; do > + cd ${S}/$d > + autoconf > + rm -rf autom4te.cache > + done > + cd ${S} > + gnu-configize) > + Correct the indentation to use tabs. There are also some patches below that still modify configure, which shouldn't be needed with the introduction of autoconf above. > oe_runconf > # > # must prime config.cache to ensure the build of libiberty > @@ -123,10 +129,6 @@ do_configure () { > done > } > > -do_compile_append_class-target() { > - chrpath -d ${B}/binutils/elfedit > - chrpath -d ${B}/binutils/readelf > -} > do_install () { > autotools_do_install > > diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch > index 3a9461bf4a..a36c259711 100644 > --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch > +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch > @@ -1,7 +1,7 @@ > -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 > +From 9caa0964b6f50411d1b4520a31461cd0a87810fd Mon Sep 17 00:00:00 2001 > From: Khem Raj > -Date: Sun, 8 Dec 2019 00:31:35 -0800 > -Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs > +Date: Mon, 2 Mar 2015 01:58:54 +0000 > +Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs > > This patch will modify the ELF linker scripts so that the crosssdk > linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries [cut] > @@ -57,3 +57,6 @@ index f9f0f7d402..9e469dca86 100644 > fi > if test -z "$PLT"; then > IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" > +-- > +2.25.1 > + May I suggest that you continue to use --no-signature and --no-numbered as options to git format-patch to avoid unnecessary changes to the patches? [cut] > diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch > new file mode 100644 > index 0000000000..82906026a9 > --- /dev/null > +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch > @@ -0,0 +1,7118 @@ > +From c0ec70962bffb56b563475f539e8175ea97d7eb1 Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Sun, 14 Feb 2016 17:04:07 +0000 > +Subject: [PATCH 07/15] Use libtool 2.4 > + > +get libtool sysroot support > + > +Upstream-Status: Pending > + > +Signed-off-by: Khem Raj > +--- > + bfd/configure.ac | 2 +- > + libtool.m4 | 1080 +++++++++++------ > + ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- > + ltoptions.m4 | 2 +- > + ltversion.m4 | 12 +- > + lt~obsolete.m4 | 2 +- Wouldn't it be better to run automake --add-missing --copy instead (or autoreconf)? That way you would get rid of all the patches to Makefile.in as well. > + 6 files changed, 2717 insertions(+), 1306 deletions(-) > + [cut] //Peter From richard.purdie at linuxfoundation.org Thu Feb 20 10:02:02 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 20 Feb 2020 10:02:02 +0000 Subject: [OE-core] [PATCH] lttng-modules: Check the pid_ns before using it because it may be NULL In-Reply-To: <1582165584-187223-1-git-send-email-li.zhou@windriver.com> References: <1582165584-187223-1-git-send-email-li.zhou@windriver.com> Message-ID: <4688fc5ac550088b553d602ef1ecb110447a9100.camel@linuxfoundation.org> On Thu, 2020-02-20 at 10:26 +0800, Li Zhou wrote: > Check the pid_ns before using it because it may be NULL to fix below > issue: > <1>[ 22.637196] Unable to handle kernel NULL pointer dereference at > virtual address 0000000000000080 > <1>[ 22.645982] Mem abort info: > <1>[ 22.648769] ESR = 0x96000007 > <1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits > <1>[ 22.657730] SET = 0, FnV = 0 > <1>[ 22.660777] EA = 0, S1PTW = 0 > <1>[ 22.663910] Data abort info: > <1>[ 22.666784] ISV = 0, ISS = 0x00000007 > <1>[ 22.670611] CM = 0, WnR = 0 > <1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = > 0000000012378f78 > <1>[ 22.680180] [0000000000000080] pgd=000000007f023003, > pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 > <0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP > <4>[ 22.690797] Modules linked in: adkNetD ncp > lttng_ring_buffer_client_overwrite(C) > lttng_ring_buffer_metadata_client(C) > lttng_ring_buffer_client_discard(C) > lttng_ring_buffer_client_mmap_overwrite(C) > lttng_ring_buffer_client_mmap_discard(C) > lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) > lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) > lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) > lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) > lttng_clock(C) > <0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = > 0x000000005d27910f) > <4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C > 4.18.37-rt820-custom #1 > <4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) > <4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) > <4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] > <4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] > <4>[ 22.690851] sp : ffffffc07fe57ad0 > <4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 > <4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 > <4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 > <4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 > <4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 > <4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe > <4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 > <4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f > <4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 > <4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f > <4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 > <4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 > <4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 > <4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 > <4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 > <4>[ 22.690896] Call trace: > <4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] > <4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] > <4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] > <4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] > <4>[ 22.691026] compat_sys_ioctl+0x110/0x778 > > Signed-off-by: Li Zhou Are upstream aware of this issue? I'd really like their opinion on this before we merge anything. Cheers, Richard From alex.kanavin at gmail.com Thu Feb 20 10:08:12 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 20 Feb 2020 11:08:12 +0100 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection In-Reply-To: <20200220002849.9126-1-schnitzeltony@gmail.com> References: <20200220002849.9126-1-schnitzeltony@gmail.com> Message-ID: You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? This line: http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70 And for consistency, it would be good to do the same for gtk-doc. Alex ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ On Thu, 20 Feb 2020 at 01:29, Andreas M?ller wrote: > Enable if 'gobject-introspection-data' is in DISTRO_FEATURES. This is what > gobject-introspection.bbclass does automatically for projects build with > autotools and meson. > > It was checked: there are webkitgtk and libdnf inheriting > gobject-introspection > and cmake. Since libdnf cannot configure gir, webkitgtk seems the only > project > requiring gir-auto-enabling. So handle at recipe / no common magic at > gobject-introspection.bbclass required. > > Signed-off-by: Andreas M?ller > --- > > This patch applies on top of master-next/Alex's patches sent > > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > index 585723772e..d5085620d2 100644 > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > @@ -39,6 +39,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt > libxt libidn libgcrypt \ > " > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', > d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', > 'gobject-introspection-data', 'gobject-introspection', '' ,d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'webgl opengl', '' ,d)} \ > enchant \ > libsecret \ > @@ -46,6 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', > 'wayland x11', d)} \ > > PACKAGECONFIG[wayland] = > "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe > wpebackend-fdo wayland-native" > PACKAGECONFIG[x11] = > "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" > +PACKAGECONFIG[gobject-introspection] = > "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF" > PACKAGECONFIG[geoclue] = > "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" > PACKAGECONFIG[enchant] = > "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" > PACKAGECONFIG[gtk2] = > "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" > -- > 2.21.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Thu Feb 20 10:26:15 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 20 Feb 2020 10:26:15 +0000 Subject: [OE-core] [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20 In-Reply-To: <20200219194752.7967-11-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> <20200219194752.7967-11-alex.kanavin@gmail.com> Message-ID: <62847ad6d3204b5080b2c71f7d6e9f56436e3d02.camel@linuxfoundation.org> On Wed, 2020-02-19 at 20:47 +0100, Alexander Kanavin wrote: > Signed-off-by: Alexander Kanavin > --- > .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > rename meta/recipes-support/p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} (93%) > > diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb > similarity index 93% > rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb > rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb > index 19895ec269..26833ef431 100644 > --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb > +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb > @@ -9,7 +9,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi" > DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" > > SRC_URI = "git://github.com/p11-glue/p11-kit" > -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" > +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" > S = "${WORKDIR}/git" > > PACKAGECONFIG ??= "" This version adds bash-completion which is triggering in some builds and isn't deterministic. https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/291 Cheers, Richard From Saloni.Jain at kpit.com Thu Feb 20 10:26:57 2020 From: Saloni.Jain at kpit.com (Saloni Jain) Date: Thu, 20 Feb 2020 10:26:57 +0000 Subject: [OE-core] [meta-oe][master][PATCH] strongswan: avoid charon crash Message-ID: From: Anuj Chougule This is a possible fix to charon that crashed early due to invalid memory access. Important frames from Backtraces : 8 0x00007f607246e160 in memcpy (__len=1704, __src=, __dest=) at /usr/include/bits/string_fortified.h:34 No locals. 9 memcpy_noop (n=1704, src=, dst=) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/utils/utils/memory.h:47 n = 1704 src = dst = 10 chunk_create_clone (ptr=, chunk=...) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/utils/chunk.c:48 clone = 11 0x00007f606ebae810 in load_from_blob (blob=..., type=type at entry=CRED_PRIVATE_KEY, subtype=subtype at entry=1, subject=subject at entry=0x0, flags=flags at entry=X509_NONE) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:399 x = cred = 0x0 ---Type to continue, or q to quit--- pgp = false 12 0x00007f606ebaf0e4 in load_from_file (flags=X509_NONE, subject=0x0, subtype=1, type=CRED_PRIVATE_KEY, file=0x7f6069d21a20 "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec-internal_key.pem") at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:452 cred = chunk = 0x7f6054005430 13 pem_load (type=CRED_PRIVATE_KEY, subtype=1, args=) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:498 file = 0x7f6069d21a20 "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec-internal_key.pem" pem = subject = 0x0 flags = 0 Problem lies in frame 12 & 11. (gdb) f 12 12 0x00007f606ebaf0e4 in load_from_file (flags=X509_NONE, subject=0x0, subtype=1, type=CRED_PRIVATE_KEY, file=0x7f6069d21a20 "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec-internal_key.pem") at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:452 452 in /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c (gdb) info locals cred = chunk = 0x7f6054005430 (gdb) print *chunk $21 = {ptr = 0x7f60728b7000 , len = 1704} (gdb) f 11 11 0x00007f606ebae810 in load_from_blob (blob=..., type=type at entry=CRED_PRIVATE_KEY, subtype=subtype at entry=1, subject=subject at entry=0x0, flags=flags at entry=X509_NONE) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:399 399 in /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c (gdb) info args blob = {ptr = 0x7f60728b7000 , len = 140052215328768} type = CRED_PRIVATE_KEY subtype = 1 subject = 0x0 flags = X509_NONE (gdb) print blob $22 = {ptr = 0x7f60728b7000 , len = 140052215328768} Source code snippet : static void *load_from_file(char *file, credential_type_t type, int subtype, identification_t *subject, x509_flag_t flags) { void *cred; chunk_t *chunk; chunk = chunk_map(file, FALSE); if (!chunk) { DBG1(DBG_LIB, " opening '%s' failed: %s", file, strerror(errno)); return NULL; } cred = load_from_blob(*chunk, type, subtype, subject, flags); chunk_unmap(chunk); return cred; } Local variable chunk is an uninitialised pointer in load_from_file() (frame 12 above) which is expected to get initialised through chunk_map() & then passed to load_from_blob() as a parameter. But somehow, the chunk pointer has not got initialised & got passed as it is to load_from_blob() in frame 11 above. As this contains a garbage address, when method load_from_blob() tried cloning the memory regions through chunk_clone() -> chunk_create_clone() -> memcpy() -> memcpy_noop(), it crashed with SIGBUS (frames 10, 9, 8). It could also be that chunk_map() has a bug which does not memmap() the full or correct areas. Upstream-Status: Pending Tested By: Anuj Chougule Signed-off-by: Anuj Chougule Signed-off-by: Saloni Jain --- .../strongswan/files/fix-charon-crash.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes-support/strongswan/files/fix-charon-crash.patch diff --git a/recipes-support/strongswan/files/fix-charon-crash.patch b/recipes-support/strongswan/files/fix-charon-crash.patch new file mode 100644 index 0000000..95e71a2 --- /dev/null +++ b/recipes-support/strongswan/files/fix-charon-crash.patch @@ -0,0 +1,23 @@ +strongswan: avoid charon crash + +Variable chunk is an uninitialised pointer,which +is expected to get initialised through method chunk_map() +& then passed to load_from_blob() as a parameter. +But somehow, if the chunk pointer did not get initialised & gets +passed as it is to load_from_blob(), it may lead crash as this +contains a garbage address. + +Signed-off-by: Anuj Chougule +Upstream-Status: Pending + +--- a/src/libstrongswan/plugins/pem/pem_builder.c ++++ b/src/libstrongswan/plugins/pem/pem_builder.c +@@ -441,7 +441,7 @@ static void *load_from_file(char *file, credential_type_t type, int subtype, + identification_t *subject, x509_flag_t flags) + { + void *cred; +- chunk_t *chunk; ++ chunk_t *chunk = NULL; + + chunk = chunk_map(file, FALSE); + if (!chunk) -- 2.7.4 This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails. -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Thu Feb 20 10:33:47 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 20 Feb 2020 10:33:47 +0000 Subject: [OE-core] Yocto Project Status WW07'20 In-Reply-To: References: <0b8a01d5e675$d2363e30$76a2ba90$@gmail.com> Message-ID: <77217fc86fe8451eae53e3b6e93cd9cefab8b022.camel@linuxfoundation.org> On Thu, 2020-02-20 at 07:46 +0000, Jain, Sangeeta wrote: > Planned upcoming dot releases: > YP 2.7.3 built and in QA > > I didn?t see any notification for this build. Am I missing something? No, its due to be built but isn't built yet! I think that was meant to say 3.0.2, sorry about any confusion. Cheers, Richard From Saloni.Jain at kpit.com Thu Feb 20 10:58:35 2020 From: Saloni.Jain at kpit.com (Saloni Jain) Date: Thu, 20 Feb 2020 10:58:35 +0000 Subject: [OE-core] [meta-oe][sumo][PATCH] strongswan: avoid charon crash Message-ID: From: Anuj Chougule This is a possible fix to charon that crashed early due to invalid memory access. Important frames from Backtraces : 8 0x00007f607246e160 in memcpy (__len=1704, __src=, __dest=) at /usr/include/bits/string_fortified.h:34 No locals. 9 memcpy_noop (n=1704, src=, dst=) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/utils/utils/memory.h:47 n = 1704 src = dst = 10 chunk_create_clone (ptr=, chunk=...) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/utils/chunk.c:48 clone = 11 0x00007f606ebae810 in load_from_blob (blob=..., type=type at entry=CRED_PRIVATE_KEY, subtype=subtype at entry=1, subject=subject at entry=0x0, flags=flags at entry=X509_NONE) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:399 x = cred = 0x0 ---Type to continue, or q to quit--- pgp = false 12 0x00007f606ebaf0e4 in load_from_file (flags=X509_NONE, subject=0x0, subtype=1, type=CRED_PRIVATE_KEY, file=0x7f6069d21a20 "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec-internal_key.pem") at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:452 cred = chunk = 0x7f6054005430 13 pem_load (type=CRED_PRIVATE_KEY, subtype=1, args=) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:498 file = 0x7f6069d21a20 "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec-internal_key.pem" pem = subject = 0x0 flags = 0 Problem lies in frame 12 & 11. (gdb) f 12 12 0x00007f606ebaf0e4 in load_from_file (flags=X509_NONE, subject=0x0, subtype=1, type=CRED_PRIVATE_KEY, file=0x7f6069d21a20 "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec-internal_key.pem") at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:452 452 in /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c (gdb) info locals cred = chunk = 0x7f6054005430 (gdb) print *chunk $21 = {ptr = 0x7f60728b7000 , len = 1704} (gdb) f 11 11 0x00007f606ebae810 in load_from_blob (blob=..., type=type at entry=CRED_PRIVATE_KEY, subtype=subtype at entry=1, subject=subject at entry=0x0, flags=flags at entry=X509_NONE) at /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:399 399 in /usr/src/debug/strongswan/5.7.2-r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c (gdb) info args blob = {ptr = 0x7f60728b7000 , len = 140052215328768} type = CRED_PRIVATE_KEY subtype = 1 subject = 0x0 flags = X509_NONE (gdb) print blob $22 = {ptr = 0x7f60728b7000 , len = 140052215328768} Source code snippet : static void *load_from_file(char *file, credential_type_t type, int subtype, identification_t *subject, x509_flag_t flags) { void *cred; chunk_t *chunk; chunk = chunk_map(file, FALSE); if (!chunk) { DBG1(DBG_LIB, " opening '%s' failed: %s", file, strerror(errno)); return NULL; } cred = load_from_blob(*chunk, type, subtype, subject, flags); chunk_unmap(chunk); return cred; } Local variable chunk is an uninitialised pointer in load_from_file() (frame 12 above) which is expected to get initialised through chunk_map() & then passed to load_from_blob() as a parameter. But somehow, the chunk pointer has not got initialised & got passed as it is to load_from_blob() in frame 11 above. As this contains a garbage address, when method load_from_blob() tried cloning the memory regions through chunk_clone() -> chunk_create_clone() -> memcpy() -> memcpy_noop(), it crashed with SIGBUS (frames 10, 9, 8). It could also be that chunk_map() has a bug which does not memmap() the full or correct areas. Upstream-Status: Pending Tested By: Anuj Chougule Signed-off-by: Anuj Chougule Signed-off-by: Saloni Jain --- .../strongswan/files/fix-charon-crash.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes-support/strongswan/files/fix-charon-crash.patch diff --git a/recipes-support/strongswan/files/fix-charon-crash.patch b/recipes-support/strongswan/files/fix-charon-crash.patch new file mode 100644 index 0000000..95e71a2 --- /dev/null +++ b/recipes-support/strongswan/files/fix-charon-crash.patch @@ -0,0 +1,23 @@ +strongswan: avoid charon crash + +Variable chunk is an uninitialised pointer,which +is expected to get initialised through method chunk_map() +& then passed to load_from_blob() as a parameter. +But somehow, if the chunk pointer did not get initialised & gets +passed as it is to load_from_blob(), it may lead crash as this +contains a garbage address. + +Signed-off-by: Anuj Chougule +Upstream-Status: Pending + +--- a/src/libstrongswan/plugins/pem/pem_builder.c ++++ b/src/libstrongswan/plugins/pem/pem_builder.c +@@ -441,7 +441,7 @@ static void *load_from_file(char *file, credential_type_t type, int subtype, + identification_t *subject, x509_flag_t flags) + { + void *cred; +- chunk_t *chunk; ++ chunk_t *chunk = NULL; + + chunk = chunk_map(file, FALSE); + if (!chunk) -- 2.7.4 This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails. -------------- next part -------------- An HTML attachment was scrubbed... URL: From martin at geanix.com Thu Feb 20 11:56:29 2020 From: martin at geanix.com (=?UTF-8?Q?Martin_Hundeb=c3=b8ll?=) Date: Thu, 20 Feb 2020 12:56:29 +0100 Subject: [OE-core] [PATCH] gstreamer: Fix reproducibility issue around libcap In-Reply-To: <20200219152355.123718-1-richard.purdie@linuxfoundation.org> References: <20200219152355.123718-1-richard.purdie@linuxfoundation.org> Message-ID: Hi, On 19/02/2020 16.23, Richard Purdie wrote: > Add an option to avoid builds depending on the presence of setcap > from the host system. > > Signed-off-by: Richard Purdie > --- > .../gstreamer/gstreamer1.0/capfix.patch | 37 +++++++++++++++++++ > .../gstreamer/gstreamer1.0_1.16.1.bb | 2 + > 2 files changed, 39 insertions(+) > create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch > new file mode 100644 > index 00000000000..7ca3d5ad4a6 > --- /dev/null > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch > @@ -0,0 +1,37 @@ > +Currently gstreamer configuration depends on whether setcap is found on the host > +system. Turn this into a configure option to make builds deterinistic. > + > +RP 2020/2/19 > +Signed-off-by: Richard Purdie > +Upstream-Status: Pending > + > +Index: gstreamer-1.16.1/libs/gst/helpers/meson.build > +=================================================================== > +--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build > ++++ gstreamer-1.16.1/libs/gst/helpers/meson.build > +@@ -73,7 +73,12 @@ if have_ptp > + endif > + endif > + > +- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) > ++ setcap_feature = get_option('setcap') > ++ if setcap_feature.disabled() > ++ setcap = find_program('dontexist', required : false) > ++ else > ++ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) > ++ endif I think this can be simplified by using get_option() directly for the "required" argument: setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : get_option('setcap')) // Martin > + > + # user/group to change to in gst-ptp-helper > + ptp_helper_setuid_user = get_option('ptp-helper-setuid-user') > +Index: gstreamer-1.16.1/meson_options.txt > +=================================================================== > +--- gstreamer-1.16.1.orig/meson_options.txt > ++++ gstreamer-1.16.1/meson_options.txt > +@@ -26,6 +26,7 @@ option('libunwind', type : 'feature', va > + option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') > + option('dbghelp', type : 'feature', value : 'auto', description : 'Use dbghelp to generate backtraces') > + option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') > ++option('setcap', type : 'feature', value : 'auto', description : 'Use setcap') > + > + # Common feature options > + option('examples', type : 'feature', value : 'auto', yield : true) > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb > index 6b8a5a0eb01..68f5ca649fe 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb > @@ -21,6 +21,7 @@ SRC_URI = " \ > file://0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ > file://0003-meson-Add-valgrind-feature.patch \ > file://0004-meson-Add-option-for-installed-tests.patch \ > + file://capfix.patch \ > " > SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" > SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" > @@ -39,6 +40,7 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" > PACKAGECONFIG[dw] = "-Dlibdw=enabled,-Dlibdw=disabled,elfutils" > PACKAGECONFIG[bash-completion] = "-Dbash-completion=enabled,-Dbash-completion=disabled,bash-completion" > PACKAGECONFIG[tools] = "-Dtools=enabled,-Dtools=disabled" > +PACKAGECONFIG[setcap] = "-Dsetcap=enabled,-Dsetcap=disabled,libcap" > > # TODO: put this in a gettext.bbclass patch > def gettext_oemeson(d): > From richard.purdie at linuxfoundation.org Thu Feb 20 12:00:08 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 20 Feb 2020 12:00:08 +0000 Subject: [OE-core] [PATCH] gstreamer: Fix reproducibility issue around libcap In-Reply-To: References: <20200219152355.123718-1-richard.purdie@linuxfoundation.org> Message-ID: On Thu, 2020-02-20 at 12:56 +0100, Martin Hundeb?ll wrote: > On 19/02/2020 16.23, Richard Purdie wrote: > > Add an option to avoid builds depending on the presence of setcap > > from the host system. > > > > Signed-off-by: Richard Purdie > > --- > > .../gstreamer/gstreamer1.0/capfix.patch | 37 +++++++++++++++++++ > > .../gstreamer/gstreamer1.0_1.16.1.bb | 2 + > > 2 files changed, 39 insertions(+) > > create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch > > > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch > > new file mode 100644 > > index 00000000000..7ca3d5ad4a6 > > --- /dev/null > > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch > > @@ -0,0 +1,37 @@ > > +Currently gstreamer configuration depends on whether setcap is found on the host > > +system. Turn this into a configure option to make builds deterinistic. > > + > > +RP 2020/2/19 > > +Signed-off-by: Richard Purdie > > +Upstream-Status: Pending > > + > > +Index: gstreamer-1.16.1/libs/gst/helpers/meson.build > > +=================================================================== > > +--- gstreamer-1.16.1.orig/libs/gst/helpers/meson.build > > ++++ gstreamer-1.16.1/libs/gst/helpers/meson.build > > +@@ -73,7 +73,12 @@ if have_ptp > > + endif > > + endif > > + > > +- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) > > ++ setcap_feature = get_option('setcap') > > ++ if setcap_feature.disabled() > > ++ setcap = find_program('dontexist', required : false) > > ++ else > > ++ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) > > ++ endif > > I think this can be simplified by using get_option() directly for the > "required" argument: > > setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', > required : get_option('setcap')) Yes, that looks better. I'm no meson expert, this is the first time I've touched it. I'd love if it someone was able to get this resolved with upstream. I've been trying to work on getting various things fixed upstream (e.g. some of the perl changes) but I'm having to take a practical view in some areas. Getting the autobuilder stable/working sanely is currently more of a priority than getting involved in a discussion with upstream on something I know little about :/. I've merged this patch but if anyone wants to improve it, I'm fine with that. Cheers, Richard From richard.purdie at linuxfoundation.org Thu Feb 20 12:24:09 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 20 Feb 2020 12:24:09 +0000 Subject: [OE-core] [PATCH] libsolv: upgrade 0.7.10 -> 0.7.11 In-Reply-To: <1582191660-130760-1-git-send-email-wangmy@cn.fujitsu.com> References: <1582191660-130760-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: On Thu, 2020-02-20 at 01:40 -0800, Wang Mingyu wrote: > Signed-off-by: Wang Mingyu > --- > .../libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > rename meta/recipes-extended/libsolv/{libsolv_0.7.10.bb => libsolv_0.7.11.bb} (93%) > > diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.11.bb > similarity index 93% > rename from meta/recipes-extended/libsolv/libsolv_0.7.10.bb > rename to meta/recipes-extended/libsolv/libsolv_0.7.11.bb > index 502f4e0e85..84349606f1 100644 > --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb > +++ b/meta/recipes-extended/libsolv/libsolv_0.7.11.bb > @@ -10,7 +10,7 @@ DEPENDS = "expat zlib" > SRC_URI = "git://github.com/openSUSE/libsolv.git \ > " > > -SRCREV = "605dd2645ef899e2b7c95709476fb51e28d7e378" > +SRCREV = "102ac552669181d3e43731aa275bdbbc7ddcb94c" > > UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" > I think this causes: https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/1591 ERROR: core-image-sato-1.0-r0 do_testimage: core-image-sato - FAILED - check the task log and the ssh log ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/build/tmp/work/qemux86-poky-linux/core-image-sato/1.0-r0/temp/log.do_testimage.5108 NOTE: recipe core-image-sato-1.0-r0: task do_testimage: Failed ERROR: Task (/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/recipes-sato/images/core-image-sato.bb:do_testimage) failed with exit code '1' Test requires gtk+3 to be installed Started HTTPService on 0.0.0.0:35043 Traceback (most recent call last): File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/dnf.py", line 181, in test_dnf_exclude self.dnf_with_repo('install -y curl*') File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/dnf.py", line 69, in dnf_with_repo output = self.dnf(" ".join(cmdlinerepoopts) + " --nogpgcheck " + command) File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/dnf.py", line 21, in dnf self.assertEqual(status, expected, message) AssertionError: 1 != 0 : dnf --repofrompath=oe-testimage-repo-qemux86,http://192.168.7.3:35043/qemux86 --repofrompath=oe-testimage-repo-noarch,http://192.168.7.3:35043/noarch --repofrompath=oe-testimage-repo-core2_32,http://192.168.7.3:35043/core2_32 --nogpgcheck install -y curl* Added oe-testimage-repo-qemux86 repo from http://192.168.7.3:35043/qemux86 Added oe-testimage-repo-noarch repo from http://192.168.7.3:35043/noarch Added oe-testimage-repo-core2_32 repo from http://192.168.7.3:35043/core2_32 Last metadata expiration check: 0:00:01 ago on Thu Feb 20 12:13:09 2020. Package curl-7.68.0-r0.core2_32 is already installed. Package curl-dev-7.68.0-r0.core2_32 is already installed. Dependencies resolved. ================================================================================ Package Architecture Version Repository Size ================================================================================ Installing: curl-dbg core2_32 7.68.0-r0 oe-testimage-repo-core2_32 36 k curl-doc core2_32 7.68.0-r0 oe-testimage-repo-core2_32 269 k Transaction Summary ================================================================================ Install 2 Packages /usr/lib/python3.8/site-packages/dnf/package.py:57: DeprecationWarning: PY_SSIZE_T_CLEAN will be required for '#' formats return super(Package, self).chksum Total download size: 305 k Installed size: 1.6 M Downloading Packages: (1/2): curl-dbg-7.68.0-r0.core2_32.rpm 2.6 MB/s | 36 kB 00:00 (2/2): curl-doc-7.68.0-r0.core2_32.rpm 16 MB/s | 269 kB 00:00 -------------------------------------------------------------------------------- Total 14 MB/s | 305 kB 00:00 Running transaction check Transaction check succeeded. Running transaction test Transaction test succeeded. Running transaction Failed to obtain the transaction lock (logged in as: root). The downloaded packages were saved in cache until the next successful transaction. You can remove cached packages by executing 'dnf clean packages'. Error: Could not run transaction. Traceback (most recent call last): File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/dnf.py", line 90, in test_dnf_install self.dnf_with_repo('remove -y run-postinsts-dev') File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/dnf.py", line 69, in dnf_with_repo output = self.dnf(" ".join(cmdlinerepoopts) + " --nogpgcheck " + command) File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/dnf.py", line 21, in dnf self.assertEqual(status, expected, message) AssertionError: 1 != 0 : dnf --repofrompath=oe-testimage-repo-qemux86,http://192.168.7.3:35043/qemux86 --repofrompath=oe-testimage-repo-noarch,http://192.168.7.3:35043/noarch --repofrompath=oe-testimage-repo-core2_32,http://192.168.7.3:35043/core2_32 --nogpgcheck remove -y run-postinsts-dev Added oe-testimage-repo-qemux86 repo from http://192.168.7.3:35043/qemux86 Added oe-testimage-repo-noarch repo from http://192.168.7.3:35043/noarch Added oe-testimage-repo-core2_32 repo from http://192.168.7.3:35043/core2_32 Dependencies resolved. ================================================================================ Package Architecture Version Repository Size ================================================================================ Removing: run-postinsts-dev noarch 1.0-r10 @oe-repo 0 Transaction Summary ================================================================================ Remove 1 Package Freed space: 0 Running transaction check Transaction check succeeded. Running transaction test Transaction test succeeded. Running transaction Failed to obtain the transaction lock (logged in as: root). Error: Could not run transaction. Test case dnf.DnfRepoTest.test_dnf_install_dependency depends on dnf.DnfRepoTest.test_dnf_install but it didn't pass/run. Test case dnf.DnfRepoTest.test_dnf_install_from_disk depends on dnf.DnfRepoTest.test_dnf_install_dependency but it didn't pass/run. Test case dnf.DnfRepoTest.test_dnf_install_from_http depends on dnf.DnfRepoTest.test_dnf_install_from_disk but it didn't pass/run. Test run when enable usrmege Test case dnf.DnfRepoTest.test_dnf_reinstall depends on dnf.DnfRepoTest.test_dnf_install but it didn't pass/run. Stopped HTTPService on 0.0.0.0:35043 Test requires opkg to be installed Test requires pam to be in DISTRO_FEATURES Traceback (most recent call last): File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 370, in test_parselogs self.assertEqual(errcount, 0, msg=self.msg) AssertionError: 6 != 0 : Log: /home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/build/tmp/work/qemux86-poky-linux/core-image-sato-sdk/1.0-r0/target_logs/dnf.log ----------------------- Central error: 2020-02-20T12:13:10Z CRITICAL Failed to obtain the transaction lock (logged in as: root). *********************** 2020-02-20T12:13:10Z INFO Total 14 MB/s | 305 kB 00:00 2020-02-20T12:13:10Z INFO Running transaction check 2020-02-20T12:13:10Z INFO Transaction check succeeded. 2020-02-20T12:13:10Z INFO Running transaction test 2020-02-20T12:13:10Z INFO Transaction test succeeded. 2020-02-20T12:13:10Z DDEBUG timer: transaction test: 145 ms 2020-02-20T12:13:10Z INFO Running transaction 2020-02-20T12:13:10Z DEBUG RPMDB altered outside of DNF. 2020-02-20T12:13:10Z DDEBUG RPM transaction start. 2020-02-20T12:13:10Z DDEBUG RPM transaction over. 2020-02-20T12:13:10Z CRITICAL Failed to obtain the transaction lock (logged in as: root). 2020-02-20T12:13:10Z DDEBUG Cleaning up. 2020-02-20T12:13:10Z INFO The downloaded packages were saved in cache until the next successful transaction. 2020-02-20T12:13:10Z INFO You can remove cached packages by executing 'dnf clean packages'. 2020-02-20T12:13:10Z SUBDEBUG Traceback (most recent call last): File "/usr/lib/python3.8/site-packages/dnf/cli/main.py", line 64, in main return _main(base, args, cli_class, option_parser_class) File "/usr/lib/python3.8/site-packages/dnf/cli/main.py", line 99, in _main return cli_run(cli, base) File "/usr/lib/python3.8/site-packages/dnf/cli/main.py", line 123, in cli_run *********************** Central error: raise dnf.exceptions.Error(msg) *********************** return cli_run(cli, base) File "/usr/lib/python3.8/site-packages/dnf/cli/main.py", line 123, in cli_run ret = resolving(cli, base) File "/usr/lib/python3.8/site-packages/dnf/cli/main.py", line 167, in resolving base.do_transaction(display=displays) File "/usr/lib/python3.8/site-packages/dnf/cli/cli.py", line 225, in do_transaction tid = super(BaseCli, self).do_transaction(display) File "/usr/lib/python3.8/site-packages/dnf/base.py", line 882, in do_transaction tid = self._run_transaction(cb=cb) File "/usr/lib/python3.8/site-packages/dnf/base.py", line 1005, in _run_transaction raise dnf.exceptions.Error(msg) dnf.exceptions.Error: Could not run transaction. 2020-02-20T12:13:10Z CRITICAL Error: Could not run transaction. 2020-02-20T12:13:10Z INFO --- logging initialized --- 2020-02-20T12:13:10Z DDEBUG timer: config: 3 msa 2020-02-20T12:13:10Z DEBUG DNF version: 4.2.2 2020-02-20T12:13:10Z DDEBUG Command: dnf --repofrompath=oe-testimage-repo-qemux86,http://192.168.7.3:35043/qemux86 --repofrompath=oe-testimage-repo-noarch,http://192.168.7.3:35043/noarch --repofrompath=oe-testimage-repo-core2_32,http://192.168.7.3:35043/core2_32 --nogpgcheck list run-postinsts-dev 2020-02-20T12:13:10Z DDEBUG Installroot: / 2020-02-20T12:13:10Z DDEBUG Releasever: master 2020-02-20T12:13:10Z DEBUG cachedir: /var/cache/dnf 2020-02-20T12:13:10Z DDEBUG Base command: list est requires ptest-runner to be installed Traceback (most recent call last): File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/rpm.py", line 100, in test_rpm_install self.assertEqual(status, 0, msg=msg) AssertionError: 1 != 0 : Failed to install base-passwd-doc package: error: db5 error(-30969) from dbenv->open: BDB0091 DB_VERSION_MISMATCH: Database environment version mismatch error: cannot open Packages index using db5 - (-30969) error: cannot open Packages database in /var/lib/rpm From wallinux at gmail.com Thu Feb 20 12:38:50 2020 From: wallinux at gmail.com (Anders Wallin) Date: Thu, 20 Feb 2020 13:38:50 +0100 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: References: <20200218132054.20341-1-wallinux@gmail.com> <20200219152720.GM17818@joraj-alpa> <143f590b688ed8166a702873275c16f3c7217d52.camel@linuxfoundation.org> <20200219155626.GN17818@joraj-alpa> Message-ID: Hi Alex, should I update the patch to include changes to maintainer file, packagegroup etc in the same way as for babeltrace or is it something you will do? Anders Wallin On Wed, Feb 19, 2020 at 5:02 PM Alexander Kanavin wrote: > On Wed, 19 Feb 2020 at 16:56, Jonathan Rajotte-Julien < > jonathan.rajotte-julien at efficios.com> wrote: > >> > There are some things where the namespaces are quite specific (python >> > vs python3, gtk(+) 2/3/4, qt) but they're fairly few and far between. >> > >> > If babeltrace2 will replace babeltrace and become babeltrace, we >> > probably want to keep PN as babeltrace. If it will be known as >> > babeltrace2 always, we probably change PN. >> >> Babeltrace 2 executable will be forever named babeltrace2. >> >> Hope this clear up this part a bit. >> > > Right, then I'm fine with naming the recipe babeltrace2. > > Alex > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 20 12:42:26 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 20 Feb 2020 13:42:26 +0100 Subject: [OE-core] [PATCH] babeltrace2: added 2.0.1 In-Reply-To: References: <20200218132054.20341-1-wallinux@gmail.com> <20200219152720.GM17818@joraj-alpa> <143f590b688ed8166a702873275c16f3c7217d52.camel@linuxfoundation.org> <20200219155626.GN17818@joraj-alpa> Message-ID: Generally this should be done by the person introducing the new recipe. Also check that upstream version check works correctly for both: devtool latest-version babeltrace (this should be probably limited to 1.x versions) devtool latest-version babeltrace2 Alex On Thu, 20 Feb 2020 at 13:39, Anders Wallin wrote: > Hi Alex, > > should I update the patch to include changes to maintainer file, > packagegroup etc in the same way as for babeltrace or > is it something you will do? > > Anders Wallin > > > On Wed, Feb 19, 2020 at 5:02 PM Alexander Kanavin > wrote: > >> On Wed, 19 Feb 2020 at 16:56, Jonathan Rajotte-Julien < >> jonathan.rajotte-julien at efficios.com> wrote: >> >>> > There are some things where the namespaces are quite specific (python >>> > vs python3, gtk(+) 2/3/4, qt) but they're fairly few and far between. >>> > >>> > If babeltrace2 will replace babeltrace and become babeltrace, we >>> > probably want to keep PN as babeltrace. If it will be known as >>> > babeltrace2 always, we probably change PN. >>> >>> Babeltrace 2 executable will be forever named babeltrace2. >>> >>> Hope this clear up this part a bit. >>> >> >> Right, then I'm fine with naming the recipe babeltrace2. >> >> Alex >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From schnitzeltony at gmail.com Thu Feb 20 12:45:11 2020 From: schnitzeltony at gmail.com (=?UTF-8?Q?Andreas_M=C3=BCller?=) Date: Thu, 20 Feb 2020 13:45:11 +0100 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection In-Reply-To: References: <20200220002849.9126-1-schnitzeltony@gmail.com> Message-ID: On Thu, Feb 20, 2020 at 11:07 AM Alexander Kanavin wrote: > > You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? > This line: > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70 > > And for consistency, it would be good to do the same for gtk-doc. This is odd: I fell over this because there was no gir created. Did not notice it was few lines below. Need to check that - maybe I am a bit off-sync to master or something is wrong elsewhere. Will sync to master and send V2 then. Andreas > > Alex > > ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ > > ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ > > > On Thu, 20 Feb 2020 at 01:29, Andreas M?ller wrote: >> >> Enable if 'gobject-introspection-data' is in DISTRO_FEATURES. This is what >> gobject-introspection.bbclass does automatically for projects build with >> autotools and meson. >> >> It was checked: there are webkitgtk and libdnf inheriting gobject-introspection >> and cmake. Since libdnf cannot configure gir, webkitgtk seems the only project >> requiring gir-auto-enabling. So handle at recipe / no common magic at >> gobject-introspection.bbclass required. >> >> Signed-off-by: Andreas M?ller >> --- >> >> This patch applies on top of master-next/Alex's patches sent >> >> meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> index 585723772e..d5085620d2 100644 >> --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> @@ -39,6 +39,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ >> " >> >> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ >> + ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'gobject-introspection', '' ,d)} \ >> ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ >> enchant \ >> libsecret \ >> @@ -46,6 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ >> >> PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" >> PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" >> +PACKAGECONFIG[gobject-introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF" >> PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" >> PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" >> PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" >> -- >> 2.21.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Thu Feb 20 14:02:18 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 20 Feb 2020 14:02:18 +0000 Subject: [OE-core] [PATCH] oeqa/logparser: Fix performance issues with ptest log parsing Message-ID: <20200220140218.165918-1-richard.purdie@linuxfoundation.org> On the autobuilder a ptest log with 2.1 million lines took around 18 hours to process. This is clearly crazy. We can tweak the processing code to: a) Stop repeatedly joining large strings together (append to a list instead) b) Use one startswith expression instead of multiple re.search() operations With this change it takes 18 hours down to around 12s. Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/logparser.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 7313df8ec35..54037210736 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py @@ -25,13 +25,20 @@ class PtestParser(object): section_regex['exitcode'] = re.compile(r"^ERROR: Exit status is (.+)") section_regex['timeout'] = re.compile(r"^TIMEOUT: .*/(.+)/ptest") + # Cache markers so we don't take the re.search() hit all the time. + markers = ("PASSED", "FAILED", "SKIPPED", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") + def newsection(): - return { 'name': "No-section", 'log': "" } + return { 'name': "No-section", 'log': [] } current_section = newsection() with open(logfile, errors='replace') as f: for line in f: + if not line.startswith(markers): + current_section['log'].append(line) + continue + result = section_regex['begin'].search(line) if result: current_section['name'] = result.group(1) @@ -61,7 +68,7 @@ class PtestParser(object): current_section[t] = result.group(1) continue - current_section['log'] = current_section['log'] + line + current_section['log'].append(line) for t in test_regex: result = test_regex[t].search(line) @@ -70,6 +77,11 @@ class PtestParser(object): self.results[current_section['name']] = {} self.results[current_section['name']][result.group(1).strip()] = t + # Python performance for repeatedly joining long strings is poor, do it all at once at the end. + # For 2.1 million lines in a log this reduces 18 hours to 12s. + for section in self.sections: + self.sections[section]['log'] = "".join(self.sections[section]['log']) + return self.results, self.sections # Log the results as files. The file name is the section name and the contents are the tests in that section. -- 2.25.0 From jonathan.rajotte-julien at efficios.com Thu Feb 20 14:37:38 2020 From: jonathan.rajotte-julien at efficios.com (Jonathan Rajotte-Julien) Date: Thu, 20 Feb 2020 09:37:38 -0500 (EST) Subject: [OE-core] [PATCH] lttng-modules: Check the pid_ns before using it because it may be NULL In-Reply-To: <4688fc5ac550088b553d602ef1ecb110447a9100.camel@linuxfoundation.org> References: <1582165584-187223-1-git-send-email-li.zhou@windriver.com> <4688fc5ac550088b553d602ef1ecb110447a9100.camel@linuxfoundation.org> Message-ID: <1762953313.2081.1582209458673.JavaMail.zimbra@efficios.com> I forwarded it to lttng-modules maintainer. I'll get back to you as soon as I get feedback. ----- Richard Purdie wrote: > On Thu, 2020-02-20 at 10:26 +0800, Li Zhou wrote: > > Check the pid_ns before using it because it may be NULL to fix below > > issue: > > <1>[ 22.637196] Unable to handle kernel NULL pointer dereference at > > virtual address 0000000000000080 > > <1>[ 22.645982] Mem abort info: > > <1>[ 22.648769] ESR = 0x96000007 > > <1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits > > <1>[ 22.657730] SET = 0, FnV = 0 > > <1>[ 22.660777] EA = 0, S1PTW = 0 > > <1>[ 22.663910] Data abort info: > > <1>[ 22.666784] ISV = 0, ISS = 0x00000007 > > <1>[ 22.670611] CM = 0, WnR = 0 > > <1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = > > 0000000012378f78 > > <1>[ 22.680180] [0000000000000080] pgd=000000007f023003, > > pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 > > <0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP > > <4>[ 22.690797] Modules linked in: adkNetD ncp > > lttng_ring_buffer_client_overwrite(C) > > lttng_ring_buffer_metadata_client(C) > > lttng_ring_buffer_client_discard(C) > > lttng_ring_buffer_client_mmap_overwrite(C) > > lttng_ring_buffer_client_mmap_discard(C) > > lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) > > lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) > > lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) > > lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) > > lttng_clock(C) > > <0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = > > 0x000000005d27910f) > > <4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C > > 4.18.37-rt820-custom #1 > > <4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) > > <4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) > > <4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] > > <4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] > > <4>[ 22.690851] sp : ffffffc07fe57ad0 > > <4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 > > <4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 > > <4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 > > <4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 > > <4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 > > <4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe > > <4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 > > <4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f > > <4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 > > <4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f > > <4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 > > <4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 > > <4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 > > <4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 > > <4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 > > <4>[ 22.690896] Call trace: > > <4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] > > <4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] > > <4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] > > <4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] > > <4>[ 22.691026] compat_sys_ioctl+0x110/0x778 > > > > Signed-off-by: Li Zhou > > Are upstream aware of this issue? I'd really like their opinion on this > before we merge anything. > > Cheers, > > Richard > > > From jonathan.rajotte-julien at efficios.com Thu Feb 20 14:47:35 2020 From: jonathan.rajotte-julien at efficios.com (Jonathan Rajotte-Julien) Date: Thu, 20 Feb 2020 09:47:35 -0500 (EST) Subject: [OE-core] [PATCH] lttng-modules: Check the pid_ns before using it because it may be NULL In-Reply-To: <1582165584-187223-1-git-send-email-li.zhou@windriver.com> References: <1582165584-187223-1-git-send-email-li.zhou@windriver.com> Message-ID: <1196510898.2098.1582210055795.JavaMail.zimbra@efficios.com> Hi, Can we get more info on the kernel version and config? Did you submit this on our mailing list?(lttng-dev). If not I would highly recommend that you do so in the future so we can eliminate *custom* patches and get to the bottom of the issue at hand so that the whole community benefit from it. Cheers ----- Li Zhou wrote: > Check the pid_ns before using it because it may be NULL to fix below > issue: > <1>[ 22.637196] Unable to handle kernel NULL pointer dereference at > virtual address 0000000000000080 > <1>[ 22.645982] Mem abort info: > <1>[ 22.648769] ESR = 0x96000007 > <1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits > <1>[ 22.657730] SET = 0, FnV = 0 > <1>[ 22.660777] EA = 0, S1PTW = 0 > <1>[ 22.663910] Data abort info: > <1>[ 22.666784] ISV = 0, ISS = 0x00000007 > <1>[ 22.670611] CM = 0, WnR = 0 > <1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = > 0000000012378f78 > <1>[ 22.680180] [0000000000000080] pgd=000000007f023003, > pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 > <0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP > <4>[ 22.690797] Modules linked in: adkNetD ncp > lttng_ring_buffer_client_overwrite(C) > lttng_ring_buffer_metadata_client(C) lttng_ring_buffer_client_discard(C) > lttng_ring_buffer_client_mmap_overwrite(C) > lttng_ring_buffer_client_mmap_discard(C) > lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) > lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) > lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) > lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) lttng_clock(C) > <0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = > 0x000000005d27910f) > <4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C > 4.18.37-rt820-custom #1 > <4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) > <4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) > <4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] > <4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] > <4>[ 22.690851] sp : ffffffc07fe57ad0 > <4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 > <4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 > <4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 > <4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 > <4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 > <4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe > <4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 > <4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f > <4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 > <4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f > <4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 > <4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 > <4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 > <4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 > <4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 > <4>[ 22.690896] Call trace: > <4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] > <4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] > <4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] > <4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] > <4>[ 22.691026] compat_sys_ioctl+0x110/0x778 > > Signed-off-by: Li Zhou > --- > ...es-Check-the-pid_ns-before-using-it-becau.patch | 86 ++++++++++++++++++++++ > meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb | 2 + > 2 files changed, 88 insertions(+) > create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch > > diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch > new file mode 100644 > index 0000000..5306c79 > --- /dev/null > +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch > @@ -0,0 +1,86 @@ > +From 0c0072e005ce9d591518d1819a39264859132561 Mon Sep 17 00:00:00 2001 > +From: Li Zhou > +Date: Wed, 19 Feb 2020 11:14:38 +0800 > +Subject: [PATCH] lttng-modules: Check the pid_ns before using it because it > + may be NULL > + > +<1>[ 22.637196] Unable to handle kernel NULL pointer dereference at > +virtual address 0000000000000080 > +<1>[ 22.645982] Mem abort info: > +<1>[ 22.648769] ESR = 0x96000007 > +<1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits > +<1>[ 22.657730] SET = 0, FnV = 0 > +<1>[ 22.660777] EA = 0, S1PTW = 0 > +<1>[ 22.663910] Data abort info: > +<1>[ 22.666784] ISV = 0, ISS = 0x00000007 > +<1>[ 22.670611] CM = 0, WnR = 0 > +<1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = > +0000000012378f78 > +<1>[ 22.680180] [0000000000000080] pgd=000000007f023003, > +pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 > +<0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP > +<4>[ 22.690797] Modules linked in: adkNetD ncp > +lttng_ring_buffer_client_overwrite(C) > +lttng_ring_buffer_metadata_client(C) lttng_ring_buffer_client_discard(C) > +lttng_ring_buffer_client_mmap_overwrite(C) > +lttng_ring_buffer_client_mmap_discard(C) > +lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) > +lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) > +lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) > +lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) lttng_clock(C) > +<0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = > +0x000000005d27910f) > +<4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C > +4.18.37-rt820-custom #1 > +<4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) > +<4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) > +<4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] > +<4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] > +<4>[ 22.690851] sp : ffffffc07fe57ad0 > +<4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 > +<4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 > +<4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 > +<4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 > +<4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 > +<4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe > +<4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 > +<4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f > +<4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 > +<4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f > +<4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 > +<4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 > +<4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 > +<4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 > +<4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 > +<4>[ 22.690896] Call trace: > +<4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] > +<4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] > +<4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] > +<4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] > +<4>[ 22.691026] compat_sys_ioctl+0x110/0x778 > + > +Signed-off-by: Liguang Li > + > +Upstream-Status: Pending > + > +Signed-off-by: Li Zhou > +--- > + lttng-statedump-impl.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c > +index 1c09e51..fb609e3 100644 > +--- a/lttng-statedump-impl.c > ++++ b/lttng-statedump-impl.c > +@@ -397,7 +397,7 @@ void lttng_statedump_process_ns(struct lttng_session *session, > + do { > + trace_lttng_statedump_process_state(session, > + p, type, mode, submode, status, pid_ns); > +- pid_ns = pid_ns->parent; > ++ pid_ns = pid_ns ? pid_ns->parent : NULL; > + } while (pid_ns); > + } > + > +-- > +1.9.1 > + > diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb > index c833ff7..cbd43e3 100644 > --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb > +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb > @@ -11,6 +11,7 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' > SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ > file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ > file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ > + file://0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch \ > " > > SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" > @@ -36,6 +37,7 @@ DEFAULT_PREFERENCE_class-devupstream = "-1" > SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ > file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ > file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ > + file://0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch \ > " > SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" > PV_class-devupstream = "2.11.1+git${SRCPV}" > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From malus.brandywine at gmail.com Thu Feb 20 15:03:18 2020 From: malus.brandywine at gmail.com (Nataliya Korovkina) Date: Thu, 20 Feb 2020 10:03:18 -0500 Subject: [OE-core] [PATCH] Set default CONNECTIVITY_CHECK_URIS to https://www.yoctoproject.org/ Message-ID: <20200220150318.20003-1-malus.brandywine@gmail.com> Signed-off-by: Nataliya Korovkina --- meta/conf/distro/include/default-distrovars.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 433d4b6651..6c9155b2ae 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -48,4 +48,4 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}" # fetch from the network (and warn you if not). To disable the test set # the variable to be empty. # Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master -CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" +CONNECTIVITY_CHECK_URIS ?= "https://www.yoctoproject.org/" -- 2.17.1 From praveen at linumiz.com Thu Feb 20 15:02:19 2020 From: praveen at linumiz.com (praveen at linumiz.com) Date: Thu, 20 Feb 2020 16:02:19 +0100 Subject: [OE-core] [PATCH] alsa-utils: upgrade 1.2.1 -> 1.2.2 Message-ID: Signed-off-by: Praveen Muthusamy --- ...lsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} | 0 .../alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} (100%) rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} (97%) diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb similarity index 100% rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb index 9144af628a..8bbc5d3ef3 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb @@ -21,8 +21,8 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" -SRC_URI[md5sum] = "c4628bae7632937eac2de4cf2a3de82e" -SRC_URI[sha256sum] = "0b110ba71ef41d3009db1bc4dcae0cf79efb99cb5426fa19d0312470560a2c0d" +SRC_URI[md5sum] = "00612234ff4722c8f7f8f7a83ff9bc63" +SRC_URI[sha256sum] = "44807bd578c5f6df6e91a11b8d37e546424a5a1ea8d8e659ee359fe01730e4f3" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with -- 2.17.1 From richard.purdie at linuxfoundation.org Thu Feb 20 15:27:56 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 20 Feb 2020 15:27:56 +0000 Subject: [OE-core] [PATCH] Set default CONNECTIVITY_CHECK_URIS to https://www.yoctoproject.org/ In-Reply-To: <20200220150318.20003-1-malus.brandywine@gmail.com> References: <20200220150318.20003-1-malus.brandywine@gmail.com> Message-ID: <18c55700df9ee84ea44fbffc93ba4e9f3c0e1663.camel@linuxfoundation.org> On Thu, 2020-02-20 at 10:03 -0500, Nataliya Korovkina wrote: > Signed-off-by: Nataliya Korovkina > --- > meta/conf/distro/include/default-distrovars.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/conf/distro/include/default-distrovars.inc > b/meta/conf/distro/include/default-distrovars.inc > index 433d4b6651..6c9155b2ae 100644 > --- a/meta/conf/distro/include/default-distrovars.inc > +++ b/meta/conf/distro/include/default-distrovars.inc > @@ -48,4 +48,4 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}" > # fetch from the network (and warn you if not). To disable the test > set > # the variable to be empty. > # Git example url: git://git.yoctoproject.org/yocto-firewall- > test;protocol=git;rev=master > -CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" > +CONNECTIVITY_CHECK_URIS ?= "https://www.yoctoproject.org/" Why would that be better? There have been several requests to change this however I'm not sure we can find one perfect url we can use :( Cheers, Richard From patchwork at patchwork.openembedded.org Thu Feb 20 15:32:13 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Thu, 20 Feb 2020 15:32:13 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_alsa-utils?= =?utf-8?b?OiB1cGdyYWRlIDEuMi4xIC0+IDEuMi4y?= In-Reply-To: References: Message-ID: <20200220153213.2276.77672@do> == Series Details == Series: alsa-utils: upgrade 1.2.1 -> 1.2.2 Revision: 1 URL : https://patchwork.openembedded.org/series/22793/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] Suggested fix Create the series again using git-format-patch and ensure it can be applied using git am Diff line "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 10c2216cb6) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From jpewhacker at gmail.com Thu Feb 20 16:21:43 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 20 Feb 2020 10:21:43 -0600 Subject: [OE-core] [PATCH 04/13] wayland: convert to meson build In-Reply-To: <20200219194752.7967-4-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> <20200219194752.7967-4-alex.kanavin@gmail.com> Message-ID: On Wed, Feb 19, 2020 at 1:49 PM Alexander Kanavin wrote: > > Replace an autotools-specific .pc adjustment patch with a meson-specific one. This can (and did) break meta-mingw in the autobuilder, but I pushed the fix to master-next of meta-mingw (https://git.yoctoproject.org/cgit/cgit.cgi/meta-mingw/commit/?h=master-next&id=32ccf9d5089694e4a58951ca1a38452f889a27ef), so that can be pulled in to try again > > Signed-off-by: Alexander Kanavin > --- > ...hardcode-the-path-to-wayland-scanner.patch | 26 +++++++++++++++ > ...-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++ > .../wayland/wayland/fixpathinpcfiles.patch | 32 ------------------- > .../wayland/wayland_1.18.0.bb | 11 ++++--- > 4 files changed, 59 insertions(+), 37 deletions(-) > create mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch > delete mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch > > diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > new file mode 100644 > index 0000000000..2199548bdf > --- /dev/null > +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > @@ -0,0 +1,26 @@ > +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin > +Date: Mon, 17 Feb 2020 21:46:18 +0100 > +Subject: [PATCH] Do not hardcode the path to wayland-scanner > + > +This results in host contamination during builds. > + > +Upstream-Status: Inappropriate [oe-core specific] > +Signed-off-by: Alexander Kanavin > +--- > + src/meson.build | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/meson.build b/src/meson.build > +index 294aee0..7e410fa 100644 > +--- a/src/meson.build > ++++ b/src/meson.build > +@@ -49,7 +49,7 @@ pkgconfig.generate( > + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), > + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), > + 'bindir=' + join_paths('${prefix}', get_option('bindir')), > +- 'wayland_scanner=${bindir}/wayland-scanner' > ++ 'wayland_scanner=wayland-scanner' > + ], > + filebase: 'wayland-scanner' > + ) > diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch > new file mode 100644 > index 0000000000..f98037a850 > --- /dev/null > +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch > @@ -0,0 +1,27 @@ > +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin > +Date: Sun, 16 Feb 2020 16:29:53 +0100 > +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH > + > +Otherwise, meson attempts to use the target pkg-config and fails. > + > +Upstream-Status: Pending > +Signed-off-by: Alexander Kanavin > +--- > + src/meson.build | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/src/meson.build b/src/meson.build > +index 3e8c9bf..294aee0 100644 > +--- a/src/meson.build > ++++ b/src/meson.build > +@@ -55,8 +55,7 @@ pkgconfig.generate( > + ) > + > + if meson.is_cross_build() > +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') > +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) > ++ wayland_scanner_for_build = find_program('wayland-scanner') > + else > + wayland_scanner_for_build = wayland_scanner > + endif > diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch > deleted file mode 100644 > index ad3526d984..0000000000 > --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -Fix wayland-client and wayland-scanner pc files > - > -Upstream-Status: Pending > - > -Signed-off-by: Fabien Lahoudere > - > -Index: wayland-1.14.0/src/wayland-client.pc.in > -=================================================================== > ---- wayland-1.14.0.orig/src/wayland-client.pc.in > -+++ wayland-1.14.0/src/wayland-client.pc.in > -@@ -1,7 +1,7 @@ > - prefix=@prefix@ > - exec_prefix=@exec_prefix@ > - datarootdir=@datarootdir@ > --pkgdatadir=@datadir@/@PACKAGE@ > -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ > - libdir=@libdir@ > - includedir=@includedir@ > - > -Index: wayland-1.14.0/src/wayland-scanner.pc.in > -=================================================================== > ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in > -+++ wayland-1.14.0/src/wayland-scanner.pc.in > -@@ -2,7 +2,7 @@ prefix=@prefix@ > - exec_prefix=@exec_prefix@ > - datarootdir=@datarootdir@ > - pkgdatadir=@datadir@/@PACKAGE@ > --wayland_scanner=@bindir@/wayland-scanner > -+wayland_scanner=wayland-scanner > - > - Name: Wayland Scanner > - Description: Wayland scanner > diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb > index 7a3f075552..a702b3f6cc 100644 > --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb > +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb > @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ > DEPENDS = "expat libffi wayland-native" > > SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ > - file://fixpathinpcfiles.patch \ > + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ > + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ > " > SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" > SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" > > UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" > > -inherit autotools pkgconfig > +inherit meson pkgconfig > > PACKAGECONFIG ??= "dtd-validation" > -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,," > +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," > > -EXTRA_OECONF = "--disable-documentation --with-host-scanner" > -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" > +EXTRA_OEMESON = "-Ddocumentation=false" > +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" > > # Wayland installs a M4 macro for other projects to use, which uses the target > # pkg-config to find files. Replace pkg-config with pkg-config-native. > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From malus.brandywine at gmail.com Thu Feb 20 16:30:21 2020 From: malus.brandywine at gmail.com (Nataliya Korovkina) Date: Thu, 20 Feb 2020 11:30:21 -0500 Subject: [OE-core] [PATCH] Set default CONNECTIVITY_CHECK_URIS to https://www.yoctoproject.org/ In-Reply-To: <18c55700df9ee84ea44fbffc93ba4e9f3c0e1663.camel@linuxfoundation.org> References: <20200220150318.20003-1-malus.brandywine@gmail.com> <18c55700df9ee84ea44fbffc93ba4e9f3c0e1663.camel@linuxfoundation.org> Message-ID: https://www.yoctoproject.org/ is good enough until the project is on. https://www.example.com/ doesn't exist for at least a year while I'm witnessing it, so the instructions of "Quick build" don't work out-of-the-box. Thanks, Nataliya On Thu, Feb 20, 2020 at 10:27 AM Richard Purdie wrote: > > On Thu, 2020-02-20 at 10:03 -0500, Nataliya Korovkina wrote: > > Signed-off-by: Nataliya Korovkina > > --- > > meta/conf/distro/include/default-distrovars.inc | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/conf/distro/include/default-distrovars.inc > > b/meta/conf/distro/include/default-distrovars.inc > > index 433d4b6651..6c9155b2ae 100644 > > --- a/meta/conf/distro/include/default-distrovars.inc > > +++ b/meta/conf/distro/include/default-distrovars.inc > > @@ -48,4 +48,4 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}" > > # fetch from the network (and warn you if not). To disable the test > > set > > # the variable to be empty. > > # Git example url: git://git.yoctoproject.org/yocto-firewall- > > test;protocol=git;rev=master > > -CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" > > +CONNECTIVITY_CHECK_URIS ?= "https://www.yoctoproject.org/" > > Why would that be better? > > There have been several requests to change this however I'm not sure we > can find one perfect url we can use :( > > Cheers, > > Richard > From ross at burtonini.com Thu Feb 20 16:36:53 2020 From: ross at burtonini.com (Ross Burton) Date: Thu, 20 Feb 2020 16:36:53 +0000 Subject: [OE-core] [PATCH] Set default CONNECTIVITY_CHECK_URIS to https://www.yoctoproject.org/ In-Reply-To: References: <20200220150318.20003-1-malus.brandywine@gmail.com> <18c55700df9ee84ea44fbffc93ba4e9f3c0e1663.camel@linuxfoundation.org> Message-ID: On Thu, 20 Feb 2020 at 16:30, Nataliya Korovkina wrote: > https://www.yoctoproject.org/ is good enough until the project is on. > https://www.example.com/ doesn't exist for at least a year while I'm > witnessing it, so the instructions of "Quick build" don't work > out-of-the-box. $ GET www.example.com Example Domain ...

Example Domain

This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.

More information...

Works for me, and everyone else presumably. What specific issues are you seeing? Ross From alex.kanavin at gmail.com Thu Feb 20 16:38:36 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 20 Feb 2020 17:38:36 +0100 Subject: [OE-core] [PATCH 04/13] wayland: convert to meson build In-Reply-To: References: <20200219194752.7967-1-alex.kanavin@gmail.com> <20200219194752.7967-4-alex.kanavin@gmail.com> Message-ID: Thanks for looking into it :) Alex On Thu, 20 Feb 2020 at 17:21, Joshua Watt wrote: > On Wed, Feb 19, 2020 at 1:49 PM Alexander Kanavin > wrote: > > > > Replace an autotools-specific .pc adjustment patch with a meson-specific > one. > > This can (and did) break meta-mingw in the autobuilder, but I pushed > the fix to master-next of meta-mingw > ( > https://git.yoctoproject.org/cgit/cgit.cgi/meta-mingw/commit/?h=master-next&id=32ccf9d5089694e4a58951ca1a38452f889a27ef > ), > so that can be pulled in to try again > > > > > Signed-off-by: Alexander Kanavin > > --- > > ...hardcode-the-path-to-wayland-scanner.patch | 26 +++++++++++++++ > > ...-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++ > > .../wayland/wayland/fixpathinpcfiles.patch | 32 ------------------- > > .../wayland/wayland_1.18.0.bb | 11 ++++--- > > 4 files changed, 59 insertions(+), 37 deletions(-) > > create mode 100644 > meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > > create mode 100644 > meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch > > delete mode 100644 > meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch > > > > diff --git > a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > > new file mode 100644 > > index 0000000000..2199548bdf > > --- /dev/null > > +++ > b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > > @@ -0,0 +1,26 @@ > > +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin > > +Date: Mon, 17 Feb 2020 21:46:18 +0100 > > +Subject: [PATCH] Do not hardcode the path to wayland-scanner > > + > > +This results in host contamination during builds. > > + > > +Upstream-Status: Inappropriate [oe-core specific] > > +Signed-off-by: Alexander Kanavin > > +--- > > + src/meson.build | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/src/meson.build b/src/meson.build > > +index 294aee0..7e410fa 100644 > > +--- a/src/meson.build > > ++++ b/src/meson.build > > +@@ -49,7 +49,7 @@ pkgconfig.generate( > > + 'datarootdir=' + join_paths('${prefix}', > get_option('datadir')), > > + 'pkgdatadir=' + join_paths('${datarootdir}', > meson.project_name()), > > + 'bindir=' + join_paths('${prefix}', > get_option('bindir')), > > +- 'wayland_scanner=${bindir}/wayland-scanner' > > ++ 'wayland_scanner=wayland-scanner' > > + ], > > + filebase: 'wayland-scanner' > > + ) > > diff --git > a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch > b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch > > new file mode 100644 > > index 0000000000..f98037a850 > > --- /dev/null > > +++ > b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch > > @@ -0,0 +1,27 @@ > > +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin > > +Date: Sun, 16 Feb 2020 16:29:53 +0100 > > +Subject: [PATCH] meson.build: find the native wayland-scanner directly > in PATH > > + > > +Otherwise, meson attempts to use the target pkg-config and fails. > > + > > +Upstream-Status: Pending > > +Signed-off-by: Alexander Kanavin > > +--- > > + src/meson.build | 3 +-- > > + 1 file changed, 1 insertion(+), 2 deletions(-) > > + > > +diff --git a/src/meson.build b/src/meson.build > > +index 3e8c9bf..294aee0 100644 > > +--- a/src/meson.build > > ++++ b/src/meson.build > > +@@ -55,8 +55,7 @@ pkgconfig.generate( > > + ) > > + > > + if meson.is_cross_build() > > +- scanner_dep = dependency('wayland-scanner', native: true, > version: '>=1.14.0') > > +- wayland_scanner_for_build = > find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) > > ++ wayland_scanner_for_build = find_program('wayland-scanner') > > + else > > + wayland_scanner_for_build = wayland_scanner > > + endif > > diff --git > a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch > b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch > > deleted file mode 100644 > > index ad3526d984..0000000000 > > --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch > > +++ /dev/null > > @@ -1,32 +0,0 @@ > > -Fix wayland-client and wayland-scanner pc files > > - > > -Upstream-Status: Pending > > - > > -Signed-off-by: Fabien Lahoudere > > - > > -Index: wayland-1.14.0/src/wayland-client.pc.in > > -=================================================================== > > ---- wayland-1.14.0.orig/src/wayland-client.pc.in > > -+++ wayland-1.14.0/src/wayland-client.pc.in > > -@@ -1,7 +1,7 @@ > > - prefix=@prefix@ > > - exec_prefix=@exec_prefix@ > > - datarootdir=@datarootdir@ > > --pkgdatadir=@datadir@/@PACKAGE@ > > -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ > > - libdir=@libdir@ > > - includedir=@includedir@ > > - > > -Index: wayland-1.14.0/src/wayland-scanner.pc.in > > -=================================================================== > > ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in > > -+++ wayland-1.14.0/src/wayland-scanner.pc.in > > -@@ -2,7 +2,7 @@ prefix=@prefix@ > > - exec_prefix=@exec_prefix@ > > - datarootdir=@datarootdir@ > > - pkgdatadir=@datadir@/@PACKAGE@ > > --wayland_scanner=@bindir@/wayland-scanner > > -+wayland_scanner=wayland-scanner > > - > > - Name: Wayland Scanner > > - Description: Wayland scanner > > diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb > b/meta/recipes-graphics/wayland/wayland_1.18.0.bb > > index 7a3f075552..a702b3f6cc 100644 > > --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb > > +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb > > @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ > > DEPENDS = "expat libffi wayland-native" > > > > SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz > \ > > - file://fixpathinpcfiles.patch \ > > + > file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ > > + > file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ > > " > > SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" > > SRC_URI[sha256sum] = > "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" > > > > UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" > > > > -inherit autotools pkgconfig > > +inherit meson pkgconfig > > > > PACKAGECONFIG ??= "dtd-validation" > > -PACKAGECONFIG[dtd-validation] = > "--enable-dtd-validation,--disable-dtd-validation,libxml2,," > > +PACKAGECONFIG[dtd-validation] = > "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," > > > > -EXTRA_OECONF = "--disable-documentation --with-host-scanner" > > -EXTRA_OECONF_class-native = "--disable-documentation > --disable-libraries" > > +EXTRA_OEMESON = "-Ddocumentation=false" > > +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" > > > > # Wayland installs a M4 macro for other projects to use, which uses the > target > > # pkg-config to find files. Replace pkg-config with pkg-config-native. > > -- > > 2.25.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 20 16:50:50 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 08:50:50 -0800 Subject: [OE-core] [PATCH] ltp: Use upstreamed patch for time64 syscall fixes Message-ID: <20200220165050.3590678-1-raj.khem@gmail.com> Signed-off-by: Khem Raj --- ...or-time64-unsafe-syscalls-before-usi.patch | 109 +++++++++++------- 1 file changed, 66 insertions(+), 43 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index 92e5fdfe6e..c431669716 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,4 +1,4 @@ -From 09e631419d9763a4ff08b32d9801c12b475d8ec5 Mon Sep 17 00:00:00 2001 +From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Feb 2020 22:22:17 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them @@ -7,75 +7,98 @@ musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2020-February/015400.html] +Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj --- - lib/tst_clocks.c | 9 +++++++++ - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 4 ++++ - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 4 ++++ - 3 files changed, 17 insertions(+) + lib/tst_clocks.c | 9 +++++---- + testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 10 insertions(+), 13 deletions(-) -diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c -index 35798a4aaf..6a5b05c4ea 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -28,15 +28,24 @@ +@@ -22,21 +22,22 @@ + #define _GNU_SOURCE + #include + #include +-#include +- ++#define TST_NO_DEFAULT_MAIN ++#include "tst_test.h" + #include "tst_clocks.h" ++#include "lapi/syscalls.h" int tst_clock_getres(clockid_t clk_id, struct timespec *res) { -+#if defined(__NR_clock_getres) - return syscall(SYS_clock_getres, clk_id, res); -+#endif -+ return -1; +- return syscall(SYS_clock_getres, clk_id, res); ++ return tst_syscall(__NR_clock_getres, clk_id, res); } int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) { -+#if defined(__NR_clock_gettime) - return syscall(SYS_clock_gettime, clk_id, ts); -+#endif -+ return -1; +- return syscall(SYS_clock_gettime, clk_id, ts); ++ return tst_syscall(__NR_clock_gettime, clk_id, ts); } int tst_clock_settime(clockid_t clk_id, struct timespec *ts) { -+#if defined(__NR_clock_settime) - return syscall(SYS_clock_settime, clk_id, ts); -+#endif -+ return -1; +- return syscall(SYS_clock_settime, clk_id, ts); ++ return tst_syscall(__NR_clock_settime, clk_id, ts); } -diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -index 583d8f7b9b..b498de5b68 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -@@ -41,7 +41,11 @@ - #include +@@ -38,10 +38,8 @@ + #include + #include + #include "test.h" +-#include #include - -+#ifdef __NR_gettimeofday - #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) -+#else -+#define gettimeofday(a,b) (-1) -+#endif +- +-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#include "lapi/syscalls.h" char *TCID = "gettimeofday01"; int TST_TOTAL = 1; -diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -index 1d60f448e8..218e017df8 100644 +@@ -63,7 +61,7 @@ int main(int ac, char **av) + for (lc = 0; TEST_LOOPING(lc); lc++) { + tst_count = 0; + +- TEST(gettimeofday((void *)-1, (void *)-1)); ++ TEST(ltp_syscall(__NR_gettimeofday, (void *)-1, (void *)-1)); + + /* gettimeofday returns an int, so we need to turn the long + * TEST_RETURN into an int to test with */ --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -@@ -23,7 +23,11 @@ +@@ -16,14 +16,12 @@ + #include + #include + #include +-#include + #include + #include + #include #include "tst_test.h" - -+#ifdef __NR_gettimeofday - #define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) -+#else -+#define gettimeofday(a,b) (-1) -+#endif +- +-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) ++#include "lapi/syscalls.h" static volatile sig_atomic_t done; static char *str_rtime; --- -2.25.0 - +@@ -48,13 +46,13 @@ static void verify_gettimeofday(void) + + alarm(rtime); + +- if (gettimeofday(&tv1, NULL)) { ++ if (tst_syscall(__NR_gettimeofday, &tv1, NULL)) { + tst_res(TBROK | TERRNO, "gettimeofday() failed"); + return; + } + + while (!done) { +- if (gettimeofday(&tv2, NULL)) { ++ if (tst_syscall(__NR_gettimeofday, &tv2, NULL)) { + tst_res(TBROK | TERRNO, "gettimeofday() failed"); + return; + } -- 2.25.1 From raj.khem at gmail.com Thu Feb 20 16:53:17 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 08:53:17 -0800 Subject: [OE-core] [PATCH 1/2] libsolv: Enable rpm packageconfig by default only if rpm O_P_M is enabled Message-ID: <20200220165318.3677793-1-raj.khem@gmail.com> opkg also depends on libsolv and can needlessly pull in rpm even if the O_P_M does not desire to use rpm Signed-off-by: Khem Raj --- meta/recipes-extended/libsolv/libsolv_0.7.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb index 502f4e0e85..265a27c00d 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.10.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.10.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit cmake -PACKAGECONFIG ??= "rpm" +PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" -- 2.25.1 From raj.khem at gmail.com Thu Feb 20 16:53:18 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 08:53:18 -0800 Subject: [OE-core] [PATCH 2/2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: <20200220165318.3677793-1-raj.khem@gmail.com> References: <20200220165318.3677793-1-raj.khem@gmail.com> Message-ID: <20200220165318.3677793-2-raj.khem@gmail.com> dnf does not work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj --- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f1ad..220f1aabbd 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435b32..49afa04812 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" -- 2.25.1 From alex.kanavin at gmail.com Thu Feb 20 16:56:05 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 20 Feb 2020 17:56:05 +0100 Subject: [OE-core] [PATCH 2/2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: <20200220165318.3677793-2-raj.khem@gmail.com> References: <20200220165318.3677793-1-raj.khem@gmail.com> <20200220165318.3677793-2-raj.khem@gmail.com> Message-ID: Can you add "...due to missing rpm support in libsolv" to the reasoning string please? Alex On Thu, 20 Feb 2020 at 17:53, Khem Raj wrote: > dnf does not work with opkg or dpkg/apt anyway > > Signed-off-by: Khem Raj > --- > meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ > meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > index f38167f1ad..220f1aabbd 100644 > --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb > +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb > @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service > dnf-makecache.timer \ > dnf-automatic-notifyonly.service > dnf-automatic-notifyonly.timer \ > " > SYSTEMD_AUTO_ENABLE ?= "disable" > + > +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > index 882c435b32..49afa04812 100644 > --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb > @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" > EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" > > BBCLASSEXTEND = "native nativesdk" > +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > > -- > 2.25.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From jean-marie.lemetayer at savoirfairelinux.com Thu Feb 20 16:52:55 2020 From: jean-marie.lemetayer at savoirfairelinux.com (Jean-Marie LEMETAYER) Date: Thu, 20 Feb 2020 11:52:55 -0500 (EST) Subject: [OE-core] [PATCH] Set default CONNECTIVITY_CHECK_URIS to https://www.yoctoproject.org/ In-Reply-To: <18c55700df9ee84ea44fbffc93ba4e9f3c0e1663.camel@linuxfoundation.org> References: <20200220150318.20003-1-malus.brandywine@gmail.com> <18c55700df9ee84ea44fbffc93ba4e9f3c0e1663.camel@linuxfoundation.org> Message-ID: <248874866.3048780.1582217575008.JavaMail.zimbra@savoirfairelinux.com> On Feb 20, 2020, at 4:27 PM, Richard Purdie richard.purdie at linuxfoundation.org wrote: > On Thu, 2020-02-20 at 10:03 -0500, Nataliya Korovkina wrote: >> Signed-off-by: Nataliya Korovkina >> --- >> meta/conf/distro/include/default-distrovars.inc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/conf/distro/include/default-distrovars.inc >> b/meta/conf/distro/include/default-distrovars.inc >> index 433d4b6651..6c9155b2ae 100644 >> --- a/meta/conf/distro/include/default-distrovars.inc >> +++ b/meta/conf/distro/include/default-distrovars.inc >> @@ -48,4 +48,4 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}" >> # fetch from the network (and warn you if not). To disable the test >> set >> # the variable to be empty. >> # Git example url: git://git.yoctoproject.org/yocto-firewall- >> test;protocol=git;rev=master >> -CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" >> +CONNECTIVITY_CHECK_URIS ?= "https://www.yoctoproject.org/" > > Why would that be better? > > There have been several requests to change this however I'm not sure we > can find one perfect url we can use :( Hi Nataliya, I am one of those who made a request: http://lists.openembedded.org/pipermail/openembedded-core/2020-January/291926.html Since I have created 3 pages on GitHub pages, GitLab pages and Bitbucket pages: - https://connectivitycheck.github.io - https://connectivitycheck.github.io - https://connectivitycheck.bitbucket.io I think we could use them in a mirrored way like Richard have suggested (in my thread). I cannot do it right now, but this is definitely on my roadmap because I still see the issue regularly. Best Regards, Jean-Marie From raj.khem at gmail.com Thu Feb 20 17:07:11 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 09:07:11 -0800 Subject: [OE-core] [PATCH v3] binutils: Upgrade to 2.34 release In-Reply-To: References: <20200219224239.3662791-1-raj.khem@gmail.com> Message-ID: <8cd75706-4e07-0838-1f5e-5e47f0f4ef07@gmail.com> On 2/20/20 12:07 AM, Peter Kjellerstedt wrote: >> -----Original Message----- >> From: openembedded-core-bounces at lists.openembedded.org > bounces at lists.openembedded.org> On Behalf Of Khem Raj >> Sent: den 19 februari 2020 23:43 >> To: openembedded-core at lists.openembedded.org >> Cc: Christopher Clark >> Subject: [OE-core] [PATCH v3] binutils: Upgrade to 2.34 release >> >> Details of changelog [1] >> >> Removing bfd/ld patch to ebale pe targets instead use > > Change "ebale" to "enable". > Will be in v4 >> specific emulations via --enable-targets for x86_64 >> >> Re-arrange/forward-port patches and upgrade libctf configure to libtool >> 2.4 patch >> >> rpaths are no longer emitted into elfedit/readelf therefore no need of >> chrpath anymore >> >> Instead of pre-generating configure scripts and house them in libtool >> patch, generate them during configure. This also ensures that we do not >> patch configure directly but rather the sources which generate it >> >> Package newly added libctf library >> >> [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html >> >> Signed-off-by: Khem Raj >> Cc: Christopher Clark >> --- >> v2: Fix libtool patch and drop EFI patch for configure option >> v3: Make libtool patch not generate configure, fix packaging > > [cut] > >> diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc >> index a4b9aa586d..b070d85e15 100644 >> --- a/meta/recipes-devtools/binutils/binutils.inc >> +++ b/meta/recipes-devtools/binutils/binutils.inc >> @@ -13,17 +13,12 @@ LICENSE = "GPLv3" >> >> DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" >> >> -# >> -# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath >> -# >> -DEPENDS_append_class-target = " chrpath-replacement-native" >> -EXTRANATIVEPATH_append_class-target = " chrpath-native" >> - >> inherit autotools gettext multilib_header texinfo >> >> FILES_${PN} = " \ >> ${bindir}/${TARGET_PREFIX}* \ >> - ${libdir}/lib*-*.so \ >> + ${libdir}/lib*.so.* \ >> + ${libdir}/lib*-${PV}*.so \ >> ${prefix}/${TARGET_SYS}/bin/* \ >> ${bindir}/embedspu" >> >> @@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ >> ${includedir} \ >> ${libdir}/*.la \ >> ${libdir}/libbfd.so \ >> + ${libdir}/libctf.so \ >> + ${libdir}/libctf-nobfd.so \ >> ${libdir}/libopcodes.so" >> >> # Rather than duplicating multiple entries for these, make one >> @@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ >> ${LDGOLD} \ >> mailto:${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" >> >> +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " >> + >> LDGOLD_class-native = "" >> LDGOLD_class-crosssdk = "" >> LDGOLD ?= "mailto:${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" >> @@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" >> MULTIARCH := "mailto:${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" >> do_configure[vardeps] += "MULTIARCH" >> do_configure () { >> - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" >> + (for d in . bfd binutils gas gold gprof ld libctf opcodes; do >> + cd ${S}/$d >> + autoconf >> + rm -rf autom4te.cache >> + done >> + cd ${S} >> + gnu-configize) >> + > > Correct the indentation to use tabs. > in v4 > There are also some patches below that still modify configure, which > shouldn't be needed with the introduction of autoconf above. > thats intentional. Ideally all patches should modify configure since that will be needed if they are upstreamed. However, libtool 2.4 is quite intrusive where it has to be regenerated almost everytime it is rebased on top of latest binutils. >> oe_runconf >> # >> # must prime config.cache to ensure the build of libiberty >> @@ -123,10 +129,6 @@ do_configure () { >> done >> } >> >> -do_compile_append_class-target() { >> - chrpath -d ${B}/binutils/elfedit >> - chrpath -d ${B}/binutils/readelf >> -} >> do_install () { >> autotools_do_install >> >> diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch >> index 3a9461bf4a..a36c259711 100644 >> --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch >> +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch >> @@ -1,7 +1,7 @@ >> -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 >> +From 9caa0964b6f50411d1b4520a31461cd0a87810fd Mon Sep 17 00:00:00 2001 >> From: Khem Raj >> -Date: Sun, 8 Dec 2019 00:31:35 -0800 >> -Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs >> +Date: Mon, 2 Mar 2015 01:58:54 +0000 >> +Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs >> >> This patch will modify the ELF linker scripts so that the crosssdk >> linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries > > [cut] > >> @@ -57,3 +57,6 @@ index f9f0f7d402..9e469dca86 100644 >> fi >> if test -z "$PLT"; then >> IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" >> +-- >> +2.25.1 >> + > > May I suggest that you continue to use --no-signature and --no-numbered as > options to git format-patch to avoid unnecessary changes to the patches? > I guess yes will be in v4 > [cut] > >> diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch >> new file mode 100644 >> index 0000000000..82906026a9 >> --- /dev/null >> +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch >> @@ -0,0 +1,7118 @@ >> +From c0ec70962bffb56b563475f539e8175ea97d7eb1 Mon Sep 17 00:00:00 2001 >> +From: Khem Raj >> +Date: Sun, 14 Feb 2016 17:04:07 +0000 >> +Subject: [PATCH 07/15] Use libtool 2.4 >> + >> +get libtool sysroot support >> + >> +Upstream-Status: Pending >> + >> +Signed-off-by: Khem Raj >> +--- >> + bfd/configure.ac | 2 +- >> + libtool.m4 | 1080 +++++++++++------ >> + ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- >> + ltoptions.m4 | 2 +- >> + ltversion.m4 | 12 +- >> + lt~obsolete.m4 | 2 +- > > Wouldn't it be better to run automake --add-missing --copy instead > (or autoreconf)? That way you would get rid of all the patches to > Makefile.in as well. As said above, we only want to regenerate configure, nothing else, there are different versions of gettext etc would be needed to fully reconfigure it and its version specific. > >> + 6 files changed, 2717 insertions(+), 1306 deletions(-) >> + > > [cut] > > //Peter > From raj.khem at gmail.com Thu Feb 20 17:13:40 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 09:13:40 -0800 Subject: [OE-core] [PATCH v4] binutils: Upgrade to 2.34 release Message-ID: <20200220171340.3967684-1-raj.khem@gmail.com> Details of changelog [1] Removing bfd/ld patch to enable PE targets, instead use specific emulations via --enable-targets for x86_64 Re-arrange/forward-port patches and upgrade libctf configure to libtool 2.4 patch rpaths are no longer emitted into elfedit/readelf therefore no need of chrpath anymore Instead of pre-generating configure scripts and house them in libtool patch, generate them during configure. This also ensures that we do not patch configure directly but rather the sources which generate it Package newly added libctf library [1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00000.html Signed-off-by: Khem Raj Cc: Christopher Clark --- v2: Fix libtool patch and drop EFI patch for configure option v3: Make libtool patch not generate configure, fix packaging v4: Regenerate patches, fix indentation and commit comments meta/conf/distro/include/tcmode-default.inc | 2 +- .../{binutils-2.33.inc => binutils-2.34.inc} | 37 +- ....33.bb => binutils-cross-canadian_2.34.bb} | 0 ...33.bb => binutils-cross-testsuite_2.34.bb} | 0 ...s-cross_2.33.bb => binutils-cross_2.34.bb} | 0 ...ssdk_2.33.bb => binutils-crosssdk_2.34.bb} | 0 meta/recipes-devtools/binutils/binutils.inc | 26 +- ...s-crosssdk-Generate-relocatable-SDKs.patch | 16 +- ...o-not-generate-linker-script-directo.patch | 4 +- ...k-Search-for-alternative-ld.so.conf.patch} | 75 +- ...iden-the-regexp-for-SH-architectures.patch | 44 - ...iden-the-regexp-for-SH-architectures.patch | 41 + ...05-Point-scripts-location-to-libdir.patch} | 10 +- ...RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} | 30 +- .../binutils/0006-Use-libtool-2.4.patch | 21203 ---------------- .../binutils/0007-Use-libtool-2.4.patch | 7115 ++++++ ...tro-compiler-point-to-the-wrong-ins.patch} | 6 +- ...system-directories-when-cross-linki.patch} | 40 +- ...-in-libtool-when-sysroot-is-enabled.patch} | 2 +- ...-default-emulation-for-mips64-linux.patch} | 23 +- ...> 0012-Add-support-for-Netlogic-XLP.patch} | 112 +- ...ct-assembling-for-ppc-wait-mnemonic.patch} | 4 +- ... => 0014-Detect-64-bit-MIPS-targets.patch} | 4 +- ...x86_64-pep-for-producing-EFI-binarie.patch | 46 - ...> 0015-sync-with-OE-libtool-changes.patch} | 2 +- .../binutils/binutils/CVE-2019-17450.patch | 94 - .../binutils/binutils/CVE-2019-17451.patch | 46 - .../{binutils_2.33.bb => binutils_2.34.bb} | 4 +- 28 files changed, 7396 insertions(+), 21590 deletions(-) rename meta/recipes-devtools/binutils/{binutils-2.33.inc => binutils-2.34.inc} (54%) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.33.bb => binutils-cross-canadian_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.33.bb => binutils-cross-testsuite_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-cross_2.33.bb => binutils-cross_2.34.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.33.bb => binutils-crosssdk_2.34.bb} (100%) rename meta/recipes-devtools/binutils/binutils/{nativesdk-relocation.patch => 0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch} (56%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch rename meta/recipes-devtools/binutils/binutils/{0004-Point-scripts-location-to-libdir.patch => 0005-Point-scripts-location-to-libdir.patch} (83%) rename meta/recipes-devtools/binutils/binutils/{0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch => 0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch} (51%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch rename meta/recipes-devtools/binutils/binutils/{0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch => 0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch} (87%) rename meta/recipes-devtools/binutils/binutils/{0008-warn-for-uses-of-system-directories-when-cross-linki.patch => 0009-warn-for-uses-of-system-directories-when-cross-linki.patch} (86%) rename meta/recipes-devtools/binutils/binutils/{0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch => 0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch} (96%) rename meta/recipes-devtools/binutils/binutils/{0010-Change-default-emulation-for-mips64-linux.patch => 0011-Change-default-emulation-for-mips64-linux.patch} (80%) rename meta/recipes-devtools/binutils/binutils/{0011-Add-support-for-Netlogic-XLP.patch => 0012-Add-support-for-Netlogic-XLP.patch} (81%) rename meta/recipes-devtools/binutils/binutils/{0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch => 0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch} (91%) rename meta/recipes-devtools/binutils/binutils/{0013-Detect-64-bit-MIPS-targets.patch => 0014-Detect-64-bit-MIPS-targets.patch} (91%) delete mode 100644 meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch rename meta/recipes-devtools/binutils/binutils/{0014-sync-with-OE-libtool-changes.patch => 0015-sync-with-OE-libtool-changes.patch} (97%) delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch delete mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch rename meta/recipes-devtools/binutils/{binutils_2.33.bb => binutils_2.34.bb} (91%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 82530f5e7b..e957e3a9bb 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.33%" +BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" diff --git a/meta/recipes-devtools/binutils/binutils-2.33.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc similarity index 54% rename from meta/recipes-devtools/binutils/binutils-2.33.inc rename to meta/recipes-devtools/binutils/binutils-2.34.inc index 84a9ec8fc3..eaaa5ed2ac 100644 --- a/meta/recipes-devtools/binutils/binutils-2.33.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -14,35 +14,32 @@ def binutils_branch_version(d): pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] -# When upgrading to 2.33, please make sure there is no trailing .0, so +# When upgrading to 2.35, please make sure there is no trailing .0, so # that upstream version check can work correctly. -PV = "2.33.1" -CVE_VERSION = "2.33" +PV = "2.34" +CVE_VERSION = "2.34" BINUPV = "${@binutils_branch_version(d)}" #BRANCH = "binutils-${BINUPV}-branch" -BRANCH ?= "binutils-2_33-branch" +BRANCH ?= "binutils-2_34-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "c656f9a430636a6a7fc7a08c0e08f0098a729a02" +SRCREV ?= "d4b50999b3b287b5f984ade2f8734aa8c9359440" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ - file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ - file://0004-Point-scripts-location-to-libdir.patch \ - file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ - file://0006-Use-libtool-2.4.patch \ - file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ - file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ - file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ - file://0010-Change-default-emulation-for-mips64-linux.patch \ - file://0011-Add-support-for-Netlogic-XLP.patch \ - file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ - file://0013-Detect-64-bit-MIPS-targets.patch \ - file://0014-sync-with-OE-libtool-changes.patch \ - file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ - file://CVE-2019-17450.patch \ - file://CVE-2019-17451.patch \ + file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ + file://0005-Point-scripts-location-to-libdir.patch \ + file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ + file://0007-Use-libtool-2.4.patch \ + file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ + file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ + file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ + file://0011-Change-default-emulation-for-mips64-linux.patch \ + file://0012-Add-support-for-Netlogic-XLP.patch \ + file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ + file://0014-Detect-64-bit-MIPS-targets.patch \ + file://0015-sync-with-OE-libtool-changes.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.33.bb b/meta/recipes-devtools/binutils/binutils-cross_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-cross_2.33.bb rename to meta/recipes-devtools/binutils/binutils-cross_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb similarity index 100% rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.33.bb rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a4b9aa586d..5b4a339209 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -13,17 +13,12 @@ LICENSE = "GPLv3" DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-native" -# -# we need chrpath > 0.14 and some distros like centos 7 still have older chrpath -# -DEPENDS_append_class-target = " chrpath-replacement-native" -EXTRANATIVEPATH_append_class-target = " chrpath-native" - inherit autotools gettext multilib_header texinfo FILES_${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ - ${libdir}/lib*-*.so \ + ${libdir}/lib*.so.* \ + ${libdir}/lib*-${PV}*.so \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" @@ -33,6 +28,8 @@ FILES_${PN}-dev = " \ ${includedir} \ ${libdir}/*.la \ ${libdir}/libbfd.so \ + ${libdir}/libctf.so \ + ${libdir}/libctf-nobfd.so \ ${libdir}/libopcodes.so" # Rather than duplicating multiple entries for these, make one @@ -80,6 +77,8 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${LDGOLD} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" +EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " + LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" @@ -112,7 +111,14 @@ export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" do_configure[vardeps] += "MULTIARCH" do_configure () { - (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" + (for d in . bfd binutils gas gold gprof ld libctf opcodes; do + cd ${S}/$d + autoconf + rm -rf autom4te.cache + done + cd ${S} + gnu-configize) + oe_runconf # # must prime config.cache to ensure the build of libiberty @@ -123,10 +129,6 @@ do_configure () { done } -do_compile_append_class-target() { - chrpath -d ${B}/binutils/elfedit - chrpath -d ${B}/binutils/readelf -} do_install () { autotools_do_install diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 3a9461bf4a..14e84215e0 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch @@ -1,6 +1,6 @@ -From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001 +From b05f0be13aadf0b26a0b39dfe7daf2c47a300338 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 8 Dec 2019 00:31:35 -0800 +Date: Mon, 2 Mar 2015 01:58:54 +0000 Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs This patch will modify the ELF linker scripts so that the crosssdk @@ -18,23 +18,23 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index cb2b081e9e..db2e9fd569 100755 +index 03392d265c..435689ea14 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" +@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" LD_FLAG=r DATA_ALIGNMENT=${DATA_ALIGNMENT_r} DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +PARTIAL_LINKING=" " - ( echo "/* Script for ld -r: link without relocation */" + ( echo "/* Script for -r */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc -@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" +@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" LD_FLAG=u DATA_ALIGNMENT=${DATA_ALIGNMENT_u} CONSTRUCTING=" " +PARTIAL_LINKING=" " - ( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */" + ( echo "/* Script for -Ur */" source_sh ${CUSTOMIZER_SCRIPT} source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu @@ -43,7 +43,7 @@ index cb2b081e9e..db2e9fd569 100755 DATA_ALIGNMENT=${DATA_ALIGNMENT_} RELOCATING=" " diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc -index f9f0f7d402..9e469dca86 100644 +index 0b8b32a440..ee6b71075d 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 1b499a4504..91de94b768 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch @@ -1,4 +1,4 @@ -From 9fe5a2dd03fdf2986c89dd58ae48c0095f1c0411 Mon Sep 17 00:00:00 2001 +From 6d79f81336e7cbe727b5a51134f5d314a455379d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 23:37:05 -0800 Subject: [PATCH] binutils-cross: Do not generate linker script directories @@ -22,7 +22,7 @@ Signed-off-by: Khem Raj 1 file changed, 25 deletions(-) diff --git a/ld/genscripts.sh b/ld/genscripts.sh -index c90f38a63c..97ad1a24d6 100755 +index 435689ea14..cff8a1467f 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -235,31 +235,6 @@ append_to_lib_path() diff --git a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch similarity index 56% rename from meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch rename to meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 408f7d18b7..8b59ba5dec 100644 --- a/meta/recipes-devtools/binutils/binutils/nativesdk-relocation.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -1,4 +1,10 @@ -We need binutils to look at our ld.so.conf file within the SDK to ensure +From d057b215f114f6158b4010ab44a19cae9dcc8386 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Wed, 19 Feb 2020 09:51:16 -0800 +Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK + installation + +We need binutils to look at our ld.so.conf file within the SDK to ensure we search the SDK's libdirs as well as those from the host system. We therefore pass in the directory to the code using a define, then add @@ -6,18 +12,27 @@ it to a section we relocate in a similar way to the way we relocate the gcc internal paths. This ensures that ld works correctly in our buildtools tarball. -Standard sysroot relocation doesn't work since we're not in a sysroot, +Standard sysroot relocation doesn't work since we're not in a sysroot, we want to use both the host system and SDK libs. Signed-off-by: Richard Purdie 2020/1/17 Upstream-Status: Inappropriate [OE specific tweak] -Index: git/ld/Makefile.am -=================================================================== ---- git.orig/ld/Makefile.am -+++ git/ld/Makefile.am -@@ -36,7 +36,8 @@ am__skipyacc = +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 3 ++- + ld/Makefile.in | 3 ++- + ld/ldelf.c | 2 +- + ld/ldmain.c | 1 + + ld/ldmain.h | 1 + + 5 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 4a9b8404b7..1c132d3ce4 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ ELF_CLFAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ @@ -27,12 +42,12 @@ Index: git/ld/Makefile.am WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) -Index: git/ld/Makefile.in -=================================================================== ---- git.orig/ld/Makefile.in -+++ git/ld/Makefile.in -@@ -546,7 +546,8 @@ am__skiplex = - am__skipyacc = +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 46d9b14077..e453bc1b33 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz + ZLIBINC = @zlibinc@ ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ - -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ @@ -41,24 +56,24 @@ Index: git/ld/Makefile.in AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) @ENABLE_PLUGINS_FALSE at PLUGIN_C = -Index: git/ld/emultempl/elf32.em -=================================================================== ---- git.orig/ld/emultempl/elf32.em -+++ git/ld/emultempl/elf32.em -@@ -1024,7 +1024,7 @@ gld${EMULATION_NAME}_check_ld_so_conf (c +diff --git a/ld/ldelf.c b/ld/ldelf.c +index 2e27cf48a8..a095d6aac5 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, info.path = NULL; info.len = info.alloc = 0; -- tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/ld.so.conf", +- tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", (const char *) NULL); - if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath)) + if (!ldelf_parse_ld_so_conf (&info, tmppath)) { -Index: git/ld/ldmain.c -=================================================================== ---- git.orig/ld/ldmain.c -+++ git/ld/ldmain.c -@@ -68,6 +68,7 @@ char *program_name; +diff --git a/ld/ldmain.c b/ld/ldmain.c +index c4af10f4e9..da1ad17763 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -69,6 +69,7 @@ char *program_name; /* The prefix for system library directories. */ const char *ld_sysroot; @@ -66,10 +81,10 @@ Index: git/ld/ldmain.c /* The canonical representation of ld_sysroot. */ char *ld_canon_sysroot; -Index: git/ld/ldmain.h -=================================================================== ---- git.orig/ld/ldmain.h -+++ git/ld/ldmain.h +diff --git a/ld/ldmain.h b/ld/ldmain.h +index 0f05821d1e..54c36a94ce 100644 +--- a/ld/ldmain.h ++++ b/ld/ldmain.h @@ -23,6 +23,7 @@ extern char *program_name; diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch deleted file mode 100644 index 4a6b107126..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ /dev/null @@ -1,44 +0,0 @@ -From aecded290b2ec0b469c70fc6b062bd5ee6ba5e3a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 01:07:33 +0000 -Subject: [PATCH] configure: widen the regexp for SH architectures - -gprof needs to know about uclibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - configure | 2 +- - gprof/configure | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 6a9719f609..001523eebf 100755 ---- a/configure -+++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/gprof/configure b/gprof/configure -index cbb3aced46..b5eabceb77 100755 ---- a/gprof/configure -+++ b/gprof/configure -@@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch new file mode 100644 index 0000000000..d10a144ed5 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch @@ -0,0 +1,41 @@ +From f7ad8a44c10f01e03680f093fd7af71c9f5e8606 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:07:33 +0000 +Subject: [PATCH] configure: widen the regexp for SH architectures + +gprof needs to know about uclibc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 91dc42f6c7..7c1b747e7c 100755 +--- a/configure ++++ b/configure +@@ -3915,7 +3915,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 4bd869a63a..7187b34dfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1159,7 +1159,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch similarity index 83% rename from meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch rename to meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 8318bd3899..3ba0ba63f1 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch @@ -1,4 +1,4 @@ -From a9332107872ada73e72e92872ea2998a4e1495e0 Mon Sep 17 00:00:00 2001 +From 08b088b7dd3d9707ed66948a7271ffb438eeddf5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:09:58 +0000 Subject: [PATCH] Point scripts location to libdir @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/Makefile.am b/ld/Makefile.am -index ddc7a78368..6fa7bf2583 100644 +index 1c132d3ce4..8d82cf2e16 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -63,7 +63,7 @@ endif +@@ -64,7 +64,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -25,10 +25,10 @@ index ddc7a78368..6fa7bf2583 100644 EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ diff --git a/ld/Makefile.in b/ld/Makefile.in -index fdf06128b2..5c108b9e05 100644 +index e453bc1b33..2dcd72f809 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -572,7 +572,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch similarity index 51% rename from meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch rename to meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 214ae06344..d920729204 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch @@ -1,4 +1,4 @@ -From 65fb7a33aba30dec8690e0a237efaa3b9649154c Mon Sep 17 00:00:00 2001 +From 13791636abf518f0db209dc51c29445d80421f2e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:27:17 +0000 Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty @@ -10,21 +10,23 @@ Upstream-Status: Pending Signed-off-by: Chris Chimelis Signed-off-by: Khem Raj --- - ld/emultempl/elf32.em | 4 ++++ + ld/ldelf.c | 4 ++++ 1 file changed, 4 insertions(+) ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment < -Date: Sun, 14 Feb 2016 17:04:07 +0000 -Subject: [PATCH] Use libtool 2.4 - -get libtool sysroot support - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - bfd/configure | 1322 ++++++++++++++----- - bfd/configure.ac | 2 +- - binutils/configure | 1320 ++++++++++++++----- - gas/configure | 1320 ++++++++++++++----- - gprof/configure | 1321 ++++++++++++++----- - ld/configure | 1695 ++++++++++++++++++------ - libtool.m4 | 1080 +++++++++++----- - ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- - ltoptions.m4 | 2 +- - ltversion.m4 | 12 +- - lt~obsolete.m4 | 2 +- - opcodes/configure | 1322 ++++++++++++++----- - opcodes/configure.ac | 2 +- - zlib/configure | 1320 ++++++++++++++----- - 14 files changed, 9940 insertions(+), 3705 deletions(-) - ---- a/bfd/configure -+++ b/bfd/configure -@@ -704,6 +704,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -822,6 +825,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1504,6 +1508,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-mmap try using mmap for BFD input files if available - --with-separate-debug-dir=DIR - Look for global separate debug info in DIR -@@ -5693,8 +5699,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5734,7 +5740,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6470,6 +6476,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6486,6 +6566,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6654,7 +6739,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6808,6 +6894,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6841,7 +7095,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6861,11 +7115,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6881,7 +7139,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6900,6 +7158,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6911,16 +7173,72 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a - -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi - - - -@@ -7262,8 +7580,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7299,6 +7617,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7340,6 +7659,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7351,7 +7682,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7388,8 +7719,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7426,6 +7757,20 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7445,6 +7790,41 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - - - # Check whether --enable-libtool-lock was given. -@@ -7653,6 +8033,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8216,6 +8713,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8380,7 +8879,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8469,7 +8969,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8767,8 +9267,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9053,13 +9557,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9120,6 +9628,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9470,7 +9983,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9569,12 +10083,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9588,8 +10102,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9607,8 +10121,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9654,8 +10168,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9785,7 +10299,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9798,22 +10318,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9838,22 +10371,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10102,23 +10685,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10800,8 +11396,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10834,13 +11431,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10932,7 +11587,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11728,7 +12383,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11731 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11772,10 +12427,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11834,7 +12489,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11837 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11878,10 +12533,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= - if test "$enable_shared" = "yes"; then - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -17177,13 +17832,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -17198,14 +17860,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -17238,12 +17903,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -17298,8 +17963,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -17309,12 +17979,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -17330,7 +18002,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -17366,6 +18037,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18154,7 +18826,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -18257,19 +18930,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -18299,6 +18995,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -18308,6 +19010,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -18422,12 +19127,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -18514,9 +19219,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -18532,6 +19234,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -18564,210 +19269,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -290,7 +290,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/binutils/configure -+++ b/binutils/configure -@@ -689,8 +689,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -807,6 +810,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1483,6 +1487,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-system-zlib use installed libz - --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5457,8 +5463,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6234,6 +6240,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6250,6 +6330,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6418,7 +6503,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6572,6 +6658,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6605,7 +6859,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6645,7 +6903,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6664,6 +6922,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7026,8 +7344,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7104,6 +7423,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7115,7 +7446,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7152,8 +7483,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7190,6 +7521,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -7211,6 +7554,43 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7417,6 +7797,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7980,6 +8477,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8175,7 +8674,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8264,7 +8764,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8562,8 +9062,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8848,13 +9352,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8915,6 +9423,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9265,7 +9778,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9364,12 +9878,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9383,8 +9897,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9402,8 +9916,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9449,8 +9963,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9580,7 +10094,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9593,22 +10113,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9633,22 +10166,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9897,23 +10480,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10727,7 +11382,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11523,7 +12178,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11526 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11567,10 +12222,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11629,7 +12284,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11632 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11673,10 +12328,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16057,8 +16722,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16089,7 +16761,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16125,6 +16796,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16891,7 +17563,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17159,12 +17864,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gas/configure -+++ b/gas/configure -@@ -681,8 +681,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -799,6 +802,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1490,6 +1494,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-cpu=CPU default cpu variant is CPU (currently only supported - on ARC) - --with-system-zlib use installed libz -@@ -5277,8 +5283,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5318,7 +5324,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6004,8 +6010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6054,6 +6060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6070,6 +6150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6238,7 +6323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6392,6 +6478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6407,9 +6508,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6425,7 +6679,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6445,11 +6699,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6465,7 +6723,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6484,6 +6742,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6495,12 +6757,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6512,6 +6772,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6846,8 +7164,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6883,6 +7201,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6924,6 +7243,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6935,7 +7266,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6961,8 +7292,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6972,8 +7303,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7010,6 +7341,19 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ - - - -@@ -7030,6 +7374,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -7237,6 +7617,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7800,6 +8297,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7995,7 +8494,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8084,7 +8584,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8382,8 +8882,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8549,6 +9047,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8611,7 +9115,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8668,13 +9172,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8735,6 +9243,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9085,7 +9598,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9184,12 +9698,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9203,8 +9717,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9222,8 +9736,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9269,8 +9783,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9400,7 +9914,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9413,22 +9933,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9440,7 +9967,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9453,22 +9986,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9513,20 +10053,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9595,7 +10178,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9611,7 +10194,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9635,10 +10218,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9717,23 +10300,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9818,7 +10414,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9837,9 +10433,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10415,8 +11011,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10449,13 +11046,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10547,7 +11202,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11343,7 +11998,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11346 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11387,10 +12042,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11449,7 +12104,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11452 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11493,10 +12148,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -16049,8 +16714,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -16081,7 +16753,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -16117,6 +16788,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -16890,7 +17562,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -17158,12 +17863,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/gprof/configure -+++ b/gprof/configure -@@ -662,8 +662,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -780,6 +783,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1442,6 +1446,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5124,8 +5130,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5165,7 +5171,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5901,6 +5907,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if test "${lt_cv_to_host_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if test "${lt_cv_to_tool_file_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5917,6 +5997,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6085,7 +6170,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6162,11 +6248,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --linux-uclibc*) -- lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -- ;; -- - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -6244,6 +6325,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6276,8 +6525,8 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6297,11 +6546,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6336,6 +6589,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6347,12 +6604,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -6364,6 +6619,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if test "${lt_cv_ar_at_file+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6698,8 +7011,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6735,6 +7048,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6776,6 +7090,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6787,7 +7113,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6824,8 +7150,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6862,6 +7188,17 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ - - - -@@ -6883,6 +7220,44 @@ fi - - - -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7089,6 +7464,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7652,6 +8144,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7847,7 +8341,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7936,7 +8431,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8234,8 +8729,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8520,13 +9019,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8587,6 +9090,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8937,7 +9445,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9036,12 +9545,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9055,8 +9564,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9074,8 +9583,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9121,8 +9630,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9252,7 +9761,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9265,22 +9780,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if test "${lt_cv_aix_libpath_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9305,22 +9833,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9569,23 +10147,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if test "${lt_cv_irix_exported_symbol+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10267,8 +10858,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10301,13 +10893,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10399,7 +11049,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11239,10 +11889,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11345,10 +11995,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13435,8 +14095,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13446,12 +14111,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13467,7 +14134,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13503,6 +14169,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14268,7 +14935,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14371,19 +15039,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14422,6 +15119,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14536,12 +15236,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -14628,9 +15328,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -14646,6 +15343,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -14678,210 +15378,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/ld/configure -+++ b/ld/configure -@@ -688,8 +688,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -816,6 +819,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_plugins - enable_largefile -@@ -1508,6 +1512,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-lib-path=dir1:dir2... set default LIB_PATH - --with-sysroot=DIR Search for usr/lib et al within DIR. - -@@ -5960,8 +5966,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -6001,7 +6007,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6687,8 +6693,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6737,6 +6743,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6753,6 +6833,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6921,7 +7006,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -7075,6 +7161,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7090,9 +7191,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -7108,7 +7362,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7128,11 +7382,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -7148,7 +7406,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -7167,6 +7425,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -7178,12 +7440,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -7194,6 +7455,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -7529,8 +7847,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7566,6 +7884,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7607,6 +7926,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7618,7 +7949,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7644,8 +7975,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7655,8 +7986,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7693,6 +8024,13 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - - - -@@ -7714,6 +8052,48 @@ fi - - - -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7920,6 +8300,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -8483,6 +8980,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8551,6 +9050,16 @@ done - - - -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+ -+ -+ - - - # Set options -@@ -8679,7 +9188,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8768,7 +9278,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -9066,8 +9576,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9233,6 +9741,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -9295,7 +9809,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9352,13 +9866,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -9419,6 +9937,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9769,7 +10292,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9868,12 +10392,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9887,8 +10411,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9906,8 +10430,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9953,8 +10477,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10084,7 +10608,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10097,22 +10627,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10124,7 +10661,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10137,22 +10680,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -10197,20 +10747,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -10271,7 +10864,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10279,7 +10872,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -10295,7 +10888,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10319,10 +10912,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10401,23 +10994,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10502,7 +11108,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -10521,9 +11127,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -11099,8 +11705,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11133,13 +11740,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -11231,7 +11896,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -12027,7 +12692,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12030 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12071,10 +12736,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12133,7 +12798,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12136 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12177,10 +12842,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12572,6 +13237,7 @@ $RM -r conftest* - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -12589,6 +13255,7 @@ $RM -r conftest* - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do -@@ -12871,7 +13538,13 @@ $as_echo_n "checking whether the $compil - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12884,22 +13557,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -@@ -12912,7 +13592,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12925,22 +13611,29 @@ main () - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -12983,29 +13676,75 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX=' ' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=yes -+ file_list_spec_CXX='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' -+ enable_shared_with_static_runtimes_CXX=yes -+ # Don't use ranlib -+ old_postinstall_cmds_CXX='chmod 644 $oldlib' -+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - - -@@ -13111,7 +13850,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - *) - if test "$GXX" = yes; then -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13182,10 +13921,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -13226,9 +13965,9 @@ if test -z "$aix_libpath"; then aix_libp - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes -@@ -13298,20 +14037,20 @@ if test -z "$aix_libpath"; then aix_libp - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13506,7 +14245,7 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -13552,7 +14291,7 @@ if test -z "$aix_libpath"; then aix_libp - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -@@ -13593,9 +14332,9 @@ if test -z "$aix_libpath"; then aix_libp - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -13730,6 +14469,13 @@ private: - }; - _LT_EOF - -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -13743,7 +14489,7 @@ if { { eval echo "\"\$as_me\":${as_linen - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -13752,13 +14498,22 @@ if { { eval echo "\"\$as_me\":${as_linen - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -13778,8 +14533,10 @@ if { { eval echo "\"\$as_me\":${as_linen - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -13815,6 +14572,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - case $host_os in -@@ -13850,7 +14608,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -13915,8 +14673,6 @@ fi - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -14021,6 +14777,11 @@ $as_echo_n "checking for $compiler optio - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -14173,7 +14934,7 @@ $as_echo_n "checking for $compiler optio - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' -@@ -14238,10 +14999,17 @@ case $host_os in - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - - # - # Check to make sure the PIC flag actually works. -@@ -14299,6 +15067,8 @@ fi - - - -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -14476,6 +15246,7 @@ fi - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -14490,15 +15261,20 @@ $as_echo_n "checking whether the $compil - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -+ ;; -+ esac -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 - $as_echo "$ld_shlibs_CXX" >&6; } -@@ -14761,8 +15537,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -14794,13 +15571,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -14891,7 +15726,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -15350,6 +16185,7 @@ fi - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -18449,13 +19285,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -18470,14 +19313,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -18510,12 +19356,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -18554,8 +19400,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi - compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' - GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' - archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18582,12 +19428,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har - hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' - inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' - link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' - always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' - exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' - prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' - file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' - hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' - compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18625,8 +19471,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -18636,12 +19487,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -18657,7 +19510,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -18679,8 +19531,8 @@ LD_CXX \ - reload_flag_CXX \ - compiler_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_wl_CXX \ - lt_prog_compiler_static_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - export_dynamic_flag_spec_CXX \ -@@ -18692,7 +19544,6 @@ no_undefined_flag_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX \ - file_list_spec_CXX \ -@@ -18726,6 +19577,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -18740,7 +19592,8 @@ archive_expsym_cmds_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -+prelink_cmds_CXX \ -+postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -@@ -19505,7 +20358,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -19608,19 +20462,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -19650,6 +20527,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -19659,6 +20542,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -19773,12 +20659,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -19865,9 +20751,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -19883,6 +20766,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -19929,210 +20815,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -@@ -20160,12 +21005,12 @@ with_gcc=$GCC_CXX - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic_CXX - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static_CXX - -@@ -20252,9 +21097,6 @@ inherit_rpath=$inherit_rpath_CXX - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs_CXX - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path_CXX -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX - -@@ -20270,6 +21112,9 @@ include_expsyms=$lt_include_expsyms_CXX - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds_CXX - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds_CXX -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec_CXX - ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - AC_SUBST(LIBTOOL)dnl - - _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable - dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl - m4_require([_LT_CMD_RELOAD])dnl - m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_WITH_SYSROOT])dnl - - _LT_CONFIG_LIBTOOL_INIT([ - # See if we are running on zsh, and set the options which allow our -@@ -199,7 +205,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -746,15 +752,12 @@ _LT_EOF - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -- _LT_PROG_XSI_SHELLFNS -+ _LT_PROG_REPLACE_SHELLFNS - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ], -@@ -980,6 +983,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - fi - ]) - --# _LT_SYS_MODULE_PATH_AIX --# ----------------------- -+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -+# ---------------------------------- - # Links a minimal program and checks the executable - # for the system default hardcoded library path. In most cases, - # this is /usr/lib:/lib, but when the MPI compilers are used - # the location of the communication and MPI libs are included too. - # If we don't find anything, use the default library path according - # to the aix ld manual. -+# Store the results from the different compilers for each TAGNAME. -+# Allow to override them for all tags through lt_cv_aix_libpath. - m4_defun([_LT_SYS_MODULE_PATH_AIX], - [m4_require([_LT_DECL_SED])dnl --AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -+ lt_aix_libpath_sed='[ -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }]' -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi],[]) -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ fi -+ ]) -+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -+fi - ])# _LT_SYS_MODULE_PATH_AIX - - -@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - - AC_MSG_CHECKING([how to print strings]) - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr - ])# _LT_PROG_ECHO_BACKSLASH - - -+# _LT_WITH_SYSROOT -+# ---------------- -+AC_DEFUN([_LT_WITH_SYSROOT], -+[AC_MSG_CHECKING([for sysroot]) -+AC_ARG_WITH([libtool-sysroot], -+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified).], -+[], [with_libtool_sysroot=no]) -+ -+dnl lt_sysroot will always be passed unquoted. We quote it here -+dnl in case the user passed a directory name. -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ AC_MSG_RESULT([${with_libtool_sysroot}]) -+ AC_MSG_ERROR([The sysroot must be an absolute path.]) -+ ;; -+esac -+ -+ AC_MSG_RESULT([${lt_sysroot:-no}]) -+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -+[dependent libraries, and in which our libraries should be installed.])]) -+ - # _LT_ENABLE_LOCK - # --------------- - m4_defun([_LT_ENABLE_LOCK], -@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" - ])# _LT_ENABLE_LOCK - - -+# _LT_PROG_AR -+# ----------- -+m4_defun([_LT_PROG_AR], -+[AC_CHECK_TOOLS(AR, [ar], false) -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -+ [lt_cv_ar_at_file=no -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -+ [echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ ]) -+ ]) -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+_LT_DECL([], [archiver_list_spec], [1], -+ [How to feed a file listing to the archiver]) -+])# _LT_PROG_AR -+ -+ - # _LT_CMD_OLD_ARCHIVE - # ------------------- - m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1]) -+[_LT_PROG_AR - - AC_CHECK_TOOL(STRIP, strip, :) - test -z "$STRIP" && STRIP=: -@@ -1623,7 +1705,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" -+[#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -1667,10 +1749,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -2342,7 +2483,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -2950,6 +3091,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -3016,7 +3162,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -3167,6 +3314,21 @@ tpf*) - ;; - esac - ]) -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli - _LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) - _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) -+ [Command to use when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [file_magic_glob], [1], -+ [How to find potential files when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [want_nocaseglob], [1], -+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) - ])# _LT_CHECK_MAGIC_METHOD - - -@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AM_PROG_NM], []) - dnl AC_DEFUN([AC_PROG_NM], []) - -+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+# -------------------------------- -+# how to determine the name of the shared library -+# associated with a specific link library. -+# -- PORTME fill in with the dynamic library characteristics -+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+m4_require([_LT_DECL_DLLTOOL]) -+AC_CACHE_CHECK([how to associate runtime and link libraries], -+lt_cv_sharedlib_from_linklib_cmd, -+[lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+]) -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+ -+ -+# _LT_PATH_MANIFEST_TOOL -+# ---------------------- -+# locate the manifest tool -+m4_defun([_LT_PATH_MANIFEST_TOOL], -+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -+ [lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL -+ - - # LT_LIB_M - # -------- -@@ -3403,8 +3630,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -3473,6 +3701,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT@&t at _DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT@&t at _DLSYM_CONST -+#else -+# define LT@&t at _DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -3484,7 +3724,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT@&t at _DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -@@ -3551,6 +3791,13 @@ else - AC_MSG_RESULT(ok) - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([], [nm_file_list_spec], [1], -+ [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS - - -@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)= - --AC_MSG_CHECKING([for $compiler option to produce PIC]) - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4172,9 +4432,11 @@ case $host_os in - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; - esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+ -+AC_CACHE_CHECK([for $compiler option to produce PIC], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - - # - # Check to make sure the PIC flag actually works. -@@ -4193,6 +4455,8 @@ fi - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - # - # Check to make sure the static flag actually works. - # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog - m4_defun([_LT_LINKER_SHLIBS], - [AC_REQUIRE([LT_PATH_LD])dnl - AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_DECL_SED])dnl -@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. -@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -+ ;; -+ esac -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4411,7 +4682,8 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4510,12 +4782,12 @@ _LT_EOF - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4529,8 +4801,8 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -4548,8 +4820,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4595,8 +4867,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4726,7 +4998,7 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else -@@ -4737,7 +5009,7 @@ _LT_EOF - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -4781,20 +5053,63 @@ _LT_EOF - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4828,7 +5143,7 @@ _LT_EOF - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4836,7 +5151,7 @@ _LT_EOF - - hpux9*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -4852,7 +5167,7 @@ _LT_EOF - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -4876,10 +5191,10 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -4926,16 +5241,31 @@ _LT_EOF - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- ) -- LDFLAGS="$save_LDFLAGS" -+ # This should be the same for all languages, so no per-tag cache variable. -+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], -+ [lt_cv_irix_exported_symbol], -+ [save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], -+ [C++], [[int foo (void) { return 0; }]], -+ [Fortran 77], [[ -+ subroutine foo -+ end]], -+ [Fortran], [[ -+ subroutine foo -+ end]])])], -+ [lt_cv_irix_exported_symbol=yes], -+ [lt_cv_irix_exported_symbol=no]) -+ LDFLAGS="$save_LDFLAGS"]) -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -5020,7 +5350,7 @@ _LT_EOF - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -@@ -5039,9 +5369,9 @@ _LT_EOF - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], - to runtime path list]) - _LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) --_LT_TAGDECL([], [fix_srcfile_path], [1], -- [Fix the shell variable $srcfile for the compiler]) - _LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) - _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) - _LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [postlink_cmds], [2], -+ [Commands necessary for finishing linking programs]) - _LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) - dnl FIXME: Not yet implemented -@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" - m4_defun([_LT_LANG_CXX_CONFIG], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; - ;; - *) - if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -6445,6 +6825,29 @@ AC_LANG_POP - ])# _LT_LANG_CXX_CONFIG - - -+# _LT_FUNC_STRIPNAME_CNF -+# ---------------------- -+# func_stripname_cnf prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# -+# This function is identical to the (non-XSI) version of func_stripname, -+# except this one can be used by m4 code that may be executed by configure, -+# rather than the libtool script. -+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -+AC_REQUIRE([_LT_DECL_SED]) -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+])# _LT_FUNC_STRIPNAME_CNF -+ - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) - # --------------------------------- - # Figure out "hidden" library dependencies from verbose -@@ -6453,6 +6856,7 @@ AC_LANG_POP - # objects, libraries and library flags. - m4_defun([_LT_SYS_HIDDEN_LIBDEPS], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl - # Dependencies to place before and after the object being linked: - _LT_TAGVAR(predep_objects, $1)= - _LT_TAGVAR(postdep_objects, $1)= -@@ -6503,6 +6907,13 @@ public class foo { - }; - _LT_EOF - ]) -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+esac -+ - dnl Parse the compiler output and extract the necessary - dnl objects, libraries and library flags. - if AC_TRY_EVAL(ac_compile); then -@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -6586,6 +7008,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - m4_if([$1], [CXX], -@@ -6622,7 +7045,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} -+ CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then - - GCC=$lt_save_GCC - CC="$lt_save_CC" -+ CFLAGS="$lt_save_CFLAGS" - fi # test "$_lt_disable_F77" != yes - - AC_LANG_POP -@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} -+ CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - -@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then - fi # test -n "$compiler" - - GCC=$lt_save_GCC -- CC="$lt_save_CC" -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - fi # test "$_lt_disable_FC" != yes - - AC_LANG_POP -@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC="$CC" -+lt_save_CC=$CC -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC=yes - CC=${GCJ-"gcj"} -+CFLAGS=$GCJFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_TAGVAR(LD, $1)="$LD" -@@ -6992,7 +7423,8 @@ fi - AC_LANG_RESTORE - - GCC=$lt_save_GCC --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_GCJ_CONFIG - - -@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC= - CC=${RC-"windres"} -+CFLAGS= - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -7042,7 +7476,8 @@ fi - - GCC=$lt_save_GCC - AC_LANG_RESTORE --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_RC_CONFIG - - -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object - AC_SUBST([OBJDUMP]) - ]) - -+# _LT_DECL_DLLTOOL -+# ---------------- -+# Ensure DLLTOOL variable is set. -+m4_defun([_LT_DECL_DLLTOOL], -+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -+AC_SUBST([DLLTOOL]) -+]) - - # _LT_DECL_SED - # ------------ -@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -+# ------------------------------------------------------ -+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -+m4_defun([_LT_PROG_FUNCTION_REPLACE], -+[dnl { -+sed -e '/^$1 ()$/,/^} # $1 /c\ -+$1 ()\ -+{\ -+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -+# _LT_PROG_REPLACE_SHELLFNS -+# ------------------------- -+# Replace existing portable implementations of several shell functions with -+# equivalent extended shell implementations where those features are available.. -+m4_defun([_LT_PROG_REPLACE_SHELLFNS], -+[if test x"$xsi_shell" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -+ func_basename_result="${1##*/}"]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}"]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -+ func_split_long_opt_name=${1%%=*} -+ func_split_long_opt_arg=${1#*=}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac]) - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` --} -+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -+fi - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -+if test x"$lt_shell_append" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -+ func_quote_for_eval "${2}" -+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi - --_LT_EOF --esac -+if test x"$_lt_function_replace_fail" = x":"; then -+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -+fi -+]) - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -+# _LT_PATH_CONVERSION_FUNCTIONS -+# ----------------------------- -+# Determine which file name conversion functions should be used by -+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -+# for certain cross-compile configurations and native mingw. -+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_MSG_CHECKING([how to convert $build file names to $host format]) -+AC_CACHE_VAL(lt_cv_to_host_file_cmd, -+[case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac - ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -- --_LT_EOF -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac - ;; -- esac -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+]) -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], -+ [0], [convert $build file names to $host format])dnl -+ -+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -+[#assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac - ]) -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], -+ [0], [convert $build files to toolchain format])dnl -+])# _LT_PATH_CONVERSION_FUNCTIONS ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,10 +1,9 @@ --# Generated from ltmain.m4sh. - --# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# libtool (GNU libtool) 2.4 - # Written by Gordon Matzigkeit , 1996 - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -38,7 +37,6 @@ - # -n, --dry-run display commands without modifying any files - # --features display basic configuration information and exit - # --mode=MODE use operation mode MODE --# --no-finish let install mode avoid finish commands - # --preserve-dup-deps don't remove duplicate dependency libraries - # --quiet, --silent don't print informational messages - # --no-quiet, --no-silent -@@ -71,17 +69,19 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a -+# $progname: (GNU libtool) 2.4 - # automake: $automake_version - # autoconf: $autoconf_version - # - # Report bugs to . -+# GNU libtool home page: . -+# General help using GNU software: . - - PROGRAM=libtool - PACKAGE=libtool --VERSION=2.2.7a --TIMESTAMP=" 1.3134 2009-11-29" --package_revision=1.3134 -+VERSION=2.4 -+TIMESTAMP="" -+package_revision=1.3293 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -106,9 +106,6 @@ _LTECHO_EOF' - } - - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -121,15 +118,13 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -- -- -- -- -- - # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh - # is ksh but when the shell is invoked as "sh" and the current value of - # the _XPG environment variable is not equal to 1 (one), the special -@@ -140,7 +135,7 @@ progpath="$0" - - - : ${CP="cp -f"} --: ${ECHO=$as_echo} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -149,7 +144,7 @@ progpath="$0" - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} -+: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -169,6 +164,27 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -183,17 +199,31 @@ basename="s,^.*/,," - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` --} -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation - --# Generated shell functions inserted here. - - # These SED scripts presuppose an absolute path with a trailing slash. - pathcar='s,^/\([^/]*\).*$,\1,' -@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -404,7 +443,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -430,14 +469,14 @@ func_echo_all () - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -656,19 +695,35 @@ func_show_eval_locale () - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -+ $opt_debug -+ - $SED -n '/(C)/!b go - :more - /\./!{ - N -- s/\n# // -+ s/\n# / / - b more - } - :go -@@ -685,7 +740,9 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/^# *-h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ -@@ -701,7 +758,10 @@ func_usage () - # unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -714,7 +774,11 @@ func_help () - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret -@@ -726,12 +790,39 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation -+ -+ -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation -+ -+exit_cmd=: - - - -@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. --# $mode is unset - nonopt= --execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - --opt_dry_run=false --opt_finish=: --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -- - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -850,130 +979,204 @@ func_enable_tag () - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi -+ -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac -+ -+ -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- --no-finish) opt_finish=false ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -- opt_verbose=false -+ opt_preserve_dup_deps=: - ;; -- -- --no-quiet|--no-silent) -- preserve_args="$preserve_args $opt" -- opt_silent=false -+ --features) -+ opt_features=: -+func_features - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -- opt_verbose=: -+func_append preserve_args " $opt" - ;; -- -- --no-verbose) preserve_args="$preserve_args $opt" -+ --no-verbose) - opt_verbose=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --help-all) opt_help=': help-all' ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi -+ -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) -@@ -981,82 +1184,44 @@ func_enable_tag () - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -- --## ----------- ## --## Main. ## --## ----------- ## -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - - -- # Darwin sucks -- eval "std_shrext=\"$shrext_cmds\"" -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1149,7 +1311,7 @@ func_execute_cmds () - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -@@ -1172,6 +1334,37 @@ func_source () - } - - -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} -+ -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} -+ - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1184,8 +1377,7 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1204,8 +1396,7 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` -@@ -1274,6 +1465,486 @@ EOF - } - } - -+ -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 -+ -+ -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 -+ -+ -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath -+ -+ -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 -+ -+ -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check -+ -+ -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check -+ -+ -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep -+ -+ -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -@@ -1314,12 +1985,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1340,15 +2011,14 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1364,8 +2034,7 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1496,17 +2165,16 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- if test -n "$fix_srcfile_path"; then -- eval "srcfile=\"$fix_srcfile_path\"" -- fi -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -1526,7 +2194,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1573,11 +2241,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1622,13 +2290,13 @@ compiler." - } - - $opt_help || { -- test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -@@ -1819,13 +2487,13 @@ if $opt_help; then - else - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit -- for mode in compile link execute install finish uninstall clean; do -+ for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done -@@ -1854,13 +2522,16 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -1882,7 +2553,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1907,10 +2578,10 @@ func_mode_execute () - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. -- if eval test -z \"\$$shlibpath_var\"; then -- eval $shlibpath_var=\$dir -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" - else -- eval $shlibpath_var=\$dir:\$$shlibpath_var -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - -@@ -1939,8 +2610,7 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1972,22 +2642,59 @@ func_mode_execute () - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libdirs="$nonopt" -+ libs= -+ libdirs= - admincmds= - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi - -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi -+ -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -1997,7 +2704,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -2006,53 +2713,55 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval "flag=\"$hardcode_libdir_flag_spec\"" -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo - -- echo "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- echo "pages." -- ;; -- *) -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- echo "----------------------------------------------------------------------" -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" -+ fi - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -2077,7 +2786,7 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; -@@ -2097,7 +2806,7 @@ func_mode_install () - do - arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -2135,11 +2844,11 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi -- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -2151,7 +2860,7 @@ func_mode_install () - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" -- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - -@@ -2209,10 +2918,13 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -2226,23 +2938,30 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$libdir" -+ destlibdir=$func_stripname_result -+ -+ func_stripname '' '/' "$destdir" -+ s_destdir=$func_stripname_result -+ - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2315,7 +3034,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2503,7 +3222,7 @@ func_mode_install () - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - -- if test -n "$current_libdirs" && $opt_finish; then -+ if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -@@ -2512,7 +3231,7 @@ func_mode_install () - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2559,6 +3278,18 @@ extern \"C\" { - #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" - #endif - -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2570,21 +3301,22 @@ extern \"C\" { - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { -- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { -- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - } - fi - -@@ -2593,23 +3325,23 @@ extern \"C\" { - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols -- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" -+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$export_symbols" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { -- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" -- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) -- echo EXPORTS > "$output_objdir/$outputname.def" -- cat "$nlist" >> "$output_objdir/$outputname.def" -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } -@@ -2620,10 +3352,52 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- $ECHO ": $name " >> "$nlist" -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen . -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2661,26 +3435,9 @@ typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -- -- echo >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist -+extern LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist -+LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2796,9 +3553,11 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -- win32_nmres=`$NM -f posix -A "$1" | -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ -@@ -2827,6 +3586,131 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2917,7 +3801,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2932,7 +3816,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -@@ -3014,7 +3898,110 @@ func_fallback_echo () - _LTECHO_EOF' - } - ECHO=\"$qECHO\" -- fi\ -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` -@@ -3078,7 +4065,7 @@ _LTECHO_EOF' - - # relink executable if necessary - if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" -@@ -3102,6 +4089,18 @@ _LTECHO_EOF' - - if test -f \"\$progdir/\$program\"; then" - -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -3116,35 +4115,10 @@ _LTECHO_EOF' - " - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. -@@ -3158,166 +4132,6 @@ fi\ - } - - --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_result=`cygpath -w "$1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result= -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path -- --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1"; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_stripname : : "$1" -- func_to_host_pathlist_tmp1=$func_stripname_result -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- func_to_host_pathlist_result=` -- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_append func_to_host_pathlist_result ";$func_to_host_path_result" -- fi -- fi -- fi -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result"; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_append func_to_host_pathlist_result ";" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist -- - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout - # Must ONLY be called from within func_mode_link because -@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined LT_DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); - void lt_update_exe_path (const char *name, const char *value); -@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); - EOF - - cat <"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3706,7 +4529,9 @@ EOF - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3728,7 +4553,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3762,8 +4587,8 @@ check_executable (const char *path) - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3780,8 +4605,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4222,7 +5078,7 @@ EOF - func_win32_import_lib_p () - { - $opt_debug -- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -@@ -4401,9 +5257,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4427,7 +5283,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4446,7 +5302,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4475,7 +5331,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4487,7 +5343,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4557,12 +5413,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4574,28 +5430,28 @@ func_mode_link () - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4686,15 +5542,16 @@ func_mode_link () - ;; - - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -4706,10 +5563,16 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "*) ;; -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" - ;; - esac - case $host in -@@ -4718,12 +5581,12 @@ func_mode_link () - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4747,7 +5610,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4758,9 +5621,6 @@ func_mode_link () - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; -- *-*-linux*) -- test "X$arg" = "X-lc" && continue -- ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -@@ -4770,7 +5630,7 @@ func_mode_link () - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4782,8 +5642,8 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -4791,12 +5651,12 @@ func_mode_link () - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4863,13 +5723,17 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4922,8 +5786,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4938,9 +5802,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4968,24 +5832,27 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -- # -tp=* Portland pgcc target processor selection -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4997,7 +5864,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -5028,7 +5895,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -5040,7 +5907,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -5085,24 +5952,25 @@ func_mode_link () - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -+ func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; -@@ -5127,7 +5995,7 @@ func_mode_link () - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -- eval "arg=\"$export_dynamic_flag_spec\"" -+ eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi -@@ -5144,11 +6012,13 @@ func_mode_link () - else - shlib_search_path= - fi -- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" -- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -5169,12 +6039,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -5187,9 +6057,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5256,8 +6126,9 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -+ func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$lib" ;; -+ *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library -@@ -5267,7 +6138,7 @@ func_mode_link () - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5288,11 +6159,11 @@ func_mode_link () - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5377,7 +6248,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5390,7 +6261,8 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5404,7 +6276,8 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5415,17 +6288,21 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) lib="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -5488,11 +6365,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5538,7 +6415,7 @@ func_mode_link () - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -@@ -5546,8 +6423,8 @@ func_mode_link () - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5558,20 +6435,20 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done - continue - fi # $pass = conv -@@ -5579,9 +6456,15 @@ func_mode_link () - - # Get the name of the library we link against. - linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -5598,9 +6481,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5622,14 +6505,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5637,12 +6520,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5653,20 +6536,46 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5684,7 +6593,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5697,7 +6606,8 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5708,12 +6618,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5728,7 +6638,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5740,7 +6650,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5749,7 +6659,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5774,12 +6684,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5814,7 +6724,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5823,7 +6733,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5835,7 +6745,7 @@ func_mode_link () - shift - realname="$1" - shift -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" -@@ -5848,7 +6758,7 @@ func_mode_link () - versuffix="-$major" - ;; - esac -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -5877,7 +6787,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5933,7 +6843,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5955,7 +6865,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5969,13 +6879,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5989,7 +6899,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -6001,12 +6911,12 @@ func_mode_link () - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -+ add_dir="-L$lt_sysroot$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -6083,27 +6993,33 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then -@@ -6113,8 +7029,10 @@ func_mode_link () - case $deplib in - -L*) path="$deplib" ;; - *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -6130,7 +7048,7 @@ func_mode_link () - case $host in - *-*-darwin*) - depdepl= -- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp -@@ -6141,8 +7059,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -6152,7 +7070,7 @@ func_mode_link () - ;; - esac - else -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ -@@ -6192,7 +7110,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6205,7 +7123,7 @@ func_mode_link () - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order -- eval tmp_libs=\$$var -+ eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so -@@ -6250,13 +7168,13 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done -- eval $var=\$tmp_libs -+ eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs -@@ -6269,7 +7187,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6310,7 +7228,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6319,8 +7237,8 @@ func_mode_link () - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ -@@ -6330,8 +7248,8 @@ func_mode_link () - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result -- eval "shared_ext=\"$shrext_cmds\"" -- eval "libname=\"$libname_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result -@@ -6346,7 +7264,7 @@ func_mode_link () - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6544,7 +7462,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6612,10 +7530,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6631,7 +7549,7 @@ func_mode_link () - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6642,7 +7560,7 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` -@@ -6659,10 +7577,11 @@ func_mode_link () - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6676,7 +7595,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6686,7 +7605,7 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - -@@ -6698,7 +7617,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6715,7 +7634,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6764,18 +7683,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6789,7 +7708,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6807,18 +7726,18 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac - fi - if test -n "$i" ; then -- eval "libname=\"$libname_spec\"" -- eval "deplib_matches=\"$library_names_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes - echo -@@ -6840,7 +7759,7 @@ EOF - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6857,15 +7776,27 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6885,10 +7816,10 @@ EOF - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done -- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6913,7 +7844,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6929,20 +7860,20 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then -- eval "libname=\"$libname_spec\"" -+ libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6967,7 +7898,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -7071,7 +8002,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7081,10 +8012,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -7101,10 +8032,12 @@ EOF - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -7113,18 +8046,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- dep_rpath="$dep_rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -7133,40 +8066,38 @@ EOF - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then -- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else -- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done -- eval $runpath_var=\$rpath\$$runpath_var -- export $runpath_var -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then -- eval $shlibpath_var=\$shlibpath\$$shlibpath_var -- export $shlibpath_var -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. -- eval "shared_ext=\"$shrext_cmds\"" -- eval "library_names=\"$library_names_spec\"" -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then -- eval "soname=\"$soname_spec\"" -+ eval soname=\"$soname_spec\" - else - soname="$realname" - fi -@@ -7178,7 +8109,7 @@ EOF - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -@@ -7189,7 +8120,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7220,13 +8151,45 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -7248,7 +8211,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7260,7 +8223,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7270,7 +8233,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7286,43 +8249,43 @@ EOF - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval "flag=\"$thread_safe_flag_spec\"" -- linker_flags="$linker_flags $flag" -+ eval flag=\"$thread_safe_flag_spec\" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -- eval "test_cmds=\"$module_expsym_cmds\"" -+ eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else -- eval "test_cmds=\"$module_cmds\"" -+ eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval "test_cmds=\"$archive_expsym_cmds\"" -+ eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else -- eval "test_cmds=\"$archive_cmds\"" -+ eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi -@@ -7366,10 +8329,13 @@ EOF - echo 'INPUT (' > $output - for obj in $save_libobjs - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output -- delfiles="$delfiles $output" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7383,15 +8349,17 @@ EOF - fi - for obj - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext -- eval "test_cmds=\"$reload_cmds\"" -+ eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -7411,12 +8379,12 @@ EOF - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist -- eval "concat_cmds=\"$reload_cmds\"" -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 -@@ -7433,11 +8401,11 @@ EOF - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" -- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" -+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7450,9 +8418,9 @@ EOF - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" -+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then -- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - -@@ -7471,7 +8439,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7492,7 +8460,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7504,7 +8472,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7515,7 +8483,7 @@ EOF - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the -@@ -7539,23 +8507,23 @@ EOF - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. -- eval "cmds=\"\$cmds~\$RM $delfiles\"" -+ eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- eval "cmd=\"$cmd\"" -+ eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" -@@ -7564,7 +8532,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7576,8 +8544,8 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? -+ if test "$opt_mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then -@@ -7656,17 +8624,20 @@ EOF - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - -@@ -7690,7 +8661,7 @@ EOF - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" -- # $opt_dry_run || echo timestamp > $libobj || exit $? -+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - -@@ -7740,8 +8711,8 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi -@@ -7761,7 +8732,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7771,17 +8742,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7789,7 +8760,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7808,18 +8779,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7828,12 +8799,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7842,7 +8813,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - -@@ -7859,18 +8830,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else -- eval "flag=\"$hardcode_libdir_flag_spec\"" -- rpath="$rpath $flag" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7878,7 +8849,7 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- eval "rpath=\" $hardcode_libdir_flag_spec\"" -+ eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - -@@ -7921,6 +8892,12 @@ EOF - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7943,7 +8920,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7951,7 +8928,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7966,6 +8943,13 @@ EOF - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7999,6 +8983,12 @@ EOF - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -8096,7 +9086,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -8104,10 +9094,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -8118,10 +9108,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -8139,7 +9129,7 @@ EOF - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -8163,18 +9153,28 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -- eval "cmds=\"$old_archive_cmds\"" -+ eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -8189,7 +9189,7 @@ EOF - do - last_oldobj=$obj - done -- eval "test_cmds=\"$old_archive_cmds\"" -+ eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 -@@ -8208,7 +9208,7 @@ EOF - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi -@@ -8216,9 +9216,9 @@ EOF - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then -- eval "cmds=\"\$concat_cmds\"" -+ eval cmds=\"\$concat_cmds\" - else -- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi -@@ -8268,12 +9268,23 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" -+ ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8284,12 +9295,14 @@ EOF - *.la) - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8303,10 +9316,11 @@ EOF - # the library: - func_basename "$lib" - name="$func_basename_result" -- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -@@ -8318,7 +9332,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8327,7 +9341,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi -@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8432,9 +9446,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8443,24 +9457,23 @@ func_mode_uninstall () - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8486,18 +9499,17 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8525,19 +9537,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8547,7 +9559,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8556,7 +9568,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8564,12 +9576,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8577,7 +9589,6 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8589,16 +9600,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" ---- a/ltoptions.m4 -+++ b/ltoptions.m4 -@@ -8,7 +8,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 6 ltoptions.m4 -+# serial 7 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ---- a/ltversion.m4 -+++ b/ltversion.m4 -@@ -7,17 +7,17 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# Generated from ltversion.in. -+# @configure_input@ - --# serial 3134 ltversion.m4 -+# serial 3293 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.7a]) --m4_define([LT_PACKAGE_REVISION], [1.3134]) -+m4_define([LT_PACKAGE_VERSION], [2.4]) -+m4_define([LT_PACKAGE_REVISION], [1.3293]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.7a' --macro_revision='1.3134' -+[macro_version='2.4' -+macro_revision='1.3293' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) ---- a/lt~obsolete.m4 -+++ b/lt~obsolete.m4 -@@ -7,7 +7,7 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 4 lt~obsolete.m4 -+# serial 5 lt~obsolete.m4 - - # These exist entirely to fool aclocal when bootstrapping libtool. - # ---- a/opcodes/configure -+++ b/opcodes/configure -@@ -680,6 +680,9 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL -+ac_ct_AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -798,6 +801,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_targets - enable_werror -@@ -1462,6 +1466,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -5403,8 +5409,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -6180,6 +6186,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6196,6 +6276,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6364,7 +6449,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -6518,6 +6604,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6533,9 +6634,162 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -6551,7 +6805,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6591,7 +6849,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -6610,6 +6868,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -6621,12 +6883,11 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+ - - - -@@ -6637,6 +6898,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -6972,8 +7290,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -7050,6 +7369,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -7061,7 +7392,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7098,8 +7429,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -7136,6 +7467,14 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ - - - -@@ -7157,6 +7496,47 @@ fi - - - -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7363,6 +7743,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -7926,6 +8423,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -8091,7 +8590,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -8180,7 +8680,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8478,8 +8978,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -8764,13 +9268,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8831,6 +9339,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -9181,7 +9694,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9280,12 +9794,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -9299,8 +9813,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -9318,8 +9832,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9365,8 +9879,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -9496,7 +10010,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9509,22 +10029,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9549,22 +10082,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -9813,23 +10396,36 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -10643,7 +11298,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11439,7 +12094,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11442 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11483,10 +12138,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11545,7 +12200,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11548 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11589,10 +12244,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then - # since libbfd may not pull in the entirety of libiberty. - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in -@@ -13757,13 +14412,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -13778,14 +14440,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -13818,12 +14483,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -13878,8 +14543,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -13889,12 +14559,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -13910,7 +14582,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -13946,6 +14617,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -14711,7 +15383,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -14814,19 +15487,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -14856,6 +15552,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -14865,6 +15567,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -14979,12 +15684,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -15071,9 +15776,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -15089,6 +15791,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -15121,210 +15826,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -170,7 +170,7 @@ changequote(,)dnl - x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` - changequote([,])dnl - if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" - fi - - case "${host}" in ---- a/zlib/configure -+++ b/zlib/configure -@@ -646,8 +646,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -774,6 +777,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_libtool_sysroot - enable_libtool_lock - enable_host_shared - ' -@@ -1428,6 +1432,8 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - - Some influential environment variables: - CC C compiler command -@@ -4147,8 +4153,8 @@ esac - - - --macro_version='2.2.7a' --macro_revision='1.3134' -+macro_version='2.4' -+macro_revision='1.3293' - - - -@@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 - $as_echo_n "checking how to print strings... " >&6; } - # Test print first, because it will be a builtin if present. --if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' - elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -5054,6 +5060,80 @@ esac - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } - if ${lt_cv_ld_reload_flag+:} false; then : -@@ -5070,6 +5150,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5238,7 +5323,8 @@ mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; -@@ -5392,6 +5478,21 @@ esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_AR+:} false; then : -@@ -5425,7 +5680,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -+if test -z "$AR"; then - ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -5465,7 +5724,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -5484,6 +5743,10 @@ else - $as_echo "no" >&6; } - fi - -+ -+ test -n "$ac_ct_AR" && break -+done -+ - if test "x$ac_ct_AR" = x; then - AR="false" - else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR - fi --else -- AR="$ac_cv_prog_AR" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -5846,8 +6165,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -5924,6 +6244,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -5935,7 +6267,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -5972,8 +6304,8 @@ _LT_EOF - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6010,6 +6342,18 @@ else - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -6031,6 +6375,42 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } -+ -+# Check whether --with-libtool-sysroot was given. -+if test "${with_libtool_sysroot+set}" = set; then : -+ withval=$with_libtool_sysroot; -+else -+ with_libtool_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_libtool_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 -+$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -6241,6 +6621,123 @@ esac - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -6807,6 +7304,8 @@ _LT_EOF - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF - int main() { return 0;} - _LT_EOF -@@ -7269,7 +7768,8 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - - - -@@ -7358,7 +7858,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -7656,8 +8156,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -7942,13 +8446,17 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -8009,6 +8517,11 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -8359,7 +8872,8 @@ _LT_EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8458,12 +8972,12 @@ _LT_EOF - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -8477,8 +8991,8 @@ _LT_EOF - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -8496,8 +9010,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8543,8 +9057,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -8674,7 +9188,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8690,22 +9210,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp - else - # Determine the default libpath from the value encoded in an - # empty executable. -- if test x$gcc_no_link = xyes; then -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8733,22 +9266,29 @@ main () - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi -+ -+fi -+ -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -8997,26 +9580,39 @@ fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- if test x$gcc_no_link = xyes; then -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --int foo(void) {} -+int foo (void) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+ lt_cv_irix_exported_symbol=yes -+else -+ lt_cv_irix_exported_symbol=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -9830,7 +10485,7 @@ haiku*) - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -10644,7 +11299,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10647 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10688,10 +11343,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10750,7 +11405,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10753 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10794,10 +11449,10 @@ else - /* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ - #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --void fnord () __attribute__((visibility("default"))); -+int fnord () __attribute__((visibility("default"))); - #endif - --void fnord () { int i=42; } -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ - lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' - lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' - lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' - reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' - reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' - OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' - deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' - file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' - AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' - AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' - STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' - RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' - old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' - lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' - need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' - DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' - NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' - LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod - hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' - inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' - link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' - always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' - export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' - exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' - include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' - prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' - file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' - variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' - need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -@@ -12388,8 +13053,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -12420,7 +13092,6 @@ no_undefined_flag \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -12456,6 +13127,7 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ -@@ -13054,7 +13726,8 @@ $as_echo X"$file" | - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+ - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_c - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -13322,12 +14027,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch new file mode 100644 index 0000000000..c71e19ecb4 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch @@ -0,0 +1,7115 @@ +From 3a2e7ec956568c503a678385ebee17098337feab Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 14 Feb 2016 17:04:07 +0000 +Subject: [PATCH] Use libtool 2.4 + +get libtool sysroot support + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + bfd/configure.ac | 2 +- + libtool.m4 | 1080 +++++++++++------ + ltmain.sh | 2925 +++++++++++++++++++++++++++++++--------------- + ltoptions.m4 | 2 +- + ltversion.m4 | 12 +- + lt~obsolete.m4 | 2 +- + 6 files changed, 2717 insertions(+), 1306 deletions(-) + +diff --git a/bfd/configure.ac b/bfd/configure.ac +index af4d4b8c13..a521738244 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -296,7 +296,7 @@ changequote(,)dnl + x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` + changequote([,])dnl + if test -n "$x"; then +- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" ++ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" + fi + + case "${host}" in +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -1,7 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -10,7 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 56 LT_INIT ++# serial 57 LT_INIT + + + # LT_PREREQ(VERSION) +@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool" + AC_SUBST(LIBTOOL)dnl + + _LT_SETUP +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl + dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl + m4_require([_LT_CMD_RELOAD])dnl + m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl + m4_require([_LT_CMD_OLD_ARCHIVE])dnl + m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_WITH_SYSROOT])dnl + + _LT_CONFIG_LIBTOOL_INIT([ + # See if we are running on zsh, and set the options which allow our +@@ -199,7 +205,7 @@ aix3*) + esac + + # Global variables: +-ofile=libtool ++ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except MSVC, +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +@@ -746,15 +752,12 @@ _LT_EOF + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +- _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ], +@@ -980,6 +983,8 @@ _LT_EOF + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD ++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD ++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF + int main() { return 0;} + _LT_EOF +@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], + fi + ]) + +-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ---------------------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. ++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath. + m4_defun([_LT_SYS_MODULE_PATH_AIX], + [m4_require([_LT_DECL_SED])dnl +-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi + ])# _LT_SYS_MODULE_PATH_AIX + + +@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + + AC_MSG_CHECKING([how to print strings]) + # Test print first, because it will be a builtin if present. +-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' + elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) + ])# _LT_PROG_ECHO_BACKSLASH + + ++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([libtool-sysroot], ++[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_libtool_sysroot=no]) ++ ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_libtool_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_libtool_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac ++ ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) ++ + # _LT_ENABLE_LOCK + # --------------- + m4_defun([_LT_ENABLE_LOCK], +@@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" + ])# _LT_ENABLE_LOCK + + ++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++ + # _LT_CMD_OLD_ARCHIVE + # ------------------- + m4_defun([_LT_CMD_OLD_ARCHIVE], +-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR + + AC_CHECK_TOOL(STRIP, strip, :) + test -z "$STRIP" && STRIP=: +@@ -1623,7 +1705,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-[#line __oline__ "configure" ++[#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -1667,10 +1749,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -2244,13 +2327,71 @@ m4_if([$1], [],[ + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -2342,7 +2483,7 @@ haiku*) + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +@@ -2950,6 +3091,11 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -3016,7 +3162,8 @@ mingw* | pw32*) + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +@@ -3167,6 +3314,21 @@ tpf*) + ;; + esac + ]) ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + _LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) + _LT_DECL([], [file_magic_cmd], [1], +- [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + ])# _LT_CHECK_MAGIC_METHOD + + +@@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([AM_PROG_NM], []) + dnl AC_DEFUN([AC_PROG_NM], []) + ++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++ + + # LT_LIB_M + # -------- +@@ -3403,8 +3630,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -3473,6 +3701,18 @@ _LT_EOF + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t at _DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t at _DLSYM_CONST ++#else ++# define LT@&t at _DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -3484,7 +3724,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT@&t at _DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi +@@ -3551,6 +3791,13 @@ else + AC_MSG_RESULT(ok) + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) + _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], + _LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM]) + ]) # _LT_CMD_GLOBAL_SYMBOLS + + +@@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)= + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) + m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + dgux*) + case $cc_basename in + ec++*) +@@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ + ;; + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +@@ -4172,9 +4432,11 @@ case $host_os in + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; + esac +-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) ++ ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + + # + # Check to make sure the PIC flag actually works. +@@ -4193,6 +4455,8 @@ fi + _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) + # + # Check to make sure the static flag actually works. + # +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + m4_defun([_LT_LINKER_SHLIBS], + [AC_REQUIRE([LT_PATH_LD])dnl + AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_DECL_SED])dnl +@@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. +@@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; ++ ;; + cygwin* | mingw* | cegcc*) +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ case $cc_basename in ++ cl*) ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ ;; + esac +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -4411,7 +4682,8 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -4510,12 +4782,12 @@ _LT_EOF + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -4529,8 +4801,8 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -4548,8 +4820,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4595,8 +4867,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4726,7 +4998,7 @@ _LT_EOF + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else +@@ -4737,7 +5009,7 @@ _LT_EOF + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -4781,20 +5053,63 @@ _LT_EOF + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -4828,7 +5143,7 @@ _LT_EOF + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4836,7 +5151,7 @@ _LT_EOF + + hpux9*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -4852,7 +5167,7 @@ _LT_EOF + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -4876,10 +5191,10 @@ _LT_EOF + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -4926,16 +5241,31 @@ _LT_EOF + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ) +- LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +@@ -5020,7 +5350,7 @@ _LT_EOF + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +@@ -5039,9 +5369,9 @@ _LT_EOF + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], + to runtime path list]) + _LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler]) + _LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) + _LT_TAGDECL([], [export_symbols_cmds], [2], +@@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) + _LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs]) + _LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) + dnl FIXME: Not yet implemented +@@ -5426,6 +5756,7 @@ CC="$lt_save_CC" + m4_defun([_LT_LANG_CXX_CONFIG], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + + cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then + ;; + *) + if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC +@@ -6445,6 +6825,29 @@ AC_LANG_POP + ])# _LT_LANG_CXX_CONFIG + + ++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++ + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- + # Figure out "hidden" library dependencies from verbose +@@ -6453,6 +6856,7 @@ AC_LANG_POP + # objects, libraries and library flags. + m4_defun([_LT_SYS_HIDDEN_LIBDEPS], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl + # Dependencies to place before and after the object being linked: + _LT_TAGVAR(predep_objects, $1)= + _LT_TAGVAR(postdep_objects, $1)= +@@ -6503,6 +6907,13 @@ public class foo { + }; + _LT_EOF + ]) ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++esac ++ + dnl Parse the compiler output and extract the necessary + dnl objects, libraries and library flags. + if AC_TRY_EVAL(ac_compile); then +@@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. +@@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then + test $p = "-R"; then + prev=$p + continue +- else +- prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. +@@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. +@@ -6586,6 +7008,7 @@ else + fi + + $RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + + # PORTME: override above test on systems where it is broken + m4_if([$1], [CXX], +@@ -6622,7 +7045,7 @@ linux*) + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as +@@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} ++ CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then + + GCC=$lt_save_GCC + CC="$lt_save_CC" ++ CFLAGS="$lt_save_CFLAGS" + fi # test "$_lt_disable_F77" != yes + + AC_LANG_POP +@@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} ++ CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + +@@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then + fi # test -n "$compiler" + + GCC=$lt_save_GCC +- CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + fi # test "$_lt_disable_FC" != yes + + AC_LANG_POP +@@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC=yes + CC=${GCJ-"gcj"} ++CFLAGS=$GCJFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_TAGVAR(LD, $1)="$LD" +@@ -6992,7 +7423,8 @@ fi + AC_LANG_RESTORE + + GCC=$lt_save_GCC +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_GCJ_CONFIG + + +@@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC= + CC=${RC-"windres"} ++CFLAGS= + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -7042,7 +7476,8 @@ fi + + GCC=$lt_save_GCC + AC_LANG_RESTORE +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_RC_CONFIG + + +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) + AC_SUBST([OBJDUMP]) + ]) + ++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++]) + + # _LT_DECL_SED + # ------------ +@@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl + ])# _LT_CHECK_SHELL_FEATURES + + +-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++]) + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) ++ ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"]) + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}]) + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}]) + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac]) + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ ++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + +-_LT_EOF +-esac ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++]) + +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=\$[2]" +-} +-_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac + ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=\$$[1]\$[2]" +-} +- +-_LT_EOF ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac + ;; +- esac ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl ++ ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac + ]) ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1,10 +1,9 @@ +-# Generated from ltmain.m4sh. + +-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# libtool (GNU libtool) 2.4 + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +@@ -38,7 +37,6 @@ + # -n, --dry-run display commands without modifying any files + # --features display basic configuration information and exit + # --mode=MODE use operation mode MODE +-# --no-finish let install mode avoid finish commands + # --preserve-dup-deps don't remove duplicate dependency libraries + # --quiet, --silent don't print informational messages + # --no-quiet, --no-silent +@@ -71,17 +69,19 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a ++# $progname: (GNU libtool) 2.4 + # automake: $automake_version + # autoconf: $autoconf_version + # + # Report bugs to . ++# GNU libtool home page: . ++# General help using GNU software: . + + PROGRAM=libtool + PACKAGE=libtool +-VERSION=2.2.7a +-TIMESTAMP=" 1.3134 2009-11-29" +-package_revision=1.3134 ++VERSION=2.4 ++TIMESTAMP="" ++package_revision=1.3293 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -106,9 +106,6 @@ _LTECHO_EOF' + } + + # NLS nuisances: We save the old values to restore during execute mode. +-# Only set LANG and LC_ALL to C if already set. +-# These must not be set unconditionally because not all systems understand +-# e.g. LANG=C (notably SCO). + lt_user_locale= + lt_safe_locale= + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +@@ -121,15 +118,13 @@ do + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" + done ++LC_ALL=C ++LANGUAGE=C ++export LANGUAGE LC_ALL + + $lt_unset CDPATH + + +- +- +- +- +- + # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh + # is ksh but when the shell is invoked as "sh" and the current value of + # the _XPG environment variable is not equal to 1 (one), the special +@@ -140,7 +135,7 @@ progpath="$0" + + + : ${CP="cp -f"} +-: ${ECHO=$as_echo} ++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} + : ${EGREP="/bin/grep -E"} + : ${FGREP="/bin/grep -F"} + : ${GREP="/bin/grep"} +@@ -149,7 +144,7 @@ progpath="$0" + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} ++: ${SED="/bin/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -169,6 +164,27 @@ IFS=" $lt_nl" + dirname="s,/[^/]*$,," + basename="s,^.*/,," + ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} # func_dirname may be replaced by extended shell implementation ++ ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} # func_basename may be replaced by extended shell implementation ++ ++ + # func_dirname_and_basename file append nondir_replacement + # perform func_basename and func_dirname in a single function + # call: +@@ -183,17 +199,31 @@ basename="s,^.*/,," + # those functions but instead duplicate the functionality here. + func_dirname_and_basename () + { +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +-} ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` ++} # func_dirname_and_basename may be replaced by extended shell implementation ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname may be replaced by extended shell implementation + +-# Generated shell functions inserted here. + + # These SED scripts presuppose an absolute path with a trailing slash. + pathcar='s,^/\([^/]*\).*$,\1,' +@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + # Same as above, but do not quote variable references. + double_quote_subst='s/\(["`\\]\)/\\\1/g' + ++# Sed substitution that turns a string into a regex matching for the ++# string literally. ++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' ++ ++# Sed substitution that converts a w32 file name or path ++# which contains forward slashes, into one that contains ++# (escaped) backslashes. A very naive implementation. ++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ + # Re-`\' parameter expansions in output of double_quote_subst that were + # `\'-ed in input to the same. If an odd number of `\' preceded a '$' + # in input to double_quote_subst, that '$' was protected from expansion. +@@ -404,7 +443,7 @@ opt_warning=: + # name if it has been set yet. + func_echo () + { +- $ECHO "$progname${mode+: }$mode: $*" ++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + } + + # func_verbose arg... +@@ -430,14 +469,14 @@ func_echo_all () + # Echo program name prefixed message to standard error. + func_error () + { +- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + } + + # func_warning arg... + # Echo program name prefixed warning message to standard error. + func_warning () + { +- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +@@ -656,19 +695,35 @@ func_show_eval_locale () + fi + } + +- +- ++# func_tr_sh ++# Turn $1 into a string suitable for a shell variable name. ++# Result is stored in $func_tr_sh_result. All characters ++# not in the set a-zA-Z0-9_ are replaced with '_'. Further, ++# if $1 begins with a digit, a '_' is prepended as well. ++func_tr_sh () ++{ ++ case $1 in ++ [0-9]* | *[!a-zA-Z0-9_]*) ++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` ++ ;; ++ * ) ++ func_tr_sh_result=$1 ++ ;; ++ esac ++} + + + # func_version + # Echo version message to standard output and exit. + func_version () + { ++ $opt_debug ++ + $SED -n '/(C)/!b go + :more + /\./!{ + N +- s/\n# // ++ s/\n# / / + b more + } + :go +@@ -685,7 +740,9 @@ func_version () + # Echo short help message to standard output and exit. + func_usage () + { +- $SED -n '/^# Usage:/,/^# *-h/ { ++ $opt_debug ++ ++ $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ +@@ -701,7 +758,10 @@ func_usage () + # unless 'noexit' is passed as argument. + func_help () + { ++ $opt_debug ++ + $SED -n '/^# Usage:/,/# Report bugs to/ { ++ :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* +@@ -714,7 +774,11 @@ func_help () + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p +- }' < "$progpath" ++ d ++ } ++ /^# .* home page:/b print ++ /^# General help using/b print ++ ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret +@@ -726,12 +790,39 @@ func_help () + # exit_cmd. + func_missing_arg () + { +- func_error "missing argument for $1" ++ $opt_debug ++ ++ func_error "missing argument for $1." + exit_cmd=exit + } + +-exit_cmd=: + ++# func_split_short_opt shortopt ++# Set func_split_short_opt_name and func_split_short_opt_arg shell ++# variables after splitting SHORTOPT after the 2nd character. ++func_split_short_opt () ++{ ++ my_sed_short_opt='1s/^\(..\).*$/\1/;q' ++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' ++ ++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` ++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` ++} # func_split_short_opt may be replaced by extended shell implementation ++ ++ ++# func_split_long_opt longopt ++# Set func_split_long_opt_name and func_split_long_opt_arg shell ++# variables after splitting LONGOPT at the `=' sign. ++func_split_long_opt () ++{ ++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' ++ my_sed_long_arg='1s/^--[^=]*=//' ++ ++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` ++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` ++} # func_split_long_opt may be replaced by extended shell implementation ++ ++exit_cmd=: + + + +@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" + magic_exe="%%%MAGIC EXE variable%%%" + + # Global variables. +-# $mode is unset + nonopt= +-execute_dlfiles= + preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" + extracted_archives= + extracted_serial=0 + +-opt_dry_run=false +-opt_finish=: +-opt_duplicate_deps=false +-opt_silent=false +-opt_debug=: +- + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. + exec_cmd= + ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "${1}=\$${1}\${2}" ++} # func_append may be replaced by extended shell implementation ++ ++# func_append_quoted var value ++# Quote VALUE and append to the end of shell variable VAR, separated ++# by a space. ++func_append_quoted () ++{ ++ func_quote_for_eval "${2}" ++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" ++} # func_append_quoted may be replaced by extended shell implementation ++ ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "${@}"` ++} # func_arith may be replaced by extended shell implementation ++ ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` ++} # func_len may be replaced by extended shell implementation ++ ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} # func_lo2o may be replaced by extended shell implementation ++ ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} # func_xform may be replaced by extended shell implementation ++ ++ + # func_fatal_configuration arg... + # Echo program name prefixed message to standard error, followed by + # a configuration failure hint, and exit. +@@ -850,130 +979,204 @@ func_enable_tag () + esac + } + +-# Parse options once, thoroughly. This comes as soon as possible in +-# the script to make things like `libtool --version' happen quickly. ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () + { ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ fi ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++# Shorthand for --mode=foo, only valid as the first argument ++case $1 in ++clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++esac + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do ++ ++ ++# Option defaults: ++opt_debug=: ++opt_dry_run=false ++opt_config=false ++opt_preserve_dup_deps=false ++opt_features=false ++opt_finish=false ++opt_help=false ++opt_help_all=false ++opt_silent=: ++opt_verbose=: ++opt_silent=false ++opt_verbose=false ++ ++ ++# Parse options once, thoroughly. This comes as soon as possible in the ++# script to make things like `--version' happen as quickly as we can. ++{ ++ # this just eases exit handling ++ while test $# -gt 0; do + opt="$1" + shift +- + case $opt in +- --config) func_config ;; +- +- --debug) preserve_args="$preserve_args $opt" ++ --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" +- opt_debug='set -x' + $opt_debug + ;; +- +- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break +- execute_dlfiles="$execute_dlfiles $1" +- shift ++ --dry-run|--dryrun|-n) ++ opt_dry_run=: + ;; +- +- --dry-run | -n) opt_dry_run=: ;; +- --features) func_features ;; +- --finish) mode="finish" ;; +- --no-finish) opt_finish=false ;; +- +- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break +- case $1 in +- # Valid mode arguments: +- clean) ;; +- compile) ;; +- execute) ;; +- finish) ;; +- install) ;; +- link) ;; +- relink) ;; +- uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +- esac +- +- mode="$1" ++ --config) ++ opt_config=: ++func_config ++ ;; ++ --dlopen|-dlopen) ++ optarg="$1" ++ opt_dlopen="${opt_dlopen+$opt_dlopen ++}$optarg" + shift + ;; +- + --preserve-dup-deps) +- opt_duplicate_deps=: ;; +- +- --quiet|--silent) preserve_args="$preserve_args $opt" +- opt_silent=: +- opt_verbose=false ++ opt_preserve_dup_deps=: + ;; +- +- --no-quiet|--no-silent) +- preserve_args="$preserve_args $opt" +- opt_silent=false ++ --features) ++ opt_features=: ++func_features + ;; +- +- --verbose| -v) preserve_args="$preserve_args $opt" ++ --finish) ++ opt_finish=: ++set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ --help) ++ opt_help=: ++ ;; ++ --help-all) ++ opt_help_all=: ++opt_help=': help-all' ++ ;; ++ --mode) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_mode="$optarg" ++case $optarg in ++ # Valid mode arguments: ++ clean|compile|execute|finish|install|link|relink|uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++esac ++ shift ++ ;; ++ --no-silent|--no-quiet) + opt_silent=false +- opt_verbose=: ++func_append preserve_args " $opt" + ;; +- +- --no-verbose) preserve_args="$preserve_args $opt" ++ --no-verbose) + opt_verbose=false ++func_append preserve_args " $opt" + ;; +- +- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break +- preserve_args="$preserve_args $opt $1" +- func_enable_tag "$1" # tagname is set here ++ --silent|--quiet) ++ opt_silent=: ++func_append preserve_args " $opt" ++ opt_verbose=false ++ ;; ++ --verbose|-v) ++ opt_verbose=: ++func_append preserve_args " $opt" ++opt_silent=false ++ ;; ++ --tag) ++ test $# = 0 && func_missing_arg $opt && break ++ optarg="$1" ++ opt_tag="$optarg" ++func_append preserve_args " $opt $optarg" ++func_enable_tag "$optarg" + shift + ;; + ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ --version) func_version ;; ++ + # Separate optargs to long options: +- -dlopen=*|--mode=*|--tag=*) +- func_opt_split "$opt" +- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ --*=*) ++ func_split_long_opt "$opt" ++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + +- -\?|-h) func_usage ;; +- --help) opt_help=: ;; +- --help-all) opt_help=': help-all' ;; +- --version) func_version ;; +- +- -*) func_fatal_help "unrecognized option \`$opt'" ;; +- +- *) nonopt="$opt" +- break ++ # Separate non-argument short options: ++ -\?*|-h*|-n*|-v*) ++ func_split_short_opt "$opt" ++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} ++ shift + ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + ++ # Validate options: ++ ++ # save first non-option argument ++ if test "$#" -gt 0; then ++ nonopt="$opt" ++ shift ++ fi ++ ++ # preserve --debug ++ test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) +@@ -981,82 +1184,44 @@ func_enable_tag () + opt_duplicate_compiler_generated_deps=: + ;; + *) +- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + +- # Having warned about all mis-specified options, bail out if +- # anything was wrong. +- $exit_cmd $EXIT_FAILURE +-} ++ $opt_help || { ++ # Sanity checks first: ++ func_check_version_match + +-# func_check_version_match +-# Ensure that we are using m4 macros, and libtool script from the same +-# release of libtool. +-func_check_version_match () +-{ +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from an older release. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- fi +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +-$progname: but the definition of this LT_INIT comes from revision $macro_revision. +-$progname: You should recreate aclocal.m4 with macros from revision $package_revision +-$progname: of $PACKAGE $VERSION and run autoconf again. +-_LT_EOF ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" + fi + +- exit $EXIT_MISMATCH +- fi +-} +- ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" + +-## ----------- ## +-## Main. ## +-## ----------- ## +- +-$opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" +- fi ++ # Only execute mode is allowed to have -dlopen flags. ++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ # Change the help message to a mode-specific one. ++ generic_help="$help" ++ help="Try \`$progname --help --mode=$opt_mode' for more information." ++ } + + +- # Darwin sucks +- eval "std_shrext=\"$shrext_cmds\"" ++ # Bail if the options were screwed ++ $exit_cmd $EXIT_FAILURE ++} + + +- # Only execute mode is allowed to have -dlopen flags. +- if test -n "$execute_dlfiles" && test "$mode" != execute; then +- func_error "unrecognized option \`-dlopen'" +- $ECHO "$help" 1>&2 +- exit $EXIT_FAILURE +- fi + +- # Change the help message to a mode-specific one. +- generic_help="$help" +- help="Try \`$progname --help --mode=$mode' for more information." +-} + ++## ----------- ## ++## Main. ## ++## ----------- ## + + # func_lalib_p file + # True iff FILE is a libtool `.la' library or `.lo' object file. +@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () + # temporary ltwrapper_script. + func_ltwrapper_scriptname () + { +- func_ltwrapper_scriptname_result="" +- if func_ltwrapper_executable_p "$1"; then +- func_dirname_and_basename "$1" "" "." +- func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +- fi ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + } + + # func_ltwrapper_p file +@@ -1149,7 +1311,7 @@ func_execute_cmds () + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +@@ -1172,6 +1334,37 @@ func_source () + } + + ++# func_resolve_sysroot PATH ++# Replace a leading = in PATH with a sysroot. Store the result into ++# func_resolve_sysroot_result ++func_resolve_sysroot () ++{ ++ func_resolve_sysroot_result=$1 ++ case $func_resolve_sysroot_result in ++ =*) ++ func_stripname '=' '' "$func_resolve_sysroot_result" ++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result ++ ;; ++ esac ++} ++ ++# func_replace_sysroot PATH ++# If PATH begins with the sysroot, replace it with = and ++# store the result into func_replace_sysroot_result. ++func_replace_sysroot () ++{ ++ case "$lt_sysroot:$1" in ++ ?*:"$lt_sysroot"*) ++ func_stripname "$lt_sysroot" '' "$1" ++ func_replace_sysroot_result="=$func_stripname_result" ++ ;; ++ *) ++ # Including no sysroot. ++ func_replace_sysroot_result=$1 ++ ;; ++ esac ++} ++ + # func_infer_tag arg + # Infer tagged configuration to use if any are available and + # if one wasn't chosen via the "--tag" command line option. +@@ -1184,8 +1377,7 @@ func_infer_tag () + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1204,8 +1396,7 @@ func_infer_tag () + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` +@@ -1274,6 +1465,486 @@ EOF + } + } + ++ ++################################################## ++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # ++################################################## ++ ++# func_convert_core_file_wine_to_w32 ARG ++# Helper function used by file name conversion functions when $build is *nix, ++# and $host is mingw, cygwin, or some other w32 environment. Relies on a ++# correctly configured wine environment available, with the winepath program ++# in $build's $PATH. ++# ++# ARG is the $build file name to be converted to w32 format. ++# Result is available in $func_convert_core_file_wine_to_w32_result, and will ++# be empty on error (or when ARG is empty) ++func_convert_core_file_wine_to_w32 () ++{ ++ $opt_debug ++ func_convert_core_file_wine_to_w32_result="$1" ++ if test -n "$1"; then ++ # Unfortunately, winepath does not exit with a non-zero error code, so we ++ # are forced to check the contents of stdout. On the other hand, if the ++ # command is not found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both error code of ++ # zero AND non-empty stdout, which explains the odd construction: ++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then ++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ func_convert_core_file_wine_to_w32_result= ++ fi ++ fi ++} ++# end: func_convert_core_file_wine_to_w32 ++ ++ ++# func_convert_core_path_wine_to_w32 ARG ++# Helper function used by path conversion functions when $build is *nix, and ++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly ++# configured wine environment available, with the winepath program in $build's ++# $PATH. Assumes ARG has no leading or trailing path separator characters. ++# ++# ARG is path to be converted from $build format to win32. ++# Result is available in $func_convert_core_path_wine_to_w32_result. ++# Unconvertible file (directory) names in ARG are skipped; if no directory names ++# are convertible, then the result may be empty. ++func_convert_core_path_wine_to_w32 () ++{ ++ $opt_debug ++ # unfortunately, winepath doesn't convert paths, only file names ++ func_convert_core_path_wine_to_w32_result="" ++ if test -n "$1"; then ++ oldIFS=$IFS ++ IFS=: ++ for func_convert_core_path_wine_to_w32_f in $1; do ++ IFS=$oldIFS ++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" ++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then ++ if test -z "$func_convert_core_path_wine_to_w32_result"; then ++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" ++ else ++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" ++ fi ++ fi ++ done ++ IFS=$oldIFS ++ fi ++} ++# end: func_convert_core_path_wine_to_w32 ++ ++ ++# func_cygpath ARGS... ++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when ++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) ++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or ++# (2), returns the Cygwin file name or path in func_cygpath_result (input ++# file name or path is assumed to be in w32 format, as previously converted ++# from $build's *nix or MSYS format). In case (3), returns the w32 file name ++# or path in func_cygpath_result (input file name or path is assumed to be in ++# Cygwin format). Returns an empty string on error. ++# ++# ARGS are passed to cygpath, with the last one being the file name or path to ++# be converted. ++# ++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH ++# environment variable; do not put it in $PATH. ++func_cygpath () ++{ ++ $opt_debug ++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then ++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` ++ if test "$?" -ne 0; then ++ # on failure, ensure result is empty ++ func_cygpath_result= ++ fi ++ else ++ func_cygpath_result= ++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" ++ fi ++} ++#end: func_cygpath ++ ++ ++# func_convert_core_msys_to_w32 ARG ++# Convert file name or path ARG from MSYS format to w32 format. Return ++# result in func_convert_core_msys_to_w32_result. ++func_convert_core_msys_to_w32 () ++{ ++ $opt_debug ++ # awkward: cmd appends spaces to result ++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | ++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ++} ++#end: func_convert_core_msys_to_w32 ++ ++ ++# func_convert_file_check ARG1 ARG2 ++# Verify that ARG1 (a file name in $build format) was converted to $host ++# format in ARG2. Otherwise, emit an error message, but continue (resetting ++# func_to_host_file_result to ARG1). ++func_convert_file_check () ++{ ++ $opt_debug ++ if test -z "$2" && test -n "$1" ; then ++ func_error "Could not determine host file name corresponding to" ++ func_error " \`$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_file_result="$1" ++ fi ++} ++# end func_convert_file_check ++ ++ ++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH ++# Verify that FROM_PATH (a path in $build format) was converted to $host ++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting ++# func_to_host_file_result to a simplistic fallback value (see below). ++func_convert_path_check () ++{ ++ $opt_debug ++ if test -z "$4" && test -n "$3"; then ++ func_error "Could not determine the host path corresponding to" ++ func_error " \`$3'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This is a deliberately simplistic "conversion" and ++ # should not be "improved". See libtool.info. ++ if test "x$1" != "x$2"; then ++ lt_replace_pathsep_chars="s|$1|$2|g" ++ func_to_host_path_result=`echo "$3" | ++ $SED -e "$lt_replace_pathsep_chars"` ++ else ++ func_to_host_path_result="$3" ++ fi ++ fi ++} ++# end func_convert_path_check ++ ++ ++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG ++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT ++# and appending REPL if ORIG matches BACKPAT. ++func_convert_path_front_back_pathsep () ++{ ++ $opt_debug ++ case $4 in ++ $1 ) func_to_host_path_result="$3$func_to_host_path_result" ++ ;; ++ esac ++ case $4 in ++ $2 ) func_append func_to_host_path_result "$3" ++ ;; ++ esac ++} ++# end func_convert_path_front_back_pathsep ++ ++ ++################################################## ++# $build to $host FILE NAME CONVERSION FUNCTIONS # ++################################################## ++# invoked via `$to_host_file_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# Result will be available in $func_to_host_file_result. ++ ++ ++# func_to_host_file ARG ++# Converts the file name ARG from $build format to $host format. Return result ++# in func_to_host_file_result. ++func_to_host_file () ++{ ++ $opt_debug ++ $to_host_file_cmd "$1" ++} ++# end func_to_host_file ++ ++ ++# func_to_tool_file ARG LAZY ++# converts the file name ARG from $build format to toolchain format. Return ++# result in func_to_tool_file_result. If the conversion in use is listed ++# in (the comma separated) LAZY, no conversion takes place. ++func_to_tool_file () ++{ ++ $opt_debug ++ case ,$2, in ++ *,"$to_tool_file_cmd",*) ++ func_to_tool_file_result=$1 ++ ;; ++ *) ++ $to_tool_file_cmd "$1" ++ func_to_tool_file_result=$func_to_host_file_result ++ ;; ++ esac ++} ++# end func_to_tool_file ++ ++ ++# func_convert_file_noop ARG ++# Copy ARG to func_to_host_file_result. ++func_convert_file_noop () ++{ ++ func_to_host_file_result="$1" ++} ++# end func_convert_file_noop ++ ++ ++# func_convert_file_msys_to_w32 ARG ++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_file_result. ++func_convert_file_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_msys_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_w32 ++ ++ ++# func_convert_file_cygwin_to_w32 ARG ++# Convert file name ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_file_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use ++ # LT_CYGPATH in this case. ++ func_to_host_file_result=`cygpath -m "$1"` ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_cygwin_to_w32 ++ ++ ++# func_convert_file_nix_to_w32 ARG ++# Convert file name ARG from *nix to w32 format. Requires a wine environment ++# and a working winepath. Returns result in func_to_host_file_result. ++func_convert_file_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_file_wine_to_w32 "$1" ++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_w32 ++ ++ ++# func_convert_file_msys_to_cygwin ARG ++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_file_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ func_convert_core_msys_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_msys_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_msys_to_cygwin ++ ++ ++# func_convert_file_nix_to_cygwin ARG ++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed ++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result ++# in func_to_host_file_result. ++func_convert_file_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_file_result="$1" ++ if test -n "$1"; then ++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. ++ func_convert_core_file_wine_to_w32 "$1" ++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" ++ func_to_host_file_result="$func_cygpath_result" ++ fi ++ func_convert_file_check "$1" "$func_to_host_file_result" ++} ++# end func_convert_file_nix_to_cygwin ++ ++ ++############################################# ++# $build to $host PATH CONVERSION FUNCTIONS # ++############################################# ++# invoked via `$to_host_path_cmd ARG' ++# ++# In each case, ARG is the path to be converted from $build to $host format. ++# The result will be available in $func_to_host_path_result. ++# ++# Path separators are also converted from $build format to $host format. If ++# ARG begins or ends with a path separator character, it is preserved (but ++# converted to $host format) on output. ++# ++# All path conversion functions are named using the following convention: ++# file name conversion function : func_convert_file_X_to_Y () ++# path conversion function : func_convert_path_X_to_Y () ++# where, for any given $build/$host combination the 'X_to_Y' value is the ++# same. If conversion functions are added for new $build/$host combinations, ++# the two new functions must follow this pattern, or func_init_to_host_path_cmd ++# will break. ++ ++ ++# func_init_to_host_path_cmd ++# Ensures that function "pointer" variable $to_host_path_cmd is set to the ++# appropriate value, based on the value of $to_host_file_cmd. ++to_host_path_cmd= ++func_init_to_host_path_cmd () ++{ ++ $opt_debug ++ if test -z "$to_host_path_cmd"; then ++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" ++ to_host_path_cmd="func_convert_path_${func_stripname_result}" ++ fi ++} ++ ++ ++# func_to_host_path ARG ++# Converts the path ARG from $build format to $host format. Return result ++# in func_to_host_path_result. ++func_to_host_path () ++{ ++ $opt_debug ++ func_init_to_host_path_cmd ++ $to_host_path_cmd "$1" ++} ++# end func_to_host_path ++ ++ ++# func_convert_path_noop ARG ++# Copy ARG to func_to_host_path_result. ++func_convert_path_noop () ++{ ++ func_to_host_path_result="$1" ++} ++# end func_convert_path_noop ++ ++ ++# func_convert_path_msys_to_w32 ARG ++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic ++# conversion to w32 is not available inside the cwrapper. Returns result in ++# func_to_host_path_result. ++func_convert_path_msys_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ARG. MSYS ++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; ++ # and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_msys_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_msys_to_w32 ++ ++ ++# func_convert_path_cygwin_to_w32 ARG ++# Convert path ARG from Cygwin to w32 format. Returns result in ++# func_to_host_file_result. ++func_convert_path_cygwin_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_cygwin_to_w32 ++ ++ ++# func_convert_path_nix_to_w32 ARG ++# Convert path ARG from *nix to w32 format. Requires a wine environment and ++# a working winepath. Returns result in func_to_host_file_result. ++func_convert_path_nix_to_w32 () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" ++ func_convert_path_check : ";" \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" ++ fi ++} ++# end func_convert_path_nix_to_w32 ++ ++ ++# func_convert_path_msys_to_cygwin ARG ++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. ++# Returns result in func_to_host_file_result. ++func_convert_path_msys_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # See func_convert_path_msys_to_w32: ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_msys_to_cygwin ++ ++ ++# func_convert_path_nix_to_cygwin ARG ++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a ++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in ++# func_to_host_file_result. ++func_convert_path_nix_to_cygwin () ++{ ++ $opt_debug ++ func_to_host_path_result="$1" ++ if test -n "$1"; then ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_stripname : : "$1" ++ func_to_host_path_tmp1=$func_stripname_result ++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" ++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" ++ func_to_host_path_result="$func_cygpath_result" ++ func_convert_path_check : : \ ++ "$func_to_host_path_tmp1" "$func_to_host_path_result" ++ func_convert_path_front_back_pathsep ":*" "*:" : "$1" ++ fi ++} ++# end func_convert_path_nix_to_cygwin ++ ++ + # func_mode_compile arg... + func_mode_compile () + { +@@ -1314,12 +1985,12 @@ func_mode_compile () + ;; + + -pie | -fpie | -fPIE) +- pie_flag="$pie_flag $arg" ++ func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) +- later="$later $arg" ++ func_append later " $arg" + continue + ;; + +@@ -1340,15 +2011,14 @@ func_mode_compile () + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" +- func_quote_for_eval "$arg" +- lastarg="$lastarg $func_quote_for_eval_result" ++ func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. +- base_compile="$base_compile $lastarg" ++ func_append base_compile " $lastarg" + continue + ;; + +@@ -1364,8 +2034,7 @@ func_mode_compile () + esac # case $arg_mode + + # Aesthetically quote the previous argument. +- func_quote_for_eval "$lastarg" +- base_compile="$base_compile $func_quote_for_eval_result" ++ func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in +@@ -1496,17 +2165,16 @@ compiler." + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi +- removelist="$removelist $output_obj" ++ func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist +- removelist="$removelist $lockfile" ++ func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + +- if test -n "$fix_srcfile_path"; then +- eval "srcfile=\"$fix_srcfile_path\"" +- fi ++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 ++ srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + +@@ -1526,7 +2194,7 @@ compiler." + + if test -z "$output_obj"; then + # Place PIC objects in $objdir +- command="$command -o $lobj" ++ func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ +@@ -1573,11 +2241,11 @@ compiler." + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then +- command="$command -o $obj" ++ func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. +- command="$command$suppress_output" ++ func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + +@@ -1622,13 +2290,13 @@ compiler." + } + + $opt_help || { +- test "$mode" = compile && func_mode_compile ${1+"$@"} ++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + } + + func_mode_help () + { + # We need to display help for each of the modes. +- case $mode in ++ case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only ++ -prefer-pic try to build PIC objects only ++ -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." + ;; + + *) +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + +@@ -1819,13 +2487,13 @@ if $opt_help; then + else + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit +- for mode in compile link execute install finish uninstall clean; do ++ for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done +@@ -1854,13 +2522,16 @@ func_mode_execute () + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do ++ for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" +@@ -1882,7 +2553,7 @@ func_mode_execute () + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" ++ func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" +@@ -1907,10 +2578,10 @@ func_mode_execute () + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. +- if eval test -z \"\$$shlibpath_var\"; then +- eval $shlibpath_var=\$dir ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" + else +- eval $shlibpath_var=\$dir:\$$shlibpath_var ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + +@@ -1939,8 +2610,7 @@ func_mode_execute () + ;; + esac + # Quote arguments (to preserve shell metacharacters). +- func_quote_for_eval "$file" +- args="$args $func_quote_for_eval_result" ++ func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then +@@ -1972,22 +2642,59 @@ func_mode_execute () + fi + } + +-test "$mode" = execute && func_mode_execute ${1+"$@"} ++test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + + # func_mode_finish arg... + func_mode_finish () + { + $opt_debug +- libdirs="$nonopt" ++ libs= ++ libdirs= + admincmds= + +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done ++ for opt in "$nonopt" ${1+"$@"} ++ do ++ if test -d "$opt"; then ++ func_append libdirs " $opt" + ++ elif test -f "$opt"; then ++ if func_lalib_unsafe_p "$opt"; then ++ func_append libs " $opt" ++ else ++ func_warning "\`$opt' is not a valid libtool archive" ++ fi ++ ++ else ++ func_fatal_error "invalid argument \`$opt'" ++ fi ++ done ++ ++ if test -n "$libs"; then ++ if test -n "$lt_sysroot"; then ++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` ++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" ++ else ++ sysroot_cmd= ++ fi ++ ++ # Remove sysroot references ++ if $opt_dry_run; then ++ for lib in $libs; do ++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" ++ done ++ else ++ tmpdir=`func_mktempdir` ++ for lib in $libs; do ++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ ++ > $tmpdir/tmp-la ++ mv -f $tmpdir/tmp-la $lib ++ done ++ ${RM}r "$tmpdir" ++ fi ++ fi ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +@@ -1997,7 +2704,7 @@ func_mode_finish () + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" +- $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done +@@ -2006,53 +2713,55 @@ func_mode_finish () + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + +- echo "----------------------------------------------------------------------" +- echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $ECHO " $libdir" +- done +- echo +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- echo " during execution" +- fi +- if test -n "$runpath_var"; then +- echo " - add LIBDIR to the \`$runpath_var' environment variable" +- echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval "flag=\"$hardcode_libdir_flag_spec\"" ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ echo "----------------------------------------------------------------------" ++ echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ echo ++ echo "If you ever happen to want to link against installed libraries" ++ echo "in a given directory, LIBDIR, you must either use libtool, and" ++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" + +- $ECHO " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $ECHO " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- echo ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ echo + +- echo "See any operating system documentation about shared libraries for" +- case $host in +- solaris2.[6789]|solaris2.1[0-9]) +- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" +- echo "pages." +- ;; +- *) +- echo "more information, such as the ld(1) and ld.so(8) manual pages." +- ;; +- esac +- echo "----------------------------------------------------------------------" ++ echo "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ echo "pages." ++ ;; ++ *) ++ echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ echo "----------------------------------------------------------------------" ++ fi + exit $EXIT_SUCCESS + } + +-test "$mode" = finish && func_mode_finish ${1+"$@"} ++test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + + # func_mode_install arg... +@@ -2077,7 +2786,7 @@ func_mode_install () + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" +- install_prog="$install_prog$func_quote_for_eval_result" ++ func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; +@@ -2097,7 +2806,7 @@ func_mode_install () + do + arg2= + if test -n "$dest"; then +- files="$files $dest" ++ func_append files " $dest" + dest=$arg + continue + fi +@@ -2135,11 +2844,11 @@ func_mode_install () + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" +- install_prog="$install_prog $func_quote_for_eval_result" ++ func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi +- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" ++ func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ +@@ -2151,7 +2860,7 @@ func_mode_install () + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" +- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" ++ func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + +@@ -2209,10 +2918,13 @@ func_mode_install () + case $file in + *.$libext) + # Do the static libraries later. +- staticlibs="$staticlibs $file" ++ func_append staticlibs " $file" + ;; + + *.la) ++ func_resolve_sysroot "$file" ++ file=$func_resolve_sysroot_result ++ + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" +@@ -2226,23 +2938,30 @@ func_mode_install () + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; ++ *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; ++ *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" +- dir="$dir$objdir" ++ func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +@@ -2315,7 +3034,7 @@ func_mode_install () + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) +@@ -2503,7 +3222,7 @@ func_mode_install () + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + +- if test -n "$current_libdirs" && $opt_finish; then ++ if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' +@@ -2512,7 +3231,7 @@ func_mode_install () + fi + } + +-test "$mode" = install && func_mode_install ${1+"$@"} ++test "$opt_mode" = install && func_mode_install ${1+"$@"} + + + # func_generate_dlsyms outputname originator pic_p +@@ -2559,6 +3278,18 @@ extern \"C\" { + #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" + #endif + ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ + /* External symbol declarations for the compiler. */\ + " + +@@ -2570,21 +3301,22 @@ extern \"C\" { + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do +- func_verbose "extracting global C symbols from \`$progfile'" +- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 ++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" ++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { +- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + } + fi + +@@ -2593,23 +3325,23 @@ extern \"C\" { + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols +- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$export_symbols" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { +- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" +- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) +- echo EXPORTS > "$output_objdir/$outputname.def" +- cat "$nlist" >> "$output_objdir/$outputname.def" ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } +@@ -2620,10 +3352,52 @@ extern \"C\" { + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" +- $opt_dry_run || { +- $ECHO ": $name " >> "$nlist" +- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" +- } ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ # if an import library, we need to obtain dlname ++ if func_win32_import_lib_p "$dlprefile"; then ++ func_tr_sh "$dlprefile" ++ eval "curr_lafile=\$libfile_$func_tr_sh_result" ++ dlprefile_dlbasename="" ++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then ++ # Use subshell, to avoid clobbering current variable values ++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` ++ if test -n "$dlprefile_dlname" ; then ++ func_basename "$dlprefile_dlname" ++ dlprefile_dlbasename="$func_basename_result" ++ else ++ # no lafile. user explicitly requested -dlpreopen . ++ $sharedlib_from_linklib_cmd "$dlprefile" ++ dlprefile_dlbasename=$sharedlib_from_linklib_result ++ fi ++ fi ++ $opt_dry_run || { ++ if test -n "$dlprefile_dlbasename" ; then ++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' ++ else ++ func_warning "Could not compute DLL name from $name" ++ eval '$ECHO ": $name " >> "$nlist"' ++ fi ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | ++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" ++ } ++ else # not an import lib ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ fi ++ ;; ++ *) ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 ++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ ;; ++ esac + done + + $opt_dry_run || { +@@ -2661,26 +3435,9 @@ typedef struct { + const char *name; + void *address; + } lt_dlsymlist; +-" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* DATA imports from DLLs on WIN32 con't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs. */" +- lt_dlsym_const= ;; +- *osf5*) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* This system does not cope well with relocations in const data */" +- lt_dlsym_const= ;; +- *) +- lt_dlsym_const=const ;; +- esac +- +- echo >> "$output_objdir/$my_dlsyms" "\ +-extern $lt_dlsym_const lt_dlsymlist ++extern LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[]; +-$lt_dlsym_const lt_dlsymlist ++LT_DLSYM_CONST lt_dlsymlist + lt_${my_prefix}_LTX_preloaded_symbols[] = + {\ + { \"$my_originator\", (void *) 0 }," +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; +- *) symtab_cflags="$symtab_cflags $arg" ;; ++ *) func_append symtab_cflags " $arg" ;; + esac + done + +@@ -2796,9 +3553,11 @@ func_win32_libid () + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static +- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | +- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then +- win32_nmres=`$NM -f posix -A "$1" | ++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ +@@ -2827,6 +3586,131 @@ func_win32_libid () + $ECHO "$win32_libid_type" + } + ++# func_cygming_dll_for_implib ARG ++# ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib () ++{ ++ $opt_debug ++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` ++} ++ ++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs ++# ++# The is the core of a fallback implementation of a ++# platform-specific function to extract the name of the ++# DLL associated with the specified import library LIBNAME. ++# ++# SECTION_NAME is either .idata$6 or .idata$7, depending ++# on the platform and compiler that created the implib. ++# ++# Echos the name of the DLL associated with the ++# specified import library. ++func_cygming_dll_for_implib_fallback_core () ++{ ++ $opt_debug ++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` ++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | ++ $SED '/^Contents of section '"$match_literal"':/{ ++ # Place marker at beginning of archive member dllname section ++ s/.*/====MARK====/ ++ p ++ d ++ } ++ # These lines can sometimes be longer than 43 characters, but ++ # are always uninteresting ++ /:[ ]*file format pe[i]\{,1\}-/d ++ /^In archive [^:]*:/d ++ # Ensure marker is printed ++ /^====MARK====/p ++ # Remove all lines with less than 43 characters ++ /^.\{43\}/!d ++ # From remaining lines, remove first 43 characters ++ s/^.\{43\}//' | ++ $SED -n ' ++ # Join marker and all lines until next marker into a single line ++ /^====MARK====/ b para ++ H ++ $ b para ++ b ++ :para ++ x ++ s/\n//g ++ # Remove the marker ++ s/^====MARK====// ++ # Remove trailing dots and whitespace ++ s/[\. \t]*$// ++ # Print ++ /./p' | ++ # we now have a list, one entry per line, of the stringified ++ # contents of the appropriate section of all members of the ++ # archive which possess that section. Heuristic: eliminate ++ # all those which have a first or second character that is ++ # a '.' (that is, objdump's representation of an unprintable ++ # character.) This should work for all archives with less than ++ # 0x302f exports -- but will fail for DLLs whose name actually ++ # begins with a literal '.' or a single character followed by ++ # a '.'. ++ # ++ # Of those that remain, print the first one. ++ $SED -e '/^\./d;/^.\./d;q' ++} ++ ++# func_cygming_gnu_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is a GNU/binutils-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_gnu_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` ++ test -n "$func_cygming_gnu_implib_tmp" ++} ++ ++# func_cygming_ms_implib_p ARG ++# This predicate returns with zero status (TRUE) if ++# ARG is an MS-style import library. Returns ++# with nonzero status (FALSE) otherwise. ++func_cygming_ms_implib_p () ++{ ++ $opt_debug ++ func_to_tool_file "$1" func_convert_file_msys_to_w32 ++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` ++ test -n "$func_cygming_ms_implib_tmp" ++} ++ ++# func_cygming_dll_for_implib_fallback ARG ++# Platform-specific function to extract the ++# name of the DLL associated with the specified ++# import library ARG. ++# ++# This fallback implementation is for use when $DLLTOOL ++# does not support the --identify-strict option. ++# Invoked by eval'ing the libtool variable ++# $sharedlib_from_linklib_cmd ++# Result is available in the variable ++# $sharedlib_from_linklib_result ++func_cygming_dll_for_implib_fallback () ++{ ++ $opt_debug ++ if func_cygming_gnu_implib_p "$1" ; then ++ # binutils import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` ++ elif func_cygming_ms_implib_p "$1" ; then ++ # ms-generated import library ++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` ++ else ++ # unknown ++ sharedlib_from_linklib_result="" ++ fi ++} + + + # func_extract_an_archive dir oldlib +@@ -2917,7 +3801,7 @@ func_extract_archives () + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do +- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ +@@ -2932,7 +3816,7 @@ func_extract_archives () + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac +- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +@@ -3014,7 +3898,110 @@ func_fallback_echo () + _LTECHO_EOF' + } + ECHO=\"$qECHO\" +- fi\ ++ fi ++ ++# Very basic option parsing. These options are (a) specific to ++# the libtool wrapper, (b) are identical between the wrapper ++# /script/ and the wrapper /executable/ which is used only on ++# windows platforms, and (c) all begin with the string "--lt-" ++# (application programs are unlikely to have options which match ++# this pattern). ++# ++# There are only two supported options: --lt-debug and ++# --lt-dump-script. There is, deliberately, no --lt-help. ++# ++# The first argument to this parsing function should be the ++# script's $0 value, followed by "$@". ++lt_option_debug= ++func_parse_lt_options () ++{ ++ lt_script_arg0=\$0 ++ shift ++ for lt_opt ++ do ++ case \"\$lt_opt\" in ++ --lt-debug) lt_option_debug=1 ;; ++ --lt-dump-script) ++ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` ++ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. ++ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` ++ cat \"\$lt_dump_D/\$lt_dump_F\" ++ exit 0 ++ ;; ++ --lt-*) ++ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 ++ exit 1 ++ ;; ++ esac ++ done ++ ++ # Print the debug banner immediately: ++ if test -n \"\$lt_option_debug\"; then ++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 ++ fi ++} ++ ++# Used when --lt-debug. Prints its arguments to stdout ++# (redirection is the responsibility of the caller) ++func_lt_dump_args () ++{ ++ lt_dump_args_N=1; ++ for lt_arg ++ do ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" ++ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` ++ done ++} ++ ++# Core function for launching the target application ++func_exec_program_core () ++{ ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ if test -n \"\$lt_option_debug\"; then ++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 ++ func_lt_dump_args \${1+\"\$@\"} 1>&2 ++ fi ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 ++ exit 1 ++} ++ ++# A function to encapsulate launching the target application ++# Strips options in the --lt-* namespace from \$@ and ++# launches target application with the remaining arguments. ++func_exec_program () ++{ ++ for lt_wr_arg ++ do ++ case \$lt_wr_arg in ++ --lt-*) ;; ++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; ++ esac ++ shift ++ done ++ func_exec_program_core \${1+\"\$@\"} ++} ++ ++ # Parse options ++ func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` +@@ -3078,7 +4065,7 @@ _LTECHO_EOF' + + # relink executable if necessary + if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" +@@ -3102,6 +4089,18 @@ _LTECHO_EOF' + + if test -f \"\$progdir/\$program\"; then" + ++ # fixup the dll searchpath if we need to. ++ # ++ # Fix the DLL searchpath if we need to. Do this before prepending ++ # to shlibpath, because on Windows, both are PATH and uninstalled ++ # libraries must come first. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi ++ + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ +@@ -3116,35 +4115,10 @@ _LTECHO_EOF' + " + fi + +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $ECHO "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" +- fi +- + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2* | *-cegcc*) +- $ECHO "\ +- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +-" +- ;; +- +- *) +- $ECHO "\ +- exec \"\$progdir/\$program\" \${1+\"\$@\"} +-" +- ;; +- esac +- $ECHO "\ +- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 +- exit 1 ++ func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. +@@ -3158,166 +4132,6 @@ fi\ + } + + +-# func_to_host_path arg +-# +-# Convert paths to host format when used with build tools. +-# Intended for use with "native" mingw (where libtool itself +-# is running under the msys shell), or in the following cross- +-# build environments: +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# where wine is equipped with the `winepath' executable. +-# In the native mingw case, the (msys) shell automatically +-# converts paths for any non-msys applications it launches, +-# but that facility isn't available from inside the cwrapper. +-# Similar accommodations are necessary for $host mingw and +-# $build cygwin. Calling this function does no harm for other +-# $host/$build combinations not listed above. +-# +-# ARG is the path (on $build) that should be converted to +-# the proper representation for $host. The result is stored +-# in $func_to_host_path_result. +-func_to_host_path () +-{ +- func_to_host_path_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- case $build in +- *mingw* ) # actually, msys +- # awkward: cmd appends spaces to result +- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_path_result=`cygpath -w "$1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # Unfortunately, winepath does not exit with a non-zero +- # error code, so we are forced to check the contents of +- # stdout. On the other hand, if the command is not +- # found, the shell will set an exit code of 127 and print +- # *an error message* to stdout. So we must check for both +- # error code of zero AND non-empty stdout, which explains +- # the odd construction: +- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` +- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then +- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- else +- # Allow warning below. +- func_to_host_path_result= +- fi +- ;; +- esac +- if test -z "$func_to_host_path_result" ; then +- func_error "Could not determine host path corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback: +- func_to_host_path_result="$1" +- fi +- ;; +- esac +- fi +-} +-# end: func_to_host_path +- +-# func_to_host_pathlist arg +-# +-# Convert pathlists to host format when used with build tools. +-# See func_to_host_path(), above. This function supports the +-# following $build/$host combinations (but does no harm for +-# combinations not listed here): +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# +-# Path separators are also converted from $build format to +-# $host format. If ARG begins or ends with a path separator +-# character, it is preserved (but converted to $host format) +-# on output. +-# +-# ARG is a pathlist (on $build) that should be converted to +-# the proper representation on $host. The result is stored +-# in $func_to_host_pathlist_result. +-func_to_host_pathlist () +-{ +- func_to_host_pathlist_result="$1" +- if test -n "$1"; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- # Remove leading and trailing path separator characters from +- # ARG. msys behavior is inconsistent here, cygpath turns them +- # into '.;' and ';.', and winepath ignores them completely. +- func_stripname : : "$1" +- func_to_host_pathlist_tmp1=$func_stripname_result +- case $build in +- *mingw* ) # Actually, msys. +- # Awkward: cmd appends spaces to result. +- func_to_host_pathlist_result=` +- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | +- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # unfortunately, winepath doesn't convert pathlists +- func_to_host_pathlist_result="" +- func_to_host_pathlist_oldIFS=$IFS +- IFS=: +- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do +- IFS=$func_to_host_pathlist_oldIFS +- if test -n "$func_to_host_pathlist_f" ; then +- func_to_host_path "$func_to_host_pathlist_f" +- if test -n "$func_to_host_path_result" ; then +- if test -z "$func_to_host_pathlist_result" ; then +- func_to_host_pathlist_result="$func_to_host_path_result" +- else +- func_append func_to_host_pathlist_result ";$func_to_host_path_result" +- fi +- fi +- fi +- done +- IFS=$func_to_host_pathlist_oldIFS +- ;; +- esac +- if test -z "$func_to_host_pathlist_result"; then +- func_error "Could not determine the host path(s) corresponding to" +- func_error " \`$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback. This may break if $1 contains DOS-style drive +- # specifications. The fix is not to complicate the expression +- # below, but for the user to provide a working wine installation +- # with winepath so that path translation in the cross-to-mingw +- # case works properly. +- lt_replace_pathsep_nix_to_dos="s|:|;|g" +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_replace_pathsep_nix_to_dos"` +- fi +- # Now, add the leading and trailing path separators back +- case "$1" in +- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" +- ;; +- esac +- case "$1" in +- *: ) func_append func_to_host_pathlist_result ";" +- ;; +- esac +- ;; +- esac +- fi +-} +-# end: func_to_host_pathlist +- + # func_emit_cwrapperexe_src + # emit the source code for a wrapper executable on stdout + # Must ONLY be called from within func_mode_link because +@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () + + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. +- +- Currently, it simply execs the wrapper *script* "$SHELL $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly. + */ + EOF + cat <<"EOF" +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + +-#undef LTWRAPPER_DEBUGPRINTF +-#if defined LT_DEBUGWRAPPER +-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +-static void +-ltwrapper_debugprintf (const char *fmt, ...) +-{ +- va_list args; +- va_start (args, fmt); +- (void) vfprintf (stderr, fmt, args); +- va_end (args); +-} ++#if defined(LT_DEBUGWRAPPER) ++static int lt_debug = 1; + #else +-# define LTWRAPPER_DEBUGPRINTF(args) ++static int lt_debug = 0; + #endif + +-const char *program_name = NULL; ++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + + void *xmalloc (size_t num); + char *xstrdup (const char *string); +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); + int make_executable (const char *path); + int check_executable (const char *path); + char *strendzap (char *str, const char *pat); +-void lt_fatal (const char *message, ...); ++void lt_debugprintf (const char *file, int line, const char *fmt, ...); ++void lt_fatal (const char *file, int line, const char *message, ...); ++static const char *nonnull (const char *s); ++static const char *nonempty (const char *s); + void lt_setenv (const char *name, const char *value); + char *lt_extend_str (const char *orig_value, const char *add, int to_end); + void lt_update_exe_path (const char *name, const char *value); +@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); + EOF + + cat <"))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", ++ nonnull (lt_argv_zero)); + for (i = 0; i < newargc; i++) + { +- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); ++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", ++ i, nonnull (newargz[i])); + } + + EOF +@@ -3706,7 +4529,9 @@ EOF + if (rval == -1) + { + /* failed to start process */ +- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(main) failed to launch target \"%s\": %s\n", ++ lt_argv_zero, nonnull (strerror (errno))); + return 127; + } + return rval; +@@ -3728,7 +4553,7 @@ xmalloc (size_t num) + { + void *p = (void *) malloc (num); + if (!p) +- lt_fatal ("Memory exhausted"); ++ lt_fatal (__FILE__, __LINE__, "memory exhausted"); + + return p; + } +@@ -3762,8 +4587,8 @@ check_executable (const char *path) + { + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3780,8 +4605,8 @@ make_executable (const char *path) + int rval = 0; + struct stat st; + +- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", ++ nonempty (path)); + if ((!path) || (!*path)) + return 0; + +@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) + int tmp_len; + char *concat_name; + +- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", +- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", ++ nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; +@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); +@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); ++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", ++ nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); +@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { +- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", +- tmp_pathspec)); ++ lt_debugprintf (__FILE__, __LINE__, ++ "checking path component for symlinks: %s\n", ++ tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) +@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) + } + else + { +- char *errstr = strerror (errno); +- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ lt_fatal (__FILE__, __LINE__, ++ "error accessing file \"%s\": %s", ++ tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); +@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { +- lt_fatal ("Could not follow symlinks for %s", pathspec); ++ lt_fatal (__FILE__, __LINE__, ++ "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); + #endif +@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) + return str; + } + ++void ++lt_debugprintf (const char *file, int line, const char *fmt, ...) ++{ ++ va_list args; ++ if (lt_debug) ++ { ++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++ } ++} ++ + static void +-lt_error_core (int exit_status, const char *mode, ++lt_error_core (int exit_status, const char *file, ++ int line, const char *mode, + const char *message, va_list ap) + { +- fprintf (stderr, "%s: %s: ", program_name, mode); ++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, + } + + void +-lt_fatal (const char *message, ...) ++lt_fatal (const char *file, int line, const char *message, ...) + { + va_list ap; + va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); + } + ++static const char * ++nonnull (const char *s) ++{ ++ return s ? s : "(null)"; ++} ++ ++static const char * ++nonempty (const char *s) ++{ ++ return (s && !*s) ? "(empty)" : nonnull (s); ++} ++ + void + lt_setenv (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_setenv) setting '%s' to '%s'\n", ++ nonnull (name), nonnull (value)); + { + #ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) + void + lt_update_exe_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) + void + lt_update_lib_path (const char *name, const char *value) + { +- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", +- (name ? name : ""), +- (value ? value : ""))); ++ lt_debugprintf (__FILE__, __LINE__, ++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { +@@ -4222,7 +5078,7 @@ EOF + func_win32_import_lib_p () + { + $opt_debug +- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in ++ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +@@ -4401,9 +5257,9 @@ func_mode_link () + ;; + *) + if test "$prev" = dlfiles; then +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $arg" + else +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $arg" + fi + prev= + continue +@@ -4427,7 +5283,7 @@ func_mode_link () + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; +@@ -4446,7 +5302,7 @@ func_mode_link () + moreargs= + for fil in `cat "$save_arg"` + do +-# moreargs="$moreargs $fil" ++# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + +@@ -4475,7 +5331,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -4487,7 +5343,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -4557,12 +5413,12 @@ func_mode_link () + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; +- *) rpath="$rpath $arg" ;; ++ *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; +- *) xrpath="$xrpath $arg" ;; ++ *) func_append xrpath " $arg" ;; + esac + fi + prev= +@@ -4574,28 +5430,28 @@ func_mode_link () + continue + ;; + weak) +- weak_libs="$weak_libs $arg" ++ func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) +- compiler_flags="$compiler_flags $qarg" ++ func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $wl$qarg" ++ func_append linker_flags " $qarg" ++ func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" +@@ -4686,15 +5542,16 @@ func_mode_link () + ;; + + -L*) +- func_stripname '-L' '' "$arg" +- dir=$func_stripname_result +- if test -z "$dir"; then ++ func_stripname "-L" '' "$arg" ++ if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +@@ -4706,10 +5563,16 @@ func_mode_link () + ;; + esac + case "$deplibs " in +- *" -L$dir "*) ;; ++ *" -L$dir "* | *" $arg "*) ++ # Will only happen for absolute or sysroot arguments ++ ;; + *) +- deplibs="$deplibs -L$dir" +- lib_search_path="$lib_search_path $dir" ++ # Preserve sysroot, but never include relative directories ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; ++ *) func_append deplibs " -L$dir" ;; ++ esac ++ func_append lib_search_path " $dir" + ;; + esac + case $host in +@@ -4718,12 +5581,12 @@ func_mode_link () + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; +- *) dllsearchpath="$dllsearchpath:$dir";; ++ *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -4747,7 +5610,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) +@@ -4758,9 +5621,6 @@ func_mode_link () + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; +- *-*-linux*) +- test "X$arg" = "X-lc" && continue +- ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +@@ -4770,7 +5630,7 @@ func_mode_link () + ;; + esac + fi +- deplibs="$deplibs $arg" ++ func_append deplibs " $arg" + continue + ;; + +@@ -4782,8 +5642,8 @@ func_mode_link () + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. +- -model|-arch|-isysroot) +- compiler_flags="$compiler_flags $arg" ++ -model|-arch|-isysroot|--sysroot) ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler +@@ -4791,12 +5651,12 @@ func_mode_link () + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; +@@ -4863,13 +5723,17 @@ func_mode_link () + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; ++ =*) ++ func_stripname '=' '' "$dir" ++ dir=$lt_sysroot$func_stripname_result ++ ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + continue + ;; +@@ -4922,8 +5786,8 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $func_quote_for_eval_result" +- compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ func_append arg " $func_quote_for_eval_result" ++ func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4938,9 +5802,9 @@ func_mode_link () + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" +- linker_flags="$linker_flags $func_quote_for_eval_result" ++ func_append arg " $wl$func_quote_for_eval_result" ++ func_append compiler_flags " $wl$func_quote_for_eval_result" ++ func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" +@@ -4968,24 +5832,27 @@ func_mode_link () + arg="$func_quote_for_eval_result" + ;; + +- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args for GCC +- # -F/path gives path to uninstalled frameworks, gcc on darwin +- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC +- # @file GCC response files +- # -tp=* Portland pgcc target processor selection ++ # Flags to be passed through unchanged, with rationale: ++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler ++ # -r[0-9][0-9]* specify processor for the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler ++ # +DA*, +DD* enable 64-bit mode for the HP compiler ++ # -q* compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC ++ # -F/path path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC ++ # @file GCC response files ++ # -tp=* Portland pgcc target processor selection ++ # --sysroot=* for sysroot support ++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" +- compiler_flags="$compiler_flags $arg" ++ func_append compiler_flags " $arg" + continue + ;; + +@@ -4997,7 +5864,7 @@ func_mode_link () + + *.$objext) + # A standard object. +- objs="$objs $arg" ++ func_append objs " $arg" + ;; + + *.lo) +@@ -5028,7 +5895,7 @@ func_mode_link () + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" ++ func_append dlfiles " $pic_object" + prev= + continue + else +@@ -5040,7 +5907,7 @@ func_mode_link () + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" ++ func_append dlprefiles " $pic_object" + prev= + fi + +@@ -5085,24 +5952,25 @@ func_mode_link () + + *.$libext) + # An archive. +- deplibs="$deplibs $arg" +- old_deplibs="$old_deplibs $arg" ++ func_append deplibs " $arg" ++ func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + ++ func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. +- dlfiles="$dlfiles $arg" ++ func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. +- dlprefiles="$dlprefiles $arg" ++ func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else +- deplibs="$deplibs $arg" ++ func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; +@@ -5127,7 +5995,7 @@ func_mode_link () + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +- eval "arg=\"$export_dynamic_flag_spec\"" ++ eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi +@@ -5144,11 +6012,13 @@ func_mode_link () + else + shlib_search_path= + fi +- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" +- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" ++ func_to_tool_file "$output_objdir/" ++ tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + +@@ -5169,12 +6039,12 @@ func_mode_link () + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- libs="$libs $deplib" ++ func_append libs " $deplib" + done + + if test "$linkmode" = lib; then +@@ -5187,9 +6057,9 @@ func_mode_link () + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in +- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac +- pre_post_deps="$pre_post_deps $pre_post_dep" ++ func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= +@@ -5256,8 +6126,9 @@ func_mode_link () + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= ++ func_resolve_sysroot "$lib" + case $lib in +- *.la) func_source "$lib" ;; ++ *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library +@@ -5267,7 +6138,7 @@ func_mode_link () + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; +- *) deplibs="$deplibs $deplib" ;; ++ *) func_append deplibs " $deplib" ;; + esac + done + done +@@ -5288,11 +6159,11 @@ func_mode_link () + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- compiler_flags="$compiler_flags $deplib" ++ func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5377,7 +6248,7 @@ func_mode_link () + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi +@@ -5390,7 +6261,8 @@ func_mode_link () + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then +@@ -5404,7 +6276,8 @@ func_mode_link () + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" +@@ -5415,17 +6288,21 @@ func_mode_link () + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" +- dir=$func_stripname_result ++ func_resolve_sysroot "$func_stripname_result" ++ dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; ++ *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; +- *.la) lib="$deplib" ;; ++ *.la) ++ func_resolve_sysroot "$deplib" ++ lib=$func_resolve_sysroot_result ++ ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" +@@ -5488,11 +6365,11 @@ func_mode_link () + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. +- newdlprefiles="$newdlprefiles $deplib" ++ func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- newdlfiles="$newdlfiles $deplib" ++ func_append newdlfiles " $deplib" + fi + fi + continue +@@ -5538,7 +6415,7 @@ func_mode_link () + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; +- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi +@@ -5546,8 +6423,8 @@ func_mode_link () + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" +- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ test -n "$dlopen" && func_append dlfiles " $dlopen" ++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then +@@ -5558,20 +6435,20 @@ func_mode_link () + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. +- convenience="$convenience $ladir/$objdir/$old_library" +- old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ func_append convenience " $ladir/$objdir/$old_library" ++ func_append old_convenience " $ladir/$objdir/$old_library" + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done + continue + fi # $pass = conv +@@ -5579,9 +6456,15 @@ func_mode_link () + + # Get the name of the library we link against. + linklib= +- for l in $old_library $library_names; do +- linklib="$l" +- done ++ if test -n "$old_library" && ++ { test "$prefer_static_libs" = yes || ++ test "$prefer_static_libs,$installed" = "built,no"; }; then ++ linklib=$old_library ++ else ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi +@@ -5598,9 +6481,9 @@ func_mode_link () + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. +- dlprefiles="$dlprefiles $lib $dependency_libs" ++ func_append dlprefiles " $lib $dependency_libs" + else +- newdlfiles="$newdlfiles $lib" ++ func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen +@@ -5622,14 +6505,14 @@ func_mode_link () + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then +- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$libdir" +- absdir="$libdir" ++ dir="$lt_sysroot$libdir" ++ absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -5637,12 +6520,12 @@ func_mode_link () + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" +@@ -5653,20 +6536,46 @@ func_mode_link () + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi +- # Prefer using a static library (so that no silly _DYNAMIC symbols +- # are required to link). +- if test -n "$old_library"; then +- newdlprefiles="$newdlprefiles $dir/$old_library" +- # Keep a list of preopened convenience libraries to check +- # that they are being used correctly in the link pass. +- test -z "$libdir" && \ +- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" +- # Otherwise, use the dlname, so that lt_dlopen finds it. +- elif test -n "$dlname"; then +- newdlprefiles="$newdlprefiles $dir/$dlname" +- else +- newdlprefiles="$newdlprefiles $dir/$linklib" +- fi ++ case "$host" in ++ # special handling for platforms with PE-DLLs. ++ *cygwin* | *mingw* | *cegcc* ) ++ # Linker will automatically link against shared library if both ++ # static and shared are present. Therefore, ensure we extract ++ # symbols from the import library if a shared library is present ++ # (otherwise, the dlopen module name will be incorrect). We do ++ # this by putting the import library name into $newdlprefiles. ++ # We recover the dlopen module name by 'saving' the la file ++ # name in a special purpose variable, and (later) extracting the ++ # dlname from the la file. ++ if test -n "$dlname"; then ++ func_tr_sh "$dir/$linklib" ++ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" ++ func_append newdlprefiles " $dir/$linklib" ++ else ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ fi ++ ;; ++ * ) ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ func_append newdlprefiles " $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ func_append dlpreconveniencelibs " $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ func_append newdlprefiles " $dir/$dlname" ++ else ++ func_append newdlprefiles " $dir/$linklib" ++ fi ++ ;; ++ esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then +@@ -5684,7 +6593,7 @@ func_mode_link () + + + if test "$linkmode" = prog && test "$pass" != link; then +- newlib_search_path="$newlib_search_path $ladir" ++ func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no +@@ -5697,7 +6606,8 @@ func_mode_link () + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" ++ func_resolve_sysroot "$func_stripname_result" ++ func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? +@@ -5708,12 +6618,12 @@ func_mode_link () + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi +- if $opt_duplicate_deps ; then ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... +@@ -5728,7 +6638,7 @@ func_mode_link () + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; +- *) temp_rpath="$temp_rpath$absdir:" ;; ++ *) func_append temp_rpath "$absdir:" ;; + esac + fi + +@@ -5740,7 +6650,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5749,7 +6659,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5774,12 +6684,12 @@ func_mode_link () + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" ++ func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; +@@ -5814,7 +6724,7 @@ func_mode_link () + *) + case "$compile_rpath " in + *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" ++ *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac +@@ -5823,7 +6733,7 @@ func_mode_link () + *) + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ++ *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac +@@ -5835,7 +6745,7 @@ func_mode_link () + shift + realname="$1" + shift +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" +@@ -5848,7 +6758,7 @@ func_mode_link () + versuffix="-$major" + ;; + esac +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -5877,7 +6787,7 @@ func_mode_link () + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + +- if test "$linkmode" = prog || test "$mode" != relink; then ++ if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= +@@ -5933,7 +6843,7 @@ func_mode_link () + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -5955,7 +6865,7 @@ func_mode_link () + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; +- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then +@@ -5969,13 +6879,13 @@ func_mode_link () + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + +- if test "$linkmode" = prog || test "$mode" = relink; then ++ if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= +@@ -5989,7 +6899,7 @@ func_mode_link () + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +@@ -6001,12 +6911,12 @@ func_mode_link () + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" ++ add_dir="-L$lt_sysroot$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -6083,27 +6993,33 @@ func_mode_link () + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; +- *) xrpath="$xrpath $temp_xrpath";; ++ *) func_append xrpath " $temp_xrpath";; + esac;; +- *) temp_deplibs="$temp_deplibs $libdir";; ++ *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + +- newlib_search_path="$newlib_search_path $absdir" ++ func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" +- if $opt_duplicate_deps ; then ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ func_resolve_sysroot "$func_stripname_result";; ++ *) func_resolve_sysroot "$deplib" ;; ++ esac ++ if $opt_preserve_dup_deps ; then + case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ *" $func_resolve_sysroot_result "*) ++ func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi +- tmp_libs="$tmp_libs $deplib" ++ func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then +@@ -6113,8 +7029,10 @@ func_mode_link () + case $deplib in + -L*) path="$deplib" ;; + *.la) ++ func_resolve_sysroot "$deplib" ++ deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." +- dir="$func_dirname_result" ++ dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; +@@ -6130,7 +7048,7 @@ func_mode_link () + case $host in + *-*-darwin*) + depdepl= +- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp +@@ -6141,8 +7059,8 @@ func_mode_link () + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi +- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi +@@ -6152,7 +7070,7 @@ func_mode_link () + ;; + esac + else +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ +@@ -6192,7 +7110,7 @@ func_mode_link () + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; +- *) lib_search_path="$lib_search_path $dir" ;; ++ *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= +@@ -6205,7 +7123,7 @@ func_mode_link () + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order +- eval tmp_libs=\$$var ++ eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so +@@ -6250,13 +7168,13 @@ func_mode_link () + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + ;; +- *) tmp_libs="$tmp_libs $deplib" ;; ++ *) func_append tmp_libs " $deplib" ;; + esac + done +- eval $var=\$tmp_libs ++ eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs +@@ -6269,7 +7187,7 @@ func_mode_link () + ;; + esac + if test -n "$i" ; then +- tmp_libs="$tmp_libs $i" ++ func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs +@@ -6310,7 +7228,7 @@ func_mode_link () + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" +- objs="$objs$old_deplibs" ++ func_append objs "$old_deplibs" + ;; + + lib) +@@ -6319,8 +7237,8 @@ func_mode_link () + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ +@@ -6330,8 +7248,8 @@ func_mode_link () + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result +- eval "shared_ext=\"$shrext_cmds\"" +- eval "libname=\"$libname_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result +@@ -6346,7 +7264,7 @@ func_mode_link () + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" +- libobjs="$libobjs $objs" ++ func_append libobjs " $objs" + fi + fi + +@@ -6544,7 +7462,7 @@ func_mode_link () + done + + # Make executables depend on our current version. +- verstring="$verstring:${current}.0" ++ func_append verstring ":${current}.0" + ;; + + qnx) +@@ -6612,10 +7530,10 @@ func_mode_link () + fi + + func_generate_dlsyms "$libname" "$libname" "yes" +- libobjs="$libobjs $symfileobj" ++ func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + +- if test "$mode" != relink; then ++ if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= +@@ -6631,7 +7549,7 @@ func_mode_link () + continue + fi + fi +- removelist="$removelist $p" ++ func_append removelist " $p" + ;; + *) ;; + esac +@@ -6642,7 +7560,7 @@ func_mode_link () + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then +- oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` +@@ -6659,10 +7577,11 @@ func_mode_link () + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do +- temp_xrpath="$temp_xrpath -R$libdir" ++ func_replace_sysroot "$libdir" ++ func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then +@@ -6676,7 +7595,7 @@ func_mode_link () + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; +- *) dlfiles="$dlfiles $lib" ;; ++ *) func_append dlfiles " $lib" ;; + esac + done + +@@ -6686,7 +7605,7 @@ func_mode_link () + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; +- *) dlprefiles="$dlprefiles $lib" ;; ++ *) func_append dlprefiles " $lib" ;; + esac + done + +@@ -6698,7 +7617,7 @@ func_mode_link () + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. +@@ -6715,7 +7634,7 @@ func_mode_link () + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +- deplibs="$deplibs -lc" ++ func_append deplibs " -lc" + fi + ;; + esac +@@ -6764,18 +7683,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6789,7 +7708,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6807,18 +7726,18 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + i="" + ;; + esac + fi + if test -n "$i" ; then +- eval "libname=\"$libname_spec\"" +- eval "deplib_matches=\"$library_names_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` + set dummy $deplib_matches; shift + deplib_match=$1 + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + else + droppeddeps=yes + echo +@@ -6840,7 +7759,7 @@ EOF + fi + ;; + *) +- newdeplibs="$newdeplibs $i" ++ func_append newdeplibs " $i" + ;; + esac + done +@@ -6857,15 +7776,27 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ if test -n "$file_magic_glob"; then ++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` ++ else ++ libnameglob=$libname ++ fi ++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ if test "$want_nocaseglob" = yes; then ++ shopt -s nocaseglob ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ $nocaseglob ++ else ++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` ++ fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | +@@ -6885,10 +7816,10 @@ EOF + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done +- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6913,7 +7844,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -6929,20 +7860,20 @@ EOF + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then +- eval "libname=\"$libname_spec\"" ++ libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi +@@ -6967,7 +7898,7 @@ EOF + ;; + *) + # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" ++ func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. +@@ -7071,7 +8002,7 @@ EOF + *) + case " $deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7081,10 +8012,10 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" +@@ -7101,10 +8032,12 @@ EOF + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && rpath="$compile_rpath$rpath" ++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else +@@ -7113,18 +8046,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- dep_rpath="$dep_rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_apped perm_rpath " $libdir" ;; + esac + fi + done +@@ -7133,40 +8066,38 @@ EOF + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then +- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else +- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" ++ eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done +- eval $runpath_var=\$rpath\$$runpath_var +- export $runpath_var ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" +- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then +- eval $shlibpath_var=\$shlibpath\$$shlibpath_var +- export $shlibpath_var ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. +- eval "shared_ext=\"$shrext_cmds\"" +- eval "library_names=\"$library_names_spec\"" ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then +- eval "soname=\"$soname_spec\"" ++ eval soname=\"$soname_spec\" + else + soname="$realname" + fi +@@ -7178,7 +8109,7 @@ EOF + linknames= + for link + do +- linknames="$linknames $link" ++ func_append linknames " $link" + done + + # Use standard objects if they are pic +@@ -7189,7 +8120,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" +- delfiles="$delfiles $export_symbols" ++ func_append delfiles " $export_symbols" + fi + + orig_export_symbols= +@@ -7220,13 +8151,45 @@ EOF + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do ++ for cmd1 in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" +- func_len " $cmd" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ # Take the normal branch if the nm_file_list_spec branch ++ # doesn't work or if tool conversion is not needed. ++ case $nm_file_list_spec~$to_tool_file_cmd in ++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) ++ try_normal_branch=yes ++ eval cmd=\"$cmd1\" ++ func_len " $cmd" ++ len=$func_len_result ++ ;; ++ *) ++ try_normal_branch=no ++ ;; ++ esac ++ if test "$try_normal_branch" = yes \ ++ && { test "$len" -lt "$max_cmd_len" \ ++ || test "$max_cmd_len" -le -1; } ++ then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ elif test -n "$nm_file_list_spec"; then ++ func_basename "$output" ++ output_la=$func_basename_result ++ save_libobjs=$libobjs ++ save_output=$output ++ output=${output_objdir}/${output_la}.nm ++ func_to_tool_file "$output" ++ libobjs=$nm_file_list_spec$func_to_tool_file_result ++ func_append delfiles " $output" ++ func_verbose "creating $NM input file list: $output" ++ for obj in $save_libobjs; do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > "$output" ++ eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' ++ output=$save_output ++ libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. +@@ -7248,7 +8211,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then +@@ -7260,7 +8223,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7270,7 +8233,7 @@ EOF + case " $convenience " in + *" $test_deplib "*) ;; + *) +- tmp_deplibs="$tmp_deplibs $test_deplib" ++ func_append tmp_deplibs " $test_deplib" + ;; + esac + done +@@ -7286,43 +8249,43 @@ EOF + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then +- eval "flag=\"$thread_safe_flag_spec\"" +- linker_flags="$linker_flags $flag" ++ eval flag=\"$thread_safe_flag_spec\" ++ func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval "test_cmds=\"$module_expsym_cmds\"" ++ eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else +- eval "test_cmds=\"$module_cmds\"" ++ eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval "test_cmds=\"$archive_expsym_cmds\"" ++ eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else +- eval "test_cmds=\"$archive_cmds\"" ++ eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi +@@ -7366,10 +8329,13 @@ EOF + echo 'INPUT (' > $output + for obj in $save_libobjs + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output +- delfiles="$delfiles $output" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" +@@ -7383,15 +8349,17 @@ EOF + fi + for obj + do +- $ECHO "$obj" >> $output ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" >> $output + done +- delfiles="$delfiles $output" +- output=$firstobj\"$file_list_spec$output\" ++ func_append delfiles " $output" ++ func_to_tool_file "$output" ++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext +- eval "test_cmds=\"$reload_cmds\"" ++ eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -7411,12 +8379,12 @@ EOF + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist +- eval "concat_cmds=\"$reload_cmds\"" ++ eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 +@@ -7433,11 +8401,11 @@ EOF + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" +- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi +- delfiles="$delfiles $output" ++ func_append delfiles " $output" + + else + output= +@@ -7450,9 +8418,9 @@ EOF + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then +- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + +@@ -7471,7 +8439,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7492,7 +8460,7 @@ EOF + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" ++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then +@@ -7504,7 +8472,7 @@ EOF + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi +@@ -7515,7 +8483,7 @@ EOF + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then +- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the +@@ -7539,23 +8507,23 @@ EOF + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. +- eval "cmds=\"\$cmds~\$RM $delfiles\"" ++ eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- libobjs="$libobjs $func_extract_archives_result" ++ func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval "cmd=\"$cmd\"" ++ eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" +@@ -7564,7 +8532,7 @@ EOF + lt_exit=$? + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then ++ if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) +@@ -7576,8 +8544,8 @@ EOF + IFS="$save_ifs" + + # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? ++ if test "$opt_mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then +@@ -7656,17 +8624,20 @@ EOF + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + ++ # If we're not building shared, we need to use non_pic_objs ++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" ++ + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + +@@ -7690,7 +8661,7 @@ EOF + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" +- # $opt_dry_run || echo timestamp > $libobj || exit $? ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + +@@ -7740,8 +8711,8 @@ EOF + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" ++ func_append compile_command " ${wl}-bind_at_load" ++ func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi +@@ -7761,7 +8732,7 @@ EOF + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; ++ func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac +@@ -7771,17 +8742,17 @@ EOF + -L*) + case " $new_libs " in + *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + ;; +- *) new_libs="$new_libs $deplib" ;; ++ *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + +- compile_command="$compile_command $compile_deplibs" +- finalize_command="$finalize_command $finalize_deplibs" ++ func_append compile_command " $compile_deplibs" ++ func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -7789,7 +8760,7 @@ EOF + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; ++ *) func_append finalize_rpath " $libdir" ;; + esac + done + fi +@@ -7808,18 +8779,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; ++ *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in +@@ -7828,12 +8799,12 @@ EOF + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; +- *) dllsearchpath="$dllsearchpath:$libdir";; ++ *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; ++ *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac +@@ -7842,7 +8813,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + +@@ -7859,18 +8830,18 @@ EOF + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else +- eval "flag=\"$hardcode_libdir_flag_spec\"" +- rpath="$rpath $flag" ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; +- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done +@@ -7878,7 +8849,7 @@ EOF + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" +- eval "rpath=\" $hardcode_libdir_flag_spec\"" ++ eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + +@@ -7921,6 +8892,12 @@ EOF + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' +@@ -7943,7 +8920,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7951,7 +8928,7 @@ EOF + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do +- rpath="$rpath$dir:" ++ func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +@@ -7966,6 +8943,13 @@ EOF + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' ++ ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + exit $EXIT_SUCCESS + fi + +@@ -7999,6 +8983,12 @@ EOF + + func_show_eval "$link_command" 'exit $?' + ++ if test -n "$postlink_cmds"; then ++ func_to_tool_file "$output_objdir/$outputname" ++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` ++ func_execute_cmds "$postlink_cmds" 'exit $?' ++ fi ++ + # Now create the wrapper script. + func_verbose "creating $output" + +@@ -8096,7 +9086,7 @@ EOF + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then +- oldobjs="$oldobjs $symfileobj" ++ func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" +@@ -8104,10 +9094,10 @@ EOF + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $addlibs +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. +@@ -8118,10 +9108,10 @@ EOF + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles +- oldobjs="$oldobjs $func_extract_archives_result" ++ func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have +@@ -8139,7 +9129,7 @@ EOF + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= +@@ -8163,18 +9153,28 @@ EOF + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- oldobjs="$oldobjs $gentop/$newobj" ++ func_append oldobjs " $gentop/$newobj" + ;; +- *) oldobjs="$oldobjs $obj" ;; ++ *) func_append oldobjs " $obj" ;; + esac + done + fi +- eval "cmds=\"$old_archive_cmds\"" ++ eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds ++ elif test -n "$archiver_list_spec"; then ++ func_verbose "using command file archive linking..." ++ for obj in $oldobjs ++ do ++ func_to_tool_file "$obj" ++ $ECHO "$func_to_tool_file_result" ++ done > $output_objdir/$libname.libcmd ++ func_to_tool_file "$output_objdir/$libname.libcmd" ++ oldobjs=" $archiver_list_spec$func_to_tool_file_result" ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." +@@ -8189,7 +9189,7 @@ EOF + do + last_oldobj=$obj + done +- eval "test_cmds=\"$old_archive_cmds\"" ++ eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 +@@ -8208,7 +9208,7 @@ EOF + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi +@@ -8216,9 +9216,9 @@ EOF + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then +- eval "cmds=\"\$concat_cmds\"" ++ eval cmds=\"\$concat_cmds\" + else +- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi +@@ -8268,12 +9268,23 @@ EOF + *.la) + func_basename "$deplib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ func_resolve_sysroot "$deplib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" +- newdependency_libs="$newdependency_libs $libdir/$name" ++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ++ ;; ++ -L*) ++ func_stripname -L '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; ++ -R*) ++ func_stripname -R '' "$deplib" ++ func_replace_sysroot "$func_stripname_result" ++ func_append newdependency_libs " -R$func_replace_sysroot_result" ++ ;; ++ *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" +@@ -8284,12 +9295,14 @@ EOF + *.la) + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` ++ + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlfiles="$newdlfiles $libdir/$name" ++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; +- *) newdlfiles="$newdlfiles $lib" ;; ++ *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" +@@ -8303,10 +9316,11 @@ EOF + # the library: + func_basename "$lib" + name="$func_basename_result" +- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlprefiles="$newdlprefiles $libdir/$name" ++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done +@@ -8318,7 +9332,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlfiles="$newdlfiles $abs" ++ func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= +@@ -8327,7 +9341,7 @@ EOF + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +- newdlprefiles="$newdlprefiles $abs" ++ func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi +@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" + exit $EXIT_SUCCESS + } + +-{ test "$mode" = link || test "$mode" = relink; } && ++{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +@@ -8432,9 +9446,9 @@ func_mode_uninstall () + for arg + do + case $arg in +- -f) RM="$RM $arg"; rmforce=yes ;; +- -*) RM="$RM $arg" ;; +- *) files="$files $arg" ;; ++ -f) func_append RM " $arg"; rmforce=yes ;; ++ -*) func_append RM " $arg" ;; ++ *) func_append files " $arg" ;; + esac + done + +@@ -8443,24 +9457,23 @@ func_mode_uninstall () + + rmdirs= + +- origobjdir="$objdir" + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then +- objdir="$origobjdir" ++ odir="$objdir" + else +- objdir="$dir/$origobjdir" ++ odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" +- test "$mode" = uninstall && objdir="$dir" ++ test "$opt_mode" = uninstall && odir="$dir" + +- # Remember objdir for removal later, being careful to avoid duplicates +- if test "$mode" = clean; then ++ # Remember odir for removal later, being careful to avoid duplicates ++ if test "$opt_mode" = clean; then + case " $rmdirs " in +- *" $objdir "*) ;; +- *) rmdirs="$rmdirs $objdir" ;; ++ *" $odir "*) ;; ++ *) func_append rmdirs " $odir" ;; + esac + fi + +@@ -8486,18 +9499,17 @@ func_mode_uninstall () + + # Delete the libtool libraries and symlinks. + for n in $library_names; do +- rmfiles="$rmfiles $objdir/$n" ++ func_append rmfiles " $odir/$n" + done +- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ++ test -n "$old_library" && func_append rmfiles " $odir/$old_library" + +- case "$mode" in ++ case "$opt_mode" in + clean) +- case " $library_names " in +- # " " in the beginning catches empty $dlname ++ case " $library_names " in + *" $dlname "*) ;; +- *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac +- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then +@@ -8525,19 +9537,19 @@ func_mode_uninstall () + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then +- rmfiles="$rmfiles $dir/$pic_object" ++ func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then +- rmfiles="$rmfiles $dir/$non_pic_object" ++ func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) +- if test "$mode" = clean ; then ++ if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) +@@ -8547,7 +9559,7 @@ func_mode_uninstall () + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe +- rmfiles="$rmfiles $file" ++ func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. +@@ -8556,7 +9568,7 @@ func_mode_uninstall () + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result +- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename +@@ -8564,12 +9576,12 @@ func_mode_uninstall () + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" ++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then +- rmfiles="$rmfiles $objdir/lt-$name" ++ func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then +- rmfiles="$rmfiles $objdir/lt-${noexename}.c" ++ func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi +@@ -8577,7 +9589,6 @@ func_mode_uninstall () + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done +- objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do +@@ -8589,16 +9600,16 @@ func_mode_uninstall () + exit $exit_status + } + +-{ test "$mode" = uninstall || test "$mode" = clean; } && ++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +-test -z "$mode" && { ++test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" + } + + test -z "$exec_cmd" && \ +- func_fatal_help "invalid operation mode \`$mode'" ++ func_fatal_help "invalid operation mode \`$opt_mode'" + + if test -n "$exec_cmd"; then + eval exec "$exec_cmd" +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 +@@ -8,7 +8,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 6 ltoptions.m4 ++# serial 7 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 +--- a/ltversion.m4 ++++ b/ltversion.m4 +@@ -7,17 +7,17 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# Generated from ltversion.in. ++# @configure_input@ + +-# serial 3134 ltversion.m4 ++# serial 3293 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) +-m4_define([LT_PACKAGE_REVISION], [1.3134]) ++m4_define([LT_PACKAGE_VERSION], [2.4]) ++m4_define([LT_PACKAGE_REVISION], [1.3293]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.7a' +-macro_revision='1.3134' ++[macro_version='2.4' ++macro_revision='1.3293' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 +--- a/lt~obsolete.m4 ++++ b/lt~obsolete.m4 +@@ -7,7 +7,7 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 4 lt~obsolete.m4 ++# serial 5 lt~obsolete.m4 + + # These exist entirely to fool aclocal when bootstrapping libtool. + # diff --git a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch similarity index 87% rename from meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch rename to meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index 5a195054f6..b0e94ab1cb 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch @@ -1,4 +1,4 @@ -From cd6151c8423a0550fd5758ce17664e34560a103c Mon Sep 17 00:00:00 2001 +From e36a4e05f900bbe6a8d744a93f3a407bc55c96f7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:39:01 +0000 Subject: [PATCH] don't let the distro compiler point to the wrong installation @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 0be45b4ae8..4817616bb2 100644 +index fe738d0db4..27d818f253 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -364,7 +364,8 @@ install-strip: install +@@ -365,7 +365,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch similarity index 86% rename from meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch rename to meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch index 655cc375a9..11a8110d40 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,4 +1,4 @@ -From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 +From 7b24f81e04c9d00d96de7dbd250beade6d2c6e44 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 Subject: [PATCH] warn for uses of system directories when cross linking @@ -59,9 +59,11 @@ Signed-off-by: Khem Raj ld/ldfile.c | 17 +++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ - ld/lexsup.c | 16 ++++++++++++++++ - 9 files changed, 86 insertions(+) + ld/lexsup.c | 15 +++++++++++++++ + 9 files changed, 85 insertions(+) +diff --git a/ld/config.in b/ld/config.in +index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -74,9 +76,11 @@ Signed-off-by: Khem Raj /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION +diff --git a/ld/configure b/ld/configure +index 811134a503..f8c17c19ae 100755 --- a/ld/configure +++ b/ld/configure -@@ -827,6 +827,7 @@ with_lib_path +@@ -826,6 +826,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +97,7 @@ Signed-off-by: Khem Raj --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16619,6 +16622,19 @@ fi +@@ -15788,6 +15791,19 @@ fi @@ -113,6 +117,8 @@ Signed-off-by: Khem Raj # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in +diff --git a/ld/configure.ac b/ld/configure.ac +index b5e849d84a..22e022ec03 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -132,9 +138,11 @@ Signed-off-by: Khem Raj dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 71fd781267..5c7843100b 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -149,9 +157,11 @@ Signed-off-by: Khem Raj /* Big or little endian as set on command line. */ enum endian_enum endian; +diff --git a/ld/ld.texi b/ld/ld.texi +index eb7bcb9933..3c73d445a0 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -170,9 +180,11 @@ Signed-off-by: Khem Raj @end table @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 411f7ddf97..17db16c2cc 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -196,6 +208,8 @@ Signed-off-by: Khem Raj } /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 5287f19a7f..55096e4fc9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -150,6 +150,8 @@ enum option_values @@ -207,9 +221,11 @@ Signed-off-by: Khem Raj }; /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index da1ad17763..12d0b07d8a 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -274,6 +274,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -218,9 +234,11 @@ Signed-off-by: Khem Raj /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 3d15cc491d..0e8b4f2b7a 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -235,7 +253,7 @@ Signed-off-by: Khem Raj }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) +@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) case OPTION_PRINT_MAP_DISCARDED: config.print_map_discarded = TRUE; diff --git a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch similarity index 96% rename from meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch rename to meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index e63d278bcd..f4f1a068cb 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch @@ -1,4 +1,4 @@ -From 903a43f07b7229adadff0f01d560646eb4b0e200 Mon Sep 17 00:00:00 2001 +From 70f3f2d9e912ea777fa113e02cdbc3465a66e40d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:42:38 +0000 Subject: [PATCH] Fix rpath in libtool when sysroot is enabled diff --git a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch similarity index 80% rename from meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch rename to meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch index e6b50dbcde..c49b8e863f 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch @@ -1,4 +1,4 @@ -From 84349ede307f61d624e5d97397074f5177a5bdc9 Mon Sep 17 00:00:00 2001 +From 2182791a453f34bee6968b3e72848608cf7d7abe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Mar 2015 01:44:14 +0000 Subject: [PATCH] Change default emulation for mips64*-*-linux @@ -13,9 +13,11 @@ Signed-off-by: Khem Raj ld/configure.tgt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/bfd/config.bfd b/bfd/config.bfd +index b96931f52e..847f9f0ba9 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -915,12 +915,12 @@ case "${targ}" in +@@ -911,12 +911,12 @@ case "${targ}" in targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; mips64*el-*-linux*) @@ -32,21 +34,24 @@ Signed-off-by: Khem Raj ;; mips*el-*-linux*) targ_defvec=mips_elf32_trad_le_vec +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 23194e357f..f4f0eaf9b2 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip - mips*-*-vxworks*) targ_emul=elf32ebmipvxworks - targ_extra_emuls="elf32elmipvxworks" ;; - mips*-*-windiss) targ_emul=elf32mipswindiss ;; +@@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + ;; + mips*-*-windiss) targ_emul=elf32mipswindiss + ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 - targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" +mips64*el-*-linux-*) targ_emul=elf64ltsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 - targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" +mips64*-*-linux-*) targ_emul=elf64btsmip + targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls + ;; mips*el-*-linux-*) targ_emul=elf32ltsmip - targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" diff --git a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch similarity index 81% rename from meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch rename to meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch index b710752245..c32867a238 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch @@ -1,4 +1,4 @@ -From 97e0fdbf8e85a7e690ac09d01a2ae93ba00cfb5d Mon Sep 17 00:00:00 2001 +From a0237ec2d1e58bd35c236df39dd5a06504c6d2ed Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Feb 2016 17:06:19 +0000 Subject: [PATCH] Add support for Netlogic XLP @@ -26,16 +26,19 @@ Signed-off-by: Mark Hatle binutils/readelf.c | 1 + gas/config/tc-mips.c | 4 +++- gas/configure | 3 +++ + gas/configure.ac | 3 +++ include/elf/mips.h | 1 + include/opcode/mips.h | 6 ++++++ ld/configure.tgt | 3 +++ opcodes/mips-dis.c | 12 +++++------- opcodes/mips-opc.c | 31 ++++++++++++++++++++----------- - 14 files changed, 62 insertions(+), 21 deletions(-) + 15 files changed, 65 insertions(+), 21 deletions(-) +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index fa3a9746b6..5078024fd5 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h -@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_arch +@@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, case bfd_mach_mipsisa64r6: case bfd_mach_mips_sb1: case bfd_mach_mips_xlr: @@ -43,6 +46,8 @@ Signed-off-by: Mark Hatle /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc. */ arch_flags = M_MIPS2; break; +diff --git a/bfd/archures.c b/bfd/archures.c +index 232103817c..b2b3b8c124 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -185,6 +185,7 @@ DESCRIPTION @@ -53,9 +58,11 @@ Signed-off-by: Mark Hatle .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 7c13bc8c91..2e453c50c1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -2125,6 +2125,7 @@ enum bfd_architecture +@@ -1568,6 +1568,7 @@ enum bfd_architecture #define bfd_mach_mips_octeon3 6503 #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ @@ -63,9 +70,11 @@ Signed-off-by: Mark Hatle #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa32r3 34 +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 847f9f0ba9..a12707f827 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd -@@ -898,6 +898,11 @@ case "${targ}" in +@@ -894,6 +894,11 @@ case "${targ}" in targ_defvec=mips_elf32_le_vec targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" ;; @@ -77,9 +86,11 @@ Signed-off-by: Mark Hatle mips*-*-elf* | mips*-*-rtems* | mips*-*-windiss | mips*-*-none) targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" +diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c +index 802acb45f1..fd9ec4c0ad 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c -@@ -107,7 +107,8 @@ enum +@@ -108,7 +108,8 @@ enum I_mipsocteon3, I_xlr, I_interaptiv_mr2, @@ -89,16 +100,18 @@ Signed-off-by: Mark Hatle }; #define NN(index) (&arch_info_struct[(index) + 1]) -@@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_inf - N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), +@@ -163,7 +164,8 @@ static const bfd_arch_info_type arch_info_struct[] = + N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, NN(I_interaptiv_mr2)), -- N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0) +- N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NULL) + N (64, 64, bfd_mach_mips_micromips, "mips:micromips", FALSE, NN(I_micromips)), + N (64, 64, bfd_mach_mips_xlp, "mips:xlp", FALSE, NULL) }; /* The default architecture is mips:3000, but with a machine number of +diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c +index d7e3aed3b6..7baeee9ee3 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) @@ -111,7 +124,7 @@ Signed-off-by: Mark Hatle default: switch (flags & EF_MIPS_ARCH) { -@@ -12360,6 +12363,10 @@ mips_set_isa_flags (bfd *abfd) +@@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; break; @@ -122,7 +135,7 @@ Signed-off-by: Mark Hatle case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; -@@ -14394,6 +14401,7 @@ static const struct mips_mach_extension +@@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, @@ -130,9 +143,11 @@ Signed-off-by: Mark Hatle /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6b5bebe743..d15a7828db 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c -@@ -3446,6 +3446,7 @@ get_machine_flags (Filedata * filedata, +@@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; @@ -140,6 +155,8 @@ Signed-off-by: Mark Hatle case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index fc6898834e..2c7151ccdb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; @@ -158,7 +175,7 @@ Signed-off-by: Mark Hatle ) /* Whether the processor uses hardware interlocks to protect reads -@@ -20138,7 +20140,7 @@ static const struct mips_cpu_info mips_c +@@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ @@ -167,18 +184,36 @@ Signed-off-by: Mark Hatle /* MIPS 64 Release 6. */ { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, +diff --git a/gas/configure b/gas/configure +index 60c1a055ae..59d6d11215 100755 --- a/gas/configure +++ b/gas/configure -@@ -13377,6 +13377,9 @@ _ACEOF +@@ -12722,6 +12722,9 @@ _ACEOF mipsisa64r6 | mipsisa64r6el) mips_cpu=mips64r6 ;; + mipsisa64r2nlm | mipsisa64r2nlmel) -+ mips_cpu=xlp -+ ;; ++ mips_cpu=xlp ++ ;; mipstx39 | mipstx39el) mips_cpu=r3900 ;; +diff --git a/gas/configure.ac b/gas/configure.ac +index 6f32e55a1a..11c2e0d273 100644 +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -325,6 +325,9 @@ changequote([,])dnl + mipsisa64r6 | mipsisa64r6el) + mips_cpu=mips64r6 + ;; ++ mipsisa64r2nlm | mipsisa64r2nlmel) ++ mips_cpu=xlp ++ ;; + mipstx39 | mipstx39el) + mips_cpu=r3900 + ;; +diff --git a/include/elf/mips.h b/include/elf/mips.h +index d116b036b6..dceeb3f156 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) @@ -189,9 +224,11 @@ Signed-off-by: Mark Hatle #define E_MIPS_MACH_OCTEON2 0x008d0000 #define E_MIPS_MACH_OCTEON3 0x008e0000 #define E_MIPS_MACH_5400 0x00910000 +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index fd031f3758..a96a44df84 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h -@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table +@@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { #define INSN_XLR 0x00000020 /* Imagination interAptiv MR2. */ #define INSN_INTERAPTIV_MR2 0x04000000 @@ -200,7 +237,7 @@ Signed-off-by: Mark Hatle /* DSP ASE */ #define ASE_DSP 0x00000001 -@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table +@@ -1384,6 +1386,7 @@ static const unsigned int mips_isa_table[] = { #define CPU_OCTEON3 6503 #define CPU_XLR 887682 /* decimal 'XLR' */ #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ @@ -208,7 +245,7 @@ Signed-off-by: Mark Hatle /* Return true if the given CPU is included in INSN_* mask MASK. */ -@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mas +@@ -1461,6 +1464,9 @@ cpu_is_member (int cpu, unsigned int mask) return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); @@ -218,20 +255,25 @@ Signed-off-by: Mark Hatle default: return FALSE; } +diff --git a/ld/configure.tgt b/ld/configure.tgt +index f4f0eaf9b2..0da3eca19c 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt -@@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mi - mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) +@@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) targ_emul=elf32btsmip - targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; + targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" + ;; +mipsisa64*-*-elf*) targ_emul=elf32btsmip -+ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ;; ++ targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip" ++ ;; mips64*el-ps2-elf*) targ_emul=elf32lr5900n32 targ_extra_emuls="elf32lr5900" - targ_extra_libpath=$targ_extra_emuls ;; + targ_extra_libpath=$targ_extra_emuls +diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c +index 755bbe294b..ce22ef683a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c -@@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_ +@@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), mips_cp1_names_mips3264, mips_hwr_names_numeric }, @@ -250,6 +292,8 @@ Signed-off-by: Mark Hatle /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ +diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c +index 5270aeefa8..d17dc78cd7 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) @@ -260,7 +304,7 @@ Signed-off-by: Mark Hatle #define IVIRT ASE_VIRT #define IVIRT64 ASE_VIRT64 -@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_op +@@ -990,6 +991,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, @@ -268,7 +312,7 @@ Signed-off-by: Mark Hatle /* ctc0 is at the bottom of the table. */ {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, -@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_op +@@ -1022,12 +1024,13 @@ const struct mips_opcode mips_builtin_opcodes[] = {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, @@ -283,7 +327,7 @@ Signed-off-by: Mark Hatle /* dctr and dctw are used on the r5000. */ {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, -@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_op +@@ -1099,6 +1102,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, @@ -291,7 +335,7 @@ Signed-off-by: Mark Hatle {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, -@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_op +@@ -1114,6 +1118,8 @@ const struct mips_opcode mips_builtin_opcodes[] = /* dmfc3 is at the bottom of the table. */ /* dmtc3 is at the bottom of the table. */ {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, @@ -300,7 +344,7 @@ Signed-off-by: Mark Hatle {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, -@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_op +@@ -1267,9 +1273,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, @@ -313,7 +357,7 @@ Signed-off-by: Mark Hatle {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, -@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_op +@@ -1438,7 +1444,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -322,7 +366,7 @@ Signed-off-by: Mark Hatle {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, -@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_op +@@ -1483,10 +1489,13 @@ const struct mips_opcode mips_builtin_opcodes[] = /* move is at the top of the table. */ {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, @@ -338,7 +382,7 @@ Signed-off-by: Mark Hatle {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, -@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_op +@@ -1536,7 +1545,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, @@ -347,7 +391,7 @@ Signed-off-by: Mark Hatle {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, -@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_op +@@ -1978,9 +1987,9 @@ const struct mips_opcode mips_builtin_opcodes[] = {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, diff --git a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch rename to meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index f686763594..463de80638 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch @@ -1,4 +1,4 @@ -From f34aac4314b821396fe745013dc8ec8683ea2598 Mon Sep 17 00:00:00 2001 +From ef4ad1cb9ff1b5a871ffa792a71b3ad6d14eb3dc Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Sat, 11 Jun 2016 22:08:29 -0500 Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c -index b56fe3e21a..696fe83a7b 100644 +index 7ef91d819b..145953d3c4 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { diff --git a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch similarity index 91% rename from meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch rename to meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch index 493b05026d..6acde1f781 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch @@ -1,4 +1,4 @@ -From ebb74c39acb171fd24c2698646134ce88dd96a15 Mon Sep 17 00:00:00 2001 +From 2f7f2389764ef1d699f6ad32057314024b7e84e7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 11:42:03 -0700 Subject: [PATCH] Detect 64-bit MIPS targets @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 14 insertions(+) diff --git a/gold/configure.tgt b/gold/configure.tgt -index 3e066edaa8..caf130ceda 100644 +index aa7ec552ae..470515062e 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,6 +153,13 @@ aarch64*-*) diff --git a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch deleted file mode 100644 index d25ce61626..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a326a8feb445a5713ff3d17c55f43d5681e26585 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Nov 2018 17:46:40 -0800 -Subject: [PATCH] binutils : enable x86_64-pep for producing EFI binaries on - x86-64 - -Add x86_64-pep emulation support to the set enabled for x86_64 targets -to enable the linker to produce Portable Executables for EFI binaries. - -Enables building the x86-64 EFI variant of the Xen hypervisor for -the OpenXT Project. - -Upstream-Status: Inappropriate [OE configuration specific] - -Signed-off-by: Christopher Clark -Signed-off-by: Khem Raj ---- - bfd/config.bfd | 2 +- - ld/configure.tgt | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -694,7 +694,7 @@ case "${targ}" in - ;; - x86_64-*-linux-*) - targ_defvec=x86_64_elf64_vec -- targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" -+ targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec x86_64_pe_vec x86_64_pe_be_vec i386_pe_vec" - want64=true - ;; - x86_64-*-nacl*) ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -258,8 +258,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x - tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; - x86_64-*-linux-*) targ_emul=elf_x86_64 -- targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om" -- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om" -+ targ_extra_emuls="elf32_x86_64 elf_i386 elf_iamcu elf_l1om elf_k1om i386pe i386pep" -+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om i386pep" -+ targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; - i[3-7]86-*-redox*) targ_emul=elf_i386 - targ_extra_emuls=elf_x86_64 ;; diff --git a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch similarity index 97% rename from meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch rename to meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index ae5915d39b..a794719bd2 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch @@ -1,4 +1,4 @@ -From 6bc49e9a581eb46265935ea2756a99faa7d0562e Mon Sep 17 00:00:00 2001 +From 392d474a72d37b669f53ab9f0fa913b958af93f6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 6 Mar 2017 23:33:27 -0800 Subject: [PATCH] sync with OE libtool changes diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch deleted file mode 100644 index ce5b9f392d..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 09dd135df9ebc7a4b640537e23e26a03a288a789 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 00:07:29 +1030 -Subject: [PATCH] PR25078, stack overflow in function find_abstract_instance - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17450, so backport it to master and zeus. - -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=063c511bd79] -CVE: CVE-2019-17450 -Signed-off-by: Trevor Gamblin - - PR 25078 - * dwarf2.c (find_abstract_instance): Delete orig_info_ptr, add - recur_count. Error on recur_count reaching 100 rather than - info_ptr matching orig_info_ptr. Adjust calls. - ---- - bfd/dwarf2.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod - struct dwarf2_debug *); - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1fe05d310e..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0192438051a7e781585647d5581a2a6f62fda362 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 9 Oct 2019 10:47:13 +1030 -Subject: [PATCH] PR25070, SEGV in function _bfd_dwarf2_find_nearest_line - -Selectively backporting fix for bfd/dwarf2.c, but not the ChangeLog -file. There are newer versions of binutils, but none of them contain the -commit fixing CVE-2019-17451, so backport it to master and zeus. - -Upstream-Status: Backport -[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=336bfbeb1848] -CVE: CVE-2019-17451 -Signed-off-by: Trevor Gamblin - - -Evil testcase with two debug info sections, with sizes of 2aaaabac4ec1 -and ffffd5555453b140 result in a total size of 1. Reading the first -section of course overflows the buffer and tramples on other memory. - - PR 25070 - * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Catch overflow of - total_size calculation. ---- - bfd/dwarf2.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4439,7 +4439,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/meta/recipes-devtools/binutils/binutils_2.33.bb b/meta/recipes-devtools/binutils/binutils_2.34.bb similarity index 91% rename from meta/recipes-devtools/binutils/binutils_2.33.bb rename to meta/recipes-devtools/binutils/binutils_2.34.bb index 8bd2bf778c..bfc9346822 100644 --- a/meta/recipes-devtools/binutils/binutils_2.33.bb +++ b/meta/recipes-devtools/binutils/binutils_2.34.bb @@ -49,9 +49,9 @@ do_install_class-native () { # Split out libbfd-*.so so including perf doesn't include extra stuff PACKAGE_BEFORE_PN += "libbfd" -FILES_libbfd = "${libdir}/libbfd-*.so" +FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" -SRC_URI_append_class-nativesdk = " file://nativesdk-relocation.patch " +SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR_class-nativesdk = "" FILES_${PN}_append_class-nativesdk = " ${bindir}" -- 2.25.1 From raj.khem at gmail.com Thu Feb 20 17:25:18 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 09:25:18 -0800 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm Message-ID: <20200220172518.315182-1-raj.khem@gmail.com> dnf depends on libsolv, and libsolv does not have and easy way to jusr enable rpmdb support, it either has full rpm or nothing, perhaps it could be improved in libsolv and we can use that but from now we have no other option dnf support only rpm backend and wont work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj --- v2: Improve commit message meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f1ad..220f1aabbd 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435b32..49afa04812 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" -- 2.25.1 From jpewhacker at gmail.com Thu Feb 20 18:51:50 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 20 Feb 2020 12:51:50 -0600 Subject: [OE-core] [PATCH] classes/meson.bbclass: Explicitly mark functions as missing in MinGW Message-ID: <20200220185150.23422-1-JPEWhacker@gmail.com> meson (with some help from GCC) misdetects certain builtin functions as being present on MinGW, when in fact they are not. Fix it by explicitly marking the functions as missing. This requires rearranging the meson.cross file to put the [properties] section at the end so the append works properly (meson can't handle duplicate sections). Signed-off-by: Joshua Watt --- meta/classes/meson.bbclass | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 06034e8b47..5c74658d01 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -96,14 +96,6 @@ readelf = ${@meson_array('READELF', d)} pkgconfig = 'pkg-config' llvm-config = 'llvm-config${LLVMVERSION}' -[properties] -needs_exe_wrapper = true -c_args = ${@meson_array('CFLAGS', d)} -c_link_args = ${@meson_array('LDFLAGS', d)} -cpp_args = ${@meson_array('CXXFLAGS', d)} -cpp_link_args = ${@meson_array('LDFLAGS', d)} -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' - [host_machine] system = '${@meson_operating_system('HOST_OS', d)}' cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}' @@ -115,6 +107,23 @@ system = '${@meson_operating_system('TARGET_OS', d)}' cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}' cpu = '${TARGET_ARCH}' endian = '${@meson_endian('TARGET', d)}' + +[properties] +needs_exe_wrapper = true +c_args = ${@meson_array('CFLAGS', d)} +c_link_args = ${@meson_array('LDFLAGS', d)} +cpp_args = ${@meson_array('CXXFLAGS', d)} +cpp_link_args = ${@meson_array('LDFLAGS', d)} +gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' +EOF +} + +do_write_config_append_mingw32() { + # meson mis-detects the presence of several builtin functions in MinGW + # (see https://github.com/mesonbuild/meson/issues/3672). + # Explicitly mark these functions as missing in the cross file + cat >>${WORKDIR}/meson.cross < References: <20200220150318.20003-1-malus.brandywine@gmail.com> <18c55700df9ee84ea44fbffc93ba4e9f3c0e1663.camel@linuxfoundation.org> <248874866.3048780.1582217575008.JavaMail.zimbra@savoirfairelinux.com> Message-ID: Jean-Marie, thank you for directing me to the thread with the whole discussion. My point was I found it annoying to add CONNECTIVITY_CHECK_URIS (which is empty most of time) in my local.conf every time I clone clean tree. Since the problem is bigger than it seemed to be I withdraw my patch. Thank you, Nataliya On Thu, Feb 20, 2020 at 11:52 AM Jean-Marie LEMETAYER wrote: > > > > On Feb 20, 2020, at 4:27 PM, Richard Purdie richard.purdie at linuxfoundation.org wrote: > > On Thu, 2020-02-20 at 10:03 -0500, Nataliya Korovkina wrote: > >> Signed-off-by: Nataliya Korovkina > >> --- > >> meta/conf/distro/include/default-distrovars.inc | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/meta/conf/distro/include/default-distrovars.inc > >> b/meta/conf/distro/include/default-distrovars.inc > >> index 433d4b6651..6c9155b2ae 100644 > >> --- a/meta/conf/distro/include/default-distrovars.inc > >> +++ b/meta/conf/distro/include/default-distrovars.inc > >> @@ -48,4 +48,4 @@ KERNEL_IMAGETYPES ??= "${KERNEL_IMAGETYPE}" > >> # fetch from the network (and warn you if not). To disable the test > >> set > >> # the variable to be empty. > >> # Git example url: git://git.yoctoproject.org/yocto-firewall- > >> test;protocol=git;rev=master > >> -CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" > >> +CONNECTIVITY_CHECK_URIS ?= "https://www.yoctoproject.org/" > > > > Why would that be better? > > > > There have been several requests to change this however I'm not sure we > > can find one perfect url we can use :( > > Hi Nataliya, > > I am one of those who made a request: > http://lists.openembedded.org/pipermail/openembedded-core/2020-January/291926.html > > Since I have created 3 pages on GitHub pages, GitLab pages and Bitbucket pages: > - https://connectivitycheck.github.io > - https://connectivitycheck.github.io > - https://connectivitycheck.bitbucket.io > > I think we could use them in a mirrored way like Richard have suggested (in my thread). > > I cannot do it right now, but this is definitely on my roadmap > because I still see the issue regularly. > > Best Regards, > Jean-Marie > > > > From raj.khem at gmail.com Thu Feb 20 19:30:22 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 11:30:22 -0800 Subject: [OE-core] [PATCH] classes/meson.bbclass: Explicitly mark functions as missing in MinGW In-Reply-To: <20200220185150.23422-1-JPEWhacker@gmail.com> References: <20200220185150.23422-1-JPEWhacker@gmail.com> Message-ID: On 2/20/20 10:51 AM, Joshua Watt wrote: > meson (with some help from GCC) misdetects certain builtin functions as > being present on MinGW, when in fact they are not. Fix it by explicitly > marking the functions as missing. This requires rearranging the > meson.cross file to put the [properties] section at the end so the > append works properly (meson can't handle duplicate sections). > patch is fine workaround, but I think meson should look for strndup in string.h > Signed-off-by: Joshua Watt > --- > meta/classes/meson.bbclass | 25 +++++++++++++++++-------- > 1 file changed, 17 insertions(+), 8 deletions(-) > > diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass > index 06034e8b47..5c74658d01 100644 > --- a/meta/classes/meson.bbclass > +++ b/meta/classes/meson.bbclass > @@ -96,14 +96,6 @@ readelf = ${@meson_array('READELF', d)} > pkgconfig = 'pkg-config' > llvm-config = 'llvm-config${LLVMVERSION}' > > -[properties] > -needs_exe_wrapper = true > -c_args = ${@meson_array('CFLAGS', d)} > -c_link_args = ${@meson_array('LDFLAGS', d)} > -cpp_args = ${@meson_array('CXXFLAGS', d)} > -cpp_link_args = ${@meson_array('LDFLAGS', d)} > -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' > - > [host_machine] > system = '${@meson_operating_system('HOST_OS', d)}' > cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}' > @@ -115,6 +107,23 @@ system = '${@meson_operating_system('TARGET_OS', d)}' > cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}' > cpu = '${TARGET_ARCH}' > endian = '${@meson_endian('TARGET', d)}' > + > +[properties] > +needs_exe_wrapper = true > +c_args = ${@meson_array('CFLAGS', d)} > +c_link_args = ${@meson_array('LDFLAGS', d)} > +cpp_args = ${@meson_array('CXXFLAGS', d)} > +cpp_link_args = ${@meson_array('LDFLAGS', d)} > +gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' > +EOF > +} > + > +do_write_config_append_mingw32() { > + # meson mis-detects the presence of several builtin functions in MinGW > + # (see https://github.com/mesonbuild/meson/issues/3672). > + # Explicitly mark these functions as missing in the cross file > + cat >>${WORKDIR}/meson.cross < +has_function_strndup = false > EOF > } > > From peter.kjellerstedt at axis.com Thu Feb 20 20:19:58 2020 From: peter.kjellerstedt at axis.com (Peter Kjellerstedt) Date: Thu, 20 Feb 2020 20:19:58 +0000 Subject: [OE-core] [PATCH] Revert "rootfs: Make BUILDNAME a weak default in reproducible_build_simple" In-Reply-To: <20200209060658.800-1-pkj@axis.com> References: <20200209060658.800-1-pkj@axis.com> Message-ID: <484d72b91f934887b89efbc1d087024d@XBOX03.axis.com> *ping* //Peter > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of Peter Kjellerstedt > Sent: den 9 februari 2020 07:07 > To: openembedded-core at lists.openembedded.org > Subject: [OE-core] [PATCH] Revert "rootfs: Make BUILDNAME a weak default > in reproducible_build_simple" > > This reverts commit 8380df6566db49ef184b837432558750f77f592f. > > Giving BUILDNAME a static default in reproducible_build_simple.bbclass > to have /etc/version be generated with that name lead to other users > of BUILDNAME no longer working as expected. E.g., buildstats.bcclass > would now write its information in a single directory, overwriting the > statistics for each build. > > Signed-off-by: Peter Kjellerstedt > --- > meta/classes/reproducible_build_simple.bbclass | 1 - > meta/classes/rootfs-postcommands.bbclass | 5 +++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/reproducible_build_simple.bbclass > b/meta/classes/reproducible_build_simple.bbclass > index 3e5fd82432..393372993d 100644 > --- a/meta/classes/reproducible_build_simple.bbclass > +++ b/meta/classes/reproducible_build_simple.bbclass > @@ -7,4 +7,3 @@ export PERL_HASH_SEED = "0" > export SOURCE_DATE_EPOCH ??= "1520598896" > > REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" > -BUILDNAME ??= "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" > diff --git a/meta/classes/rootfs-postcommands.bbclass > b/meta/classes/rootfs-postcommands.bbclass > index e40097444d..2f171836fa 100644 > --- a/meta/classes/rootfs-postcommands.bbclass > +++ b/meta/classes/rootfs-postcommands.bbclass > @@ -356,6 +356,11 @@ python rootfs_log_check_recommends() { > # Perform any additional adjustments needed to make rootf binary > reproducible > rootfs_reproducible () { > if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" != "" ]; then > + # Convert UTC into %4Y%2m%2d%2H%2M%2S > + sformatted=`date -u -d > @${REPRODUCIBLE_TIMESTAMP_ROOTFS} +%4Y%2m%2d%2H%2M%2S` > + echo $sformatted > ${IMAGE_ROOTFS}/etc/version > + bbnote "rootfs_reproducible: set /etc/version to > $sformatted" > + > if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then > find ${IMAGE_ROOTFS}${sysconfdir}/gconf - > name '%gconf.xml' -print0 | xargs -0r \ > sed -i -e 's@\bmtime="[0-9][0- > 9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g' > -- > 2.21.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From schnitzeltony at gmail.com Thu Feb 20 20:24:29 2020 From: schnitzeltony at gmail.com (=?UTF-8?Q?Andreas_M=C3=BCller?=) Date: Thu, 20 Feb 2020 21:24:29 +0100 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection In-Reply-To: References: <20200220002849.9126-1-schnitzeltony@gmail.com> Message-ID: On Thu, Feb 20, 2020 at 1:45 PM Andreas M?ller wrote: > > On Thu, Feb 20, 2020 at 11:07 AM Alexander Kanavin > wrote: > > > > You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? > > This line: > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70 > > > > And for consistency, it would be good to do the same for gtk-doc. > > This is odd: I fell over this because there was no gir created. Did > not notice it was few lines below. Need to check that - maybe I am a > bit off-sync to master or something is wrong elsewhere. > > Will sync to master and send V2 then. > Finally had time to look into again. In the recipe there is GI_DATA_ENABLED_armv7a = "False" GI_DATA_ENABLED_armv7ve = "False" => My patch is wrong it overrides above accidentally - thanks Alex! Since webkit builds gir fine (my machine is armv7ve) that does not seem necessary any more. I would like to send out a patch removing at least armv7ve - shall I take the risk to remove armv7a - maybe as two patches? Andreas From raj.khem at gmail.com Thu Feb 20 20:33:01 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 12:33:01 -0800 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection In-Reply-To: References: <20200220002849.9126-1-schnitzeltony@gmail.com> Message-ID: On Thu, Feb 20, 2020 at 12:24 PM Andreas M?ller wrote: > On Thu, Feb 20, 2020 at 1:45 PM Andreas M?ller > wrote: > > > > On Thu, Feb 20, 2020 at 11:07 AM Alexander Kanavin > > wrote: > > > > > > You need to at the same time drop the introspection enablement logic > from EXTRA_OECMAKE I think? > > > This line: > > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70 > > > > > > And for consistency, it would be good to do the same for gtk-doc. > > > > This is odd: I fell over this because there was no gir created. Did > > not notice it was few lines below. Need to check that - maybe I am a > > bit off-sync to master or something is wrong elsewhere. > > > > Will sync to master and send V2 then. > > > Finally had time to look into again. In the recipe there is > > GI_DATA_ENABLED_armv7a = "False" > GI_DATA_ENABLED_armv7ve = "False" > > => My patch is wrong it overrides above accidentally - thanks Alex! > > Since webkit builds gir fine (my machine is armv7ve) that does not > seem necessary any more. I would like to send out a patch removing at > least armv7ve - shall I take the risk to remove armv7a - maybe as two > patches? Perhaps just the part you are Confident about > > > Andreas > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Thu Feb 20 20:35:15 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 20 Feb 2020 21:35:15 +0100 Subject: [OE-core] [PATCH V2] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm In-Reply-To: <20200220172518.315182-1-raj.khem@gmail.com> References: <20200220172518.315182-1-raj.khem@gmail.com> Message-ID: On Thu, 20 Feb 2020 at 18:25, Khem Raj wrote: > +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', > 'package_rpm', '', 'does not build correctly without package_rpm in > PACKAGE_CLASSES', d)}" > I meant that this string is extended: "does not build correctly without package_rpm in PACKAGE_CLASSES due to disabled rpm support in libsolv" Otherwise it's vague and doesn't provide the real reason. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From jpewhacker at gmail.com Thu Feb 20 20:44:08 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 20 Feb 2020 14:44:08 -0600 Subject: [OE-core] [PATCH] classes/meson.bbclass: Explicitly mark functions as missing in MinGW In-Reply-To: References: <20200220185150.23422-1-JPEWhacker@gmail.com> Message-ID: On Thu, Feb 20, 2020, 1:30 PM Khem Raj wrote: > > > On 2/20/20 10:51 AM, Joshua Watt wrote: > > meson (with some help from GCC) misdetects certain builtin functions as > > being present on MinGW, when in fact they are not. Fix it by explicitly > > marking the functions as missing. This requires rearranging the > > meson.cross file to put the [properties] section at the end so the > > append works properly (meson can't handle duplicate sections). > > > > patch is fine workaround, but I think meson should look for strndup in > string.h > Agreed. I think the upstream fix would be better, and I will look at that also. > > Signed-off-by: Joshua Watt > > --- > > meta/classes/meson.bbclass | 25 +++++++++++++++++-------- > > 1 file changed, 17 insertions(+), 8 deletions(-) > > > > diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass > > index 06034e8b47..5c74658d01 100644 > > --- a/meta/classes/meson.bbclass > > +++ b/meta/classes/meson.bbclass > > @@ -96,14 +96,6 @@ readelf = ${@meson_array('READELF', d)} > > pkgconfig = 'pkg-config' > > llvm-config = 'llvm-config${LLVMVERSION}' > > > > -[properties] > > -needs_exe_wrapper = true > > -c_args = ${@meson_array('CFLAGS', d)} > > -c_link_args = ${@meson_array('LDFLAGS', d)} > > -cpp_args = ${@meson_array('CXXFLAGS', d)} > > -cpp_link_args = ${@meson_array('LDFLAGS', d)} > > -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' > > - > > [host_machine] > > system = '${@meson_operating_system('HOST_OS', d)}' > > cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}' > > @@ -115,6 +107,23 @@ system = '${@meson_operating_system('TARGET_OS', > d)}' > > cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}' > > cpu = '${TARGET_ARCH}' > > endian = '${@meson_endian('TARGET', d)}' > > + > > +[properties] > > +needs_exe_wrapper = true > > +c_args = ${@meson_array('CFLAGS', d)} > > +c_link_args = ${@meson_array('LDFLAGS', d)} > > +cpp_args = ${@meson_array('CXXFLAGS', d)} > > +cpp_link_args = ${@meson_array('LDFLAGS', d)} > > +gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' > > +EOF > > +} > > + > > +do_write_config_append_mingw32() { > > + # meson mis-detects the presence of several builtin functions in > MinGW > > + # (see https://github.com/mesonbuild/meson/issues/3672). > > + # Explicitly mark these functions as missing in the cross file > > + cat >>${WORKDIR}/meson.cross < > +has_function_strndup = false > > EOF > > } > > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Thu Feb 20 21:09:52 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 13:09:52 -0800 Subject: [OE-core] [PATCH v3] dnf, libdnf: Ignore if PACKAGE_CLASSES does not have rpm Message-ID: <20200220210952.3934161-1-raj.khem@gmail.com> dnf depends on libsolv, and libsolv does not have and easy way to jusr enable rpmdb support, it either has full rpm or nothing, perhaps it could be improved in libsolv and we can use that but from now we have no other option dnf support only rpm backend and wont work with opkg or dpkg/apt anyway Signed-off-by: Khem Raj --- v2: Improve commit message v3: Enhance blacklist message meta/recipes-devtools/dnf/dnf_4.2.2.bb | 2 ++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f1ad..f6e616e7f1 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -84,3 +84,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 882c435b32..d498347094 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -26,4 +26,5 @@ EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" BBCLASSEXTEND = "native nativesdk" +PNBLACKLIST[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" -- 2.25.1 From richard.purdie at linuxfoundation.org Thu Feb 20 21:24:16 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 20 Feb 2020 21:24:16 +0000 Subject: [OE-core] [PATCH] mc: upgrade 4.8.23 -> 4.8.24 In-Reply-To: <1582201146-2668-1-git-send-email-wangmy@cn.fujitsu.com> References: <1582201146-2668-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: On Thu, 2020-02-20 at 04:19 -0800, Wang Mingyu wrote: > 0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch > 0001-Add-option-to-control-configure-args.patch > Removed since they are included in 4.8.24. > > Signed-off-by: Wang Mingyu > --- > ...Add-option-to-control-configure-args.patch | 99 ---------------- > ...29-configure.ac-drop-bundled-gettext.patch | 110 ---------------- > -- > .../mc/{mc_4.8.23.bb => mc_4.8.24.bb} | 6 +- > 3 files changed, 2 insertions(+), 213 deletions(-) > delete mode 100644 meta/recipes-extended/mc/files/0001-Add-option- > to-control-configure-args.patch > delete mode 100644 meta/recipes-extended/mc/files/0001-Ticket-3629- > configure.ac-drop-bundled-gettext.patch > rename meta/recipes-extended/mc/{mc_4.8.23.bb => mc_4.8.24.bb} (88%) It looks like there is some kind of race in mc do_install: https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/703 Cheers, Richard From timothy.t.orling at linux.intel.com Thu Feb 20 21:23:15 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Thu, 20 Feb 2020 13:23:15 -0800 Subject: [OE-core] [PATCH] liberror-perl: upgrade 0.17028 -> 0.17029 Message-ID: <20200220212315.23951-1-timothy.t.orling@linux.intel.com> Upstream release notes: " 0.17029 2020-01-28 - Rebuild for order of 'NAME' and 'VERSION' sections in the generated POD documentation (see 0.001004 in https://metacpan.org/changes/distribution/Pod-Weaver-PluginBundle-SHLOMIF ). - VERSION used to appear before NAME. " Signed-off-by: Tim Orling --- .../{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} (89%) diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17028.bb b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb similarity index 89% rename from meta/recipes-devtools/perl/liberror-perl_0.17028.bb rename to meta/recipes-devtools/perl/liberror-perl_0.17029.bb index 8c6bbcba94..038808f0cd 100644 --- a/meta/recipes-devtools/perl/liberror-perl_0.17028.bb +++ b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb @@ -32,8 +32,8 @@ RDEPENDS_${PN}-ptest += " \ SRC_URI = "http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz" -SRC_URI[md5sum] = "ec3522c60a43a368f19c0f89e2205cb1" -SRC_URI[sha256sum] = "3ad85c5e58b31c8903006298424a51bba39f1840e324f5ae612eabc8b935e960" +SRC_URI[md5sum] = "6732b1c6207e4a9a3e2987c88368039a" +SRC_URI[sha256sum] = "1a23f7913032aed6d4b68321373a3899ca66590f4727391a091ec19c95bf7adc" S = "${WORKDIR}/Error-${PV}" -- 2.24.0 From armccurdy at gmail.com Thu Feb 20 22:00:46 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Thu, 20 Feb 2020 14:00:46 -0800 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection In-Reply-To: References: <20200220002849.9126-1-schnitzeltony@gmail.com> Message-ID: On Thu, Feb 20, 2020 at 12:33 PM Khem Raj wrote: > > On Thu, Feb 20, 2020 at 12:24 PM Andreas M?ller wrote: >> >> On Thu, Feb 20, 2020 at 1:45 PM Andreas M?ller wrote: >> > >> > On Thu, Feb 20, 2020 at 11:07 AM Alexander Kanavin >> > wrote: >> > > >> > > You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? >> > > This line: >> > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70 >> > > >> > > And for consistency, it would be good to do the same for gtk-doc. >> > >> > This is odd: I fell over this because there was no gir created. Did >> > not notice it was few lines below. Need to check that - maybe I am a >> > bit off-sync to master or something is wrong elsewhere. >> > >> > Will sync to master and send V2 then. >> > >> Finally had time to look into again. In the recipe there is >> >> GI_DATA_ENABLED_armv7a = "False" >> GI_DATA_ENABLED_armv7ve = "False" >> >> => My patch is wrong it overrides above accidentally - thanks Alex! >> >> Since webkit builds gir fine (my machine is armv7ve) that does not >> seem necessary any more. I would like to send out a patch removing at >> least armv7ve - shall I take the risk to remove armv7a - maybe as two >> patches? These two should be equivalent for all practical purposes and so should be updated together. ie remove them both, one patch. From raj.khem at gmail.com Thu Feb 20 22:02:31 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 14:02:31 -0800 Subject: [OE-core] [meta-oe][master][PATCH] strongswan: avoid charon crash In-Reply-To: References: Message-ID: <388c484b4224861fda2d20f9499f6e81f17a8248.camel@gmail.com> On Thu, 2020-02-20 at 10:26 +0000, Saloni Jain wrote: > From: Anuj Chougule > > This is a possible fix to charon that crashed early due to invalid > memory access. > Important frames from Backtraces : > 8 0x00007f607246e160 in memcpy (__len=1704, __src=, > __dest=) > at /usr/include/bits/string_fortified.h:34 > No locals. > 9 memcpy_noop (n=1704, src=, dst=) > at /usr/src/debug/strongswan/5.7.2-r0/strongswan- > 5.7.2/src/libstrongswan/utils/utils/memory.h:47 > n = 1704 > src = > dst = > 10 chunk_create_clone (ptr=, chunk=...) > at /usr/src/debug/strongswan/5.7.2-r0/strongswan- > 5.7.2/src/libstrongswan/utils/chunk.c:48 > clone = > 11 0x00007f606ebae810 in load_from_blob (blob=..., type=type at entry=CR > ED_PRIVATE_KEY, subtype=subtype at entry=1, > subject=subject at entry=0x0, flags=flags at entry=X509_NONE) > at /usr/src/debug/strongswan/5.7.2-r0/strongswan- > 5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:399 > x = > cred = 0x0 > ---Type to continue, or q to quit--- > pgp = false > 12 0x00007f606ebaf0e4 in load_from_file (flags=X509_NONE, > subject=0x0, subtype=1, type=CRED_PRIVATE_KEY, > file=0x7f6069d21a20 > "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec > -internal_key.pem") > at /usr/src/debug/strongswan/5.7.2-r0/strongswan- > 5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:452 > cred = > chunk = 0x7f6054005430 > 13 pem_load (type=CRED_PRIVATE_KEY, subtype=1, args=) > at /usr/src/debug/strongswan/5.7.2-r0/strongswan- > 5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:498 > file = 0x7f6069d21a20 > "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec > -internal_key.pem" > pem = > subject = 0x0 > flags = 0 > > Problem lies in frame 12 & 11. > (gdb) f 12 > 12 0x00007f606ebaf0e4 in load_from_file (flags=X509_NONE, > subject=0x0, subtype=1, type=CRED_PRIVATE_KEY, > file=0x7f6069d21a20 > "/var/opt/public/sps/sps_necema/data/public/IPsec/secureboot_on/IPsec > -internal_key.pem") > at /usr/src/debug/strongswan/5.7.2-r0/strongswan- > 5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:452 > 452 in /usr/src/debug/strongswan/5.7.2-r0/strongswan- > 5.7.2/src/libstrongswan/plugins/pem/pem_builder.c > (gdb) info locals > cred = > chunk = 0x7f6054005430 > (gdb) print *chunk > $21 = {ptr = 0x7f60728b7000 0x7f60728b7000>, len = 1704} > (gdb) f 11 > 11 0x00007f606ebae810 in load_from_blob (blob=..., type=type at entry=CR > ED_PRIVATE_KEY, subtype=subtype at entry=1, subject=subject at entry=0x0, > flags=flags at entry=X509_NONE) at /usr/src/debug/strongswan/5.7.2- > r0/strongswan-5.7.2/src/libstrongswan/plugins/pem/pem_builder.c:399 > 399 in /usr/src/debug/strongswan/5.7.2-r0/strongswan- > 5.7.2/src/libstrongswan/plugins/pem/pem_builder.c > (gdb) info args > blob = {ptr = 0x7f60728b7000 0x7f60728b7000>, len = 140052215328768} > type = CRED_PRIVATE_KEY > subtype = 1 > subject = 0x0 > flags = X509_NONE > (gdb) print blob > $22 = {ptr = 0x7f60728b7000 0x7f60728b7000>, len = 140052215328768} > > Source code snippet : > static void *load_from_file(char *file, credential_type_t type, int > subtype, > identification_t *subject, > x509_flag_t flags) > { > void *cred; > chunk_t *chunk; > > chunk = chunk_map(file, FALSE); > if (!chunk) > { > DBG1(DBG_LIB, " opening '%s' failed: %s", file, > strerror(errno)); > return NULL; > } > cred = load_from_blob(*chunk, type, subtype, subject, flags); > chunk_unmap(chunk); > return cred; > } > > Local variable chunk is an uninitialised pointer in load_from_file() > (frame 12 above) which is expected to get initialised through > chunk_map() & then passed to load_from_blob() as a parameter. > But somehow, the chunk pointer has not got initialised & > got passed as it is to load_from_blob() in frame 11 above. > As this contains a garbage address, when method load_from_blob() > tried cloning the memory regions through chunk_clone() -> > chunk_create_clone() -> memcpy() -> memcpy_noop(), it crashed with > SIGBUS (frames 10, 9, 8). > It could also be that chunk_map() has a bug which does not memmap() > the full or correct areas. > > Upstream-Status: Pending > Tested By: Anuj Chougule > Signed-off-by: Anuj Chougule > Signed-off-by: Saloni Jain > --- > .../strongswan/files/fix-charon-crash.patch | 23 > ++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > create mode 100644 recipes-support/strongswan/files/fix-charon- > crash.patch > > diff --git a/recipes-support/strongswan/files/fix-charon-crash.patch > b/recipes-support/strongswan/files/fix-charon-crash.patch > new file mode 100644 > index 0000000..95e71a2 > --- /dev/null > +++ b/recipes-support/strongswan/files/fix-charon-crash.patch > @@ -0,0 +1,23 @@ > +strongswan: avoid charon crash > + > +Variable chunk is an uninitialised pointer,which > +is expected to get initialised through method chunk_map() > +& then passed to load_from_blob() as a parameter. > +But somehow, if the chunk pointer did not get initialised & gets > +passed as it is to load_from_blob(), it may lead crash as this > +contains a garbage address. > + > +Signed-off-by: Anuj Chougule > +Upstream-Status: Pending > + > +--- a/src/libstrongswan/plugins/pem/pem_builder.c > ++++ b/src/libstrongswan/plugins/pem/pem_builder.c > +@@ -441,7 +441,7 @@ static void *load_from_file(char *file, > credential_type_t type, int subtype, > + > identification_t *subject, x509_flag_t flags) > + { > + void *cred; > +- chunk_t *chunk; > ++ chunk_t *chunk = NULL; > + I wonder if chunk_map has issues where it returns invalid values, I would rather check chunk_map and see what is it doing. > + chunk = chunk_map(file, FALSE); > + if (!chunk) > -- > 2.7.4 > This message contains information that may be privileged or > confidential and is the property of the KPIT Technologies Ltd. It is > intended only for the person to whom it is addressed. If you are not > the intended recipient, you are not authorized to read, print, retain > copy, disseminate, distribute, or use this message or any part > thereof. If you receive this message in error, please notify the > sender immediately and delete all copies of this message. KPIT > Technologies Ltd. does not accept any liability for virus infected > mails. From sakib.sajal at windriver.com Thu Feb 20 22:02:47 2020 From: sakib.sajal at windriver.com (Sakib Sajal) Date: Thu, 20 Feb 2020 14:02:47 -0800 Subject: [OE-core] [PATCH] libical: fix host contamination in -dev pkg Message-ID: <20200220220247.86581-1-sakib.sajal@windriver.com> [YOCTO #13512] Signed-off-by: Sakib Sajal --- meta/recipes-support/libical/libical_3.0.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/libical/libical_3.0.7.bb b/meta/recipes-support/libical/libical_3.0.7.bb index ac9c114691..a50473e9ec 100644 --- a/meta/recipes-support/libical/libical_3.0.7.bb +++ b/meta/recipes-support/libical/libical_3.0.7.bb @@ -40,5 +40,6 @@ do_install_append () { # Remove build host references sed -i \ -e 's,${STAGING_LIBDIR},${libdir},g' \ + -e 's,${STAGING_INCDIR},${includedir},g' \ ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake } -- 2.17.1 From raj.khem at gmail.com Thu Feb 20 22:06:29 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 14:06:29 -0800 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection In-Reply-To: References: <20200220002849.9126-1-schnitzeltony@gmail.com> Message-ID: <7dd9779b1be7e10a54b3b1bff4788cae931cb02a.camel@gmail.com> On Thu, 2020-02-20 at 14:00 -0800, Andre McCurdy wrote: > On Thu, Feb 20, 2020 at 12:33 PM Khem Raj wrote: > > On Thu, Feb 20, 2020 at 12:24 PM Andreas M?ller < > > schnitzeltony at gmail.com> wrote: > > > On Thu, Feb 20, 2020 at 1:45 PM Andreas M?ller < > > > schnitzeltony at gmail.com> wrote: > > > > On Thu, Feb 20, 2020 at 11:07 AM Alexander Kanavin > > > > wrote: > > > > > You need to at the same time drop the introspection > > > > > enablement logic from EXTRA_OECMAKE I think? > > > > > This line: > > > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70 > > > > > > > > > > And for consistency, it would be good to do the same for gtk- > > > > > doc. > > > > > > > > This is odd: I fell over this because there was no gir created. > > > > Did > > > > not notice it was few lines below. Need to check that - maybe I > > > > am a > > > > bit off-sync to master or something is wrong elsewhere. > > > > > > > > Will sync to master and send V2 then. > > > > > > > Finally had time to look into again. In the recipe there is > > > > > > GI_DATA_ENABLED_armv7a = "False" > > > GI_DATA_ENABLED_armv7ve = "False" > > > > > > => My patch is wrong it overrides above accidentally - thanks > > > Alex! > > > > > > Since webkit builds gir fine (my machine is armv7ve) that does > > > not > > > seem necessary any more. I would like to send out a patch > > > removing at > > > least armv7ve - shall I take the risk to remove armv7a - maybe as > > > two > > > patches? > > These two should be equivalent for all practical purposes and so > should be updated together. ie remove them both, one patch. it will run user mode qemu underneath, which is not same for both, are you sure libraries and apps it will run are identical ? From armccurdy at gmail.com Thu Feb 20 22:11:34 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Thu, 20 Feb 2020 14:11:34 -0800 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection In-Reply-To: <7dd9779b1be7e10a54b3b1bff4788cae931cb02a.camel@gmail.com> References: <20200220002849.9126-1-schnitzeltony@gmail.com> <7dd9779b1be7e10a54b3b1bff4788cae931cb02a.camel@gmail.com> Message-ID: On Thu, Feb 20, 2020 at 2:06 PM Khem Raj wrote: > > On Thu, 2020-02-20 at 14:00 -0800, Andre McCurdy wrote: > > On Thu, Feb 20, 2020 at 12:33 PM Khem Raj wrote: > > > On Thu, Feb 20, 2020 at 12:24 PM Andreas M?ller < > > > schnitzeltony at gmail.com> wrote: > > > > On Thu, Feb 20, 2020 at 1:45 PM Andreas M?ller < > > > > schnitzeltony at gmail.com> wrote: > > > > > On Thu, Feb 20, 2020 at 11:07 AM Alexander Kanavin > > > > > wrote: > > > > > > You need to at the same time drop the introspection > > > > > > enablement logic from EXTRA_OECMAKE I think? > > > > > > This line: > > > > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70 > > > > > > > > > > > > And for consistency, it would be good to do the same for gtk- > > > > > > doc. > > > > > > > > > > This is odd: I fell over this because there was no gir created. > > > > > Did > > > > > not notice it was few lines below. Need to check that - maybe I > > > > > am a > > > > > bit off-sync to master or something is wrong elsewhere. > > > > > > > > > > Will sync to master and send V2 then. > > > > > > > > > Finally had time to look into again. In the recipe there is > > > > > > > > GI_DATA_ENABLED_armv7a = "False" > > > > GI_DATA_ENABLED_armv7ve = "False" > > > > > > > > => My patch is wrong it overrides above accidentally - thanks > > > > Alex! > > > > > > > > Since webkit builds gir fine (my machine is armv7ve) that does > > > > not > > > > seem necessary any more. I would like to send out a patch > > > > removing at > > > > least armv7ve - shall I take the risk to remove armv7a - maybe as > > > > two > > > > patches? > > > > These two should be equivalent for all practical purposes and so > > should be updated together. ie remove them both, one patch. > > it will run user mode qemu underneath, which is not same for both, are > you sure libraries and apps it will run are identical ? Binaries built for armv7ve will contain HW integer division instructions. Binaries build for armv7a will not. That should have no impact on gobject-introspection. There's a much bigger risk in letting these two build variants drift apart than there is from updating them together but only testing one. From raj.khem at gmail.com Thu Feb 20 22:24:04 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 14:24:04 -0800 Subject: [OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection In-Reply-To: References: <20200220002849.9126-1-schnitzeltony@gmail.com> <7dd9779b1be7e10a54b3b1bff4788cae931cb02a.camel@gmail.com> Message-ID: <1cecdefa2345a98c110a8ade1b5085b0e20bf8f2.camel@gmail.com> On Thu, 2020-02-20 at 14:11 -0800, Andre McCurdy wrote: > On Thu, Feb 20, 2020 at 2:06 PM Khem Raj wrote: > > On Thu, 2020-02-20 at 14:00 -0800, Andre McCurdy wrote: > > > On Thu, Feb 20, 2020 at 12:33 PM Khem Raj > > > wrote: > > > > On Thu, Feb 20, 2020 at 12:24 PM Andreas M?ller < > > > > schnitzeltony at gmail.com> wrote: > > > > > On Thu, Feb 20, 2020 at 1:45 PM Andreas M?ller < > > > > > schnitzeltony at gmail.com> wrote: > > > > > > On Thu, Feb 20, 2020 at 11:07 AM Alexander Kanavin > > > > > > wrote: > > > > > > > You need to at the same time drop the introspection > > > > > > > enablement logic from EXTRA_OECMAKE I think? > > > > > > > This line: > > > > > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70 > > > > > > > > > > > > > > And for consistency, it would be good to do the same for > > > > > > > gtk- > > > > > > > doc. > > > > > > > > > > > > This is odd: I fell over this because there was no gir > > > > > > created. > > > > > > Did > > > > > > not notice it was few lines below. Need to check that - > > > > > > maybe I > > > > > > am a > > > > > > bit off-sync to master or something is wrong elsewhere. > > > > > > > > > > > > Will sync to master and send V2 then. > > > > > > > > > > > Finally had time to look into again. In the recipe there is > > > > > > > > > > GI_DATA_ENABLED_armv7a = "False" > > > > > GI_DATA_ENABLED_armv7ve = "False" > > > > > > > > > > => My patch is wrong it overrides above accidentally - thanks > > > > > Alex! > > > > > > > > > > Since webkit builds gir fine (my machine is armv7ve) that > > > > > does > > > > > not > > > > > seem necessary any more. I would like to send out a patch > > > > > removing at > > > > > least armv7ve - shall I take the risk to remove armv7a - > > > > > maybe as > > > > > two > > > > > patches? > > > > > > These two should be equivalent for all practical purposes and so > > > should be updated together. ie remove them both, one patch. > > > > it will run user mode qemu underneath, which is not same for both, > > are > > you sure libraries and apps it will run are identical ? > > Binaries built for armv7ve will contain HW integer division > instructions. Binaries build for armv7a will not. > > That should have no impact on gobject-introspection. if it executes correctly. The reason why this was done in first place is that introspection app inside qemu either segfaulted or got hung. > > There's a much bigger risk in letting these two build variants drift > apart than there is from updating them together but only testing one. qemu has failed in mysterious ways with slight differences in ISAs Not oppposed to doing it, All I am asking for is to try it before making the change. From jpewhacker at gmail.com Thu Feb 20 22:49:31 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 20 Feb 2020 16:49:31 -0600 Subject: [OE-core] [PATCH] wayland: Fix strndup detection on MinGW Message-ID: <20200220224931.6390-1-JPEWhacker@gmail.com> Applies a patch to fix strndup being detected as present incorrectly when building for MinGW. Signed-off-by: Joshua Watt --- ...build-Fix-strndup-detection-on-MinGW.patch | 39 +++++++++++++++++++ .../wayland/wayland_1.18.0.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch diff --git a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch new file mode 100644 index 0000000000..e445838750 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch @@ -0,0 +1,39 @@ +From e6783c99f051c6d8252db5f388d805cef0e16357 Mon Sep 17 00:00:00 2001 +From: Joshua Watt +Date: Thu, 20 Feb 2020 15:20:45 -0600 +Subject: [PATCH] build: Fix strndup detection on MinGW + +GCC and meson conspire together to incorrectly detect that strndup() +exists on MinGW as __builtin_strndup, when no such function exists. As a +work around, meson will skip looking for __builtin functions if an +'#include' is in the prefix, so add '#include ' when looking +for strndup(). + +See: https://github.com/mesonbuild/meson/issues/3672 + +Signed-off-by: Joshua Watt +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 26b084f..c05d019 100644 +--- a/meson.build ++++ b/meson.build +@@ -36,11 +36,11 @@ have_funcs = [ + 'posix_fallocate', + 'prctl', + 'memfd_create', +- 'strndup', + ] + foreach f: have_funcs + config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) + endforeach ++config_h.set('HAVE_STRNDUP', cc.has_function('strndup', prefix:'#include ')) + + if get_option('libraries') + ffi_dep = dependency('libffi') +-- +2.17.1 + diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index a702b3f6cc..6a6e7495b5 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -15,6 +15,7 @@ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ + file://0001-build-Fix-strndup-detection-on-MinGW.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" -- 2.17.1 From jpewhacker at gmail.com Thu Feb 20 22:50:49 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 20 Feb 2020 16:50:49 -0600 Subject: [OE-core] [PATCH] classes/meson.bbclass: Explicitly mark functions as missing in MinGW In-Reply-To: References: <20200220185150.23422-1-JPEWhacker@gmail.com> Message-ID: On Thu, Feb 20, 2020 at 2:44 PM Joshua Watt wrote: > > > > On Thu, Feb 20, 2020, 1:30 PM Khem Raj wrote: >> >> >> >> On 2/20/20 10:51 AM, Joshua Watt wrote: >> > meson (with some help from GCC) misdetects certain builtin functions as >> > being present on MinGW, when in fact they are not. Fix it by explicitly >> > marking the functions as missing. This requires rearranging the >> > meson.cross file to put the [properties] section at the end so the >> > append works properly (meson can't handle duplicate sections). >> > >> >> patch is fine workaround, but I think meson should look for strndup in >> string.h > > > Agreed. I think the upstream fix would be better, and I will look at that also. Fixed in http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293233.html if that is preferable. > >> >> > Signed-off-by: Joshua Watt >> > --- >> > meta/classes/meson.bbclass | 25 +++++++++++++++++-------- >> > 1 file changed, 17 insertions(+), 8 deletions(-) >> > >> > diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass >> > index 06034e8b47..5c74658d01 100644 >> > --- a/meta/classes/meson.bbclass >> > +++ b/meta/classes/meson.bbclass >> > @@ -96,14 +96,6 @@ readelf = ${@meson_array('READELF', d)} >> > pkgconfig = 'pkg-config' >> > llvm-config = 'llvm-config${LLVMVERSION}' >> > >> > -[properties] >> > -needs_exe_wrapper = true >> > -c_args = ${@meson_array('CFLAGS', d)} >> > -c_link_args = ${@meson_array('LDFLAGS', d)} >> > -cpp_args = ${@meson_array('CXXFLAGS', d)} >> > -cpp_link_args = ${@meson_array('LDFLAGS', d)} >> > -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' >> > - >> > [host_machine] >> > system = '${@meson_operating_system('HOST_OS', d)}' >> > cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}' >> > @@ -115,6 +107,23 @@ system = '${@meson_operating_system('TARGET_OS', d)}' >> > cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}' >> > cpu = '${TARGET_ARCH}' >> > endian = '${@meson_endian('TARGET', d)}' >> > + >> > +[properties] >> > +needs_exe_wrapper = true >> > +c_args = ${@meson_array('CFLAGS', d)} >> > +c_link_args = ${@meson_array('LDFLAGS', d)} >> > +cpp_args = ${@meson_array('CXXFLAGS', d)} >> > +cpp_link_args = ${@meson_array('LDFLAGS', d)} >> > +gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' >> > +EOF >> > +} >> > + >> > +do_write_config_append_mingw32() { >> > + # meson mis-detects the presence of several builtin functions in MinGW >> > + # (see https://github.com/mesonbuild/meson/issues/3672). >> > + # Explicitly mark these functions as missing in the cross file >> > + cat >>${WORKDIR}/meson.cross <> > +has_function_strndup = false >> > EOF >> > } >> > >> > >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Thu Feb 20 22:59:15 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 20 Feb 2020 14:59:15 -0800 Subject: [OE-core] [PATCH] classes/meson.bbclass: Explicitly mark functions as missing in MinGW In-Reply-To: References: <20200220185150.23422-1-JPEWhacker@gmail.com> Message-ID: On Thu, 2020-02-20 at 16:50 -0600, Joshua Watt wrote: > On Thu, Feb 20, 2020 at 2:44 PM Joshua Watt > wrote: > > > > > > On Thu, Feb 20, 2020, 1:30 PM Khem Raj wrote: > > > > > > > > > On 2/20/20 10:51 AM, Joshua Watt wrote: > > > > meson (with some help from GCC) misdetects certain builtin > > > > functions as > > > > being present on MinGW, when in fact they are not. Fix it by > > > > explicitly > > > > marking the functions as missing. This requires rearranging the > > > > meson.cross file to put the [properties] section at the end so > > > > the > > > > append works properly (meson can't handle duplicate sections). > > > > > > > > > > patch is fine workaround, but I think meson should look for > > > strndup in > > > string.h > > > > Agreed. I think the upstream fix would be better, and I will look > > at that also. > > Fixed in > http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293233.html > if that is preferable. sounds good. Thanks for taking time to fix it > > > > > Signed-off-by: Joshua Watt > > > > --- > > > > meta/classes/meson.bbclass | 25 +++++++++++++++++-------- > > > > 1 file changed, 17 insertions(+), 8 deletions(-) > > > > > > > > diff --git a/meta/classes/meson.bbclass > > > > b/meta/classes/meson.bbclass > > > > index 06034e8b47..5c74658d01 100644 > > > > --- a/meta/classes/meson.bbclass > > > > +++ b/meta/classes/meson.bbclass > > > > @@ -96,14 +96,6 @@ readelf = ${@meson_array('READELF', d)} > > > > pkgconfig = 'pkg-config' > > > > llvm-config = 'llvm-config${LLVMVERSION}' > > > > > > > > -[properties] > > > > -needs_exe_wrapper = true > > > > -c_args = ${@meson_array('CFLAGS', d)} > > > > -c_link_args = ${@meson_array('LDFLAGS', d)} > > > > -cpp_args = ${@meson_array('CXXFLAGS', d)} > > > > -cpp_link_args = ${@meson_array('LDFLAGS', d)} > > > > -gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' > > > > - > > > > [host_machine] > > > > system = '${@meson_operating_system('HOST_OS', d)}' > > > > cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}' > > > > @@ -115,6 +107,23 @@ system = '${@meson_operating_system('TARGE > > > > T_OS', d)}' > > > > cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}' > > > > cpu = '${TARGET_ARCH}' > > > > endian = '${@meson_endian('TARGET', d)}' > > > > + > > > > +[properties] > > > > +needs_exe_wrapper = true > > > > +c_args = ${@meson_array('CFLAGS', d)} > > > > +c_link_args = ${@meson_array('LDFLAGS', d)} > > > > +cpp_args = ${@meson_array('CXXFLAGS', d)} > > > > +cpp_link_args = ${@meson_array('LDFLAGS', d)} > > > > +gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper' > > > > +EOF > > > > +} > > > > + > > > > +do_write_config_append_mingw32() { > > > > + # meson mis-detects the presence of several builtin > > > > functions in MinGW > > > > + # (see https://github.com/mesonbuild/meson/issues/3672). > > > > + # Explicitly mark these functions as missing in the cross > > > > file > > > > + cat >>${WORKDIR}/meson.cross < > > > +has_function_strndup = false > > > > EOF > > > > } > > > > > > > > > > > -- > > > _______________________________________________ > > > Openembedded-core mailing list > > > Openembedded-core at lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core From patchwork at patchwork.openembedded.org Thu Feb 20 23:01:49 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Thu, 20 Feb 2020 23:01:49 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_wayland=3A?= =?utf-8?q?_Fix_strndup_detection_on_MinGW?= In-Reply-To: <20200220224931.6390-1-JPEWhacker@gmail.com> References: <20200220224931.6390-1-JPEWhacker@gmail.com> Message-ID: <20200220230149.2276.39158@do> == Series Details == Series: wayland: Fix strndup detection on MinGW Revision: 1 URL : https://patchwork.openembedded.org/series/22806/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 10c2216cb6) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From schnitzeltony at gmail.com Thu Feb 20 23:48:28 2020 From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=) Date: Fri, 21 Feb 2020 00:48:28 +0100 Subject: [OE-core] [PATCH 1/2][master-next] webkitgtk: fix reconfigure Message-ID: <20200220234829.12306-1-schnitzeltony@gmail.com> | ln: failed to create symbolic link '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/webkitgtk/2.26.4-r0/recipe-sysroot-native/usr/bin/python': File exists Signed-off-by: Andreas M?ller --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 585723772e..fa109446d1 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -61,7 +61,9 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" # webkitgtk is full of /usr/bin/env python, particular for generating docs do_configure[postfuncs] += "setup_python_link" setup_python_link() { - ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then + ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python + fi } EXTRA_OECMAKE = " \ -- 2.21.0 From schnitzeltony at gmail.com Thu Feb 20 23:48:29 2020 From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=) Date: Fri, 21 Feb 2020 00:48:29 +0100 Subject: [OE-core] [PATCH 2/2][master-next] webkitgtk: enable gobject-introspection for armv7ve - it builds without issues In-Reply-To: <20200220234829.12306-1-schnitzeltony@gmail.com> References: <20200220234829.12306-1-schnitzeltony@gmail.com> Message-ID: <20200220234829.12306-2-schnitzeltony@gmail.com> Maybe armv7a can be re-enabled either but due to limited resources there is no chance for me to test. Signed-off-by: Andreas M?ller --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index fa109446d1..a1dba73c51 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -127,7 +127,6 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb" # qemu: uncaught target signal 11 (Segmentation fault) - core dumped # Segmentation fault GI_DATA_ENABLED_armv7a = "False" -GI_DATA_ENABLED_armv7ve = "False" # Can't be built with ccache CCACHE_DISABLE = "1" -- 2.21.0 From anuj.mittal at intel.com Fri Feb 21 02:01:16 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:16 +0800 Subject: [OE-core] [PATCH 01/13] bluez5: upgrade 5.52 -> 5.53 Message-ID: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- meta/recipes-connectivity/bluez5/{bluez5_5.52.bb => bluez5_5.53.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/bluez5/{bluez5_5.52.bb => bluez5_5.53.bb} (91%) diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.52.bb b/meta/recipes-connectivity/bluez5/bluez5_5.53.bb similarity index 91% rename from meta/recipes-connectivity/bluez5/bluez5_5.52.bb rename to meta/recipes-connectivity/bluez5/bluez5_5.53.bb index b861030..055e76b 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.52.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.53.bb @@ -1,7 +1,7 @@ require bluez5.inc -SRC_URI[md5sum] = "a33eb9aadf1dd4153420958709d3ce60" -SRC_URI[sha256sum] = "f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a" +SRC_URI[md5sum] = "85b14abb138948f50b1650aa866cb019" +SRC_URI[sha256sum] = "38aa2da8302fefad53116bb281a11968732a42eeb19c5fb3668342f39b7938bc" # noinst programs in Makefile.tools that are conditional on READLINE # support -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:17 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:17 +0800 Subject: [OE-core] [PATCH 02/13] gstreamer1.0: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-2-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../gstreamer/{gstreamer1.0_1.16.1.bb => gstreamer1.0_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.16.1.bb => gstreamer1.0_1.16.2.bb} (95%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb similarity index 95% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb index d2beafd..50a872e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb @@ -23,8 +23,8 @@ SRC_URI = " \ file://0004-meson-Add-option-for-installed-tests.patch \ file://capfix.patch \ " -SRC_URI[md5sum] = "c505fb818b36988daaa846e9e63eabe8" -SRC_URI[sha256sum] = "02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" +SRC_URI[md5sum] = "0e661ed5bdf1d8996e430228d022628e" +SRC_URI[sha256sum] = "e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:18 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:18 +0800 Subject: [OE-core] [PATCH 03/13] gstreamer1.0-plugins-base: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-3-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- ...1.0-plugins-base_1.16.1.bb => gstreamer1.0-plugins-base_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.16.1.bb => gstreamer1.0-plugins-base_1.16.2.bb} (96%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb similarity index 96% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb index cf12ceb..6563b6f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb @@ -13,8 +13,8 @@ SRC_URI = " \ file://0005-viv-fb-Make-sure-config.h-is-included.patch \ file://0009-glimagesink-Downrank-to-marginal.patch \ " -SRC_URI[md5sum] = "b5eb0651bab70bf1714f103bdd66ce47" -SRC_URI[sha256sum] = "5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b" +SRC_URI[md5sum] = "3fdb32823535799a748c1fc14f978e2c" +SRC_URI[sha256sum] = "b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a" S = "${WORKDIR}/gst-plugins-base-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:19 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:19 +0800 Subject: [OE-core] [PATCH 04/13] gstreamer1.0-plugins-good: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-4-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- ...1.0-plugins-good_1.16.1.bb => gstreamer1.0-plugins-good_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.16.1.bb => gstreamer1.0-plugins-good_1.16.2.bb} (96%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb similarity index 96% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index a6eb998..1b4db19 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -4,8 +4,8 @@ SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ " -SRC_URI[md5sum] = "515987ee763256840a11bd8ea098f2bf" -SRC_URI[sha256sum] = "9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f" +SRC_URI[md5sum] = "bd025f8f14974f94b75ac69a9d1b9c93" +SRC_URI[sha256sum] = "40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319" S = "${WORKDIR}/gst-plugins-good-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:20 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:20 +0800 Subject: [OE-core] [PATCH 05/13] gstreamer1.0-plugins-bad: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-5-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- ...er1.0-plugins-bad_1.16.1.bb => gstreamer1.0-plugins-bad_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.16.1.bb => gstreamer1.0-plugins-bad_1.16.2.bb} (98%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb similarity index 98% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb index 024277e..7a227fe 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb @@ -8,8 +8,8 @@ SRC_URI = " \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[md5sum] = "24d4d30ecc67d5cbc77c0475bcea1210" -SRC_URI[sha256sum] = "56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" +SRC_URI[md5sum] = "ccc7404230afddec723bbdb63c89feec" +SRC_URI[sha256sum] = "f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74" S = "${WORKDIR}/gst-plugins-bad-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:21 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:21 +0800 Subject: [OE-core] [PATCH 06/13] gstreamer1.0-plugins-ugly: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-6-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- ...1.0-plugins-ugly_1.16.1.bb => gstreamer1.0-plugins-ugly_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.16.1.bb => gstreamer1.0-plugins-ugly_1.16.2.bb} (90%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb index 30961d0..be10800 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.2.bb @@ -9,8 +9,8 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[md5sum] = "668795903cb4971fba9aa89abdea8369" -SRC_URI[sha256sum] = "4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d" +SRC_URI[md5sum] = "10283ff5ef1e34d462dde77042e329bd" +SRC_URI[sha256sum] = "5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca" S = "${WORKDIR}/gst-plugins-ugly-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:22 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:22 +0800 Subject: [OE-core] [PATCH 07/13] gstreamer1.0-libav: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-7-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../{gstreamer1.0-libav_1.16.1.bb => gstreamer1.0-libav_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.16.1.bb => gstreamer1.0-libav_1.16.2.bb} (90%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb similarity index 90% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb index c1bd6b1..2fdefc9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.2.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ " -SRC_URI[md5sum] = "58023f4c71bbd711061e350fcd76c09d" -SRC_URI[sha256sum] = "e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4" +SRC_URI[md5sum] = "eacebd0136ede3a9bd3672eeb338806b" +SRC_URI[sha256sum] = "c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2" S = "${WORKDIR}/gst-libav-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:23 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:23 +0800 Subject: [OE-core] [PATCH 08/13] gstreamer1.0-omx: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-8-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../{gstreamer1.0-omx_1.16.1.bb => gstreamer1.0-omx_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.16.1.bb => gstreamer1.0-omx_1.16.2.bb} (92%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb similarity index 92% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb index dfe4b69..f1bdbd2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI[md5sum] = "89772e7a277fd0abfc250eaf8e4e9ce9" -SRC_URI[sha256sum] = "cbf54121a2cba575d460833e8132265781252ce32cf5b8f9fa8753e42ab24bb2" +SRC_URI[md5sum] = "6362786d2b6cce34de08c86b7847f782" +SRC_URI[sha256sum] = "11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439" S = "${WORKDIR}/gst-omx-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:24 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:24 +0800 Subject: [OE-core] [PATCH 09/13] gstreamer1.0-python: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-9-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../{gstreamer1.0-python_1.16.1.bb => gstreamer1.0-python_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.16.1.bb => gstreamer1.0-python_1.16.2.bb} (88%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb similarity index 88% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb index 0382360..9e024eb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.2.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \ file://0001-meson.build-fix-builds-with-python-3.8.patch \ " -SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b" -SRC_URI[sha256sum] = "b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489" +SRC_URI[md5sum] = "6ac709767334d8d0a71cb4e016f6abeb" +SRC_URI[sha256sum] = "208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8" DEPENDS = "gstreamer1.0 python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:25 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:25 +0800 Subject: [OE-core] [PATCH 10/13] gstreamer1.0-rtsp-server: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-10-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- ...er1.0-rtsp-server_1.16.1.bb => gstreamer1.0-rtsp-server_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.16.1.bb => gstreamer1.0-rtsp-server_1.16.2.bb} (86%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb similarity index 86% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb index deac5a9..02c3c83 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb @@ -12,8 +12,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.x file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ " -SRC_URI[md5sum] = "380d6a42e856c32fcefa508ad57129e0" -SRC_URI[sha256sum] = "b0abacad2f86f60d63781d2b24443c5668733e8b08664bbef94124906d700144" +SRC_URI[md5sum] = "8a998725820c771ba45be6e18bfdf73a" +SRC_URI[sha256sum] = "de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e" S = "${WORKDIR}/${PNREAL}-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:26 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:26 +0800 Subject: [OE-core] [PATCH 11/13] gstreamer1.0-vaapi: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-11-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../{gstreamer1.0-vaapi_1.16.1.bb => gstreamer1.0-vaapi_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.16.1.bb => gstreamer1.0-vaapi_1.16.2.bb} (93%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb similarity index 93% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb index a78807c..1bedf25 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.2.bb @@ -12,8 +12,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.x file://0001-vaapsink-downgrade-to-marginal.patch \ " -SRC_URI[md5sum] = "15b08f76777359d87b0b4a561db05f1f" -SRC_URI[sha256sum] = "cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5abb7603a" +SRC_URI[md5sum] = "13f7cb6a64bde24e67f563377487dcce" +SRC_URI[sha256sum] = "191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:27 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:27 +0800 Subject: [OE-core] [PATCH 12/13] screen: upgrade 4.7.0 -> 4.8.0 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-12-git-send-email-anuj.mittal@intel.com> License-Update: Change http to https in license text. Signed-off-by: Anuj Mittal --- meta/recipes-extended/screen/{screen_4.7.0.bb => screen_4.8.0.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename meta/recipes-extended/screen/{screen_4.7.0.bb => screen_4.8.0.bb} (87%) diff --git a/meta/recipes-extended/screen/screen_4.7.0.bb b/meta/recipes-extended/screen/screen_4.8.0.bb similarity index 87% rename from meta/recipes-extended/screen/screen_4.7.0.bb rename to meta/recipes-extended/screen/screen_4.8.0.bb index 67aa5f1..4772eb6 100644 --- a/meta/recipes-extended/screen/screen_4.7.0.bb +++ b/meta/recipes-extended/screen/screen_4.8.0.bb @@ -9,7 +9,8 @@ SECTION = "console/utils" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://screen.h;endline=26;md5=3971142989289a8198a544220703c2bf" + file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \ + " DEPENDS = "ncurses virtual/crypt \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -22,8 +23,8 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0001-Remove-more-compatibility-stuff.patch \ " -SRC_URI[md5sum] = "b8971ebd68d046f2814d1040cb8e6641" -SRC_URI[sha256sum] = "da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1" +SRC_URI[md5sum] = "d276213d3acd10339cd37848b8c4ab1e" +SRC_URI[sha256sum] = "6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1" inherit autotools texinfo -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:01:28 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:01:28 +0800 Subject: [OE-core] [PATCH 13/13] stress-ng: upgrade 0.10.16 -> 0.11.00 In-Reply-To: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> References: <1582250488-79398-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582250488-79398-13-git-send-email-anuj.mittal@intel.com> Signed-off-by: Anuj Mittal --- .../stress-ng/{stress-ng_0.10.16.bb => stress-ng_0.11.00.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/stress-ng/{stress-ng_0.10.16.bb => stress-ng_0.11.00.bb} (83%) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb similarity index 83% rename from meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb index e67b82a..c8471eb 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.10.16.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ " -SRC_URI[md5sum] = "a337cd5b1412c53c580e95ee2a9fc77b" -SRC_URI[sha256sum] = "eabfffcffcf53e67765181280456c204ad00214339cfdb3ee2769d58b4a7e304" +SRC_URI[md5sum] = "781f8a0f8509a01793d815210086e78a" +SRC_URI[sha256sum] = "a41a6a4a7ea4e50aab7331e5594af7d1b3b6e5815751d137a78a6e166295294e" DEPENDS = "coreutils-native" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:41:57 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:41:57 +0800 Subject: [OE-core] [PATCH v3 1/2] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON Message-ID: <1582252918-89191-1-git-send-email-anuj.mittal@intel.com> Use the correct variable so options actually get used and use the correct qt option name to prevent errors. Signed-off-by: Anuj Mittal --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index 1b4db19..f3e0cee 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -55,7 +55,7 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" # This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig # in a gstreamer1.0-plugins-good bbappend). -EXTRA_OECONF += " \ +EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ -Ddv=disabled \ @@ -64,7 +64,7 @@ EXTRA_OECONF += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ - -Dqt=disabled \ + -Dqt5=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- 2.7.4 From anuj.mittal at intel.com Fri Feb 21 02:41:58 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 10:41:58 +0800 Subject: [OE-core] [PATCH 2/2] gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG In-Reply-To: <1582252918-89191-1-git-send-email-anuj.mittal@intel.com> References: <1582252918-89191-1-git-send-email-anuj.mittal@intel.com> Message-ID: <1582252918-89191-2-git-send-email-anuj.mittal@intel.com> Instead of disabling unconditionally, add PACKAGECONFIG for qt5. Imported from meta-qt5 layer. Signed-off-by: Anuj Mittal --- .../gstreamer/gstreamer1.0-plugins-good_1.16.2.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb index f3e0cee..8b34111 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb @@ -42,6 +42,7 @@ PACKAGECONFIG[libpng] = "-Dpng=enabled,-Dpng=disabled,libpng" PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils" PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" +PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native" PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4" PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" @@ -50,11 +51,6 @@ PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx" PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" -# qt5 support is disabled, because it is not present in OE core, and requires more work than -# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). -# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig -# in a gstreamer1.0-plugins-good bbappend). - EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ @@ -64,7 +60,6 @@ EXTRA_OEMESON += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ - -Dqt5=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- 2.7.4 From akuster808 at gmail.com Fri Feb 21 02:53:19 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:19 -0800 Subject: [OE-core] [warrior 00/14] Merge request Message-ID: Please merge these into warrior. The following changes since commit a63d59f64a2d1f450a7639426cae8e0373a2d764: sanity.bbclass: Move sanity_info from conf to cache (2020-01-25 08:37:48 -0800) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib stable/warrior-next http://cgit.openembedded.org//log/?h=stable/warrior-next Anuj Mittal (1): cpio: fix CVE-2019-14866 Armin Kuster (2): python2: add ntpath timezone: update to 2019b Bruce Ashfield (4): linux-yocto/4.19: update to v4.19.72 linux-yocto/4.19: update to v4.19.78 linux-yocto/4.19: update to v4.19.84 linux-yocto/4.19: update to v4.19.87 Lee Chee Yang (1): rsync: whitelist CVE-2017-16548 Oleksandr Kravchuk (2): linux-firmware: bump to 20190618 linux-firmware: add PE back Otavio Salvador (1): linux-firmware: Upgrade 20190618 -> 20190815 Rahul Chauhan (1): libxml2: Fix CVE-2019-19956 Samuli Piippo (1): linux-firmware: update packaging for brcm files Zang Ruochen (1): timezone:upgrade 2019b -> 2019c .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 +++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + .../python/python/python2-manifest.json | 1 + meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 + .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + meta/recipes-extended/timezone/timezone.inc | 10 +- ...ware_git.bb => linux-firmware_20190815.bb} | 26 +- .../linux/linux-yocto-rt_4.19.bb | 6 +- .../linux/linux-yocto-tiny_4.19.bb | 8 +- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +- 11 files changed, 397 insertions(+), 33 deletions(-) create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch rename meta/recipes-kernel/linux-firmware/{linux-firmware_git.bb => linux-firmware_20190815.bb} (98%) -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:20 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:20 -0800 Subject: [OE-core] [warrior 01/14] libxml2: Fix CVE-2019-19956 In-Reply-To: References: Message-ID: <2be6ab4249c4f49c9ffcd9bb8fea964c8c5d449c.1582253544.git.akuster808@gmail.com> From: Rahul Chauhan Signed-off-by: Rahul Chauhan Signed-off-by: Armin Kuster --- .../libxml/libxml2/fix-CVE-2019-19956.patch | 38 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch new file mode 100644 index 0000000000..43c3589d2c --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2019-19956.patch @@ -0,0 +1,38 @@ +From 3cd2b25ddb04740be2880cfd78d60038452228b1 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Wed, 7 Aug 2019 17:39:17 +0800 +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover + +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to +NULL and free newDoc will cause a memory leak. + +Found with libFuzzer. + +Closes #82. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549] +CVE: CVE-2019-19956 + +Signed-off-by: Rahul Chauhan +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index b7ecd65..491f5c9 100644 +--- a/parser.c ++++ b/parser.c +@@ -13899,7 +13899,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, + xmlFreeParserCtxt(ctxt); + newDoc->intSubset = NULL; + newDoc->extSubset = NULL; +- newDoc->oldNs = NULL; ++ if(doc != NULL) ++ newDoc->oldNs = NULL; + xmlFreeDoc(newDoc); + + return(ret); +-- +2.7.4 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 62643bc764..67c2d4fafb 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb @@ -23,6 +23,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-CVE-2017-8872.patch \ file://fix-CVE-2018-14404.patch \ file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ + file://fix-CVE-2019-19956.patch \ " SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:21 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:21 -0800 Subject: [OE-core] [warrior 02/14] rsync: whitelist CVE-2017-16548 In-Reply-To: References: Message-ID: <0a88a86d92b294175c14c7c5a2533d4e418fec6a.1582253544.git.akuster808@gmail.com> From: Lee Chee Yang patch for this CVE applies to v3.1.3pre1 not for v3.1.3. patch already in v3.1.3. see https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce (From OE-Core rev: 1e2739c821312527010fb0afbde5a20cd3f03d24) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie (cherry picked from commit 842bd7ca21efc6378ba24a8d0bf065c4d0f54f1d) Signed-off-by: Armin Kuster --- meta/recipes-devtools/rsync/rsync_3.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb index ffb1d061c0..152ff02a25 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb @@ -20,6 +20,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +# -16548 required for v3.1.3pre1. Already in v3.1.3. +CVE_CHECK_WHITELIST += " CVE-2017-16548 " + inherit autotools PACKAGECONFIG ??= "acl attr \ -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:22 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:22 -0800 Subject: [OE-core] [warrior 03/14] cpio: fix CVE-2019-14866 In-Reply-To: References: Message-ID: From: Anuj Mittal Signed-off-by: Anuj Mittal (cherry picked from commit 3a9872c664cdc5c5a6ac712142ce1d28d6fcd6d1) Signed-off-by: Armin Kuster --- .../cpio/cpio-2.12/CVE-2019-14866.patch | 316 ++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.12.bb | 1 + 2 files changed, 317 insertions(+) create mode 100644 meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch diff --git a/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch new file mode 100644 index 0000000000..5d587fc832 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.12/CVE-2019-14866.patch @@ -0,0 +1,316 @@ +CVE: CVE-2019-14866 +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=7554e3e42cd72f6f8304410c47fe6f8918e9bfd7] +Signed-off-by: Anuj Mittal + +From a052401293e45a13cded5959b258204dae6d0af5 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sun, 3 Nov 2019 23:59:39 +0200 +Subject: [PATCH] Fix CVE-2019-14866 + +* src/copyout.c (to_ascii): Additional argument nul controls whether +to add the terminating nul character. +(field_width_error): Improve diagnostics: print the actual and the +maximum allowed field value. +* src/extern.h (to_ascii, field_width_error): New prototypes. +* src/tar.c (to_oct): Remove. +(to_oct_or_error): New function. +(TO_OCT): New macro. +(write_out_tar_header): Use TO_OCT and to_ascii. Return 0 on +success, 1 on error. +--- + src/copyout.c | 49 ++++++++++++++++++++++-------------- + src/extern.h | 15 +++++++++-- + src/tar.c | 69 ++++++++++++++++++++++++--------------------------- + 3 files changed, 75 insertions(+), 58 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 1f0987a..1ae5477 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -269,26 +269,32 @@ writeout_final_defers (int out_des) + so it should be moved to paxutils too. + Allowed values for logbase are: 1 (binary), 2, 3 (octal), 4 (hex) */ + int +-to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase) ++to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, bool nul) + { + static char codetab[] = "0123456789ABCDEF"; +- int i = digits; +- +- do ++ ++ if (nul) ++ where[--digits] = 0; ++ while (digits > 0) + { +- where[--i] = codetab[(v & ((1 << logbase) - 1))]; ++ where[--digits] = codetab[(v & ((1 << logbase) - 1))]; + v >>= logbase; + } +- while (i); + + return v != 0; + } + +-static void +-field_width_error (const char *filename, const char *fieldname) ++void ++field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul) + { +- error (0, 0, _("%s: field width not sufficient for storing %s"), +- filename, fieldname); ++ char valbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%s"), ++ filename, fieldname, ++ STRINGIFY_BIGINT (value, valbuf), ++ STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8), ++ maxbuf)); + } + + static void +@@ -303,7 +309,7 @@ to_ascii_or_warn (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + field_width_warning (filename, fieldname); + } + +@@ -312,9 +318,9 @@ to_ascii_or_error (char *where, uintmax_t n, size_t digits, + unsigned logbase, + const char *filename, const char *fieldname) + { +- if (to_ascii (where, n, digits, logbase)) ++ if (to_ascii (where, n, digits, logbase, false)) + { +- field_width_error (filename, fieldname); ++ field_width_error (filename, fieldname, n, digits, false); + return 1; + } + return 0; +@@ -371,7 +377,7 @@ write_out_new_ascii_header (const char *magic_string, + _("name size"))) + return 1; + p += 8; +- to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16); ++ to_ascii (p, file_hdr->c_chksum & 0xffffffff, 8, LG_16, false); + + tape_buffered_write (ascii_header, out_des, sizeof ascii_header); + +@@ -388,7 +394,7 @@ write_out_old_ascii_header (dev_t dev, dev_t rdev, + char ascii_header[76]; + char *p = ascii_header; + +- to_ascii (p, file_hdr->c_magic, 6, LG_8); ++ to_ascii (p, file_hdr->c_magic, 6, LG_8, false); + p += 6; + to_ascii_or_warn (p, dev, 6, LG_8, file_hdr->c_name, _("device number")); + p += 6; +@@ -492,7 +498,10 @@ write_out_binary_header (dev_t rdev, + short_hdr.c_namesize = file_hdr->c_namesize & 0xFFFF; + if (short_hdr.c_namesize != file_hdr->c_namesize) + { +- field_width_error (file_hdr->c_name, _("name size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%u"), ++ file_hdr->c_name, _("name size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFu); + return 1; + } + +@@ -502,7 +511,10 @@ write_out_binary_header (dev_t rdev, + if (((off_t)short_hdr.c_filesizes[0] << 16) + short_hdr.c_filesizes[1] + != file_hdr->c_filesize) + { +- field_width_error (file_hdr->c_name, _("file size")); ++ char maxbuf[UINTMAX_STRSIZE_BOUND + 1]; ++ error (0, 0, _("%s: value %s %s out of allowed range 0..%lu"), ++ file_hdr->c_name, _("file size"), ++ STRINGIFY_BIGINT (file_hdr->c_namesize, maxbuf), 0xFFFFFFFFlu); + return 1; + } + +@@ -552,8 +564,7 @@ write_out_header (struct cpio_file_stat *file_hdr, int out_des) + error (0, 0, _("%s: file name too long"), file_hdr->c_name); + return 1; + } +- write_out_tar_header (file_hdr, out_des); /* FIXME: No error checking */ +- return 0; ++ return write_out_tar_header (file_hdr, out_des); + + case arf_binary: + return write_out_binary_header (makedev (file_hdr->c_rdev_maj, +diff --git a/src/extern.h b/src/extern.h +index e27d662..f9ef56a 100644 +--- a/src/extern.h ++++ b/src/extern.h +@@ -117,6 +117,10 @@ void print_name_with_quoting (char *p); + /* copyout.c */ + int write_out_header (struct cpio_file_stat *file_hdr, int out_des); + void process_copy_out (void); ++int to_ascii (char *where, uintmax_t v, size_t digits, unsigned logbase, ++ bool nul); ++void field_width_error (const char *filename, const char *fieldname, ++ uintmax_t value, size_t width, bool nul); + + /* copypass.c */ + void process_copy_pass (void); +@@ -145,7 +149,7 @@ int make_path (char *argpath, uid_t owner, gid_t group, + const char *verbose_fmt_string); + + /* tar.c */ +-void write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); ++int write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); + int null_block (long *block, int size); + void read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des); + int otoa (char *s, unsigned long *n); +@@ -204,9 +208,16 @@ void cpio_safer_name_suffix (char *name, bool link_target, + int cpio_create_dir (struct cpio_file_stat *file_hdr, int existing_dir); + void change_dir (void); + +-/* FIXME: These two defines should be defined in paxutils */ ++/* FIXME: The following three should be defined in paxutils */ + #define LG_8 3 + #define LG_16 4 ++/* The maximum uintmax_t value that can be represented with DIGITS digits, ++ assuming that each digit is BITS_PER_DIGIT wide. */ ++#define MAX_VAL_WITH_DIGITS(digits, bits_per_digit) \ ++ ((digits) * (bits_per_digit) < sizeof (uintmax_t) * CHAR_BIT \ ++ ? ((uintmax_t) 1 << ((digits) * (bits_per_digit))) - 1 \ ++ : (uintmax_t) -1) ++ + + uintmax_t from_ascii (char const *where, size_t digs, unsigned logbase); + +diff --git a/src/tar.c b/src/tar.c +index a2ce171..ef58027 100644 +--- a/src/tar.c ++++ b/src/tar.c +@@ -79,36 +79,17 @@ stash_tar_filename (char *prefix, char *filename) + return hold_tar_filename; + } + +-/* Convert a number into a string of octal digits. +- Convert long VALUE into a DIGITS-digit field at WHERE, +- including a trailing space and room for a NUL. DIGITS==3 means +- 1 digit, a space, and room for a NUL. +- +- We assume the trailing NUL is already there and don't fill it in. +- This fact is used by start_header and finish_header, so don't change it! +- +- This is be equivalent to: +- sprintf (where, "%*lo ", digits - 2, value); +- except that sprintf fills in the trailing NUL and we don't. */ +- +-static void +-to_oct (register long value, register int digits, register char *where) ++static int ++to_oct_or_error (uintmax_t value, size_t digits, char *where, char const *field, ++ char const *file) + { +- --digits; /* Leave the trailing NUL slot alone. */ +- +- /* Produce the digits -- at least one. */ +- do ++ if (to_ascii (where, value, digits, LG_8, true)) + { +- where[--digits] = '0' + (char) (value & 7); /* One octal digit. */ +- value >>= 3; ++ field_width_error (file, field, value, digits, true); ++ return 1; + } +- while (digits > 0 && value != 0); +- +- /* Add leading zeroes, if necessary. */ +- while (digits > 0) +- where[--digits] = '0'; ++ return 0; + } +- + + + /* Compute and return a checksum for TAR_HDR, +@@ -134,10 +115,22 @@ tar_checksum (struct tar_header *tar_hdr) + return sum; + } + ++#define TO_OCT(file_hdr, c_fld, digits, tar_hdr, tar_field) \ ++ do \ ++ { \ ++ if (to_oct_or_error (file_hdr -> c_fld, \ ++ digits, \ ++ tar_hdr -> tar_field, \ ++ #tar_field, \ ++ file_hdr->c_name)) \ ++ return 1; \ ++ } \ ++ while (0) ++ + /* Write out header FILE_HDR, including the file name, to file + descriptor OUT_DES. */ + +-void ++int + write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + { + int name_len; +@@ -166,11 +159,11 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + + /* Ustar standard (POSIX.1-1988) requires the mode to contain only 3 octal + digits */ +- to_oct (file_hdr->c_mode & MODE_ALL, 8, tar_hdr->mode); +- to_oct (file_hdr->c_uid, 8, tar_hdr->uid); +- to_oct (file_hdr->c_gid, 8, tar_hdr->gid); +- to_oct (file_hdr->c_filesize, 12, tar_hdr->size); +- to_oct (file_hdr->c_mtime, 12, tar_hdr->mtime); ++ TO_OCT (file_hdr, c_mode & MODE_ALL, 8, tar_hdr, mode); ++ TO_OCT (file_hdr, c_uid, 8, tar_hdr, uid); ++ TO_OCT (file_hdr, c_gid, 8, tar_hdr, gid); ++ TO_OCT (file_hdr, c_filesize, 12, tar_hdr, size); ++ TO_OCT (file_hdr, c_mtime, 12, tar_hdr, mtime); + + switch (file_hdr->c_mode & CP_IFMT) + { +@@ -182,7 +175,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); + tar_hdr->typeflag = LNKTYPE; +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + } + else + tar_hdr->typeflag = REGTYPE; +@@ -208,7 +201,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + than TARLINKNAMESIZE. */ + strncpy (tar_hdr->linkname, file_hdr->c_tar_linkname, + TARLINKNAMESIZE); +- to_oct (0, 12, tar_hdr->size); ++ to_ascii (tar_hdr->size, 0, 12, LG_8, true); + break; + #endif /* CP_IFLNK */ + } +@@ -227,13 +220,15 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des) + if (name) + strcpy (tar_hdr->gname, name); + +- to_oct (file_hdr->c_rdev_maj, 8, tar_hdr->devmajor); +- to_oct (file_hdr->c_rdev_min, 8, tar_hdr->devminor); ++ TO_OCT (file_hdr, c_rdev_maj, 8, tar_hdr, devmajor); ++ TO_OCT (file_hdr, c_rdev_min, 8, tar_hdr, devminor); + } + +- to_oct (tar_checksum (tar_hdr), 8, tar_hdr->chksum); ++ to_ascii (tar_hdr->chksum, tar_checksum (tar_hdr), 8, LG_8, true); + + tape_buffered_write ((char *) &tar_rec, out_des, TARRECORDSIZE); ++ ++ return 0; + } + + /* Return nonzero iff all the bytes in BLOCK are NUL. +-- +2.24.1 + diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb index 3713bf0b1f..5abe494ebc 100644 --- a/meta/recipes-extended/cpio/cpio_2.12.bb +++ b/meta/recipes-extended/cpio/cpio_2.12.bb @@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Fix-CVE-2015-1197.patch \ file://0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch \ file://0001-Fix-segfault-with-append.patch \ + file://CVE-2019-14866.patch \ " SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:23 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:23 -0800 Subject: [OE-core] [warrior 04/14] linux-yocto/4.19: update to v4.19.72 In-Reply-To: References: Message-ID: <71edff03db1a508ab9e1a919b5a5b90ee7316609.1582253544.git.akuster808@gmail.com> From: Bruce Ashfield Updating to the latest -korg -stable relase. A summary of the changes follows: ee809c7e0895 Linux 4.19.72 991467a47cf2 Revert "x86/apic: Include the LDR when clearing out APIC registers" 0f134f6e722c libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer 5049632bc958 x86/boot/compressed/64: Fix missing initialization in find_trampoline_placement() b8727dff55f0 KVM: arm/arm64: VGIC: Properly initialise private IRQ affinity 1a31b0d0ddfa afs: Fix leak in afs_lookup_cell_rcu() 111d36b6fb7e KVM: arm/arm64: Only skip MMIO insn once b84817d96e0f ceph: fix buffer free while holding i_ceph_lock in fill_inode() 5cd1e3552f0e ceph: fix buffer free while holding i_ceph_lock in __ceph_build_xattrs_blob() dfb8712c7acc ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr() ddb55cc39c70 selftests/kvm: make platform_info_test pass on AMD 6cb9f8d60f8f selftests: kvm: fix state save/load on processors without XSAVE 08c2052815e3 infiniband: hfi1: fix memory leaks d1b7f3252d56 infiniband: hfi1: fix a memory leak bug adb87027b5ff IB/mlx4: Fix memory leaks 5e416b11b4a9 nvme-multipath: fix possible I/O hang when paths are updated 5bbebceec61d Tools: hv: kvp: eliminate 'may be used uninitialized' warning 1d42e40fe3c5 Input: hyperv-keyboard: Use in-place iterator API in the channel callback e02aac3edb46 x86/boot/compressed/64: Fix boot on machines with broken E820 table 05d611c4ffb7 HID: cp2112: prevent sleeping function called from invalid context 5e1d50a3eafe kprobes: Fix potential deadlock in kprobe_optimizer() a5839b6b3a79 ravb: Fix use-after-free ravb_tstamp_skb 54eac3997ee4 wimax/i2400m: fix a memory leak bug 7506e8c4bec8 net: cavium: fix driver name ea78dc8b5e66 ibmvnic: Unmap DMA address of TX descriptor buffers after use 4fcb9b3f263e net: kalmia: fix memory leaks 1ad45d0f69d2 cx82310_eth: fix a memory leak bug ac3cc25f380b vfs: fix page locking deadlocks when deduping files 9ea1feadf5e0 lan78xx: Fix memory leaks 375ab446ec76 net: myri10ge: fix memory leaks f13b7ec5e1c5 liquidio: add cleanup in octeon_setup_iq() 2c3dd20f852a cxgb4: fix a memory leak bug b8cd0b7b09ed scsi: target: tcmu: avoid use-after-free after command timeout 6c9a1e17d063 scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure b3496367d9cb drm/mediatek: set DMA max segment size c9f595453bc3 drm/mediatek: use correct device to import PRIME buffers a54fa5dff8cd netfilter: nft_flow_offload: skip tcp rst and fin packets 6052090280b8 gpio: Fix build error of function redefinition cc8aa6155611 ibmveth: Convert multicast list size for little-endian system 32e912b91b5d Bluetooth: btqca: Add a short delay before downloading the NVM 7b7a11549dc1 net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx 752832f2e8c9 hv_netvsc: Fix a warning of suspicious RCU usage 463d87bc13ff tools: bpftool: fix error message (prog -> object) 5776970fb4ec netfilter: nf_tables: use-after-free in failing rule with bound set d22ed7b72acf net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context 3ddda4f3114b spi: bcm2835aux: fix corruptions for longer spi transfers fe49c3de7372 spi: bcm2835aux: remove dangerous uncontrolled read of fifo a4a9ee79036b spi: bcm2835aux: unifying code between polling and interrupt driven code ee271ead3b61 x86/boot: Preserve boot_params.secure_boot from sanitizing 9484203d254d net/rds: Fix info leak in rds6_inc_info_copy() 5977bc19ce7f tcp: remove empty skb from write queue in error cases 6f3126379879 tcp: inherit timestamp on mtu probe 6f8348f63706 net: stmmac: dwmac-rk: Don't fail if phy regulator is absent 38166934f89c net_sched: fix a NULL pointer deref in ipt action 5ff0ab0c668b net: sched: act_sample: fix psample group handling on overwrite 6a2bd8261630 net: fix skb use after free in netpoll 8a5d27eaba68 mld: fix memory leak in mld_del_delrec() e7d2672c66e4 Linux 4.19.71 72168ae78629 Revert "Input: elantech - enable SMBus on new (2018+) systems" 0fed55c248d9 Linux 4.19.70 9854d089f790 Revert "ASoC: Fail card instantiation if DAI format setup fails" e064466cb614 mt76: mt76x0u: do not reset radio on resume b307f99dca5a x86/ptrace: fix up botched merge of spectrev1 fix 3b26fa9e3ec3 i2c: piix4: Fix port selection for AMD Family 16h Model 30h 4f4be79c9ee7 NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0 b5891b624b9a NFS: Pass error information to the pgio error cleanup routine 812de6dee596 NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend() 57c491fd844d NFS: Clean up list moves of struct nfs_page 79f1b33c53a0 KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI ab8ecc278dc8 KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long db1841a2dd4c KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling 938e383738d9 mac80211: Correctly set noencrypt for PAE frames 4f139c0376fb mac80211: Don't memset RXCB prior to PAE intercept 58f91aac4dfe mac80211: fix possible sta leak 945b35972803 Revert "cfg80211: fix processing world regdomain when non modular" 690a424838ca crypto: ccp - Ignore unconfigured CCP device on suspend/resume 4e77b2ea941b VMCI: Release resource if the work is already queued 2a964875def7 bus: hisi_lpc: Add .remove method to avoid driver unbind crash 649532efef46 bus: hisi_lpc: Unregister logical PIO range to avoid potential use-after-free 68b58d392464 drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe() c7615333645d drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest 6d3003f56449 drm/amdgpu: Add APTX quirk for Dell Latitude 5495 c4616a9b3d3f lib: logic_pio: Add logic_pio_unregister_range() 7faef13e6f68 lib: logic_pio: Avoid possible overlap for unregistering regions b865c2c6e3f2 lib: logic_pio: Fix RCU usage 79829fc4ff33 fsi: scom: Don't abort operations for minor errors e44840b7320c typec: tcpm: fix a typo in the comparison of pdo_max_voltage e91c9c119dba intel_th: pci: Add Tiger Lake support ce1c894e1e89 intel_th: pci: Add support for another Lewisburg PCH cad1d3bfdd5d stm class: Fix a double free of stm_source_device abc42341b6c4 mmc: core: Fix init of SD cards reporting an invalid VDD range 1ecc65e1418b mmc: sdhci-of-at91: add quirk for broken HS200 be8e9fa67ea7 mei: me: add Tiger Lake point LP device ID 5ed36421af24 USB: storage: ums-realtek: Whitelist auto-delink support f79d1598968b USB: storage: ums-realtek: Update module parameter description for auto_delink_en f46fd68a541f usb: host: xhci: rcar: Fix typo in compatible string matching 7af7737491ce usb: host: ohci: fix a race condition between shutdown and irq a209827549da usb: chipidea: udc: don't do hardware access if gadget has stopped 97bec7afb98f usb: hcd: use managed device resources ebad9fd106da USB: cdc-wdm: fix race between write and disconnect due to flag abuse cbf5a279a22d usb-storage: Add new JMS567 revision to unusual_devs 8ea639525db6 ftrace: Check for empty hash and comment the race with registering probes 9d98e0f4859d ftrace: Check for successful allocation of hash f184b16748f4 ftrace: Fix NULL pointer dereference in t_probe_next() edc454cd5a04 x86/apic: Include the LDR when clearing out APIC registers 959832657c03 x86/apic: Do not initialize LDR and DFR for bigsmp 941d875cd44a uprobes/x86: Fix detection of 32-bit user mode 3c2b4827798e KVM: x86: Don't update RIP or do single-step on faulting emulation 3ec35109c80a kvm: x86: skip populating logical dest map if apic is not sw enabled cbd905dac535 ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604 b5d1f31d97af ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate() 98a2017c4a17 ALSA: seq: Fix potential concurrent access to the deleted pool 842317de9797 ALSA: hda - Fixes inverted Conexant GPIO mic mute led 5ef43bdc7321 ALSA: line6: Fix memory leak at line6_init_pcm() error path c94c0bf878bf ALSA: usb-audio: Check mixer unit bitmap yet more strictly 5dd2db1ab006 mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n 9febfd30aede ipv4/icmp: fix rt dst dev null pointer dereference 0a6a9c473080 tcp: make sure EPOLLOUT wont be missed 3e79bd1e4f9a net/smc: make sure EPOLLOUT is raised ff129837a5f6 ipv6: Default fib6_type to RTN_UNICAST when not set 02127bdfee97 ipv6/addrconf: allow adding multicast addr if IFA_F_MCAUTOJOIN is set a1407b26a6ed net: tls, fix sk_write_space NULL write when tx disabled fdc4400e9628 net/tls: swap sk_write_space on close f7009bbaff54 net/tls: Fixed return value when tls_complete_pending_work() fails dc066fd0d073 drm/tilcdc: Register cpufreq notifier after we have initialized crtc eba86f0a909f scsi: ufs: Fix RX_TERMINATION_FORCE_ENABLE define value edd40f54736d drm/bridge: tfp410: fix memleak in get_modes() 2fa7c944e11f watchdog: bcm2835_wdt: Fix module autoload a3eb2eba2f79 drm/i915: fix broadwell EU computation c61c7246dc1f tools: hv: fix KVP and VSS daemons exit code 0c39d818aae4 tools: hv: fixed Python pep8/flake8 warnings for lsvmbus 39ad18a042ab usb: host: fotg2: restart hcd after port reset 37654abed26f drm/ast: Fixed reboot test may cause system hanged 1cc2ef1cfbd8 i2c: emev2: avoid race when unregistering slave client 7048cd814f4e i2c: rcar: avoid race when unregistering slave client 8bd5426889c2 arm64: cpufeature: Don't treat granule sizes as strict eb535aaf3cd7 xen/blkback: fix memory leaks 339c1572a266 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt 122ab8ea641c usb: gadget: composite: Clear "suspended" on reset/disconnect 21ec20f62fae iommu/dma: Handle SG length overflow better 7f4b81365e83 omap-dma/omap_vout_vrfb: fix off-by-one fi value 71d24f45f905 dmaengine: stm32-mdma: Fix a possible null-pointer dereference in stm32_mdma_irq_handler() 377ebe613ed8 auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach 2f87eb895ebd soundwire: cadence_master: fix definitions for INTSTAT0/1 29b064d300a2 soundwire: cadence_master: fix register definition for SLAVE_STATE 4a9829195d9e nvme-pci: Fix async probe remove race 431f579a5349 nvme: fix a possible deadlock when passthru commands sent to a multipath device 32c0b8f10351 nvmet-loop: Flush nvme_delete_wq when removing the port 9c55dc85d890 afs: Only update d_fsdata if different in afs_d_revalidate() 24e093b96905 fs: afs: Fix a possible null-pointer dereference in afs_put_read() 8e5179f982f9 afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u() dfc438c0bc6d afs: Fix the CB.ProbeUuid service handler to reply correctly 7436dc2adeff nvme-multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns 2013d6ec0bc0 dmaengine: ste_dma40: fix unneeded variable warning 97ab07e11fbf Linux 4.19.69 6d47174198ac rxrpc: Fix local refcounting ce3f9e194d25 rxrpc: Fix local endpoint replacement a05354cbb822 rxrpc: Fix read-after-free in rxrpc_queue_local() f28023c4eedc rxrpc: Fix local endpoint refcounting 32df8a30b734 powerpc: Allow flush_(inval_)dcache_range to work across ranges >4GB 0d5e34c1e263 dm zoned: fix potential NULL dereference in dmz_do_reclaim() 655bb2c4ace4 xfs: always rejoin held resources during defer roll 83a8e6b2f2e3 xfs: Add attibute remove and helper functions b21ff6cfcc24 xfs: Add attibute set and helper functions b3a248f2307c xfs: Add helper function xfs_attr_try_sf_addname a9912f346bdc xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h 17c2b7af71f2 xfs: don't trip over uninitialized buffer on extent read of corrupted inode 11f85d4d77af xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT ed11e6003314 mm/zsmalloc.c: fix race condition in zs_destroy_pool b30a2f608e94 mm/zsmalloc.c: migration can leave pages in ZS_EMPTY indefinitely db67ac031655 mm, page_owner: handle THP splits correctly 42731deff2ea genirq: Properly pair kobject_del() with kobject_add() c14fe4e8fd01 dm zoned: properly handle backing device failure 4530f2f1a79a dm zoned: improve error handling in i/o map code 8b7c17bb2753 dm zoned: improve error handling in reclaim ded8e524cfa6 dm table: fix invalid memory accesses with too high sector number 53e73d1079d7 dm space map metadata: fix missing store of apply_bops() return value 2cff6c87a0dc dm raid: add missing cleanup in raid_ctr() 795b0572729b dm integrity: fix a crash due to BUG_ON in __journal_read_write() 8114012de6c1 dm btree: fix order of block initialization in btree_split_beneath e0fb8135de9e dm kcopyd: always complete failed jobs f7d157f33001 x86/boot: Fix boot regression caused by bootparam sanitizing d955601166f8 x86/boot: Save fields explicitly, zero out everything else e063b03b451a x86/CPU/AMD: Clear RDRAND CPUID bit on AMD family 15h/16h 685e598e447e x86/apic: Handle missing global clockevent gracefully f9747104a5c8 x86/retpoline: Don't clobber RFLAGS during CALL_NOSPEC on i386 cf13e30c58d4 userfaultfd_release: always remove uffd flags and clear vm_userfaultfd_ctx a6f236e1bd97 Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE 3783c7ee9920 gpiolib: never report open-drain/source lines as 'input' to user-space f88c31b43bab drm/nouveau: Don't retry infinitely when receiving no data on i2c over AUX 51f6afddb147 libceph: fix PG split vs OSD (re)connect race f2951720629e ceph: don't try fill file_lock on unsuccessful GETFILELOCK reply 7bed2889cd18 ceph: clear page dirty before invalidate page a8f7703f2213 clk: socfpga: stratix10: fix rate caclulationg for cnt_clks b608a5a238d5 Revert "dm bufio: fix deadlock with loop device" 375c6c72f56c HID: wacom: Correct distance scale for 2nd-gen Intuos devices 8317fe4a3906 HID: wacom: correct misreported EKR ring values 3c4b283a0deb selftests: kvm: Adding config fragments ef61b79017ff KVM: arm: Don't write junk to CP15 registers on reset d5cb5b493030 KVM: arm64: Don't write junk to sysregs on reset 590549487679 perf pmu-events: Fix missing "cpu_clk_unhalted.core" event 06ed429b9018 perf cpumap: Fix writing to illegal memory in handling cpumap mask e49cfed0a8cb perf ftrace: Fix failure to set cpumask when only one cpu is present 7aa8dfa450b4 block, bfq: handle NULL return value by bfq_init_rq() fa6f4687805a drm/vmwgfx: fix memory leak when too many retries have occurred 923de016dc88 x86/lib/cpu: Address missing prototypes warning 3ca013cd63be libata: add SG safety checks in SFF pio transfers 3b84bbef51c4 libata: have ata_scsi_rw_xlat() fail invalid passthrough requests e0c030221b1f net: hisilicon: Fix dma_map_single failed on arm64 4ab3052568e5 net: hisilicon: fix hip04-xmit never return TX_BUSY 09ec5bf10749 net: hisilicon: make hip04_tx_reclaim non-reentrant b8d03c79e403 net: stmmac: tc: Do not return a fragment entry b6cd6d18423e net: stmmac: Fix issues when number of Queues >= 4 45e7e4e66b08 net: cxgb3_main: Fix a resource leak in a error path in 'init_one()' db106f695414 s390: put _stext and _etext into .text section 33bdea175df0 SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL fab5a1fd17a6 SMB3: Fix potential memory leak when processing compound chain 6cb4997861c8 drm/rockchip: Suspend DP late 1c6ca0921705 HID: input: fix a4tech horizontal wheel custom usage f6f9c4491ec5 HID: quirks: Set the INCREMENT_USAGE_ON_DUPLICATE quirk on Saitek X52 b6fb2f5b33f2 NFS: Fix regression whereby fscache errors are appearing on 'nofsc' mounts 66daeec347f0 NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim() d1ba0b81e709 net/ethernet/qlogic/qed: force the string buffer NULL-terminated 35d9e9211baf can: peak_usb: force the string buffer NULL-terminated 895c8fcfedad can: sja1000: force the string buffer NULL-terminated a3d1263c9b03 perf bench numa: Fix cpu0 binding 4533d08b6528 net: phy: phy_led_triggers: Fix a possible null-pointer dereference in phy_led_trigger_change_speed() 07efe13b95ab isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack 4db2043eec46 rxrpc: Fix the lack of notification when sendmsg() fails on a DATA packet 0d68fbc2d07b rxrpc: Fix potential deadlock 63dd147e7af0 netfilter: ipset: Fix rename concurrency with listing ea08214d8cd0 netfilter: ipset: Copy the right MAC address in bitmap:ip,mac and hash:ip,mac sets 5a072ef6a296 netfilter: ipset: Actually allow destination MAC address for hash:ip,mac sets too ba42212ac0a0 mac80211_hwsim: Fix possible null-pointer dereferences in hwsim_dump_radio_nl() 32cbe03539ac isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences in start_isoc_chain() 8a24df575c97 qed: RDMA - Fix the hw_ver returned in device attributes cb64e86ee0d1 net: usb: qmi_wwan: Add the BroadMobi BM818 card bfa713f5cec5 ASoC: ti: davinci-mcasp: Correct slot_width posed constraint dd0ff288e344 ASoC: rockchip: Fix mono capture c5cb10632c0f st_nci_hci_connectivity_event_received: null check the allocation 0d73ba88f466 st21nfca_connectivity_event_received: null check the allocation 714a8438fc8a ASoC: Fail card instantiation if DAI format setup fails bd2f4c7c2d6a can: gw: Fix error path of cgw_module_init 3257103502cf can: mcp251x: add error check when wq alloc failed dbf790dcb8a9 can: dev: call netif_carrier_off() in register_candev() 43d31fd9a8f2 selftests: forwarding: gre_multipath: Fix flower filters ef52e2b9a621 selftests: forwarding: gre_multipath: Enable IPv4 forwarding 192bbe9d57ed net: mvpp2: Don't check for 3 consecutive Idle frames for 10G links a1e5a76db8dd bonding: Force slave speed check after link state recovery for 802.3ad b7038c195fd1 selftests/bpf: fix sendmsg6_prog on s390 e6dc6409f474 ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks 71305e8ee503 netfilter: ebtables: fix a memory leak bug in compat 70b4edd74b6d mips: fix cacheinfo 326175aa28fd MIPS: kernel: only use i8253 clocksource with periodic clockevent a6067c6e630f HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT def4c11b3131 Linux 4.19.68 7c13983a2860 mmc: sdhci-of-arasan: Do now show error message in case of deffered probe 447f5f48f4fa net/mlx5e: Use flow keys dissector to parse packets for ARFS fbd8ab680675 net/mlx5e: Only support tx/rx pause setting for port owner b3410f0f8505 xen/netback: Reset nr_frags before freeing skb cc4ff0f4f564 tipc: initialise addr_trail_end when setting node addresses e89bb758c030 team: Add vlan tx offload to hw_enc_features eeb148d20819 sctp: fix the transport error_count check 227f204ad197 sctp: fix memleak in sctp_send_reset_streams 154e6bc497c9 net/packet: fix race in tpacket_snd() f588dccfc137 net/mlx4_en: fix a memory leak bug 8905a249448c net: dsa: Check existence of .port_mdb_add callback before calling it d61d8ea9ca12 bonding: Add vlan tx offload to hw_enc_features 40933af400c5 bnx2x: Fix VF's VLAN reconfiguration in reload. 03d54393e3d7 iommu/amd: Move iommu_init_pci() to .init section 62e023ddd01a Input: psmouse - fix build error of multiple definition 28ff7d3b3fda netfilter: conntrack: Use consistent ct id hash calculation 30b9da0ec2a2 arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side a1cd2f7015bd dm: disable DISCARD if the underlying storage no longer supports it 4af28b2f19b0 drm/i915/cfl: Add a new CFL PCI ID. 3ca5b7b4afee USB: serial: option: Add Motorola modem UARTs e480d6cf6f79 USB: serial: option: add the BroadMobi BM818 card 8175fa2987a6 USB: serial: option: Add support for ZTE MF871A afb677b29995 USB: serial: option: add D-Link DWM-222 device ID 487d66ae8f45 USB: CDC: fix sanity checks in CDC union parser c02c0249ce55 usb: cdc-acm: make sure a refcount is taken early enough f417f9715f4c usb: gadget: udc: renesas_usb3: Fix sysfs interface of "role" 7f52d6d2a82d USB: core: Fix races in character device registration and deregistraion 367d103a4a93 iio: adc: max9611: Fix temperature reading in probe dac96992f00a staging: comedi: dt3000: Fix rounding up of timer divisor 2e394bcfdcf3 staging: comedi: dt3000: Fix signed integer overflow 'divider * base' 8c7053d162d9 KVM: arm/arm64: Sync ICH_VMCR_EL2 back when about to block c8d95668c4ca arm64: KVM: regmap: Fix unexpected switch fall-through 0755b6b152cb asm-generic: fix -Wtype-limits compiler warnings 7113a1bc19fa ocfs2: remove set but not used variable 'last_hash' 01d8d08f4cd4 Revert "kmemleak: allow to coexist with fault injection" cf9a18d7bcd0 drm/exynos: fix missing decrement of retry counter c256729f2695 drm: msm: Fix add_gpu_components b4f0fee7f77c IB/mad: Fix use-after-free in ib mad completion handling a0258ff4993f IB/mlx5: Fix MR registration flow to use UMR properly efb742ce4e27 IB/core: Add mitigation for Spectre V1 4a0d2eeea27a arm64/mm: fix variable 'pud' set but not used 6af9263f685d arm64: unwind: Prohibit probing on return_address() ffb1a76d1c29 arm64/efi: fix variable 'si' set but not used 48522289bf50 kbuild: Check for unknown options with cc-option usage in Kconfig and clang b3aebdd46d63 kbuild: modpost: handle KBUILD_EXTRA_SYMBOLS only for external modules 23bc01f0d955 ata: libahci: do not complain in case of deferred probe 68340db992f6 drm/amdgpu: fix a potential information leaking bug 02d4fe0193d5 scsi: qla2xxx: Fix possible fcport null-pointer dereferences 3435e025ed71 scsi: hpsa: correct scsi command status issue after reset f833deae2a06 Btrfs: fix deadlock between fiemap and transaction commits 202aa96f052a drm/bridge: lvds-encoder: Fix build error while CONFIG_DRM_KMS_HELPER=m f69fd790edf7 libata: zpodd: Fix small read overflow in zpodd_get_mech_type() 0a19fff567a0 perf header: Fix use of unitialized value warning ab5aa579ca82 perf header: Fix divide by zero error if f_header.attr_size==0 a5e40452c916 irqchip/irq-imx-gpcv2: Forward irq type to parent dcb73180de61 irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail e72e6ba17ab4 xen/pciback: remove set but not used variable 'old_state' ca5b26a8f1d8 clk: renesas: cpg-mssr: Fix reset control race condition af2ed1a05a7a clk: sprd: Select REGMAP_MMIO to avoid compile errors 3e5f29b66675 clk: at91: generated: Truncate divisor to GENERATED_MAX_DIV + 1 28fd9b37b6bb riscv: Make __fstate_clean() work correctly. cef0e9eb2231 netfilter: ebtables: also count base chain policies 07d92caeb945 net: usb: pegasus: fix improper read if get_registers() fail f13de3d677d1 Input: iforce - add sanity checks 08b3af00a161 Input: kbtab - sanity check for endpoint type b545dc9debe6 HID: hiddev: do cleanup in failure of opening a device 0aab1a4653a6 HID: hiddev: avoid opening a disconnected device 537d957b144f HID: holtek: test for sanity of intfdata 9585f4440cec ALSA: hda - Let all conexant codec enter D3 when rebooting e58ba88d6c60 ALSA: hda - Add a generic reboot_notify 6c4a536ca97b ALSA: hda - Fix a memory leak bug 1bf5f827564c ALSA: hda - Apply workaround for another AMD chip 1022:1487 58b9f19ee438 ALSA: usb-audio: Fix an OOB bug in parse_audio_mixer_unit 46f9a1bc60a4 ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term d5bb12402805 ALSA: hda/realtek - Add quirk for HP Envy x360 61f6ecb75845 xtensa: add missing isync to the cpu_reset TLB code 7c001e5aab6d cpufreq: schedutil: Don't skip freq update when limits change 7f68aa2e3e1b Revert "pwm: Set class for exported channels in sysfs" 056368fc3ef7 mm/usercopy: use memory range to be accessed for wraparound check c8282f1b5653 mm/memcontrol.c: fix use after free in mem_cgroup_iter() 3c0cb90e9212 mm: mempolicy: handle vma with unmovable pages mapped correctly in mbind cd825d87140d mm: mempolicy: make the behavior consistent when MPOL_MF_MOVE* and MPOL_MF_STRICT were specified f0fed8283deb mm/hmm: fix bad subpage pointer in try_to_unmap_one 3858cca150c6 seq_file: fix problem when seeking mid-record 50d15197254a sh: kernel: hw_breakpoint: Fix missing break in switch statement a5aa80588fcd Linux 4.19.67 ac2951114955 iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support 6a81677a2e65 iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT on version < 41 80bac45e3ad8 iwlwifi: mvm: fix an out-of-bound access 7626b510fc77 iwlwifi: don't unmap as page memory that was mapped as single b38c56b76dcc mwifiex: fix 802.11n/WPA detection 2bc73d914114 KVM: Fix leak vCPU's VMCS value into other pCPU d1489f0b4de7 NFSv4: Fix an Oops in nfs4_do_setattr 898c19f1b4c8 smb3: send CAP_DFS capability during session setup 50831f1a2f57 SMB3: Fix deadlock in validate negotiate hits reconnect 2afa6c13e498 dax: dax_layout_busy_page() should not unmap cow pages a566750c3a78 mac80211: don't WARN on short WMM parameters from AP af9d64f871cf ALSA: hda - Workaround for crackled sound on AMD controller (1022:1457) 06f0bcaceb8c ALSA: hda - Don't override global PCM hw info flag 1c286e4e13f2 ALSA: hiface: fix multiple memory leak bugs bc972b6b52e2 ALSA: firewire: fix a memory leak bug edc388566a1d drm/i915: Fix wrong escape clock divisor init for GLK a73027204ac5 hwmon: (nct7802) Fix wrong detection of in4 presence 9ce1b3eb5489 can: peak_usb: pcan_usb_fd: Fix info-leaks to USB devices cab569a44a52 can: peak_usb: pcan_usb_pro: Fix info-leaks to USB devices d4d904e4e258 ALSA: usb-audio: fix a memory leak bug e0d262a57fc7 x86/purgatory: Do not use __builtin_memcpy and __builtin_memset 118293070096 HID: sony: Fix race condition between rumble and device remove. 5c4689cbe95a s390/dma: provide proper ARCH_ZONE_DMA_BITS value d768173982ec perf/core: Fix creating kernel counters for PMUs that override event->cpu 06dc92142b5e tty/ldsem, locking/rwsem: Add missing ACQUIRE to read_failed sleep loop 0ba69e96cc62 test_firmware: fix a memory leak bug cdd92ebe29c2 scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG b620c6d5779a scsi: ibmvfc: fix WARN_ON during event pool release f254faed4153 scsi: megaraid_sas: fix panic on loading firmware crashdump bb41940c89bd ARM: dts: bcm: bcm47094: add missing #cells for mdio-bus-mux 19e7df3e4fe7 ARM: davinci: fix sleep.S build error on ARMv4 bdce5621e6b0 nvme: fix multipath crash when ANA is deactivated b1689742ff4a ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id() 38c919ec7b30 drbd: dynamically allocate shash descriptor f4e2d182d6a6 perf probe: Avoid calling freeing routine multiple times for same pointer 101a155436fe perf tools: Fix proper buffer size for feature processing b065f404c946 ALSA: compress: Be more restrictive about when a drain is allowed 30dd700da7de ALSA: compress: Don't allow paritial drain operations on capture streams f1ea9a638770 ALSA: compress: Prevent bypasses of set_params b9e2fa1e15b7 ALSA: compress: Fix regression on compressed capture streams 77868c0003cc s390/qdio: add sanity checks to the fast-requeue path 8729fe83b0d5 cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init() 991c4756be69 drm: silence variable 'conn' set but not used ca1b1940a32a hwmon: (nct6775) Fix register address and added missed tolerance for nct6106 56dc57c705ef allocate_flower_entry: should check for null deref f4cfdd46b356 mac80211: don't warn about CW params when not using them f2fd89817212 nl80211: fix NL80211_HE_MAX_CAPABILITY_LEN 492c158ab2c0 iscsi_ibft: make ISCSI_IBFT dependson ACPI instead of ISCSI_IBFT_FIND 8d641499bf96 drm/amd/display: Increase size of audios array f9420bfa29f9 drm/amd/display: Only enable audio if speaker allocation exists 3998e684463a drm/amd/display: Fix dc_create failure handling and 666 color depths e7a8a794109c drm/amd/display: use encoder's engine id to find matched free audio device 2a5e21adc71b drm/amd/display: Wait for backlight programming completion in set backlight level 056af94d6e10 scripts/sphinx-pre-install: fix script for RHEL/CentOS 36b6458d8541 netfilter: nft_hash: fix symhash with modulus one 6f1d7f0d6689 netfilter: conntrack: always store window size un-scaled 307b6e5d90dc netfilter: Fix rpfilter dropping vrf packets by mistake 6f9dff8d1d58 vfio-ccw: Set pa_nr to 0 if memory allocation fails for pa_iova_pfn bb312b4aa8b0 netfilter: nfnetlink: avoid deadlock due to synchronous request_module f61c4d3a1f18 can: peak_usb: fix potential double kfree_skb() 0e9038a26c9b can: rcar_canfd: fix possible IRQ storm on high load 9479a0589923 usb: typec: tcpm: Ignore unsupported/unknown alternate mode requests 3f524b631db7 usb: typec: tcpm: Add NULL check before dereferencing config bbc2e8206012 usb: typec: tcpm: remove tcpm dir if no children 2ec5c9b785f4 usb: typec: tcpm: free log buf memory when remove debug file 33f2240acfa8 usb: yurex: Fix use-after-free in yurex_delete 49888a4f0ebc usb: host: xhci-rcar: Fix timeout in xhci_suspend() 21344f0575f0 gfs2: gfs2_walk_metadata fix b674f7914a64 x86/purgatory: Use CFLAGS_REMOVE rather than reset KBUILD_CFLAGS 0a9e41e27659 perf record: Fix module size on s390 f1f662894361 perf db-export: Fix thread__exec_comm() 532db2b9756a perf annotate: Fix s390 gap between kernel end and module start 46b306f3cd7b mm/vmalloc: Sync unmappings in __purge_vmap_area_lazy() 9935d7ed8406 x86/mm: Sync also unmappings in vmalloc_sync_all() dd524d488f5b x86/mm: Check for pfn instead of page in vmalloc_sync_one() b8a2169bcad8 Input: synaptics - enable RMI mode for HP Spectre X360 3d180fe5cd76 Input: elantech - enable SMBus on new (2018+) systems ce7d4fe4e52b Input: usbtouchscreen - initialize PM mutex before using it c9a1c10487b9 loop: set PF_MEMALLOC_NOIO for the worker thread d79d76f2bbb0 mmc: cavium: Add the missing dma unmap when the dma has finished. fd3f902dd1d5 mmc: cavium: Set the correct dma max segment size for mmc_host 9575ba61ba19 sound: fix a memory leak bug d397091dbac0 usb: iowarrior: fix deadlock on disconnect b43611cd762c usb: usbfs: fix double-free of usb memory upon submiturb error 6dbc3b74daeb crypto: ccp - Ignore tag length when decrypting GCM ciphertext 30692edea30d crypto: ccp - Add support for valid authsize values less than 16 1c4393df3622 crypto: ccp - Fix oops by properly managing allocated structures b9de21575a20 staging: android: ion: Bail out upon SIGKILL when allocating memory. 6b8f93b5a4f7 staging: gasket: apex: fix copy-paste typo fcab37830177 iio: adc: max9611: Fix misuse of GENMASK macro 805bd34ac269 iio: cros_ec_accel_legacy: Fix incorrect channel setting 893af1c79e42 Linux 4.19.66 48fcdaba7b0d spi: bcm2835: Fix 3-wire mode if DMA is enabled ebda41dd170f cgroup: Fix css_task_iter_advance_css_set() cset skip condition 0a9abd277819 cgroup: css_task_iter_skip()'d iterators must be advanced before accessed 4340d175b898 cgroup: Include dying leaders with live threads in PROCS iterations 370b9e6399da cgroup: Implement css_task_iter_skip() 7528e95b7519 cgroup: Call cgroup_release() before __exit_signal() e6e9bcef12ca compat_ioctl: pppoe: fix PPPOEIOCSFWD handling 473430ed6117 r8169: don't use MSI before RTL8168d 0ccf47265e4c net/mlx5e: Prevent encap flow counter update async to user query cd84a10792f0 net/mlx5: Fix modify_cq_in alignment f378724e10ce tun: mark small packets as owned by the tap sock 5295d6515485 tipc: compat: allow tipc commands without arguments eaa34bd4f7b5 ocelot: Cancel delayed work before wq destruction cd7f02fecac1 NFC: nfcmrvl: fix gpio-handling regression ce58a3655121 net/smc: do not schedule tx_work in SMC_CLOSED state 51d240a144a5 net: sched: use temporary variable for actions indexes cb20f74135df net sched: update vlan action for batched events operations d82dc254b967 net: sched: Fix a possible null-pointer dereference in dequeue_func() 44b96a38c2b5 net: qualcomm: rmnet: Fix incorrect UL checksum offload logic c8b05980c4bf net: phylink: Fix flow control for fixed-link 4dddd08b571d net/mlx5: Use reversed order when unregister devices 858f82c63667 net/mlx5e: always initialize frag->last_in_page edb7ad69c439 net: fix ifindex collision during namespace removal a19d4e34f092 net: bridge: mcast: don't delete permanent entries when fast leave is enabled 639239be11ad net: bridge: delete local fdb on device init failure b3645a487373 mvpp2: refactor MTU change code ffab47bf69df mvpp2: fix panic on module removal 3c46905fb182 mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() f186fb5ccf69 ipip: validate header length in ipip_tunnel_xmit 1bb2dd37cb87 ip6_tunnel: fix possible use-after-free on xmit fdcefa46c5c2 ip6_gre: reload ipv6h in prepare_ip6gre_xmit_ipv6 c4c8899376c2 ife: error out when nla attributes are empty 774358df88f7 bnx2x: Disable multi-cos feature. cb4626784f39 atm: iphase: Fix Spectre v1 vulnerability 8440cdc77577 IB: directly cast the sockaddr union to aockaddr 608cfdfa9eb7 HID: Add quirk for HP X1200 PIXART OEM mouse e830c2c3c174 HID: wacom: fix bit shift for Cintiq Companion 2 2364ed0d8ed1 libnvdimm/bus: Fix wait_nvdimm_bus_probe_idle() ABBA deadlock 7f000e7b4490 libnvdimm/bus: Prepare the nd_ioctl() path to be re-entrant 3248536919c1 libnvdimm/region: Register badblocks before namespaces d16bbdbbcb50 libnvdimm/bus: Prevent duplicate device_unregister() calls c23106d4276d drivers/base: Introduce kill_device() 7c43f84efd6d driver core: Establish order of operations for device_add and device_del via bitflag a152a7b411a5 gcc-9: don't warn about uninitialized variable 93d6f0841eef scsi: fcoe: Embed fc_rport_priv in fcoe_rport structure cc4c818b2219 Linux 4.19.65 7634b9cd27e8 Documentation: Add swapgs description to the Spectre v1 documentation b88241aef6f1 x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS 931b6bfe8af1 x86/entry/64: Use JMP instead of JMPQ 23e7a7b3a75f x86/speculation: Enable Spectre v1 swapgs mitigations befb822c062b x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations b5dd7f61fce4 x86/cpufeatures: Combine word 11 and 12 into a new scattered features word 16ad0b63f382 x86/cpufeatures: Carve out CQM features retrieval 9e034c61951a scsi: mpt3sas: Use 63-bit DMA addressing on SAS35 HBA 3732a473be54 x86/vdso: Prevent segfaults due to hoisted vclock reads 8320768d26aa gcc-9: properly declare the {pv,hv}clock_page storage 354887ae3168 objtool: Support GCC 9 cold subfunction naming scheme 89f3896b658b ARC: enable uboot support unconditionally 8dd376273fb4 eeprom: at24: make spd world-readable again a7340d31abac drm/i915/gvt: fix incorrect cache entry for guest page mapping a1c020ce2669 IB/hfi1: Check for error on call to alloc_rsm_map_table e9cd4962a85b IB/mlx5: Fix RSS Toeplitz setup to be aligned with the HW specification 924308d2a6ea IB/mlx5: Fix clean_mr() to work in the expected order 7e5ce9f3943c IB/mlx5: Move MRs to a kernel PD when freeing them to the MR cache 3cfa1087a172 IB/mlx5: Use direct mkey destroy command upon UMR unreg failure 41be1928053a IB/mlx5: Fix unreg_umr to ignore the mkey state 04fdca1f2f65 xen/swiotlb: fix condition for calling xen_destroy_contiguous_region() eb828241b491 nbd: replace kill_bdev() with __invalidate_device() again 8dfef0f442c7 arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG} 2bddc985656a arm64: compat: Allow single-byte watchpoints on all addresses c385cda0e70a drivers/perf: arm_pmu: Fix failure path in PM notifier 5f80ac50b98c parisc: Fix build of compressed kernel even with debug enabled 001f93d95d6c cgroup: kselftest: relax fs_spec checks 6cb9e0d9ad3e s390/dasd: fix endless loop after read unit address configuration beb0cc781b8e mm: vmscan: check if mem cgroup is disabled or not before calling memcg slab shrinker 72651bbdf3d5 ALSA: hda: Fix 1-minute detection delay when i915 module is not available 46650ac2e1d8 selinux: fix memory leak in policydb_init() e7bb4c81b3c7 mtd: rawnand: micron: handle on-die "ECC-off" devices correctly fafaeae4d356 IB/hfi1: Fix Spectre v1 vulnerability fdb0fb56addb gpiolib: fix incorrect IRQ requesting of an active-low lineevent 7e3efb655012 mmc: meson-mx-sdio: Fix misuse of GENMASK macro 29841b5c6ab1 mmc: dw_mmc: Fix occasional hang after tuning on eMMC 50d700408a00 Btrfs: fix race leading to fs corruption after transaction abort 009d7a4eb329 Btrfs: fix incremental send failure after deduplication 4c5a442561e8 kbuild: initialize CLANG_FLAGS correctly in the top Makefile 3736612d2582 kconfig: Clear "written" flag to avoid data loss 4c6500b5328f drm/nouveau: fix memory leak in nouveau_conn_reset() 84ce045222e9 x86, boot: Remove multiple copy of static function sanitize_boot_params() 740e0167a382 x86/paravirt: Fix callee-saved function ELF sizes ba5c072fbf8b x86/kvm: Don't call kvm_spurious_fault() from .fixup 11cb9f8700c9 xen/pv: Fix a boot up hang revealed by int3 self test d3e36788d9be mlxsw: spectrum_dcb: Configure DSCP map as the last rule is removed 48c5c4f0a47f ipc/mqueue.c: only perform resource calculation if user valid f87314225294 drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings 35ee8b844845 uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers dea2ee496a85 coda: fix build using bare-metal toolchain cf3ddc00a47d coda: add error handling for fget 93b83005ea87 lib/test_string.c: avoid masking memset16/32/64 failures 8e087a2abaf8 lib/test_overflow.c: avoid tainting the kernel and fix wrap size 439c79ed7718 mm/cma.c: fail if fixed declaration can't be honored 1b84e67496d3 x86: math-emu: Hide clang warnings for 16-bit overflow 242666b2b7e2 x86/apic: Silence -Wtype-limits compiler warnings ade866ad5aed be2net: Signal that the device cannot transmit during reconfiguration c0cca0e97ce4 ACPI: fix false-positive -Wuninitialized warning 80f58147da0f x86: kvm: avoid constant-conversion warning d60e8c0cbccb perf version: Fix segfault due to missing OPT_END() abfe761a5358 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized d5568763dd1d ACPI: blacklist: fix clang warning for unused DMI table c47e25526071 ceph: return -ERANGE if virtual xattr value didn't fit in buffer b39c377ea08f ceph: fix improper use of smp_mb__before_atomic() d29fbf677963 cifs: Fix a race condition with cifs_echo_request f96c70fa810d btrfs: qgroup: Don't hold qgroup_ioctl_lock in btrfs_qgroup_inherit() d9245dabfce1 btrfs: fix minimum number of chunk errors for DUP e7fcc587e076 clk: sprd: Add check for return value of sprd_clk_regmap_init() a093208b4c73 fs/adfs: super: fix use-after-free bug 85d854b42113 clk: tegra210: fix PLLU and PLLU_OUT1 cf0fcc7fe200 dmaengine: rcar-dmac: Reject zero-length slave DMA requests a3524486535a MIPS: lantiq: Fix bitfield masking cdee3f53510a firmware/psci: psci_checker: Park kthreads before stopping them 09ec6c6783ff kernel/module.c: Only return -EEXIST for modules that have finished loading fd53e45a11e9 arm64: dts: rockchip: fix isp iommu clocks and power domain d8388cbd4327 dmaengine: tegra-apb: Error out if DMA_PREP_INTERRUPT flag is unset f486088d38ec ftrace: Enable trampoline when rec count returns back to one ea26b427cb91 ARM: dts: rockchip: Mark that the rk3288 timer might stop in suspend 22befe671728 ARM: dts: rockchip: Make rk3288-veyron-mickey's emmc work again 8c5a33d34be6 ARM: dts: rockchip: Make rk3288-veyron-minnie run at hs200 3c1d1bad8a57 ARM: riscpc: fix DMA b3060a1a313f Linux 4.19.64 4736bb277744 ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL 475f7781a804 scsi: core: Avoid that a kernel warning appears during system resume c58a6507363b block, scsi: Change the preempt-only flag into a counter 9b17512d9165 ceph: hold i_ceph_lock when removing caps for freeing inode b6c3b6a2c662 Fix allyesconfig output. 135e7737e21f drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl 54695343b491 /proc//cmdline: add back the setproctitle() special case 54ffaa53e785 /proc//cmdline: remove all the special cases a5a3915f17ab sched/fair: Use RCU accessors consistently for ->numa_group 48046e092ad5 sched/fair: Don't free p->numa_faults with concurrent readers 02cdc166128c vhost: scsi: add weight support 239910101c4e vhost: vsock: add weight support 3af3b843aee4 vhost_net: fix possible infinite loop ad5fc8953d61 vhost: introduce vhost_exceeds_weight() 56966212e23f Bluetooth: hci_uart: check for missing tty operations 3a0c22cbc5d0 iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA 4fd0eb60bad1 iommu/vt-d: Don't queue_iova() if there is no flush queue b3836af8560e media: radio-raremono: change devm_k*alloc to k*alloc afb5340f9438 NFS: Cleanup if nfs_match_client is interrupted 8edcabb2c2e9 media: pvrusb2: use a different format for warnings 8b44cc225e60 media: cpia2_usb: first wake up, then free in disconnect 693019ee7d98 ath10k: Change the warning message string 3cf6a0707088 media: au0828: fix null dereference in error path f13ee5ae0b2f ISDN: hfcsusb: checking idx of ep configuration 22068d49d09d binder: fix possible UAF when freeing buffer ba2c247a4515 arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ b544a6855dfb usb: dwc2: Fix disable all EP's on disconnect ec58bfa2d412 usb: dwc2: Disable all EP's on disconnect 9e441c7844a6 NFSv4: Fix lookup revalidate of regular files 24acd93f5995 NFS: Refactor nfs_lookup_revalidate() 01eea1cbba9d NFS: Fix dentry revalidation on NFSv4 lookup 8a474bc4e613 vsock: correct removal of socket from the list 9d3586bcdae3 hv_sock: Add support for delayed close 9a9de33a9dfa Linux 4.19.63 408af82309a7 access: avoid the RCU grace period for the temporary subjective credentials 1a547d24ec8a libnvdimm/bus: Stop holding nvdimm_bus_list_mutex over __nd_ioctl() b993a66d8ddc powerpc/tm: Fix oops on sigreturn on systems without TM b9310c56fcfb powerpc/xive: Fix loop exit-condition in xive_find_target_in_mask() c219444254cf ALSA: hda - Add a conexant codec entry to let mute led work 491483ed70f1 ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1 602744097b2e ALSA: ac97: Fix double free of ac97_codec_device 9845fb5a3f90 hpet: Fix division by zero in hpet_time_div() e4c91583b39c mei: me: add mule creek canyon (EHL) device ids 3d0a6926e610 fpga-manager: altera-ps-spi: Fix build error e907b1314481 binder: prevent transactions to context manager from its own process. 7d20e3ba7072 x86/speculation/mds: Apply more accurate check on hypervisor platform 5e87e8b4dc0c x86/sysfb_efi: Add quirks for some devices with swapped width and height e3dc9ea5464e btrfs: inode: Don't compress if NODATASUM or NODATACOW set 1f37bec82f41 usb: pci-quirks: Correct AMD PLL quirk detection 41d3dbb931c0 usb: wusbcore: fix unbalanced get/put cluster_id 148959cc64e1 locking/lockdep: Hide unused 'class' variable b07687243d4a mm: use down_read_killable for locking mmap_sem in access_remote_vm 4acb04ef5e42 locking/lockdep: Fix lock used or unused stats error af0883f9dcf6 proc: use down_read_killable mmap_sem for /proc/pid/maps 0d72bb853afc cxgb4: reduce kernel stack usage in cudbg_collect_mem_region() 6ecdcbcd3091 proc: use down_read_killable mmap_sem for /proc/pid/map_files 3d617da8a956 proc: use down_read_killable mmap_sem for /proc/pid/clear_refs 42beb7b3d446 proc: use down_read_killable mmap_sem for /proc/pid/pagemap 1b3042d0d32b proc: use down_read_killable mmap_sem for /proc/pid/smaps_rollup a8c568fc4832 mm/mmu_notifier: use hlist_add_head_rcu() 3062448e3ee2 memcg, fsnotify: no oom-kill for remote memcg charging 041b127df733 mm/gup.c: remove some BUG_ONs from get_gate_page() fa099d6ddf68 mm/gup.c: mark undo_dev_pagemap as __maybe_unused 8be4a30e2d34 9p: pass the correct prototype to read_cache_page 071f2135cfec mm/kmemleak.c: fix check for softirq context 7bd5902a1e18 sh: prevent warnings when using iounmap af50d6a1c245 block/bio-integrity: fix a memory leak bug 7f775a67abe4 powerpc/eeh: Handle hugepages in ioremap space e7a41b276974 dlm: check if workqueues are NULL before flushing/destroying 5d59e28c3d1b mailbox: handle failed named mailbox channel request 2140a6b03a61 f2fs: avoid out-of-range memory access 8a1a3d383923 block: init flush rq ref count to 1 4b9dc73a0d4a powerpc/boot: add {get, put}_unaligned_be32 to xz_config.h 549f726fb094 PCI: dwc: pci-dra7xx: Fix compilation when !CONFIG_GPIOLIB 367cc371a8e3 RDMA/rxe: Fill in wc byte_len with IB_WC_RECV_RDMA_WITH_IMM 4fe7ea29e4a6 perf hists browser: Fix potential NULL pointer dereference found by the smatch tool 915945f3bdc2 perf annotate: Fix dereferencing freed memory found by the smatch tool b305dcff1518 perf session: Fix potential NULL pointer dereference found by the smatch tool 19cf571c64b7 perf top: Fix potential NULL pointer dereference detected by the smatch tool 995527db41f6 perf stat: Fix use-after-freed pointer detected by the smatch tool 3b8c4eae5541 perf test mmap-thread-lookup: Initialize variable to suppress memory sanitizer warning dd0a0c72a10f PCI: mobiveil: Use the 1st inbound window for MEM inbound transactions 270972df68fb PCI: mobiveil: Initialize Primary/Secondary/Subordinate bus numbers 9eb4f2886db3 kallsyms: exclude kasan local symbols on s390 4613f46ef472 PCI: mobiveil: Fix the Class Code field 51308ec525cc PCI: mobiveil: Fix PCI base address in MEM/IO outbound windows 05959ed85e34 arm64: assembler: Switch ESB-instruction with a vanilla nop if !ARM64_HAS_RAS 007b01a27d4d IB/ipoib: Add child to parent list only if device initialized d48720bafd90 powerpc/mm: Handle page table allocation failures f14537bb81d1 IB/mlx5: Fixed reporting counters on 2nd port for Dual port RoCE d03aeb8d6b98 serial: sh-sci: Fix TX DMA buffer flushing and workqueue races 48c73b8ee5c9 serial: sh-sci: Terminate TX DMA during buffer flushing ca730bf0cd67 RDMA/i40iw: Set queue pair state when being queried 52373ab6a6c7 powerpc/4xx/uic: clear pending interrupt after irq type/pol change 74520144700d um: Silence lockdep complaint about mmap_sem 30edc7c1fed5 mm/swap: fix release_pages() when releasing devmap pages b4e77006d5a7 mfd: hi655x-pmic: Fix missing return value check for devm_regmap_init_mmio_clk 9b1691c3f660 mfd: arizona: Fix undefined behavior d9c74176c275 mfd: core: Set fwnode for created devices 7b24a4a363a9 mfd: madera: Add missing of table registration e00cf1dac30c recordmcount: Fix spurious mcount entries on powerpc 9fac39480e39 powerpc/xmon: Fix disabling tracing while in xmon a80f67d5560c powerpc/cacheflush: fix variable set but not used b150423e0d5e iio: iio-utils: Fix possible incorrect mask calculation fc9c15c4e3ff PCI: xilinx-nwl: Fix Multi MSI data programming e3e2bb12c8a7 genksyms: Teach parser about 128-bit built-in types 27f2335e1440 kbuild: Add -Werror=unknown-warning-option to CLANG_FLAGS 1fa94381fdeb i2c: stm32f7: fix the get_irq error cases f930727faef2 PCI: sysfs: Ignore lockdep for remove attribute 9d45fbee76af serial: mctrl_gpio: Check if GPIO property exisits before requesting it e7f206f42fb6 drm/msm: Depopulate platform on probe failure 216462fa884f powerpc/pci/of: Fix OF flags parsing for 64bit BARs 5d3ad905af43 mmc: sdhci: sdhci-pci-o2micro: Check if controller supports 8-bit width bf7cf9fb02db usb: gadget: Zero ffs_io_data ac380eb479de tty: serial_core: Set port active bit in uart_port_activate 785e11c06db3 serial: imx: fix locking in set_termios() 741f8b39b6d4 drm/rockchip: Properly adjust to a true clock in adjusted_mode fd0d171c7064 powerpc/pseries/mobility: prevent cpu hotplug during DT update 6a7047471073 drm/amd/display: fix compilation error 709ca46f1d46 phy: renesas: rcar-gen2: Fix memory leak at error paths 725c7b781150 drm/virtio: Add memory barriers for capset cache. 11b4e9f3695c drm/amd/display: Always allocate initial connector state state 1a2425b597fa serial: 8250: Fix TX interrupt handling condition a0e7d6b7fa55 tty: serial: msm_serial: avoid system lockup condition e40f5a873fc7 tty/serial: digicolor: Fix digicolor-usart already registered warning 5c0e54839d48 memstick: Fix error cleanup path of memstick_init 0a50a272389f drm/crc-debugfs: Also sprinkle irqrestore over early exits 26a66454541c drm/crc-debugfs: User irqsafe spinlock in drm_crtc_add_crc_entry 4d14323a2eb5 gpu: host1x: Increase maximum DMA segment size f9bfd6bd8223 drm/bridge: sii902x: pixel clock unit is 10kHz instead of 1kHz 7af9abd7d6bd drm/bridge: tc358767: read display_props in get_modes() 49c7230d8f10 PCI: Return error if cannot probe VF 2a18d76592e0 drm/edid: Fix a missing-check bug in drm_load_edid_firmware() 210dfe630911 drm/amdkfd: Fix sdma queue map issue db64bc139440 drm/amdkfd: Fix a potential memory leak 6b1d2871fe36 drm/amd/display: Disable ABM before destroy ABM struct c242a531bb06 drm/amdgpu/sriov: Need to initialize the HDP_NONSURFACE_BAStE 147137f86b5b drm/amd/display: Fill prescale_params->scale for RGB565 08b0bcc8076b tty: serial: cpm_uart - fix init when SMC is relocated c901780d9294 pinctrl: rockchip: fix leaked of_node references a9dfb6e43677 tty: max310x: Fix invalid baudrate divisors calculator b0084c1b5058 usb: core: hub: Disable hub-initiated U1/U2 19755a124f4c staging: vt6656: use meaningful error code during buffer allocation b59f7650a507 iio: adc: stm32-dfsdm: missing error case during probe 302e4cdca1f4 iio: adc: stm32-dfsdm: manage the get_irq error case 586946ce83e4 drm/panel: simple: Fix panel_simple_dsi_probe 49fb03de361d hvsock: fix epollout hang from race condition 64f4694072aa Linux 4.19.62 60e9babfda94 net: sched: verify that q!=NULL before setting q->flags c1d98b766ebe mm: vmscan: scan anonymous pages on file refaults 7560e33369ed KVM: nVMX: Clear pending KVM_REQ_GET_VMCS12_PAGES when leaving nested 967bc679c596 KVM: nVMX: do not use dangling shadow VMCS after guest reset 3a17ca864baf ext4: allow directory holes caa4e08253eb ext4: use jbd2_inode dirty range scoping af3812b65c37 jbd2: introduce jbd2_inode dirty range scoping 4becd6c11e9a mm: add filemap_fdatawait_range_keep_errors() c9ea4620a37f ext4: enforce the immutable flag on open files 29171e82348c ext4: don't allow any modifications to an immutable file 4a5cc64d8a8a perf/core: Fix race between close() and fork() 75100ec5f079 perf/core: Fix exclusive events' grouping 0e6ef184315d MIPS: lb60: Fix pin mappings dd5994ab1f00 gpio: davinci: silence error prints in case of EPROBE_DEFER c947cf3e9583 dma-buf: Discard old fence_excl on retrying get_fences_rcu for realloc 95ee55cab118 dma-buf: balance refcount inbalance b72fb8dec183 net: bridge: stp: don't cache eth dest pointer before skb pull 78701843ecc4 net: bridge: don't cache ether dest pointer on input 41a8df71809e net: bridge: mcast: fix stale ipv6 hdr pointer when handling v6 query caf4488fc06e net: bridge: mcast: fix stale nsrcs pointer in igmp3/mld2 report handling bc9a2f36a7d6 sctp: not bind the socket in sctp_connect fde351aeff4a net/tls: make sure offload also gets the keys wiped d9571a9f5ec1 net_sched: unset TCQ_F_CAN_BYPASS when adding filters 69cd58454615 netrom: hold sock when setting skb->destructor dc59a2abd33e netrom: fix a memory leak in nr_rx_frame() 0c5cb5a12623 macsec: fix checksumming after decryption 21252f49cddf macsec: fix use-after-free of skb during RX a8ba53da071e net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn a2aa162a6331 vrf: make sure skb->data contains ip header to make routing 1b200acde418 tcp: Reset bytes_acked and bytes_received when disconnecting c60f57dfe995 tcp: fix tcp_set_congestion_control() use from bpf hook 6323c238bb43 tcp: be more careful in tcp_fragment() b640ade07295 sky2: Disable MSI on ASUS P6T d9ee5afd9165 sctp: fix error handling on stream scheduler initialization bfa7913575b7 rxrpc: Fix send on a connected, but unbound socket 3e4e6b71ece0 r8169: fix issue with confused RX unit after PHY power-down on RTL8411b 97739e5c9e73 nfc: fix potential illegal memory access f47f68cc9d33 net: stmmac: Re-work the queue selection for TSO packets 201d7d62a82a net: phy: sfp: hwmon: Fix scaling of RX power c60bce64615d net: openvswitch: fix csum updates for MPLS actions 257441a07201 net: neigh: fix multiple neigh timer scheduling 832d0ea751a8 net: make skb_dst_force return true when dst is refcounted 6ab30a4cc5c6 net: dsa: mv88e6xxx: wait after reset deactivation 5832ef4afd90 net: bcmgenet: use promisc for unsupported filters c0f4a6447977 ipv6: Unlink sibling route in case of failure 0bd84505f16f ipv6: rt6_check should return NULL if 'from' is NULL 47ce442783d7 ipv4: don't set IPv6 only flags to IPv4 addresses aee5dd00341b igmp: fix memory leak in igmpv3_del_delrec() 9770fe1b202f hv_netvsc: Fix extra rcu_read_unlock in netvsc_recv_callback() d7cdac6dc418 caif-hsi: fix possible deadlock in cfhsi_exit_module() 8fb37be12046 bnx2x: Prevent load reordering in tx completion processing 7250956f6eaf Linux 4.19.61 025eb12bb4b0 dm bufio: fix deadlock with loop device 404f59e265ac dt-bindings: allow up to four clocks for orion-mdio 03e6a668ea1f net: mvmdio: allow up to four clocks to be specified for orion-mdio dd87cc633ba5 blkcg: update blkcg_print_stat() to handle larger outputs 73efdc5d7d3b blk-iolatency: clear use_delay when io.latency is set to zero 1ab644bd02ab blk-throttle: fix zero wait time for iops throttled group 91da712ff592 usb: Handle USB3 remote wakeup for LPM enabled devices correctly 152ddf9f0458 Bluetooth: Add SMP workaround Microsoft Surface Precision Mouse bug 98318cd31b95 intel_th: msu: Fix single mode with disabled IOMMU d6328d7c1a71 mtd: spinand: read returns badly if the last page has bitflips 94f1db42a968 mtd: rawnand: mtk: Correct low level time calculation of r/w cycle 30c6b34759f6 eCryptfs: fix a couple type promotion bugs 92e23f5fc049 mmc: sdhci-msm: fix mutex while in spinlock 01982f7bcc9d powerpc/pseries: Fix oops in hotplug memory notifier e725502b8548 powerpc/powernv/npu: Fix reference leak 1e3b61cbc30d powerpc/watchpoint: Restore NV GPRs while returning from exception 237ac0d73b55 powerpc/32s: fix suspend/resume when IBATs 4-7 are used 7961981718d6 parisc: Fix kernel panic due invalid values in IAOQ0 or IAOQ1 a6a0daa775e8 parisc: Ensure userspace privilege for ptraced processes in regset functions ef5c2e165ab0 crypto: caam - limit output IV to CBC to work around CTR mode DMA issue 376b80276d84 gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM ef30c0739439 xfs: abort unaligned nowait directio early 669c867972c0 xfs: serialize unaligned dio writes against all other dio writes d61d885b17b0 xfs: fix reporting supported extra file attributes for statx() f614ef7a34b0 xfs: reserve blocks for ifree transaction during log recovery 424543a53ae0 xfs: don't ever put nlink > 0 inodes on the unlinked list 3a895cc066c0 xfs: rename m_inotbt_nores to m_finobt_nores 2ab62234e823 xfs: don't overflow xattr listent buffer 1dc8b13cc66d xfs: flush removing page cache in xfs_reflink_remap_prep 788920d12b95 xfs: fix pagecache truncation prior to reflink 41f64437f030 include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures afa3e571cde3 coda: pass the host file in vma->vm_file on mmap 2c0222b48e77 libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields 656d06dab4d6 HID: wacom: correct touch resolution x/y typo 1c871b4006b2 HID: wacom: generic: Correct pad syncing 46f71a15abe7 HID: wacom: generic: only switch the mode on devices with LEDs cb4c2b94f629 IB/mlx5: Report correctly tag matching rendezvous capability 4bd953241d81 Btrfs: add missing inode version, ctime and mtime updates when punching hole fffedf5cf67e Btrfs: fix fsync not persisting dentry deletions due to inode evictions 110850fffeb0 Btrfs: fix data loss after inode eviction, renaming it, and fsync it 6b71c62ea9da PCI: qcom: Ensure that PERST is asserted for at least 100 ms 529e71cae929 PCI: Do not poll for PME if the device is in D3cold 4d8504004c86 PCI: hv: Fix a use-after-free bug in hv_eject_device_work() f0ff76a42ef5 intel_th: pci: Add Ice Lake NNPI support 66a13b5e4e9c drm/edid: parse CEA blocks embedded in DisplayID 9854e06842bc perf/x86/amd/uncore: Set the thread mask for F17h L3 PMCs 82c46f7b0918 perf/x86/amd/uncore: Do not set 'ThreadMask' and 'SliceMask' for non-L3 PMCs a847a5225432 perf/x86/intel: Fix spurious NMI on fixed counter 0d4c0bb70665 x86/boot: Fix memory leak in default_get_smp_config() b52807e607f1 9p/virtio: Add cleanup path in p9_virtio_init 1253882d64d0 9p/xen: Add cleanup path in p9_trans_xen_init 007e5aaf287c xen/events: fix binding user event channels to cpus e380170b3b3a dm zoned: fix zone state management race 1e4247d7958b padata: use smp_mb in padata_reorder to avoid orphaned padata jobs 0489d808a5f2 drm/nouveau/i2c: Enable i2c pads & busses during preinit c77cbc873586 kconfig: fix missing choice values in auto.conf 2c7b50c7b1d0 fs/proc/proc_sysctl.c: fix the default values of i_uid/i_gid on /proc/sys inodes. ba271659ad42 arm64: tegra: Fix AGIC register range ba27a25df6df KVM: x86/vPMU: refine kvm_pmu err msg when event creation failed 87bae91a0fe9 media: videobuf2-dma-sg: Prevent size from overflowing cb2e2b0ae554 media: videobuf2-core: Prevent size alignment wrapping buffer size to 0 deb78bd24e0c media: coda: Remove unbalanced and unneeded mutex unlock fc0232e24541 media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom() a4c4c06f1755 ALSA: hda/realtek: apply ALC891 headset fixup to one Dell machine 8ba78e4d564e ALSA: hda/realtek - Fixed Headphone Mic can't record on Dell platform c92212a81617 ALSA: seq: Break too long mutex context in the write loop eb6c84e4b4f2 raid5-cache: Need to do start() part job after adding journal device 3f42c0000b23 ASoC: dapm: Adapt for debugfs API change 677b2aa3be5c lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE 0b174bac4e43 pnfs: Fix a problem where we gratuitously start doing I/O through the MDS f64ff5914f00 pNFS: Fix a typo in pnfs_update_layout 603e7497bf27 pnfs/flexfiles: Fix PTR_ERR() dereferences in ff_layout_track_ds_error 5347e61954fc NFSv4: Handle the special Linux file open access mode 6825ff011c7c iwlwifi: fix RF-Kill interrupt while FW load for gen2 devices a32e2ceca0ef iwlwifi: don't WARN when calling iwl_get_shared_mem_conf with RF-Kill d9ce0788da91 iwlwifi: pcie: fix ALIVE interrupt handling for gen2 devices w/o MSI-X 04c52c105a38 iwlwifi: pcie: don't service an interrupt that was masked 7ebddd5fe217 arm64: tegra: Update Jetson TX1 GPU regulator timings 042451b921b1 regulator: s2mps11: Fix buck7 and buck8 wrong voltages 8da63aa46e26 Input: alps - fix a mismatch between a condition check and its comment 81368a9a98d9 Input: synaptics - whitelist Lenovo T580 SMBus intertouch cfb9250619c8 Input: alps - don't handle ALPS cs19 trackpoint-only device d657077eda7b Input: gtco - bounds check collection indent level f11ba9df8eed bcache: destroy dc->writeback_write_wq if failed to create dc->writeback_thread 2ab14861d2eb bcache: fix mistaken sysfs entry for io_error counter 3c466df8fc59 bcache: ignore read-ahead request failure on backing device 4fc48cd21a31 bcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free" ab966241d59a bcache: Revert "bcache: fix high CPU occupancy during journal" 58169c189bd6 Revert "bcache: set CACHE_SET_IO_DISABLE in bch_cached_dev_error()" c3b7d27f3746 crypto: crypto4xx - fix a potential double free in ppc4xx_trng_probe a9fd1795fee6 crypto: ccp/gcm - use const time tag comparison. 561c4424f1e3 crypto: ccp - memset structure fields to zero before reuse 13805a5df489 crypto: crypto4xx - block ciphers should only accept complete blocks 17e63172d536 crypto: crypto4xx - fix blocksize for cfb and ofb 4598094d24c7 crypto: crypto4xx - fix AES CTR blocksize value 1c9b0a766513 crypto: chacha20poly1305 - fix atomic sleep when using async algorithm eb99c084da28 crypto: arm64/sha2-ce - correct digest for empty data in finup 4230e09e61e6 crypto: arm64/sha1-ce - correct digest for empty data in finup 52f07c1ac70e crypto: ccp - Validate the the error value used to index error messages bed97f646997 crypto: ghash - fix unaligned memory access in ghash_setkey() ce7ec07abaf7 scsi: mac_scsi: Fix pseudo DMA implementation, take 2 de769c762626 scsi: mac_scsi: Increase PIO/PDMA transfer length threshold 3e9534fa5046 scsi: megaraid_sas: Fix calculation of target ID 1334a3e2d6d0 scsi: core: Fix race on creating sense cache 58f59f6072ab Revert "scsi: ncr5380: Increase register polling limit" 7cfded7a705c scsi: NCR5380: Always re-enable reselection interrupt d91baba81a6e scsi: NCR5380: Reduce goto statements in NCR5380_select() e73db096691e xen: let alloc_xenballooned_pages() fail if not enough memory free ff54c44f1038 floppy: fix out-of-bounds read in copy_buffer a9444d9d0f6f floppy: fix invalid pointer dereference in drive_name 5b565f3276f3 floppy: fix out-of-bounds read in next_valid_format 6e34fd07484a floppy: fix div-by-zero in setup_format_params 7c16c5eae41a iavf: fix dereference of null rx_buffer pointer e9896b29d010 net: mvmdio: defer probe of orion-mdio if a clock is not ready 5f6c5f5ae25e gtp: fix use-after-free in gtp_newlink() 141222216438 gtp: fix use-after-free in gtp_encap_destroy() 0a5eca2c949c gtp: fix Illegal context switch in RCU read-side critical section. e117a04133c6 gtp: fix suspicious RCU usage 202de90df2b7 Bluetooth: validate BLE connection interval updates ca33af18b5fc gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable() 0fdb922d0ef0 Bluetooth: Check state in l2cap_disconnect_rsp 3b57b7a3a82a perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64 c814f618b799 Bluetooth: 6lowpan: search for destination address in all peers c82c4910e9e6 Bluetooth: Add new 13d3:3501 QCA_ROME device 1cbce19bd697 Bluetooth: Add new 13d3:3491 QCA_ROME device 578658df21d5 Bluetooth: hci_bcsp: Fix memory leak in rx_skb 9d47bd217539 tools: bpftool: Fix json dump crash on powerpc 2ad04d31bb3e gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants 157d1c7a1a00 bonding: validate ip header before check IPPROTO_IGMP 88f751b066f2 selftests: bpf: fix inlines in test_lwt_seg6local ef5b204336b3 bpf, libbpf, smatch: Fix potential NULL pointer dereference 0f2f2cebe64d rxrpc: Fix oops in tracepoint ca37b9a74689 net: usb: asix: init MAC address buffers 51216937c319 bnx2x: Prevent ptp_task to be rescheduled indefinitely e358d2ab42f8 perf stat: Fix group lookup for metric group a64e018be77a perf stat: Make metric event lookup more robust 7343178ccf7d bpf: fix uapi bpf_prog_info fields alignment af3790a46a55 iwlwifi: mvm: Drop large non sta frames 036184af23e0 igb: clear out skb->tstamp after reading the txtime 0024b12b776c net: mvpp2: prs: Don't override the sign bit in SRAM parser shift 05592b9b7f25 ath10k: destroy sdio workqueue while remove sdio module 26d86b29e806 net: hns3: add some error checking in hclge_tm module ddfdbcccd71a net: hns3: fix a -Wformat-nonliteral compile warning 95d084809495 bcache: fix potential deadlock in cached_def_free() 4b7758e9c4ed bcache: check c->gc_thread by IS_ERR_OR_NULL in cache_set_flush() 81b88c05bc45 bcache: acquire bch_register_lock later in cached_dev_free() d81080a0bcf8 bcache: check CACHE_SET_IO_DISABLE bit in bch_journal() 57cfb755c356 bcache: check CACHE_SET_IO_DISABLE in allocator code e78d1d234469 EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec e54cc89e6f0a wil6210: drop old event after wmi_call timeout 0388597d0627 crypto: asymmetric_keys - select CRYPTO_HASH where needed 1dea395c9e12 crypto: serpent - mark __serpent_setkey_sbox noinline b346070c72cd ixgbe: Check DDM existence in transceiver before access 0340c621eca8 rslib: Fix handling of of caller provided syndrome 8ba93c59441a rslib: Fix decoding of shortened codes dad0b17e4a4e xsk: Properly terminate assignment in xskq_produce_flush_desc e69fac59c493 clocksource/drivers/exynos_mct: Increase priority over ARM arch timer 12e20eca894b libata: don't request sense data on !ZAC ATA devices 6e6bc34f8570 ASoC: Intel: hdac_hdmi: Set ops to NULL on remove 1182ff224847 perf tools: Increase MAX_NR_CPUS and MAX_CACHES 7201cc227d4a ath10k: fix PCIE device wake up failed 8a808fadc9f7 ath10k: add missing error handling fe2ceeb4cffc ipvs: fix tinfo memory leak in start_sync_thread 20de38d282b3 mt7601u: fix possible memory leak when the device is disconnected 033577880135 x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c 3f7952b275c8 mt7601u: do not schedule rx_tasklet when the device has been disconnected 6f6e126e1995 rtlwifi: rtl8192cu: fix error handle when usb probe failed 41864adfee2e net: stmmac: sun8i: force select external PHY when no internal one bce037abc29f media: hdpvr: fix locking and a missing msleep 43b9fdc48377 media: vimc: cap: check v4l2_fill_pixfmt return value d562537dbf0d media: coda: increment sequence offset for the last returned frame 3697c12c4425 media: coda: fix last buffer handling in V4L2_ENC_CMD_STOP 6fd3e9f65db9 media: coda: fix mpeg2 sequence number handling c647c00f28af acpi/arm64: ignore 5.1 FADTs that are reported as 5.0 b9f547b7bdd9 timer_list: Guard procfs specific code d86c0b73f75b ntp: Limit TAI-UTC offset 8d8f0b9009d0 media: i2c: fix warning same module names 6439110fbeee media: s5p-mfc: Make additional clocks optional 57de3c78f0b7 ipvs: defer hook registration to avoid leaks 06a3cd416224 ipsec: select crypto ciphers for xfrm_algo 723ba7938492 arm64: Do not enable IRQs for ct_user_exit 010bfbc93424 lightnvm: pblk: fix freeing of merged pages 762bba1b7ee7 nvme-pci: set the errno on ctrl state change error c876a66553d7 nvme-pci: properly report state change failure in nvme_reset_work f0c83dd15ee1 nvme: fix possible io failures when removing multipathed ns 10cc3a65a55b EDAC/sysfs: Fix memory leak when creating a csrow object f6502ce4f050 ACPICA: Clear status of GPEs on first direct enable 3ae98dc2db1e blk-iolatency: only account submitted bios a952f7c384aa x86/cacheinfo: Fix a -Wtype-limits warning 3252b29ea41b ipoib: correcly show a VF hardware address 0e2af9b06c00 vhost_net: disable zerocopy by default 4c57957ed6c8 perf evsel: Make perf_evsel__name() accept a NULL argument 9e0bcb59b6c0 x86/atomic: Fix smp_mb__{before,after}_atomic() dd0260fd1e3a perf/x86/intel/uncore: Handle invalid event coding for free-running counter 7fc96cd2b0de sched/fair: Fix "runnable_avg_yN_inv" not used warnings d8b7db6c5004 sched/core: Add __sched tag for io_schedule() 930655b01367 xfrm: fix sa selector validation b7d66bbc8ad3 blkcg, writeback: dead memcgs shouldn't contribute to writeback ownership arbitration c8f75e753784 block: null_blk: fix race condition for null_del_dev 1a3706d8f800 net: hns3: fix for skb leak when doing selftest 6a47a42f51cf qed: iWARP - Fix tc for MPA ll2 connection 670fb965da03 x86/cpufeatures: Add FDP_EXCPTN_ONLY and ZERO_FCS_FDS 366ae49ed78c rcu: Force inlining of rcu_read_lock() 1fb3ce14f28d ASoC: meson: axg-tdm: fix sample clock inversion 32df4043aed4 x86/cpu: Add Ice Lake NNPI to Intel family 914026d58100 selinux: fix empty write to keycreate file 10e3788e6575 media: s5p-mfc: fix reading min scratch buffer size on MFC v6/v7 7c10f8941b95 bpf: silence warning messages in core b01bf44c363d regmap: fix bulk writes on paged registers 544cd592ca72 gpio: omap: ensure irq is enabled before wakeup ddeef7a00050 gpio: omap: fix lack of irqstatus_raw0 for OMAP4 79644b600850 iommu: Fix a leak in iommu_insert_resv_region f2a4624be8f3 media: fdp1: Support M3N and E3 platforms 63e53991d791 media: uvcvideo: Fix access to uninitialized fields on probe error c844f4da9b92 irqchip/meson-gpio: Add support for Meson-G12A SoC eac8b39d089a perf report: Fix OOM error in TUI mode on s390 be32a9dc3f62 perf test 6: Fix missing kvm module load for s390 3662d8bca087 perf cs-etm: Properly set the value of 'old' and 'head' in snapshot mode ac510285d40b ipset: Fix memory accounting for hash types on resize c7bf2df45044 net: sfp: add mutex to prevent concurrent state checks fa4059c5497e RAS/CEC: Fix pfn insertion 99dcd701465f s390/qdio: handle PENDING state for QEBSM devices a76f32cbd38c net: axienet: Fix race condition causing TX hang 9d643358386d net: fec: Do not use netdev messages too early 403c43921479 crypto: inside-secure - do not rely on the hardware last bit for result descriptors 50331c64f3dd net: stmmac: modify default value of tx-frames 1a0a837afc41 net: stmmac: dwmac4: fix flow control issue 713737cac327 perf jvmti: Address gcc string overflow warning for strncpy() fb83987cbe6b arm64: mm: make CONFIG_ZONE_DMA32 configurable c360eb592938 cpupower : frequency-set -r option misses the last cpu in related cpu list cac3032062e5 net: hns3: set ops to null when unregister ad_dev 35407917b0bc media: wl128x: Fix some error handling in fm_v4l2_init_video_device() 2fbde2746597 locking/lockdep: Fix merging of hlocks with non-zero references 909034b8ac64 batman-adv: Fix duplicated OGMs on NETDEV_UP aa2ad8b6fb2f tua6100: Avoid build warnings. 9072450736d0 crypto: talitos - Align SEC1 accesses to 32 bits boundaries. 9d25aedef08f crypto: talitos - properly handle split ICV. fc25cfb03ea2 net: phy: Check against net_device being NULL ef10d46d04a5 media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails. e36f25627362 media: saa7164: fix remove_proc_entry warning ea904c9f6a33 media: mc-device.c: don't memset __user pointer contents a6dd4862b98f perf annotate TUI browser: Do not use member from variable within its own initialization 71b029a5d908 fscrypt: clean up some BUG_ON()s in block encryption/decryption 2c6acf7478aa xfrm: Fix xfrm sel prefix length validation 0544b64ceb64 af_key: fix leaks in key_pol_get_resp and dump_sp. b397462a010d signal/pid_namespace: Fix reboot_pid_ns to use send_sig not force_sig 1c8e736115cd qed: Set the doorbell address correctly df6680de7a20 net: stmmac: dwmac4/5: Clear unused address entries d3969670cb5a net: stmmac: dwmac1000: Clear unused address entries 810441651a8a media: media_device_enum_links32: clean a reserved field 6fb470ace862 media: vpss: fix a potential NULL pointer dereference 70da38e80509 media: marvell-ccic: fix DMA s/g desc number calculation add712b63185 media: ov7740: avoid invalid framesize setting b0e199e13495 crypto: talitos - fix skcipher failure due to wrong output IV 6452712f95e3 media: spi: IR LED: add missing of table registration 94f2b518a788 media: dvb: usb: fix use after free in dvb_usb_device_exit 8f855c09e2af batman-adv: fix for leaked TVLV handler. 83d133c96aad regmap: debugfs: Fix memory leak in regmap_debugfs_init 2b5b12c0c1b7 ath: DFS JP domain W56 fixed pulse type 3 RADAR detection da153c0c5746 wil6210: fix spurious interrupts in 3-msi a4bf4fecff16 ath10k: add peer id check in ath10k_peer_find_by_id 83c911f4bd68 ath6kl: add some bounds checking 42dcbf20e182 ath9k: Check for errors when reading SREV register 7e19e658e535 ath10k: Do not send probe response template for mesh 009edc622bba wil6210: fix potential out-of-bounds read 09593c25b975 dmaengine: imx-sdma: fix use-after-free on probe error path 06e15cf5aead scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported 37cb02da44dc arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly 73ebefc814ef MIPS: fix build on non-linux hosts 7202df6be6ec MIPS: ath79: fix ar933x uart parity mode be9b6782a9eb Linux 4.19.60 d173ce091c1a x86/entry/32: Fix ENDPROC of common_spurious 466bdfc6c4d6 drm/udl: move to embedding drm device inside udl device. af48f7d79fae drm/udl: Replace drm_dev_unref with drm_dev_put cfd99eccede5 drm/udl: introduce a macro to convert dev to udl. 8f14cf159e9f regmap-irq: do not write mask register if mask_base is zero 820b010743ee crypto/NX: Set receive window credits to max number of CRBs in RxFIFO b24c6403633d crypto: talitos - fix hash on SEC1. ff1ce8ef1f88 crypto: talitos - move struct talitos_edesc into talitos.h b578b87bcab6 s390/qdio: don't touch the dsci in tiqdio_add_input_queues() b1d52630b12a s390/qdio: (re-)initialize tiqdio list entries 02eb533e940a s390: fix stfle zero padding 9db915738e40 ARC: hide unused function unw_hdr_alloc fc6975ee932b x86/irq: Seperate unused system vectors from spurious entry again 9494cd392885 x86/irq: Handle spurious interrupt after shutdown gracefully 7897f5a443fb x86/ioapic: Implement irq_get_irqchip_state() callback 6074f6043c49 genirq: Add optional hardware synchronization for shutdown 3f10ccc29780 genirq: Fix misleading synchronize_irq() documentation 578db1aa595b genirq: Delay deactivation in free_irq() 2656ee5a5ad5 linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL 9c875e8556d4 pinctrl: mediatek: Update cur_mask in mask/mask ops f6e01328cb0e cpu/hotplug: Fix out-of-bounds read when setting fail state fa99487a43cf pinctrl: mediatek: Ignore interrupts that are wake only during resume cd2646e57ec5 HID: multitouch: Add pointstick support for ALPS Touchpad 9ea3b131441e HID: chicony: add another quirk for PixArt mouse 94968c37b6d3 x86/boot/64: Add missing fixup_pointer() for next_early_pgt access 729d25f43b64 x86/boot/64: Fix crash if kernel image crosses page table boundary 136847140cc8 dm verity: use message limit for data block corruption message 042be78692ae dm table: don't copy from a NULL pointer in realloc_argv() 0fc080bc9a72 pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order 00640eb0eafa ARM: dts: imx6ul: fix PWM[1-4] interrupts a8cc2a2c2841 sis900: fix TX completion 3232bccddeba ppp: mppe: Add softdep to arc4 5ec7753c7c9e be2net: fix link failure after ethtool offline test 2a6ee36917f0 x86/apic: Fix integer overflow on 10 bit left shift of cpu_khz fdfff855cd36 afs: Fix uninitialised spinlock afs_volume::cb_break_lock d47f06ab0c0e ARM: omap2: remove incorrect __init annotation 5d3c45538151 ARM: dts: gemini Fix up DNS-313 compatible string afda29dc5ac6 perf/core: Fix perf_sample_regs_user() mm check 627fdcc9b718 efi/bgrt: Drop BGRT status field reserved bits check cf4deb2d4de6 clk: ti: clkctrl: Fix returning uninitialized data ff232a47567f irqchip/gic-v3-its: Fix command queue pointer comparison bug 244db54441a1 firmware: improve LSM/IMA security behaviour 079d7f16a973 drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT 68048dce650e nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header 86859ef10d25 Input: synaptics - enable SMBUS on T480 thinkpad trackpad 438a3dc6f2c3 e1000e: start network tx queue only when link is up 8020568b404b Revert "e1000e: fix cyclic resets at link up with active tx" 3bd837bfe431 Linux 4.19.59 70bae382b3dc staging: rtl8712: reduce stack usage, again b46475ecd930 staging: bcm2835-camera: Handle empty EOS buffers whilst streaming 0ee144effcc3 staging: bcm2835-camera: Remove check of the number of buffers supplied fcbc6ddcd624 staging: bcm2835-camera: Ensure all buffers are returned on disable 4502c43d7f3b staging: bcm2835-camera: Replace spinlock protecting context_map with mutex 22a20b9f6d9f staging: fsl-dpaa2/ethsw: fix memory leak of switchdev_work cc396afa1959 MIPS: Remove superfluous check for __linux__ d202b5adccfb VMCI: Fix integer overflow in VMCI handle arrays 486c32325caa carl9170: fix misuse of device driver API 524ad00e80b7 binder: fix memory leak in error path 294b893a41cd lkdtm: support llvm-objcopy 5c90a2ecd08a HID: Add another Primax PIXART OEM mouse quirk c04c751bef87 staging: comedi: amplc_pci230: fix null pointer deref on interrupt 4e49c6c91c18 staging: comedi: dt282x: fix a null pointer deref on interrupt 8419fd562a09 drivers/usb/typec/tps6598x.c: fix 4CC cmd write 63b3028cd590 drivers/usb/typec/tps6598x.c: fix portinfo width 57e16e0d8c68 usb: renesas_usbhs: add a workaround for a race condition of workqueue aa9a8038ea8b usb: dwc2: use a longer AHB idle timeout in dwc2_core_reset() cac4a04202fb usb: gadget: ether: Fix race between gether_disconnect and rx_submit 449a8d08a4bc p54usb: Fix race between disconnect and firmware loading 135d9ba3b285 Revert "serial: 8250: Don't service RX FIFO if interrupts are disabled" 0891268f36a2 USB: serial: option: add support for GosunCn ME3630 RNDIS mode 0a1c811bf033 USB: serial: ftdi_sio: add ID for isodebug v1 bb902b6c87ff mwifiex: Don't abort on small, spec-compliant vendor IEs ffbbd626e1ce mwifiex: Abort at too short BSS descriptor element a2a24b57c27a Documentation/admin: Remove the vsyscall=native documentation 8a815007f5fe Documentation: Add section about CPU vulnerabilities for Spectre bd9604022eb3 x86/tls: Fix possible spectre-v1 in do_get_thread_area() 68ff28291a4f x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg() d8e26651ce8d perf pmu: Fix uncore PMU alias list for ARM64 018524b75852 block, bfq: NULL out the bic when it's no longer valid ff75e5f41e88 ALSA: hda/realtek - Headphone Mic can't record after S3 87c3262b00d8 ALSA: usb-audio: Fix parse of UAC2 Extension Units ef374f5a2731 media: stv0297: fix frequency range limit 5db079eb0acd udf: Fix incorrect final NOT_ALLOCATED (hole) extent length 0fc3e9b9b603 fscrypt: don't set policy for a dead directory e9f76b954336 net :sunrpc :clnt :Fix xps refcount imbalance on the error path 810cfc3d9d2e NFS4: Only set creation opendata if O_CREAT 7075654ce7d0 net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge() 606561e16186 quota: fix a problem about transfer quota 5ad566af08c1 scsi: qedi: Check targetname while finding boot target information 37232abb6ea3 net: lio_core: fix potential sign-extension overflow on large shift 740b2ac49518 ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL a02ac12d2d48 drm: return -EFAULT if copy_to_user() fails 4c938a635fc3 bnx2x: Check if transceiver implements DDM before access 270ae00a0346 md: fix for divide error in status_resync 5533d9ed4112 mmc: core: complete HS400 before checking status 2da80536f629 qmi_wwan: extend permitted QMAP mux_id value range dc84e98393f7 qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode dbc6a83cf2bc qmi_wwan: add support for QMAP padding in the RX path 292ba5b1faf4 bpf, x64: fix stack layout of JITed bpf code 4c2ce7addda8 bpf, devmap: Add missing RCU read lock on flush ab44f8bcf2e5 bpf, devmap: Add missing bulk queue free 8d09e862103b bpf, devmap: Fix premature entry free on destroying map ba0afe520ee9 mac80211: do not start any work during reconfigure flow de8cf2c0bc64 mac80211: only warn once on chanctx_conf being NULL 9c2dd6d47131 ARM: davinci: da8xx: specify dma_coherent_mask for lcdc 3bbcc8b9ad37 ARM: davinci: da850-evm: call regulator_has_full_constraints() 443250665388 mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed 512bbb114b99 KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy 41420ac584d7 Input: imx_keypad - make sure keyboard can always wake up system b71f312e9bf7 riscv: Fix udelay in RV32. 122c6a71c08d drm/vmwgfx: fix a warning due to missing dma_parms d3861d4ca94c drm/vmwgfx: Honor the sg list segment size limitation c0b12abd1828 s390/boot: disable address-of-packed-member warning e71daed5176f ARM: dts: am335x phytec boards: Fix cd-gpios active level 822c2ee81c63 ibmvnic: Fix unchecked return codes of memory allocations 0f06004d16be ibmvnic: Refresh device multicast list after reset e65dd528bb8e ibmvnic: Do not close unopened driver during reset 374180b11b29 net: phy: rename Asix Electronics PHY driver 473a75c7fab5 can: af_can: Fix error path of can_init() 486954277fc1 can: m_can: implement errata "Needless activation of MRAF irq" 270149f78b9c can: mcp251x: add support for mcp25625 33672c74b484 dt-bindings: can: mcp251x: add mcp25625 support 07c96e8e8021 soundwire: intel: set dai min and max channels correctly c7e427e28a3a mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies() 8e115a079940 iwlwifi: Fix double-free problems in iwl_req_fw_callback() d4c0f752c1d2 mwifiex: Fix possible buffer overflows at parsing bss descriptor b8588a0981b7 mac80211: free peer keys before vif down in mesh acc42e5c2322 mac80211: mesh: fix RCU warning e3868c1a462f staging:iio:ad7150: fix threshold mode config bit 6b1ce3971e05 soundwire: stream: fix out of boundary access on port properties 6be857082611 bpf: sockmap, fix use after free from sleep in psock backlog workqueue bc84982f977d mac80211: fix rate reporting inside cfg80211_calculate_bitrate_he() 3c24a931e972 samples, bpf: suppress compiler warning e7779115bbd9 samples, bpf: fix to change the buffer size for read() fe01e93c3fd1 Input: elantech - enable middle button support on 2 ThinkPads 2883fc1ece69 soc: bcm: brcmstb: biuctrl: Register writes require a barrier 2f1c962a7416 soc: brcmstb: Fix error path for unsupported CPUs e8250f730410 crypto: talitos - rename alternative AEAD algos. 7a6bfa08b938 Linux 4.19.58 f37de75cb8eb dmaengine: imx-sdma: remove BD_INTR for channel0 018c968de710 dmaengine: qcom: bam_dma: Fix completed descriptors count 870de1499505 MIPS: have "plain" make calls build dtbs for selected platforms 8957895b35de MIPS: Add missing EHB in mtc0 -> mfc0 sequence. 2b8f8a80ca8b MIPS: Fix bounds check virt_addr_valid 80b25628ff26 svcrdma: Ignore source port when computing DRC hash 8129a10ce78f nfsd: Fix overflow causing non-working mounts on 1 TB machines f25c06955f8d KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC f6472f50fbfc KVM: x86: degrade WARN to pr_warn_ratelimited ac0024baf073 netfilter: ipv6: nf_defrag: accept duplicate fragments again 54e8cf41b20b bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K e6c288f7307e net: hns: fix unsigned comparison to less than zero 4f24801ef50b sc16is7xx: move label 'err_spi' to correct section 318244f3641a netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments a8891c5e2251 ip6: fix skb leak in ip6frag_expire_frag_queue() 382bc84da904 rds: Fix warning. 7e6af1fa80b8 ALSA: hda: Initialize power_state field properly c8c88293bf72 net: hns: Fixes the missing put_device in positive leg for roce reset 6bf9677300f3 x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting b91ec6ae14da selftests: fib_rule_tests: Fix icmp proto with ipv6 e2851c3ee0be scsi: tcmu: fix use after free 04096b3beace mac80211: mesh: fix missing unlock on error in table_path_del() e2379b044d67 f2fs: don't access node/meta inode mapping after iput e9fde78c3a4f drm/fb-helper: generic: Don't take module ref for fbcon 7821bcce20aa media: s5p-mfc: fix incorrect bus assignment in virtual child device 3ddc2a100706 net/smc: move unhash before release of clcsock cd54dc4cd37d mlxsw: spectrum: Handle VLAN device unlinking a8a296abee36 tty: rocket: fix incorrect forward declaration of 'rp_init()' fb814f215013 btrfs: Ensure replaced device doesn't have pending chunk allocation 27ce6c2675f6 mm/vmscan.c: prevent useless kswapd loops c854d9b6ef8d ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code() 2e716c3b562d drm/imx: only send event on crtc disable if kept disabled 8ec242fd431b drm/imx: notify drm core before sending event during crtc disable d2d061351d64 drm/etnaviv: add missing failure path to destroy suballoc ec5d99e18d30 drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE ec6d8c9e6687 drm/amd/powerplay: use hardware fan control if no powerplay fan table b6d56f4f6a49 arm64: kaslr: keep modules inside module region when KASAN is enabled 7cab3dfa6d74 ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node c8790d7f76be tracing/snapshot: Resize spare buffer if size changed 052b31810085 fs/userfaultfd.c: disable irqs for fault_pending and event locks ea38007107d6 lib/mpi: Fix karactx leak in mpi_powm 7df1e2f59bde ALSA: hda/realtek - Change front mic location for Lenovo M710q 899377c50e60 ALSA: hda/realtek: Add quirks for several Clevo notebook barebones d9b6936b134e ALSA: usb-audio: fix sign unintended sign extension on left shifts 7f52af5e9baa ALSA: line6: Fix write on zero-sized buffer 3663bf2baa97 ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages 9d2ac58c1ef9 ALSA: seq: fix incorrect order of dest_client/dest_ports arguments ae3fa28f0938 crypto: cryptd - Fix skcipher instance memory leak 015c20532ace crypto: user - prevent operating on larval algorithms 54435b7fff7b ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME 600d3712ae12 drm/i915/dmc: protect against reading random memory 2b39351e3844 ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper() 938044171949 module: Fix livepatch/ftrace module text permissions race 220adcc0e0ca tracing: avoid build warning with HAVE_NOP_MCOUNT 79fccb9815db mm/mlock.c: change count_mm_mlocked_page_nr return type 4fce0a79e985 scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE b7747ecb82be cpuset: restore sanity to cpuset_cpus_allowed_fallback() e33aeb9a7c0a i2c: pca-platform: Fix GPIO lookup code 7cf431edfb71 platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow c241f3fbfa1a platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration f853112772b0 platform/x86: intel-vbtn: Report switch events when event wakes device 2ac96173bee0 platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi 027e043f9c78 drm: panel-orientation-quirks: Add quirk for GPD MicroPC 2446563dd6d7 drm: panel-orientation-quirks: Add quirk for GPD pocket2 8be5629b9622 scsi: hpsa: correct ioaccel2 chaining c1bef204c70a SoC: rt274: Fix internal jack assignment in set_jack callback 1023af0c069d ALSA: hdac: fix memory release for SST and SOF drivers 26a6acde2a42 usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC 9be058f5dd70 usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i] 5284327f4e17 x86/CPU: Add more Icelake model numbers 74929087384f ASoC: sun4i-i2s: Add offset to RX channel select 32475634e8a8 ASoC: sun4i-i2s: Fix sun8i tx channel offset mask 7b7486398a32 ASoC: max98090: remove 24-bit format support if RJ is 0 3b60f98ef496 drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable() 34e5e1c4874f drm/mediatek: clear num_pipes when unbind driver a8a86e9a5533 drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver 79e095d234bb drm/mediatek: unbind components in mtk_drm_unbind() 319f4699bcaa drm/mediatek: fix unbind functions dbd94f4938c6 spi: bitbang: Fix NULL pointer dereference in spi_unregister_master 3f8d3c9506a5 ASoC: ak4458: rstn_control - return a non-zero on error only 3c3dd68c48e8 ASoC: soc-pcm: BE dai needs prepare when pause release after resume 4c31b4b4ba65 ASoC: ak4458: add return value for ak4458_probe 0c19bcdb0db9 ASoC : cs4265 : readable register too low c549680ed59b netfilter: nft_flow_offload: IPCB is only valid for ipv4 family 041c181e6ba0 netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment 48f611ecea0e netfilter: nft_flow_offload: set liberal tracking mode for tcp 3b2734bc839d netfilter: nf_flow_table: ignore DF bit setting 869eec894663 md/raid0: Do not bypass blocking queue entered for raid0 bios c9d8d3e9d7a0 block: Fix a NULL pointer dereference in generic_make_request() 5dd6139a0aa2 Bluetooth: Fix faulty expression for minimum encryption key size check Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 885eeb589ed3150a17a8ac62c44632cb02171478) Signed-off-by: Armin Kuster --- .../linux/linux-yocto-rt_4.19.bb | 6 +++--- .../linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index da87d476f9..c55ef50a5d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "ca2e3322f4c5678eaef6434c808d0842c805d74d" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine ?= "02f0c38dd20819c0e9d279e3b1e95280101ea8ab" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index cadf1a7402..f4f411de19 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b5a2efa31290f31384971494031285d394635938" -SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine_qemuarm ?= "283b870cef5f79a6f07465828a51f27a6aed4c50" +SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 5edb97fed1..fb505862ee 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ca3cb923f8d7962c6d47a8d29923e52da1818854" -SRCREV_machine_qemuarm64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemumips ?= "f624314048dfac57e47ac91d89ca3dc8395ca47a" -SRCREV_machine_qemuppc ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemux86 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemux86-64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemumips64 ?= "ca47368b698795cd5cada84dbfcceda1f47da1aa" -SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine_qemuarm ?= "b0be447bc9053d07f3438999778bd077679ae756" +SRCREV_machine_qemuarm64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemumips ?= "3c8b21d0a335b5f418682969448574dfd0011f02" +SRCREV_machine_qemuppc ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemux86 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemux86-64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemumips64 ?= "2854797711fee4061fb760c2b6e0e3d3135195ab" +SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:24 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:24 -0800 Subject: [OE-core] [warrior 05/14] linux-yocto/4.19: update to v4.19.78 In-Reply-To: References: Message-ID: From: Bruce Ashfield Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: 58fce2064530 Linux 4.19.78 5b0446c8e0a8 9p/cache.c: Fix memory leak in v9fs_cache_session_get_cookie d85bc11a6894 kexec: bail out upon SIGKILL when allocating memory. c8a65ec0602a NFC: fix attrs checks in netlink interface 1b42503211ca smack: use GFP_NOFS while holding inode_smack::smk_lock ef9744a0218f Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set 4703593498d3 soundwire: fix regmap dependencies and align with other serial links 322753c78d1d soundwire: Kconfig: fix help format 74e2a311a226 sch_cbq: validate TCA_CBQ_WRROPT to avoid crash ed9420ddce87 tipc: fix unlimited bundling of small messages a1afd826e549 xen-netfront: do not use ~0U as error return value for xennet_fill_frags() 36a4043c4bb8 net/rds: Fix error handling in rds_ib_add_one() 012363f5ded0 udp: only do GSO if # of segs > 1 5c08d7e4f1ea net: dsa: rtl8366: Check VLAN ID and not ports 3c1f0704401c vsock: Fix a lockdep warning in __vsock_release() 544aee546174 udp: fix gso_segs calculations 79fd59ae7c2f sch_dsmark: fix potential NULL deref in dsmark_init() 76b552775d60 rxrpc: Fix rxrpc_recvmsg tracepoint 7047aae65456 qmi_wwan: add support for Cinterion CLS8 devices dd9c580a6d9b nfc: fix memory leak in llcp_sock_bind() d5b1db1c7ce4 net: Unpublish sk from sk_reuseport_cb before call_rcu 9d0995cc268b net: qlogic: Fix memory leak in ql_alloc_large_buffers 124b64feafa9 net: ipv4: avoid mixed n_redirects and rate_tokens usage 6f8564edf8c1 ipv6: Handle missing host route in __ipv6_ifa_notify 658d7ee4da50 ipv6: drop incoming packets having a v4mapped source address a495fd19cce2 hso: fix NULL-deref on tty open 7f30c44b7ca4 erspan: remove the incorrect mtu limit for erspan 2b8389112292 cxgb4:Fix out-of-bounds MSI-X info array access ed568ca73601 bpf: fix use after free in prog symbol exposure dbb7339cfddf block: mq-deadline: Fix queue restart handling af10ffa69b06 arm: use STACK_TOP when computing mmap base address f91a9c6591c0 arm: properly account for stack randomization and stack guard gap 53ba8d4358eb mips: properly account for stack randomization and stack guard gap e1b391abbfce arm64: consider stack randomization for mmap base only when necessary 30ab799e758e kmemleak: increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE default to 16K 52132ff52cad ocfs2: wait for recovering done after direct unlock request d4a546452dcc kbuild: clean compressed initramfs image d983182d4002 crypto: hisilicon - Fix double free in sec_free_hw_sgl() 22c788ba7a52 hypfs: Fix error number left in struct pointer member bbd76d9514c7 pktcdvd: remove warning on attempting to register non-passthrough dev 0840daeea6cb fat: work around race with userspace's read via blockdev while mounting 297904ea60a3 ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address 9a87ab2b4d60 security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb() 69a32a7306dd PCI: exynos: Propagate errors for optional PHYs 1264d2e7b75b PCI: imx6: Propagate errors for optional regulators 403d6c9284f1 PCI: histb: Propagate errors for optional regulators ac9c0e2ecc49 PCI: rockchip: Propagate errors for optional regulators 709c4841e51f HID: apple: Fix stuck function keys when using FN 31e98cba55ed rtc: pcf85363/pcf85263: fix regmap error in set_time 607f95788fa9 rtc: snvs: fix possible race condition 078937549f47 ARM: 8875/1: Kconfig: default to AEABI w/ Clang 3039c788d648 soundwire: intel: fix channel number reported by hardware 6a684e002561 ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes 0f0ced702d53 livepatch: Nullify obj->mod in klp_module_coming()'s error path 78a1138672af HID: wacom: Fix several minor compiler warnings 3b7fbbddeb7a PCI: tegra: Fix OF node reference leak c74a801ded7d mfd: intel-lpss: Remove D3cold delay 70bb4bf9fdfb i2c-cht-wc: Fix lockdep warning 371077ea2e75 MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean 3ed14a8d2fe7 MIPS: Ingenic: Disable broken BTB lookup optimization. 5b400fed74df ext4: fix potential use after free after remounting with noblock_validity 81fbd2327c32 dma-buf/sw_sync: Synchronize signal vs syncpt free c76e18970d93 scsi: core: Reduce memory required for SCSI logging c6304d4d7458 clk: sprd: add missing kfree 7cd89b8db60c mbox: qcom: add APCS child device for QCS404 324b0c9efc77 powerpc: dump kernel log before carrying out fadump or kdump 72884423e77f clk: at91: select parent if main oscillator or bypass is enabled 952d1c6d7cf0 arm64: fix unreachable code issue with cmpxchg b25bd837a637 pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c b717a47dd913 powerpc/pseries: correctly track irq state in default idle ae089bf87c57 clk: qcom: gcc-sdm845: Use floor ops for sdcc clks 2c16f72135fb pstore: fs superblock limits 0c09b02842b8 powerpc/64s/exception: machine check use correct cfar for late handler 39b6d05169b2 drm/amdgpu/si: fix ASIC tests 4dcbca872a84 drm/amd/display: support spdif 38dfc974f322 clk: renesas: cpg-mssr: Set GENPD_FLAG_ALWAYS_ON for clock domain 0b5ac607db4b clk: renesas: mstp: Set GENPD_FLAG_ALWAYS_ON for clock domain 2cfb89832179 pinctrl: amd: disable spurious-firing GPIO IRQs 274d7acb0b81 drm/nouveau/volt: Fix for some cards having 0 maximum voltage 9b2d2f2ad003 vfio_pci: Restore original state on release c1f7b3fb87cf powerpc/eeh: Clear stale EEH_DEV_NO_HANDLER flag b2df456c83e3 pinctrl: tegra: Fix write barrier placement in pmx_writel 4c91e678d27c powerpc/pseries/mobility: use cond_resched when updating device tree 6d728a172732 powerpc/futex: Fix warning: 'oldval' may be used uninitialized in this function 6aa455b0d0a0 powerpc/rtas: use device model APIs and serialization during LPM 25c501f0f9d9 powerpc/xmon: Check for HV mode when dumping XIVE info from OPAL 2cca24b2cb9a clk: zx296718: Don't reference clk_init_data after registration efa0fe4cde05 clk: sprd: Don't reference clk_init_data after registration 89dc59fb267d clk: sirf: Don't reference clk_init_data after registration bd3a445c2717 clk: actions: Don't reference clk_init_data after registration 437399ed906a powerpc/powernv/ioda2: Allocate TCE table levels on demand for default DMA window 782a77f2eb39 drm/amd/display: reprogram VM config when system resume 24ba84ec0016 drm/amd/display: fix issue where 252-255 values are clipped efb0e1e3d0e1 clk: sunxi-ng: v3s: add missing clock slices for MMC2 module clocks a2279550f7be clk: qoriq: Fix -Wunused-const-variable 84038a98b904 ipmi_si: Only schedule continuously in the thread in maintenance mode b351726bb5be PCI: rpaphp: Avoid a sometimes-uninitialized warning 0936c46139cb gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property() 6e03bca91f8e drm/radeon: Fix EEH during kexec 441c15582338 drm/rockchip: Check for fast link training before enabling psr f3d62177dee3 drm/panel: check failure cases in the probe func 9cb3698dcc86 drm/stm: attach gem fence to atomic state 043f0229f442 video: ssd1307fb: Start page range at page_offset bd5b6a7c89ef drm/panel: simple: fix AUO g185han01 horizontal blanking db472be8b340 drm/bridge: tc358767: Increase AUX transfer length limit 053d0ec61e33 tpm: Fix TPM 1.2 Shutdown sequence to prevent future TPM operations d598712712e4 tpm: use tpm_try_get_ops() in tpm-sysfs.c. 6cad9d0cf87b Linux 4.19.77 2c60da90ec44 drm/amd/display: Restore backlight brightness after system resume 4d8bdf7f3a86 mm/compaction.c: clear total_{migrate,free}_scanned before scanning a new zone 5bead06b3443 fuse: fix deadlock with aio poll and fuse_iqueue::waitq.lock bbe3e2056d27 md/raid0: avoid RAID0 data corruption due to layout confusion. 4290a9e59323 CIFS: Fix oplock handling for SMB 2.1+ protocols a3a150895b6f CIFS: fix max ea value size a0f7fd38acf5 i2c: riic: Clear NACK in tend isr fec38267a2bf hwrng: core - don't wait on add_early_randomness() 060986096fea quota: fix wrong condition in is_quota_modification() 091c754d5ca9 ext4: fix punch hole for inline_data file systems 775e3e734bd3 ext4: fix warning inside ext4_convert_unwritten_extents_endio caa6926d94f1 /dev/mem: Bail out upon SIGKILL. bd3a11af1bde cfg80211: Purge frame registrations on iftype change 5dc86e9574a1 md: only call set_in_sync() when it is expected to succeed. 598a2cda62d3 md: don't report active array_state until after revalidate_disk() completes. e8323e0ddce1 md/raid6: Set R5_ReadError when there is read failure on parity disk bacff03bb286 Btrfs: fix race setting up and completing qgroup rescan workers b5c42ef09df3 btrfs: qgroup: Fix reserved data space leak if we have multiple reserve calls c521bfa8e2dc btrfs: qgroup: Fix the wrong target io_tree when freeing reserved data space 067f82a05c2f btrfs: Relinquish CPUs in btrfs_compare_trees b08344be3546 Btrfs: fix use-after-free when using the tree modification log 4874c6fe1c9e btrfs: fix allocation of free space cache v1 bitmap pages 934243a72849 ovl: filter of trusted xattr results in audit e7265adc0a3c ovl: Fix dereferencing possible ERR_PTR() 2e96c9332595 smb3: allow disabling requesting leases 82652c06f976 block: fix null pointer dereference in blk_mq_rq_timed_out() db5b2fe4d33c i40e: check __I40E_VF_DISABLE bit in i40e_sync_filters_subtask b4a734a529b8 memcg, kmem: do not fail __GFP_NOFAIL charges d40b3eafb52e memcg, oom: don't require __GFP_FS when invoking memcg OOM killer e0c1e6e55bca gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps 3620b06b1db0 efifb: BGRT: Improve efifb_bgrt_sanity_check c4f65c2fb0f5 regulator: Defer init completion for a while after late_initcall 3784576fc639 alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP 174bbcc560cc arm64: dts: rockchip: limit clock rate of MMC controllers for RK3328 8cfe3b8aa3b6 arm64: tlb: Ensure we execute an ISB following walk cache invalidation fc7d6bfdd774 Revert "arm64: Remove unnecessary ISBs from set_{pte,pmd,pud}" 881edc165b8e ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up 2209279439a1 ARM: samsung: Fix system restart on S3C6410 ad884155fb9c ASoC: Intel: Fix use of potentially uninitialized variable 7bdab36455f9 ASoC: Intel: Skylake: Use correct function to access iomem space 3c54f463402f ASoC: Intel: NHLT: Fix debug print format 29ecf8cae5f4 binfmt_elf: Do not move brk for INTERP-less ET_EXEC 02ef5c299d15 media: don't drop front-end reference count for ->detach 589ca8ec4c62 media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table 496cf984a60e KVM: x86: Manually calculate reserved bits when loading PDPTRS 933e3e2b5070 KVM: x86: set ctxt->have_exception in x86_decode_insn() 9723e4458604 KVM: x86: always stop emulation on page fault 8225db4a70b2 parisc: Disable HP HSC-PCI Cards to prevent kernel crash ad41162974c6 fuse: fix missing unlock_page in fuse_writepage() ecfe4b5f70c8 powerpc/imc: Dont create debugfs files for cpu-less nodes e94443fc7b64 scsi: implement .cleanup_rq callback 4ec3ca2770e7 blk-mq: add callback of .cleanup_rq 4848fb93243e ALSA: hda/realtek - PCI quirk for Medion E4254 e9bcaf82dd37 ceph: use ceph_evict_inode to cleanup inode's resource 72f0fff3c450 Revert "ceph: use ceph_evict_inode to cleanup inode's resource" 98dc6d958bd9 randstruct: Check member structs in is_pure_ops_struct() ad6819cd68be IB/hfi1: Define variables as unsigned long to fix KASAN warning a924850c93d4 IB/mlx5: Free mpi in mp_slave mode 40b071992ca5 printk: Do not lose last line in kmsg buffer dump 28f142b940af scsi: qla2xxx: Fix Relogin to prevent modifying scan_state flag 03b75e65ceed scsi: scsi_dh_rdac: zero cdb in send_mode_select() 2e21e5b225ef ALSA: firewire-tascam: check intermediate state of clock status and retry f5779e4449da ALSA: firewire-tascam: handle error code when getting current source of clock fdd131eab68f iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36 6437ec272eda PM / devfreq: passive: fix compiler warning 814f7fe56ebb media: omap3isp: Set device on omap3isp subdevs c5dbd74f8259 btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type 2aeeb0a4b440 iommu/amd: Override wrong IVRS IOAPIC on Raven Ridge systems 291da335040c ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93 8630a4d13683 media: ttusb-dec: Fix info-leak in ttusb_dec_send_command() d47636913bda drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2) 5370cf8d90ad ALSA: hda - Drop unsol event handler for Intel HDMI codecs ac1d43a20a08 e1000e: add workaround for possible stalled packet 35b6cba971f5 libertas: Add missing sentinel at end of if_usb.c fw_table 0a43d5d458d5 raid5: don't increment read_errors on EILSEQ return da87dfca25aa mmc: dw_mmc: Re-store SDIO IRQs mask at system resume a0dd3d95fb21 mmc: core: Add helper function to indicate if SDIO IRQs is enabled 8ba99d50cb61 mmc: sdhci: Fix incorrect switch to HS mode 869122775782 mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD a5443cd24063 raid5: don't set STRIPE_HANDLE to stripe which is in batch list 064fba888e77 ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set 476eda2539bb platform/x86: intel_pmc_core: Do not ioremap RAM e836cd2917c6 x86/cpu: Add Tiger Lake to Intel family b21919eeced6 s390/crypto: xts-aes-s390 fix extra run-time crypto self tests finding fad90d4bfa8d kprobes: Prohibit probing on BUG() and WARN() address 213077da3e7c dmaengine: ti: edma: Do not reset reserved paRAM slots f1db75622996 md/raid1: fail run raid1 array when active disk less than one 76cf93f04c3d hwmon: (acpi_power_meter) Change log level for 'unsafe software power cap' f0956418d997 closures: fix a race on wakeup from closure_sync 9fcfdff61f74 ACPI / PCI: fix acpi_pci_irq_enable() memory leak e4467fb6ef54 ACPI: custom_method: fix memory leaks 6fceb241dc76 ARM: dts: exynos: Mark LDO10 as always-on on Peach Pit/Pi Chromebooks e4b4280dcd97 libtraceevent: Change users plugin directory c55659cd1459 iommu/iova: Avoid false sharing on fq_timer_on 223b0481ed4b libata/ahci: Drop PCS quirk for Denverton and beyond de888e0244cb iommu/amd: Silence warnings under memory pressure 6241c0ac301e ALSA: firewire-motu: add support for MOTU 4pre ad58ce6cacd1 nvme-multipath: fix ana log nsid lookup when nsid is not found 9edc229b9c90 nvmet: fix data units read and written counters in SMART log 7bbb7a9dd2c3 x86/mm/pti: Handle unaligned address gracefully in pti_clone_pagetable() 5201b4ffc324 ASoC: fsl_ssi: Fix clock control issue in master mode 4b7d9c2a716e x86/mm/pti: Do not invoke PTI functions when PTI is disabled eb2485e32f90 arm64: kpti: ensure patched kernel text is fetched from PoU b619496540ba x86/apic/vector: Warn when vector space exhaustion breaks affinity 01e8f487cecb sched/cpufreq: Align trace event behavior of fast switching 2919fa0398ad ACPI / CPPC: do not require the _PSD method b79922133f9c ASoC: es8316: fix headphone mixer volume table dd25f76c1f34 media: ov9650: add a sanity check 342a0bee4d94 perf trace beauty ioctl: Fix off-by-one error in cmd->string table 57409ea782e7 media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate() 78550c5cfe6d media: cpia2_usb: fix memory leaks d796c6c1aab4 media: saa7146: add cleanup in hexium_attach() ab20f38ce522 media: cec-notifier: clear cec_adap in cec_notifier_unregister d51268d7574b PM / devfreq: exynos-bus: Correct clock enable sequence 7e19b7e0d640 PM / devfreq: passive: Use non-devm notifiers f9de170eaf7e EDAC/amd64: Decode syndrome before translating address 6f80e91a66e0 EDAC/amd64: Recognize DRAM device type ECC capability adb97f18b4e7 libperf: Fix alignment trap with xyarray contents in 'perf stat' 4df2427a5148 media: dvb-core: fix a memory leak bug 8d5fccff7b0c posix-cpu-timers: Sanitize bogus WARNONS 9df9652b7345 media: dvb-frontends: use ida for pll number 006a6065c867 media: mceusb: fix (eliminate) TX IR signal length limit d093d3183ca2 nbd: add missing config put e497ec26cc43 led: triggers: Fix a memory leak bug 83c2a42b1b84 ASoC: sun4i-i2s: Don't use the oversample to calculate BCLK 5466c30b11cb tools headers: Fixup bitsperlong per arch includes b1f1b83e2583 ASoC: uniphier: Fix double reset assersion when transitioning to suspend state e6bc6e2c0d1f media: hdpvr: add terminating 0 at end of string 4a2cb7600b72 media: radio/si470x: kill urb on error dfaf60580191 ARM: dts: imx7-colibri: disable HS400 c20ee5d906ec ARM: dts: imx7d: cl-som-imx7: make ethernet work again 21927786df27 m68k: Prevent some compiler warnings in Coldfire builds ba8f56ffaebf net: lpc-enet: fix printk format strings aa2d05a9de05 media: imx: mipi csi-2: Don't fail if initial state times-out 1b7df445d881 media: omap3isp: Don't set streaming state on random subdevs 0c3802174754 media: i2c: ov5645: Fix power sequence 3dfbac0add22 media: vsp1: fix memory leak of dl on error return path c47022e019fe perf record: Support aarch64 random socket_id assignment 482c1d0a7cc4 dmaengine: iop-adma: use correct printk format strings 19a1fa140594 media: rc: imon: Allow iMON RC protocol for ffdc 7e device a527d3d4b513 media: em28xx: modules workqueue not inited for 2nd device 6a1c59a7603d media: fdp1: Reduce FCP not found message level to debug e3f5f626e17a media: mtk-mdp: fix reference count on old device tree 066afce8d87d perf test vfs_getname: Disable ~/.perfconfig to get default output 96b61fe7a5f7 perf config: Honour $PERF_CONFIG env var to specify alternate .perfconfig db751f6d5241 media: gspca: zero usb_buf on error 511110236089 idle: Prevent late-arriving interrupts from disrupting offline 9addfbd40959 sched/fair: Use rq_lock/unlock in online_fair_sched_group 6e9d45022d26 firmware: arm_scmi: Check if platform has released shmem before using 0dbdc1986bb4 efi: cper: print AER info of PCIe fatal error 4410b8517950 EDAC, pnd2: Fix ioremap() size in dnv_rd_reg() cf8f20a1aacf loop: Add LOOP_SET_DIRECT_IO to compat ioctl 18e5e458c6d8 ACPI / processor: don't print errors for processorIDs == 0xff 465bc6e80fd2 media: media/platform: fsl-viu.c: fix build for MICROBLAZE 371538451c21 md: don't set In_sync if array is frozen d38aff20c407 md: don't call spare_active in md_reap_sync_thread if all member devices can't work 1cd972e0a107 md/raid1: end bio when the device faulty 7d75275fbfb1 arm64/prefetch: fix a -Wtype-limits warning 829bebdc1ce6 ASoC: rsnd: don't call clk_get_rate() under atomic context f5bef62df824 EDAC/altera: Use the proper type for the IRQ status bits 87bc43e2a775 ia64:unwind: fix double free for mod->arch.init_unw_table ca57eca32b3e ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid d76b5ac5016c base: soc: Export soc_device_register/unregister APIs 4a75e77ef1b5 media: iguanair: add sanity checks fe8fc7d7cb64 EDAC/mc: Fix grain_bits calculation 55a98e872186 ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() 1af6822f29d6 ALSA: hda - Show the fatal CORB/RIRB error more clearly b40c15c20e42 x86/apic: Soft disable APIC before initializing it ce7fdd5cd83e x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails 0f30856944d4 sched/deadline: Fix bandwidth accounting at all levels after offline migration d29c7b8be599 x86/apic: Make apic_pending_intr_clear() more robust f381d3d2c39c sched/core: Fix CPU controller for !RT_GROUP_SCHED 417cf53b4b85 sched/fair: Fix imbalance due to CPU affinity 7cebdfa62f22 time/tick-broadcast: Fix tick_broadcast_offline() lockdep complaint 64f3fb5d751c media: i2c: ov5640: Check for devm_gpiod_get_optional() error 6cc816dd644e media: hdpvr: Add device num check and handling 8bc254d3e6b8 media: exynos4-is: fix leaked of_node references 7ec720763a20 media: mtk-cir: lower de-glitch counter for rc-mm protocol 920acbff8932 media: dib0700: fix link error for dibx000_i2c_set_speed 8f9dc49928c2 leds: leds-lp5562 allow firmware files up to the maximum length fdcf06a35bc6 dmaengine: bcm2835: Print error in case setting DMA mask fails e841313b5731 firmware: qcom_scm: Use proper types for dma mappings ec4815460d81 ASoC: sgtl5000: Fix charge pump source assignment 84bb4024b358 ASoC: sgtl5000: Fix of unmute outputs on probe a7ace049bddc ASoC: tlv320aic31xx: suppress error message for EPROBE_DEFER 3657e58405fb regulator: lm363x: Fix off-by-one n_voltages for lm3632 ldo_vpos/ldo_vneg 3eec108aa879 ALSA: hda: Flush interrupts on disabling 5b6c791f494d nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs 33fe1f517e29 nfc: enforce CAP_NET_RAW for raw sockets dd651ab7a114 ieee802154: enforce CAP_NET_RAW for raw sockets 6f0f18e53269 ax25: enforce CAP_NET_RAW for raw sockets 6fbf86627608 appletalk: enforce CAP_NET_RAW for raw sockets 50dddec689cb mISDN: enforce CAP_NET_RAW for raw sockets f06b0b3e5d76 net/mlx5: Add device ID of upcoming BlueField-2 3fdcf6a88ded tcp: better handle TCP_USER_TIMEOUT in SYN_SENT state a749eea97ac9 net: sched: fix possible crash in tcf_action_destroy() 831d0fcba1cf usbnet: sanity checking of packet sizes and device mtu b7eeccc1c786 usbnet: ignore endpoints with invalid wMaxPacketSize ff4419d725c7 skge: fix checksum byte order 9a623e1b1d03 sch_netem: fix a divide by zero in tabledist() 1cd663adcece ppp: Fix memory leak in ppp_write 99952b08537c openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC 587df35cbf65 nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs 195a3ea494d2 net_sched: add max len check for TCA_KIND c31096dc586e net/sched: act_sample: don't push mac header on ip6gre ingress abb04d0a9dea net: qrtr: Stop rx_worker before freeing node 6ea3bc412506 net/phy: fix DP83865 10 Mbps HDX loopback disable function 831d082be72c macsec: drop skb sk before calling gro_cells_receive fd0034688358 cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize 0bf79588586c arcnet: provide a buffer big enough to actually receive packets 555161ee1b7a Linux 4.19.76 59a5cea41dd0 f2fs: use generic EFSBADCRC/EFSCORRUPTED fc3d296491f4 net/rds: Check laddr_check before calling it 3de749d6d7ce net/rds: An rds_sock is added too early to the hash table 07f7ec87b5f6 net_sched: check cops->tcf_block in tc_bind_tclass() 90b0761c1b81 Bluetooth: btrtl: Additional Realtek 8822CE Bluetooth devices 6934809432d2 netfilter: nft_socket: fix erroneous socket assignment 649836fe946c xfs: don't crash on null attr fork xfs_bmapi_read 91ae87240166 drm/nouveau/disp/nv50-: fix center/aspect-corrected scaling 3717f4a49b34 ACPI: video: Add new hw_changes_brightness quirk, set it on PB Easynote MZ35 46beb6eacef5 Bluetooth: btrtl: HCI reset on close for Realtek BT chip 8ffd7ba9ffb1 net: don't warn in inet diag when IPV6 is disabled ff0fbfacc94f drm: Flush output polling on shutdown 303f6d6bbc0c f2fs: fix to do sanity check on segment bitmap of LFS curseg dec09554eba9 net/ibmvnic: Fix missing { in __ibmvnic_reset dc9118feb472 dm zoned: fix invalid memory access 73d90f57fcc2 Revert "f2fs: avoid out-of-range memory access" 40cdc71e1111 blk-mq: move cancel of requeue_work to the front of blk_exit_queue 313efb253d03 blk-mq: change gfp flags to GFP_NOIO in blk_mq_realloc_hw_ctxs 75448f40b9f6 initramfs: don't free a non-existent initrd ad16dfef4a44 bcache: remove redundant LIST_HEAD(journal) from run_cache_set() 08fdaee2d97b PCI: hv: Avoid use of hv_pci_dev->pci_slot after freeing it ef2baa03b7f0 f2fs: check all the data segments against all node ones ef06c33dc371 irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices 52b4947bac50 bpf: libbpf: retry loading program on EAGAIN a935d78e54cc Revert "drm/amd/powerplay: Enable/Disable NBPSTATE on On/OFF of UVD" 288831cba980 scsi: qla2xxx: Return switch command on a timeout 2b983f212c68 scsi: qla2xxx: Remove all rports if fabric scan retry fails 6b449e4cf090 scsi: qla2xxx: Turn off IOCB timeout timer on IOCB completion 9423770eb336 locking/lockdep: Add debug_locks check in __lock_downgrade() 0c23335a2d81 power: supply: sysfs: ratelimit property read error message 1456c40aa906 pinctrl: sprd: Use define directive for sprd_pinconf_params values 037d73a6458e objtool: Clobber user CFLAGS variable 952844f31eb7 ALSA: hda - Apply AMD controller workaround for Raven platform 50c9ccffe041 ALSA: hda - Add laptop imic fixup for ASUS M9V laptop 866a1a7e9f23 ALSA: dice: fix wrong packet parameter for Alesis iO26 9829fd27501e ALSA: usb-audio: Add DSD support for EVGA NU Audio 303921276360 ALSA: usb-audio: Add Hiby device family to quirks for native DSD support 8a845c02e495 ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt() a5e2c65034f8 ASoC: Intel: cht_bsw_max98090_ti: Enable codec clock once and keep it enabled ec2a3681b30c media: tvp5150: fix switch exit in set control handler ba6860700d1f iwlwifi: mvm: always init rs_fw with 20MHz bandwidth rates ced0676fc9c2 iwlwifi: mvm: send BCAST management frames to the right station b3873e34cbf2 net/mlx5e: Rx, Check ip headers sanity 404f118f2790 net/mlx5e: Rx, Fixup skb checksum for packets with tail padding c95ebb394d65 net/mlx5e: XDP, Avoid checksum complete when XDP prog is loaded 79e972a89cad net/mlx5e: Allow reporting of checksum unnecessary 8da68f79b3b3 mlx5: fix get_ip_proto() 44da02576b5d net/mlx5e: don't set CHECKSUM_COMPLETE on SCTP packets 6debda97411e net/mlx5e: Set ECN for received packets using CQE indication e867ef113004 CIFS: fix deadlock in cached root handling f3160a1d71f7 crypto: talitos - fix missing break in switch statement c1a7fe486647 mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword() 5fdefdcb92bb HID: Add quirk for HP X500 PIXART OEM mouse 3d072c272b88 HID: hidraw: Fix invalid read in hidraw_ioctl acc96be807bb HID: logitech: Fix general protection fault caused by Logitech driver 3e785174fb35 HID: sony: Fix memory corruption issue on cleanup. eb77929769e3 HID: prodikeys: Fix general protection fault during probe 2661d462aaa9 IB/core: Add an unbound WQ type to the new CQ API 70ec2eecc550 drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines 80fc27953e74 powerpc/xive: Fix bogus error code returned by OPAL 4eb92a114834 RDMA/restrack: Protect from reentry to resource return path 373f9092df95 net/ibmvnic: free reset work of removed device from queue 2af977b0d1db Revert "Bluetooth: validate BLE connection interval updates" d573e8a79f70 Linux 4.19.75 b841a9f58d9c media: technisat-usb2: break out of loop at end of buffer f35f5a990a07 arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field c0ccb4da26bc binfmt_elf: move brk out of mmap when doing direct loader exec c3817ffb1036 floppy: fix usercopy direction 9c13e770cca9 ovl: fix regression caused by overlapping layers detection 5e74396d8beb PCI: kirin: Fix section mismatch warning 0d50f7b1e8c8 iommu/amd: Fix race in increase_address_space() 52f32e4aec50 iommu/amd: Flush old domains in kdump kernel ca77acdf1ac9 keys: Fix missing null pointer check in request_key_auth_describe() d73515a17c14 x86/hyper-v: Fix overflow bug in fill_gva_list() 371357770c8b x86/uaccess: Don't leak the AC flags into __get_user() argument evaluation 72c762b01eb0 dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe() d04b522a65c0 dmaengine: ti: dma-crossbar: Fix a memory leak bug 6bc421d5a04a net: seeq: Fix the function used to release some memory in an error handling path 83360eb798ca net: aquantia: fix out of memory condition on rx side 30c345bd786a tools/power turbostat: fix buffer overrun d485c65853de tools/power x86_energy_perf_policy: Fix argument parsing 254b9b2971a7 tools/power x86_energy_perf_policy: Fix "uninitialized variable" warnings at -O2 a85a0d9f3796 amd-xgbe: Fix error path in xgbe_mod_init() 7ec11cad3fde perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops 560857de3064 perf/x86/intel: Restrict period on Nehalem 65ad72ce10e7 i2c: designware: Synchronize IRQs when unregistering slave client 5a45b14b03f7 sky2: Disable MSI on yet another ASUS boards (P6Xxxx) 6cce2adae3e1 ibmvnic: Do not process reset during or after device removal 080ca754f5db ARM: 8901/1: add a criteria for pfn_valid of arm c6d779fd8197 usb: host: xhci-tegra: Set DMA mask correctly b62946852afa cifs: Use kzfree() to zero out the password 325fa2a6729b cifs: set domainName when a domain-key is used in multiuser 9a74f799b99c kallsyms: Don't let kallsyms_lookup_size_offset() fail on retrieving the first symbol 0f7130177325 NFSv2: Fix write regression 60f0d449601d NFSv2: Fix eof handling 6075729f76da netfilter: nf_conntrack_ftp: Fix debug output 7ac5947f7578 netfilter: xt_physdev: Fix spurious error message in physdev_mt_check e997c0730520 x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines 688fdaa54a3e r8152: Set memory to all 0xFFs on failed reg reads d9f79f0ace55 bpf: allow narrow loads of some sk_reuseport_md fields with offset > 0 7d4201ff9f73 batman-adv: Only read OGM2 tvlv_len after buffer len check 5b8b66274183 ARM: 8874/1: mm: only adjust sections of valid mm structures b870f8afc5a5 qed: Add cleanup in qed_slowpath_start() 30881d79de31 xdp: unpin xdp umem pages in error path 55ed0ad50201 Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105 767877deb25a NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup 4ac4f4716fba NFSv4: Fix return value in nfs_finish_open() d7565d51af18 NFSv4: Fix return values for nfs4_file_open() 4e5fbcb9a615 netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info a02c676c0f03 netfilter: nft_flow_offload: missing netlink attribute policy a4fa6c68ecc3 netfilter: ebtables: Fix argument order to ADD_COUNTER 634dd5a48627 fpga: altera-ps-spi: Fix getting of optional confd gpio 0d393f23f18e tools: bpftool: close prog FD before exit on showing a single program c5bb033529f1 selftests/bpf: fix "bind{4, 6} deny specific IP & port" on s390 48d77ca1497f s390/bpf: use 32-bit index for tail calls 999f33c2438c bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() 1a85d5819ade ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack a8919f8d352f ARM: dts: dra74x: Fix iodelay configuration for mmc3 2ff2bd2c5526 ARM: OMAP2+: Fix omap4 errata warning on other SoCs 73d003274a42 s390/bpf: fix lcgr instruction encoding c1e0937ef4d5 bus: ti-sysc: Fix using configured sysc mask value 0aee9e118eee ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss f696ba6b122d ARM: dts: am57xx: Disable voltage switching for SD card ac8f26f6a035 ieee802154: hwsim: unregister hw while hwsim_subscribe_all_others fails c237a050df3b ieee802154: hwsim: Fix error handle path in hwsim_init_module 6a10e87ffca1 nl80211: Fix possible Spectre-v1 for CQM RSSI thresholds 941431c491a6 mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings 770cee245191 tty/serial: atmel: reschedule TX after RX was started 4c2f60ed8ed8 serial: sprd: correct the wrong sequence of arguments 2871621518ac firmware: google: check if size is valid when decoding VPD data 232a6462f43f KVM: coalesced_mmio: add bounds checking 7a1bad565ceb net_sched: let qdisc_put() accept NULL pointer 47288968eebd xen-netfront: do not assume sk_buff_head list is empty in error handling fdd60d80c429 udp: correct reuseport selection with connected sockets 97b5f8c95b75 ip6_gre: fix a dst leak in ip6erspan_tunnel_xmit 4fb95f299504 phy: renesas: rcar-gen3-usb2: Disable clearing VBUS in over-current abf389e0795a media: tm6000: double free if usb disconnect while streaming 77d4e2a05885 USB: usbcore: Fix slab-out-of-bounds bug during device reset b01b1eb24c04 powerpc/mm/radix: Use the right page size for vmemmap mapping 289f3c82b116 Input: elan_i2c - remove Lenovo Legion Y7000 PnpID 305c3b497662 RDMA/restrack: Release task struct which was hold by CM_ID object 8993c673d6c4 HID: wacom: generic: read HID_DG_CONTACTMAX from any feature report 2a0aa8a06aea netfilter: nf_flow_table: set default timeout after successful insertion dbc29aff8d04 Linux 4.19.74 9d587fe2cd70 x86/build: Add -Wnoaddress-of-packed-member to REALMODE_CFLAGS, to silence GCC9 build warning 96c08711fc66 nvmem: Use the same permissions for eeprom as for nvmem 3622d621e9be rsi: fix a double free bug in rsi_91x_deinit() 780f3aadee1e platform/x86: pmc_atom: Add CB4063 Beckhoff Automation board to critclk_systems DMI table 52bfcc9c8406 modules: fix compile error if don't have strict module rwx ae415d7a2707 modules: fix BUG when load module with rodata=n 0ae0c43abcbf iio: adc: stm32-dfsdm: fix data type acf77c411b4e Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature" a03ed2891cdb drm/mediatek: mtk_drm_drv.c: Add of_node_put() before goto d13a836d787d drm: panel-orientation-quirks: Add extra quirk table entry for GPD MicroPC 4b30a0698208 firmware: ti_sci: Always request response from firmware 3dfc787f2f50 crypto: talitos - HMAC SNOOP NO AFEU mode requires SW icv checking. e89d4cb6fba3 crypto: talitos - Do not modify req->cryptlen on decryption. 9aff4077304b crypto: talitos - fix ECB algs ivsize c4d7148e2d67 crypto: talitos - check data blocksize in ablkcipher. 02ebbb4f8df8 crypto: talitos - fix CTR alg blocksize 39fa02a36bb3 crypto: talitos - check AES key size e1666bcbae0c driver core: Fix use-after-free and double free on glue directory 72cd230b3231 ubifs: Correctly use tnc_next() in search_dh_cookie() a65290083b66 gpio: fix line flag validation in lineevent_create 0f4095f33557 PCI: Always allow probing with driver_override 70facf939ba2 mtd: rawnand: mtk: Fix wrongly assigned OOB buffer pointer issue 6da56f8982bb clk: rockchip: Don't yell about bad mmc phases when getting a63416f39aaf drm/meson: Add support for XBGR8888 & ABGR8888 formats d9e8b4ba0397 powerpc: Add barrier_nospec to raw_copy_in_user() eb020b77b646 x86/purgatory: Change compiler flags from -mcmodel=kernel to -mcmodel=large to fix kexec relocation errors 73c31bd92039 KVM: nVMX: handle page fault in vmread 6e60900cfa3e KVM: x86: work around leak of uninitialized stack contents 09a9f894c65b KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl 9f8a2825918c KVM: s390: kvm_s390_vm_start_migration: check dirty_bitmap before using it as target for memset() 991b3458da56 genirq: Prevent NULL pointer dereference in resend_irqs() 5b5f14601e0a ixgbe: Prevent u8 wrapping of ITR value to something less than 10us 7cbd49cf0d62 Btrfs: fix assertion failure during fsync and use of stale transaction 22ed1d472811 gpio: fix line flag validation in linehandle_create 705df757e937 gpiolib: acpi: Add gpiolib_acpi_run_edge_events_on_boot option and blacklist 0f4ceb259493 tun: fix use-after-free when register netdev failed 9a4598424e99 tipc: add NULL pointer check before calling kfree_rcu 67fe3b94a833 tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR 7c34a29261ee sctp: use transport pf_retrans in sctp_do_8_2_transport_strike 41b624ff83d2 sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()' a9e91767b921 sch_hhf: ensure quantum and hhf_non_hh_weight are non-zero a7f46e18ecfe net: sched: fix reordering issues 3600a311f83d net: phylink: Fix flow control resolution 821302dd0c51 net: gso: Fix skb_segment splat when splitting gso_size mangled skb having linear-headed frag_list 88a46756f016 net: Fix null de-reference of device refcount b26f489245b3 ixgbe: Fix secpath usage for IPsec TX offload. 2354e925e361 isdn/capi: check message length in capi_write() ea6ec671c87e ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()' a20c8e4ae48d cdc_ether: fix rndis support for Mediatek based smartphones f57fd58dda42 bridge/mdb: remove wrong use of NLM_F_MULTI db2d0b7c1dde Linux 4.19.73 ba03ee62aed0 vhost: make sure log_num < in_num 569775bd5364 powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts 052bc385f970 powerpc/tm: Remove msr_tm_active() f193e02265aa PCI: Reset both NVIDIA GPU and HDA in ThinkPad P50 workaround ff69322509bb ext4: unsigned int compared against zero 292666d2d868 ext4: fix block validity checks for journal inodes using indirect blocks 97fbf573460e ext4: don't perform block validity checks on the journal inode 1e88a1f874ca drm/atomic_helper: Allow DPMS On<->Off changes for unregistered connectors b1dd1d06b31d virtio/s390: fix race on airq_areas[] 057cdb6f0f47 drm/i915: Make sure cdclk is high enough for DP audio on VLV/CHV b113f98432ae bcache: fix race in btree_flush_write() f73c35d92976 bcache: add comments for mutex_lock(&b->write_lock) 7989a5026fd1 bcache: only clear BTREE_NODE_dirty bit when it is set 652993a5aae5 NFSv4: Fix delegation state recovery 5026932adb1a iio: adc: gyroadc: fix uninitialized return code 2e7e7c8f9423 mm/migrate.c: initialize pud_entry in migrate_vma() b8ad18a10f70 i2c: at91: fix clk_offset for sama5d2 4c9170b55f3a i2c: at91: disable TXRDY interrupt after sending data c9c90711ee88 gpio: don't WARN() on NULL descs if gpiolib is disabled a532a120a5cd iommu/iova: Remove stale cached32_node c4fc7cb93e0a powerpc/mm: Limit rma_size to 1TB when running without HV mode 5b9a6ba975c0 ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips 87c3692172da drm/panel: Add support for Armadeus ST0700 Adapt ecf99cdea02d dm thin metadata: check if in fail_io mode when setting needs_check 5e9a2ce6d3b4 pstore: Fix double-free in pstore_mkfile() failure path 192b9af8caf0 resource: fix locking in find_next_iomem_res() 485bcc29a200 resource: Fix find_next_iomem_res() iteration issue 9a80dfccade1 resource: Include resource end in walk_*() interfaces 1c13c9c40e31 btrfs: correctly validate compression type 0ca2688bd7cd RDMA/srp: Accept again source addresses that do not have a port number 9541604735b2 RDMA/srp: Document srp_parse_in() arguments bab0ff2d87db ARM: dts: gemini: Set DIR-685 SPI CS as active low 3a1b79ade460 KVM: PPC: Book3S HV: Fix CR0 setting in TM emulation 3ac718069f7c KVM: PPC: Use ccr field in pt_regs struct embedded in vcpu struct beeeead95b2f KVM: VMX: check CPUID before allowing read/write of IA32_XSS 891011ca564d KVM: VMX: Fix handling of #MC that occurs during VM-Entry 74ce13331db9 KVM: VMX: Always signal #GP on WRMSR to MSR_IA32_CR_PAT with bad value 74fd8aae19d9 KVM: x86: optimize check for valid PAT value 812810399999 ceph: use ceph_evict_inode to cleanup inode's resource 42fa0e35d6e0 ALSA: hda - Don't resume forcibly i915 HDMI/DP codec 987564c28e8a cifs: Properly handle auto disabling of serverino option d85e830d8534 scsi: zfcp: fix request object use-after-free in send path causing wrong traces ba8701d2226c staging: wilc1000: fix error path cleanup in wilc_wlan_initialize() 60b856dc1744 scsi: target/iblock: Fix overrun in WRITE SAME emulation ba52842de1ad scsi: target/core: Use the SECTOR_SHIFT constant 17111037fdf0 apparmor: reset pos on failure to unpack for various functions 90ca4912e55d IB/hfi1: Avoid hardlockup with flushlist_lock fa717fc442ff clk: tegra210: Fix default rates for HDA clocks 350503c8982b clk: tegra: Fix maximum audio sync clock for Tegra124/210 acc07941e224 cifs: add spinlock for the openFileList to cifsInodeInfo 1d0648767ccf Btrfs: fix race between block group removal and block group allocation f276beb324cc drm/amdgpu/{uvd,vcn}: fetch ring's read_ptr after alloc 7abeffff7bc3 drm/amdgpu: fix ring test failure issue during s3 in vce 3.0 (V2) d5f6539381c7 kvm: Check irqchip mode before assign irqfd 90772cf58838 drm/amdkfd: Add missing Polaris10 ID cacbc85376b6 ARC: mm: SIGSEGV userspace trying to access kernel virtual memory 7edfa9c99d21 ARC: mm: fix uninitialised signal code in do_page_fault 0828438e523e signal/arc: Use force_sig_fault where appropriate fcb2f1e2ea68 dm crypt: move detailed message into debug level 96b44c20e6f0 cifs: smbd: take an array of reqeusts when sending upper layer data 3f27a14b03d8 PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code 842da8fac182 mmc: sdhci-pci: Add support for Intel CML e238e6dc222b blk-mq: free hw queue's resource in hctx's release handler 69409854ba08 dm mpath: fix missing call of path selector type->end_io 0fe097012b6c PCI: Reset Lenovo ThinkPad P50 nvgpu at boot if necessary 5659dfca74d0 PCI: Add macro for Switchtec quirk declarations e4ba157877db dt-bindings: mmc: Add disable-cqe-dcmd property. eb83f9fa10f7 dt-bindings: mmc: Add supports-cqe property 0a0176f93ea9 ARM: dts: qcom: ipq4019: enlarge PCIe BAR range 445a78ea3f90 ARM: dts: qcom: ipq4019: Fix MSI IRQ type df1216d8bc86 ARM: dts: qcom: ipq4019: fix PCI range 2fd4629de519 ext4: protect journal inode's blocks using block_validity f10a92309b83 media: i2c: tda1997x: select V4L2_FWNODE 4061e662c8e9 cifs: Fix lease buffer length error df5d4ea2d8be KVM: x86: Always use 32-bit SMRAM save state for 32-bit kernels 7a74d806bdaa x86/kvm: move kvm_load/put_guest_xcr0 into atomic context 163b24b1a68c kvm: mmu: Fix overflow on kvm mmu page limit calculation feced628c068 IB/mlx5: Reset access mask when looping inside page fault handler 37222eaf7eb7 arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's 3cfce8b77aad usb: typec: tcpm: Try PD-2.0 if sink does not respond to 3.0 source-caps fba4f7c118e4 drm/i915: Sanity check mmap length against object size 6423a2ad5709 drm/i915: Handle vm_mmap error during I915_GEM_MMAP ioctl with WC set 778d626c6af3 CIFS: Fix leaking locked VFS cache pages in writeback retry fb2dabeabb17 CIFS: Fix error paths in writeback code e407b58c3576 drm: add __user attribute to ptr_to_compat() e1a12c3b6f87 PCI: qcom: Don't deassert reset GPIO during probe be905d0f2330 PCI: qcom: Fix error handling in runtime PM support 476ecc14cfdb btrfs: init csum_list before possible free 936690bdd8e6 btrfs: scrub: fix circular locking dependency warning ff55333f5c52 btrfs: scrub: move scrub_setup_ctx allocation out of device_list_mutex 8ba3169dceac btrfs: scrub: pass fs_info to scrub_setup_ctx df7329207870 mmc: renesas_sdhi: Fix card initialization failure in high speed mode 915c9d0a1d68 powerpc/kvm: Save and restore host AMR/IAMR/UAMOR b3f864b88256 spi: spi-gpio: fix SPI_CS_HIGH capability 1d60902a5448 x86/kvmclock: set offset for kvm unstable clock 716b0cfa88a5 iwlwifi: add new card for 9260 series 213566a9b0de iwlwifi: fix devices with PCI Device ID 0x34F0 and 11ac RF modules 2b76fcb6ba62 drm/nouveau: Don't WARN_ON VCPI allocation failures 173b6557fcbc mt76: fix corrupted software generated tx CCMP PN 0d7f329e2431 iio: adc: exynos-adc: Use proper number of channels for Exynos4x12 4e516b721a50 dt-bindings: iio: adc: exynos-adc: Add S5PV210 variant 7f588a7262b3 iio: adc: exynos-adc: Add S5PV210 variant cd490d44150d KVM: VMX: Compare only a single byte for VMCS' "launched" in vCPU-run 687e470e9123 bcache: treat stale && dirty keys as bad keys d1cec665de2c bcache: replace hard coded number with BUCKET_GC_GEN_MAX ee30121fbd78 tpm: Fix some name collisions with drivers/char/tpm.h c207ac66848e mfd: Kconfig: Fix I2C_DESIGNWARE_PLATFORM dependencies 6fd5e50add36 drm/i915/ilk: Fix warning when reading emon_status with no output 2b4f567912ad drm/vblank: Allow dynamic per-crtc max_vblank_count 71f719105462 crypto: ccree - add missing inline qualifier 72eec6b303f4 crypto: ccree - fix resume race condition on init f0e286550af8 IB/uverbs: Fix OOPs upon device disassociation 8c6fb55abf2c ARC: mm: do_page_fault fixes #1: relinquish mmap_sem if signal arrives while handle_mm_fault 96af7d92d8d2 ARC: show_regs: lockdep: re-enable preemption 424b75b79994 media: vim2m: only cancel work if it is for right context be77686f0369 btrfs: Use real device structure to verify dev extent a2790b9939ae btrfs: volumes: Make sure no dev extent is beyond device boundary cfbf227e0591 powerpc/pkeys: Fix handling of pkey state across fork() 2ad95be18995 scsi: megaraid_sas: Use 63-bit DMA addressing 3263f78640cc scsi: megaraid_sas: Add check for reset adapter bit dc4e3ec9d226 scsi: megaraid_sas: Fix combined reply queue mode detection eb124aaa2e85 btrfs: Fix error handling in btrfs_cleanup_ordered_extents 1669d1d2e696 btrfs: Remove extent_io_ops::fill_delalloc 338a528b7922 Btrfs: fix deadlock with memory reclaim during scrub fac803479f60 Btrfs: clean up scrub is_dev_replace parameter d3984e80d7f2 KVM: PPC: Book3S HV: Fix race between kvm_unmap_hva_range and MMU mode switch d88b01d04c6a drm/i915: Cleanup gt powerstate from gem b185bde520d5 drm/i915: Restore sane defaults for KMS on GEM error load f999485109d1 media: vim2m: use cancel_delayed_work_sync instead of flush_schedule_work a7b6f95f3ca6 media: vim2m: use workqueue e432a58d7a0d s390/zcrypt: reinit ap queue state machine during device probe a4f404af3ca8 ARM: davinci: dm644x: define gpio interrupts as separate resources 8d6b2b24ca85 ARM: davinci: dm355: define gpio interrupts as separate resources d31f2b61e7f9 ARM: davinci: dm646x: define gpio interrupts as separate resources 4883e9e66f76 ARM: davinci: dm365: define gpio interrupts as separate resources 0a6c3bdae2c9 ARM: davinci: da8xx: define gpio interrupts as separate resources 016218ef6bb0 drm/amd/dm: Understand why attaching path/tile properties are needed 853dc0759586 drm/amd/pp: Fix truncated clock value when set watermark 5faabd22ed64 powerplay: Respect units on max dcfclk watermark 11bedb2e77a0 Drivers: hv: kvp: Fix the recent regression caused by incorrect clean-up 74ff258346e4 Drivers: hv: kvp: Fix the indentation of some "break" statements e352d8eb9394 drm/atomic_helper: Disallow new modesets on unregistered connectors cff9e1e33151 drm/i915/gen9+: Fix initial readout for Y tiled framebuffers 8ccbb1d24c26 drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE 4b2dfc0e2d44 drm/i915: Fix intel_dp_mst_best_encoder() 796469e361ed x86/kvm/lapic: preserve gfn_to_hva_cache len on cache reinit cdad0f65050e KVM: hyperv: define VP assist page helpers b0d9043bdbe6 KVM: x86: hyperv: keep track of mismatched VP indexes f031fd03e22e KVM: x86: hyperv: consistently use 'hv_vcpu' for 'struct kvm_vcpu_hv' variables 0b535f7b95af KVM: x86: hyperv: enforce vp_index < KVM_MAX_VCPUS 8e91cc7f7f91 drm/amdgpu: Update gc_9_0 golden settings. bcc3bd761ab5 drm/amdgpu/gfx9: Update gfx9 golden settings. 2c2cf2245ff6 remoteproc: qcom: q6v5-mss: add SCM probe dependency 4d9707586ec7 x86, hibernate: Fix nosave_regions setup for hibernation 805e0e46eb54 Drivers: hv: kvp: Fix two "this statement may fall through" warnings 3f3beae22842 keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h bac1c4edb5c4 scsi: qla2xxx: Move log messages before issuing command to firmware 6e087eae89df media: cec: remove cec-edid.c 851308450a8f media: cec/v4l2: move V4L2 specific CEC functions to V4L2 c09d675f294b drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse" 3015291b2fb5 kernel/module: Fix mem leak in module_add_modinfo_attrs 9c49f7811f82 modules: always page-align module section allocations 84ba9ae18fbb remoteproc: qcom: q6v5: shore up resource probe handling 56944c0b9774 clk: s2mps11: Add used attribute to s2mps11_dt_match 480101a4aea2 nvme-fc: use separate work queue to avoid warning 5f147150b753 riscv: remove unused variable in ftrace 8d23872c7539 scripts/decode_stacktrace: match basepath using shell prefix operator, not regex 6c550a5db18f arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64 573370113b24 media: stm32-dcmi: fix irq = 0 case 7f8b23600779 powerpc/64: mark start_here_multiplatform as __ref 85a24825b2e6 x86/ftrace: Fix warning and considate ftrace_jmp_replace() and ftrace_call_replace() b93aed78eb78 selftests: fib_rule_tests: use pre-defined DEV_ADDR 68829256e1f9 timekeeping: Use proper ktime_add when adding nsecs in coarse offset 1aa38eceb6c0 {nl,mac}80211: fix interface combinations on crypto controlled devices 178d1337a527 blk-iolatency: fix STS_AGAIN handling 5f33e81250a6 Blk-iolatency: warn on negative inflight IO counter 91a71a61da8c hv_sock: Fix hang when a connection is closed 86d5ae21d6b8 batman-adv: Only read OGM tvlv_len after buffer len check 4b5fee457723 batman-adv: fix uninit-value in batadv_netlink_get_ifindex() 47a0f70d7d9a powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction 6e7040d65a71 vhost/test: fix build for vhost test - again 4f45483faadf vhost/test: fix build for vhost test dcd22e14780a drm/vmwgfx: Fix double free in vmw_recv_msg() 38d38d1e0cc5 sched/fair: Don't assign runtime for throttled cfs_rq 044ab4715585 ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentre 849f85bfdf12 ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FL a956998ac1c2 ALSA: hda/realtek - Add quirk for HP Pavilion 15 d11ca2d79334 ALSA: hda/realtek - Fix overridden device-specific initialization 2c4d2ce8b799 ALSA: hda - Fix potential endless loop at applying quirks Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Armin Kuster (cherry picked from commit 611c7d62d67016942323d2fa4f108774c85dce09) Signed-off-by: Armin Kuster --- .../linux/linux-yocto-rt_4.19.bb | 6 +++--- .../linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index c55ef50a5d..8e36d9aa48 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "02f0c38dd20819c0e9d279e3b1e95280101ea8ab" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine ?= "0e4a79e608e92830693e511a3dd282ce7c3b3f41" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index f4f411de19..2af79874e8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "283b870cef5f79a6f07465828a51f27a6aed4c50" -SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine_qemuarm ?= "be50001808f00efee538c2a3e7c0a5a2a2df65da" +SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index fb505862ee..73f1715b13 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "b0be447bc9053d07f3438999778bd077679ae756" -SRCREV_machine_qemuarm64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemumips ?= "3c8b21d0a335b5f418682969448574dfd0011f02" -SRCREV_machine_qemuppc ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemux86 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemux86-64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_machine_qemumips64 ?= "2854797711fee4061fb760c2b6e0e3d3135195ab" -SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" -SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" +SRCREV_machine_qemuarm ?= "7fde51abcaf389193ce5d87ebfb8e8fb66a9271a" +SRCREV_machine_qemuarm64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemumips ?= "8ac68d42beb24b275ac0d2a54a0a2291970e5dde" +SRCREV_machine_qemuppc ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemux86 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemux86-64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_machine_qemumips64 ?= "ea2cb8731306f734bf0227575e04cafac7dfade0" +SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.72" +LINUX_VERSION ?= "4.19.78" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:25 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:25 -0800 Subject: [OE-core] [warrior 06/14] linux-yocto/4.19: update to v4.19.84 In-Reply-To: References: Message-ID: <69844300d3c547739cb1c3404c7b5ff74ed67d86.1582253544.git.akuster808@gmail.com> From: Bruce Ashfield Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: c555efaf1402 Linux 4.19.84 46a4a014c48e kvm: x86: mmu: Recovery of shattered NX large pages 6082f2e28887 kvm: Add helper function for creating VM worker threads 5219505fcbb6 kvm: mmu: ITLB_MULTIHIT mitigation db77548b1652 KVM: vmx, svm: always run with EFER.NXE=1 when shadow paging is active 37dfbc8ba763 KVM: x86: add tracepoints around __direct_map and FNAME(fetch) 9ef1fae24d58 KVM: x86: change kvm_mmu_page_get_gfn BUG_ON to WARN_ON b182093d1c70 KVM: x86: remove now unneeded hugepage gfn adjustment e79234ce5765 KVM: x86: make FNAME(fetch) and __direct_map more similar 8aaac3068623 kvm: mmu: Do not release the page inside mmu_set_spte() 30d8d8d6cd92 kvm: Convert kvm_lock to a mutex a991063ce576 kvm: x86, powerpc: do not allow clearing largepages debugfs entry 580c79e7e3e5 Documentation: Add ITLB_MULTIHIT documentation db5ae6596ae2 cpu/speculation: Uninline and export CPU mitigations helpers 955607466ace x86/cpu: Add Tremont to the cpu vulnerability whitelist f9aa6b73a407 x86/bugs: Add ITLB_MULTIHIT bug infrastructure 415bb221a070 x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs 4ad7466ddf2d x86/tsx: Add config options to set tsx=on|off|auto e3bf6b3ff55a x86/speculation/taa: Add documentation for TSX Async Abort 2402432d5557 x86/tsx: Add "auto" option to the tsx= cmdline parameter a0808f06dfa1 kvm/x86: Export MDS_NO=0 to guests when TSX is enabled 15dfa5d706df x86/speculation/taa: Add sysfs reporting for TSX Async Abort 6c58ea8525bf x86/speculation/taa: Add mitigation for TSX Async Abort b8eb348ae408 x86/cpu: Add a "tsx=" cmdline option with TSX disabled by default 37cf9ef900cc x86/cpu: Add a helper function x86_read_arch_cap_msr() 4002d16a2ae1 x86/msr: Add the IA32_TSX_CTRL MSR dbf38b17a892 KVM: x86: use Intel speculation bugs and features as derived in generic x86 code fee619bb8136 drm/i915/cmdparser: Fix jump whitelist clearing 255ed51599de drm/i915/gen8+: Add RC6 CTX corruption WA 011b7173cbdb drm/i915: Lower RM timeout to avoid DSI hard hangs a7bda639a17f drm/i915/cmdparser: Ignore Length operands during command matching 6e53c71a6913 drm/i915/cmdparser: Add support for backward jumps f27bc2b5950d drm/i915/cmdparser: Use explicit goto for error paths cdd77c6b4be4 drm/i915: Add gen9 BCS cmdparsing fea688c5dd81 drm/i915: Allow parsing of unsized batches 7ce726b61c57 drm/i915: Support ro ppgtt mapped cmdparser shadow buffers fc3510fe6f6b drm/i915: Add support for mandatory cmdparsing fba4207cf15e drm/i915: Remove Master tables from cmdparser f1ff77080fa1 drm/i915: Disable Secure Batches for gen6+ b4b1abdc6b18 drm/i915: Rename gen7 cmdparser tables e238e05ec2dc vsock/virtio: fix sock refcnt holding during the shutdown 2e7e3f16901d iio: imu: mpu6050: Fix FIFO layout for ICM20602 99ea48af7bd9 net: prevent load/store tearing on sk->sk_stamp d32629dcd1e5 netfilter: ipset: Copy the right MAC address in hash:ip,mac IPv6 sets 5833560d54fd usbip: Fix free of unallocated memory in vhci tx 6890b4bc3d2b cgroup,writeback: don't switch wbs immediately on dead wbs if the memcg is dead d3b3c0a14615 mm/filemap.c: don't initiate writeback if mapping has no dirty pages 285eb6af4351 iio: imu: inv_mpu6050: fix no data on MPU6050 d888a80727ab iio: imu: mpu6050: Add support for the ICM 20602 IMU 522128128dec blkcg: make blkcg_print_stat() print stats only for online blkgs 30b969392cf2 pinctrl: cherryview: Fix irq_valid_mask calculation ca79bb7e1168 ocfs2: protect extent tree in ocfs2_prepare_inode_for_write() 2c655a111968 pinctrl: intel: Avoid potential glitches if pin is in GPIO mode 713adf6dd327 e1000: fix memory leaks 4a05571772cc igb: Fix constant media auto sense switching when no cable is connected 1baab8352d80 net: ethernet: arc: add the missed clk_disable_unprepare 24523745ed41 NFSv4: Don't allow a cached open with a revoked delegation 440a748ed6df usb: dwc3: gadget: fix race when disabling ep with cancelled xfers e66f52eb3f29 hv_netvsc: Fix error handling in netvsc_attach() 99d5f18cebbf drm/amd/display: Passive DP->HDMI dongle detection fix e5edbf9c45ce drm/amdgpu: If amdgpu_ib_schedule fails return back the error. b651ddc15e7a iommu/amd: Apply the same IVRS IOAPIC workaround to Acer Aspire A315-41 214e4f0ecdd1 net: mscc: ocelot: refuse to overwrite the port's native vlan 5aedcc8aa8be net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up 3b956e63e2f3 net: hisilicon: Fix "Trying to free already-free IRQ" f09b99c883e8 fjes: Handle workqueue allocation failure 6376736d016f nvme-multipath: fix possible io hang after ctrl reconnect 1372527e6876 scsi: qla2xxx: stop timer in shutdown path f2bab3ed456c RDMA/hns: Prevent memory leaks of eq->buf_list 55ca08347487 RDMA/iw_cxgb4: Avoid freeing skb twice in arp failure case e36be7959326 usbip: tools: Fix read_usb_vudc_device() error path handling cd9561a53d26 USB: ldusb: use unsigned size format specifiers c753113ae714 USB: Skip endpoints with 0 maxpacket length ef38f4d123d0 perf/x86/uncore: Fix event group support f14751658a01 perf/x86/amd/ibs: Handle erratum #420 only on the affected CPU family (10h) 5b99e97b275a perf/x86/amd/ibs: Fix reading of the IBS OpData register and thus precise RIP validity 45944c4a7743 usb: dwc3: remove the call trace of USBx_GFLADJ dff38149cec4 usb: gadget: configfs: fix concurrent issue between composite APIs 10eb9abd21ba usb: dwc3: pci: prevent memory leak in dwc3_pci_probe c73ccf65e169 usb: gadget: composite: Fix possible double free memory bug 26d31e1c3ab2 usb: gadget: udc: atmel: Fix interrupt storm in FIFO mode. 88912019b49c usb: fsl: Check memory resource before releasing it 3a2675a2d97a macsec: fix refcnt leak in module exit routine 0d0ca85ad424 bonding: fix unexpected IFF_BONDING bit unset 50e31318b525 ipvs: move old_secure_tcp into struct netns_ipvs 102f4078fbdd ipvs: don't ignore errors in case refcounting ip_vs module fails 81de0b500baa netfilter: nf_flow_table: set timeout before insertion into hashes d45fc2ed472b scsi: qla2xxx: Initialized mailbox to prevent driver load failure b6612a3dbad8 scsi: lpfc: Honor module parameter lpfc_use_adisc 4e80e5614770 net: openvswitch: free vport unless register_netdevice() succeeds 027253315d70 RDMA/uverbs: Prevent potential underflow d582769add68 scsi: qla2xxx: fixup incorrect usage of host_byte 42de3a902443 net/mlx5: prevent memory leak in mlx5_fpga_conn_create_cq 7dfdcd9407f3 net/mlx5e: TX, Fix consumer index of error cqe dump 48dd71289ca3 RDMA/qedr: Fix reported firmware version 6208c2bfe224 iw_cxgb4: fix ECN check on the passive accept 89aa9e2626f4 RDMA/mlx5: Clear old rate limit when closing QP d6706b2ec108 HID: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() 113a154ef2f2 dmaengine: sprd: Fix the possible memory leak issue 6040f96d5147 dmaengine: xilinx_dma: Fix control reg update in vdma_channel_set_config 78e7e0248eb8 HID: google: add magnemite/masterball USB ids 8181146cd7de PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 e2dd254bde5c usbip: Implement SG support to vhci-hcd and stub driver f865ae473c16 usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path e9c0fc4a7ccd sched/fair: Fix -Wunused-but-set-variable warnings 502bd151448c sched/fair: Fix low cpu usage with high throttling by removing expiration of cpu-local slices 4ebee4875eab ALSA: usb-audio: Fix copy&paste error in the validator e0051889243d ALSA: usb-audio: remove some dead code 4f6c52002699 ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk() 3a0cdf210b94 ALSA: usb-audio: Clean up check_input_term() 9feeaa50e5b4 ALSA: usb-audio: Remove superfluous bLength checks f0e164f66e75 ALSA: usb-audio: Unify the release of usb_mixer_elem_info objects dae4d839e549 ALSA: usb-audio: Simplify parse_audio_unit() 17821e2fb167 ALSA: usb-audio: More validations of descriptor units 5e36cf8edb58 configfs: fix a deadlock in configfs_symlink() 0dfc45be875a configfs: provide exclusion between IO and removals 25c118d8d158 configfs: new object reprsenting tree fragments 65524d647e9d configfs_register_group() shouldn't be (and isn't) called in rmdirable parts 2bd63490c1dd configfs: stash the data we need into configfs_buffer at open time a7be2debb769 can: peak_usb: fix slab info leak ce9b94da0e04 can: mcba_usb: fix use-after-free on disconnect 5a9e37f2029f can: dev: add missing of_node_put() after calling of_get_child_by_name() 9289226f6982 can: gs_usb: gs_can_open(): prevent memory leak 9f5c59428843 can: rx-offload: can_rx_offload_queue_sorted(): fix error handling, avoid skb mem leak ef502d5a84d6 can: peak_usb: fix a potential out-of-sync while decoding packets 7ae08111ca70 can: c_can: c_can_poll(): only read status register after status IRQ 0327c7818da2 can: flexcan: disable completely the ECC mechanism 46265660e5ba can: usb_8dev: fix use-after-free on disconnect d8a76e300e37 SMB3: Fix persistent handles reconnect caddaf43b024 x86/apic/32: Avoid bogus LDR warnings dc1a91dc4917 intel_th: pci: Add Jasper Lake PCH support f9d3aea1dca2 intel_th: pci: Add Comet Lake PCH support 64997ee49c8c netfilter: ipset: Fix an error code in ip_set_sockfn_get() 1b0e60f6a48b netfilter: nf_tables: Align nft_expr private data to 64-bit 2dae80b5b666 ARM: sunxi: Fix CPU powerdown on A83T 20b9e094dcd3 iio: srf04: fix wrong limitation in distance measuring bee45b44b13e iio: imu: adis16480: make sure provided frequency is positive a428996147e2 iio: adc: stm32-adc: fix stopping dma 78a1d6cdd302 ceph: add missing check in d_revalidate snapdir handling 6f9657793a6e ceph: fix use-after-free in __ceph_remove_cap() 3840610d60b2 arm64: Do not mask out PTE_RDONLY in pte_same() 56f270a1d72c soundwire: bus: set initial value to port_status 9a06efc745c3 soundwire: depend on ACPI a81a4637456b HID: wacom: generic: Treat serial number and related fields as unsigned e3fdd0c1a3d0 drm/radeon: fix si_enable_smc_cac() failed issue f39fbd05f921 perf tools: Fix time sorting 66d53cd683a8 tools: gpio: Use !building_out_of_srctree to determine srctree 8e358a027611 dump_stack: avoid the livelock of the dump_lock 6c944fc51f0a mm, vmstat: hide /proc/pagetypeinfo from normal users 2686f71fdcc5 mm: thp: handle page cache THP correctly in PageTransCompoundMap 7dfa51beacac mm, meminit: recalculate pcpu batch and high limits after init completes 8e6bf4bc3a88 mm: memcontrol: fix network errors from failing __GFP_ATOMIC charges 6ecc16351a84 ALSA: hda/ca0132 - Fix possible workqueue stall 6921b1609912 ALSA: bebob: fix to detect configured source of sampling clock for Focusrite Saffire Pro i/o series b85472244b70 ALSA: timer: Fix incorrectly assigned timer instance 107451b87ea5 net: hns: Fix the stray netpoll locks causing deadlock in NAPI path 26e398dcb3f1 ipv6: fixes rt6_probe() and fib6_nh->last_probe init 05b761423d67 net: mscc: ocelot: fix NULL pointer on LAG slave removal 1cfc967ef584 net: mscc: ocelot: don't handle netdev events for other netdevs a6fdbaeef1f2 qede: fix NULL pointer deref in __qede_remove() 956b38853517 NFC: st21nfca: fix double free 1143496c9632 nfc: netlink: fix double device reference drop 760a1f7f22ee NFC: fdp: fix incorrect free object 5580091ce7d9 net: usb: qmi_wwan: add support for DW5821e with eSIM support 4fd218071f21 net: qualcomm: rmnet: Fix potential UAF when unregistering b9bda52f8f3e net: fix data-race in neigh_event_send() 2fbfdb2de4a1 net: ethernet: octeon_mgmt: Account for second possible VLAN header 88f8c39912bc ipv4: Fix table id reference in fib_sync_down_addr 0ddabef89067 CDC-NCM: handle incomplete transfer of MTU 27b5f4bf5ba9 bonding: fix state transition issue in link monitoring 7d8dbefc22ff Linux 4.19.83 818c96ac80be usb: gadget: udc: core: Fix segfault if udc_bind_to_driver() for pending driver fails b06f37eaa2b3 arm64: dts: ti: k3-am65-main: Fix gic-its node unit-address 54ee5ccd0251 ASoC: pcm3168a: The codec does not support S32_LE 3ddf2a70cf6d selftests/powerpc: Fix compile error on tlbie_test due to newer gcc e7aaa8dd60c5 selftests/powerpc: Add test case for tlbie vs mtpidr ordering issue ec199b24aa5c powerpc/mm: Fixup tlbie vs mtpidr/mtlpidr ordering issue on POWER9 06e8438eddf8 platform/x86: pmc_atom: Add Siemens SIMATIC IPC227E to critclk_systems DMI table 2d830cf287a5 wireless: Skip directory when generating certificates 558d2bdad5f6 net/flow_dissector: switch to siphash f6ef35998fb0 r8152: add device id for Lenovo ThinkPad USB-C Dock Gen 2 c33f7efec3b3 net: dsa: fix switch tree list 6b5bf3f37f72 net: usb: lan78xx: Connect PHY before registering MAC 07c62fc7bf28 net: bcmgenet: reset 40nm EPHY on energy detect 6d3ccc2a5b19 net: phy: bcm7xxx: define soft_reset for 40nm EPHY 97cc6827f418 net: bcmgenet: don't set phydev->link from MAC 57e286f67554 net: dsa: b53: Do not clear existing mirrored port mask db91be8e27c8 net/mlx5e: Fix ethtool self test: link speed 5eb1967bfde3 r8169: fix wrong PHY ID issue with RTL8168dp 9e7c4fa275cf net/mlx5e: Fix handling of compressed CQEs in case of low NAPI budget 0c3355cc8e19 selftests: fib_tests: add more tests for metric update b166e8838a97 ipv4: fix route update on metric change. cd3bcb44ee3b net: add READ_ONCE() annotation in __skb_wait_for_more_packets() 4f3df7f1eaa7 net: use skb_queue_empty_lockless() in busy poll contexts eaf548feaa17 net: use skb_queue_empty_lockless() in poll() handlers afa1f5e98c11 udp: use skb_queue_empty_lockless() d5ac4232c376 net: add skb_queue_empty_lockless() 83532eb48049 vxlan: check tun_info options_len properly a8a5adbbf779 udp: fix data-race in udp_set_dev_scratch() 12fab1634ab1 selftests: net: reuseport_dualstack: fix uninitalized parameter 321c99155f4b net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol() 9da271c1cdc1 net: usb: lan78xx: Disable interrupts before calling generic_handle_irq() 40400fdd312a netns: fix GFP flags in rtnl_net_notifyid() 1d72dbb4ca2f net/mlx4_core: Dynamically set guaranteed amount of counters per VF f05975d9f393 net: hisilicon: Fix ping latency when deal with high throughput 1d5cb12a2539 net: fix sk_page_frag() recursion from memory reclaim 189982d111c0 net: ethernet: ftgmac100: Fix DMA coherency issue with SW checksum 5536fc891221 net: dsa: bcm_sf2: Fix IMP setup for port different than 8 2c50a36d0b78 net: annotate lockless accesses to sk->sk_napi_id 0cfaf03c5d58 net: annotate accesses to sk->sk_incoming_cpu 07de738901d6 inet: stop leaking jiffies on the wire 163901dc945b erspan: fix the tun_info options_len check for erspan 96df1ec22b97 dccp: do not leak jiffies on the wire f291613ff140 cxgb4: fix panic when attaching to ULD fail 1f032ca298dd nbd: handle racing with error'ed out commands 82b7c99ee141 nbd: protect cmd->status with cmd->lock 80b42f4381c2 cifs: Fix cifsInodeInfo lock_sem deadlock when reconnect occurs a7448991fa3e i2c: stm32f7: remove warning when compiling with W=1 86fd9e339ab4 i2c: stm32f7: fix a race in slave mode with arbitration loss irq d746ce649556 i2c: stm32f7: fix first byte to send in slave mode 18e7fae372a1 irqchip/gic-v3-its: Use the exact ITSList for VMOVP 39637aafa173 MIPS: bmips: mark exception vectors as char arrays fcc3f7c810c3 of: unittest: fix memory leak in unittest_data_add c56b9da70d09 ARM: 8926/1: v7m: remove register save to stack before svc fa18f803d1f7 tracing: Fix "gfp_t" format for synthetic events 63571a1f375e scsi: target: core: Do not overwrite CDB byte 1 1df8da335d40 drm/amdgpu: fix potential VM faults 3cd2b6492cde ARM: davinci: dm365: Fix McBSP dma_slave_map entry e18bf407ea3f perf kmem: Fix memory leak in compact_gfp_flags() 05dd6283b8fc 8250-men-mcb: fix error checking when get_num_ports returns -ENODEV 81809424cad7 perf c2c: Fix memory leak in build_cl_output() 7a79420034e0 ARM: dts: imx7s: Correct GPT's ipg clock source e601e103cfed scsi: fix kconfig dependency warning related to 53C700_LE_ON_BE 3dd0be3eeeb0 scsi: sni_53c710: fix compilation error cf372c60ed13 scsi: scsi_dh_alua: handle RTPG sense code correctly during state transitions 3ee6a8bdae81 scsi: qla2xxx: fix a potential NULL pointer dereference 9d27ba401eca ARM: mm: fix alignment handler faults under memory pressure f0eabc9e9acb pinctrl: ns2: Fix off by one bugs in ns2_pinmux_enable() 9a5d5ffb3245 ARM: dts: logicpd-torpedo-som: Remove twl_keypad d7e2a8e271aa ASoc: rockchip: i2s: Fix RPM imbalance 513474f59001 ASoC: wm_adsp: Don't generate kcontrols without READ flags bab5c14b5c89 regulator: pfuze100-regulator: Variable "val" in pfuze100_regulator_probe() could be uninitialized 6ef17b446081 ASoC: rt5682: add NULL handler to set_jack function 772c18df9f3d regulator: ti-abb: Fix timeout in ti_abb_wait_txdone/ti_abb_clear_all_txdone c4c0e64deb9a arm64: dts: Fix gpio to pinmux mapping 0d3aef1ea7e8 arm64: dts: allwinner: a64: sopine-baseboard: Add PHY regulator delay a3a208ac4608 arm64: dts: allwinner: a64: pine64-plus: Add PHY regulator delay dc24ac36f304 ASoC: wm8994: Do not register inapplicable controls for WM1811 0f037d0a62b0 regulator: of: fix suspend-min/max-voltage parsing b17eae5a0e16 kbuild: add -fcf-protection=none when using retpoline flags 5ee93551c703 Linux 4.19.82 914a7d429da5 Revert "ALSA: hda: Flush interrupts on disabling" 8f5603029223 powerpc/powernv: Fix CPU idle to be called with IRQs disabled 92930e922399 ALSA: usb-audio: Add DSD support for Gustard U16/X26 USB Interface c08182dbf057 ALSA: usb-audio: Update DSD support quirks for Oppo and Rotel d8808d2e79b5 ALSA: usb-audio: DSD auto-detection for Playback Designs 831317430693 ALSA: timer: Fix mutex deadlock at releasing card 145fadf6d99a ALSA: timer: Simplify error path in snd_timer_open() a6c91087f5d5 sch_netem: fix rcu splat in netem_enqueue() 3ecf8529d52a net: usb: sr9800: fix uninitialized local variable 14a703ef2dc4 bonding: fix potential NULL deref in bond_update_slave_arr 24aaf7f4528f NFC: pn533: fix use-after-free and memleaks 8d9c4a9b8677 rxrpc: Fix trace-after-put looking at the put peer record e8e51ce79c15 rxrpc: rxrpc_peer needs to hold a ref on the rxrpc_local record 570ab0dd35f9 rxrpc: Fix call ref leak d634bd01b3a0 llc: fix sk_buff leak in llc_conn_service() 3f3f7409f028 llc: fix sk_buff leak in llc_sap_state_process() 948e8eba656f batman-adv: Avoid free/alloc race when handling OGM buffer 74001646d47c NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid() fd9a708c7bde drm/amdgpu/powerplay/vega10: allow undervolting in p7 3e285a5c1401 dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle a0e406be17e5 dmaengine: qcom: bam_dma: Fix resource leak 64efcbc7a5a3 rtlwifi: Fix potential overflow on P2P code a81669161528 arm64: Ensure VM_WRITE|VM_SHARED ptes are clean by default 8dd6066066a2 s390/idle: fix cpu idle time calculation ced8cb0230d0 s390/cmm: fix information leak in cmm_timeout_handler() be87ee689106 nl80211: fix validation of mesh path nexthop 14e0dd84db60 HID: fix error message in hid_open_report() 8a01c4b908cf HID: Fix assumption that devices have inputs cf143d65c556 HID: i2c-hid: add Trekstor Primebook C11B to descriptor override 6608702bec70 scsi: target: cxgbit: Fix cxgbit_fw4_ack() 45e7acdff38e USB: serial: whiteheat: fix line-speed endianness b7ad5aa67058 USB: serial: whiteheat: fix potential slab corruption 36e02e1fba89 usb: xhci: fix __le32/__le64 accessors in debugfs code 8e2cccd6c5d1 USB: ldusb: fix control-message timeout 3f1a7d903b8d USB: ldusb: fix ring-buffer locking f1b94b60bb1c usb-storage: Revert commit 747668dbc061 ("usb-storage: Set virt_boundary_mask to avoid SG overflows") d1c188d330ca USB: gadget: Reject endpoints with 0 maxpacket value ceb6b658f0bd UAS: Revert commit 3ae62a42090f ("UAS: fix alignment of scatter/gather segments") a58cdc35d3a0 ALSA: hda/realtek - Add support for ALC623 101bb262ba43 ALSA: hda/realtek - Fix 2 front mics of codec 0x623 3ae205d7a0a2 ALSA: bebob: Fix prototype of helper function to return negative value 62e42369de37 fuse: truncate pending writes on O_TRUNC 72c913fdde9d fuse: flush dirty data/metadata before non-truncate setattr 696da0225946 ath6kl: fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe() 1a124f16b594 thunderbolt: Use 32-bit writes when writing ring producer/consumer f2cc221b6515 USB: legousbtower: fix a signedness bug in tower_probe() 083322455c67 nbd: verify socket is supported during setup e0064f8de3f5 iwlwifi: exclude GEO SAR support for 3168 5a445f805afc ALSA: hda/realtek: Reduce the Headphone static noise on XPS 9350/9360 ce005e5d6e9f ARM: 8914/1: NOMMU: Fix exc_ret for XIP 394c90d9ce13 tracing: Initialize iter->seq after zeroing in tracing_read_pipe() 12e132664f92 s390/uaccess: avoid (false positive) compiler warnings da24be886ff6 NFSv4: Fix leak of clp->cl_acceptor string cad4448dfc9c nbd: fix possible sysfs duplicate warning c2ea451f22f1 virt: vbox: fix memory leak in hgcm_call_preprocess_linaddr 5865397db6c3 MIPS: fw: sni: Fix out of bounds init of o32 stack 317b6f68abb1 MIPS: include: Mark __xchg as __always_inline 4a4206a83fc6 iio: imu: adis16400: release allocated memory on failure f2824a020746 drm/amdgpu: fix memory leak a1112c465593 perf/x86/amd: Change/fix NMI latency mitigation to use a timestamp 2cd003a820fe sched/vtime: Fix guest/system mis-accounting on task switch 58d33d4a4a1d x86/cpu: Add Comet Lake to the Intel CPU models header 6258745b311b arm64: armv8_deprecated: Checking return value for memory allocation c3689876f5b9 fs: ocfs2: fix a possible null-pointer dereference in ocfs2_info_scan_inode_alloc() 4de544b42c7a fs: ocfs2: fix a possible null-pointer dereference in ocfs2_write_end_nolock() c18d86047622 fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry() 2141f777e6e1 ocfs2: clear zero in unaligned direct IO af140367ae66 x86/xen: Return from panic notifier 0169198631e7 MIPS: include: Mark __cmpxchg as __always_inline 9b7591cf6cf6 efi/x86: Do not clean dummy variable in kexec path 318885aa154d efi/cper: Fix endianness of PCIe class code 02c1fb11b6a0 serial: mctrl_gpio: Check for NULL pointer 497fd98a50b2 fs: cifs: mute -Wunused-const-variable message 579249a08348 gpio: max77620: Use correct unit for debounce times 7f3306a3b2df tty: n_hdlc: fix build on SPARC 14a4689f8847 tty: serial: owl: Fix the link time qualifier of 'owl_uart_exit()' d21a5d4a7339 arm64: ftrace: Ensure synchronisation in PLT setup for Neoverse-N1 #1542419 ca2cc4b47d01 nfs: Fix nfsi->nrequests count error on nfs_inode_remove_request aeb242943505 HID: hyperv: Use in-place iterator API in the channel callback 9c75c230ded2 RDMA/iwcm: Fix a lock inversion issue 962cff4f3f89 RDMA/hfi1: Prevent memory leak in sdma_init dfc1daba843b staging: rtl8188eu: fix null dereference when kzalloc fails 3545c018d0c3 perf annotate: Return appropriate error code for allocation failures f8304a9310c3 perf annotate: Propagate the symbol__annotate() error return 4e2ca0c9143c perf annotate: Fix the signedness of failure returns ec783e28e72d perf annotate: Propagate perf_env__arch() error f0ba7ab26bfc perf tools: Propagate get_cpuid() error c022c7f6171e perf jevents: Fix period for Intel fixed counters 5ecf35ed5d17 perf script brstackinsn: Fix recovery from LBR/binary mismatch 262ed71096ba perf map: Fix overlapped map handling d975e5970965 perf tests: Avoid raising SEGV using an obvious NULL dereference e3dc77d662ca libsubcmd: Make _FORTIFY_SOURCE defines dependent on the feature 915eb63dac7b iio: fix center temperature of bmc150-accel-core 78e6415d4f9a iio: adc: meson_saradc: Fix memory allocation order 1b6901f3c600 power: supply: max14656: fix potential use-after-free a0d8a590d983 drm/amd/display: fix odm combine pipe reset a897f54e921c PCI/PME: Fix possible use-after-free on remove 0e23eeb0fc58 net: dsa: mv88e6xxx: Release lock while requesting IRQ 646e5c77b418 exec: load_script: Do not exec truncated interpreter path f251c83d6c08 ext4: disallow files with EXT4_JOURNAL_DATA_FL from EXT4_IOC_SWAP_BOOT cc4d8283f6e9 media: vimc: Remove unused but set variables c629fed0347e ALSA: hda/realtek - Apply ALC294 hp init also for S4 resume b73132b74d25 cifs: add credits from unmatched responses/messages ee4d28a716e8 CIFS: Respect SMB2 hdr preamble size in read responses 2a2022688a91 scsi: lpfc: Correct localport timeout duration error 1df87fc5e468 mlxsw: spectrum: Set LAG port collector only when active e32271519bb9 arm64: kpti: Whitelist HiSilicon Taishan v110 CPUs 6021dd86ca38 arm64: Add MIDR encoding for HiSilicon Taishan CPUs 9190141529fb rtc: pcf8523: set xtal load capacitance from DT 961ba81d08d8 usb: handle warm-reset port requests on hub resume 3a77562e18bf ALSA: usb-audio: Cleanup DSD whitelist a0608eec296d usb: dwc3: gadget: clear DWC3_EP_TRANSFER_STARTED on cmd complete d0e8b35e915e usb: dwc3: gadget: early giveback if End Transfer already completed 335d4f818246 samples: bpf: fix: seg fault with NULL pointer arg c41f30e8d233 HID: steam: fix deadlock with input devices. 4c8ae7221bcc HID: steam: fix boot loop with bluetooth firmware ce05beb3b402 NFSv4: Ensure that the state manager exits the loop on SIGKILL 952b0285826e HID: Add ASUS T100CHI keyboard dock battery quirks 24ec7c1b9b17 staging: mt7621-pinctrl: use pinconf-generic for 'dt_node_to_map' and 'dt_free_map' b064e272023c scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks 9aafa2996921 clk: boston: unregister clks on failure in clk_boston_setup() 1ba6488775f1 ath10k: assign 'n_cipher_suites = 11' for WCN3990 to enable WPA3 a6af54d4ad0d platform/x86: Fix config space access for intel_atomisp2_pm 8694ceba9338 platform/x86: Add the VLV ISP PCI ID to atomisp2_pm 8c1b1d3c7593 HID: i2c-hid: Add Odys Winbook 13 to descriptor override 3db3961160f6 HID: i2c-hid: Ignore input report if there's no data present on Elan touchpanels e0bcac994ad8 HID: i2c-hid: Disable runtime PM for LG touchscreen d8187ff32b23 netfilter: ipset: Make invalid MAC address checks consistent cb38a17cc880 Btrfs: fix deadlock on tree root leaf when finding free extent 33970cf511c8 PCI: Fix Switchtec DMA aliasing quirk dmesg noise 437de04184bc bcache: fix input overflow to writeback_rate_minimum be488566ef2f drm/msm/dpu: handle failures while initializing displays b5b3bb03c372 x86/cpu: Add Atom Tremont (Jacobsville) ab0888699734 tools/power turbostat: fix goldmont C-state limit decoding 4da8b5f8a71d usb: dwc2: fix unbalanced use of external vbus-supply 649ee6f0c677 HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override ce43554395a3 f2fs: fix to recover inode->i_flags of inode block during POR b619de076f9c f2fs: fix to recover inode's i_gc_failures during POR 23848022460f powerpc/powernv: hold device_hotplug_lock when calling memtrace_offline_pages() bff91a961a05 sc16is7xx: Fix for "Unexpected interrupt: 8" 157c391babd7 scsi: lpfc: Fix a duplicate 0711 log message number. 6b2fbfacd74b f2fs: flush quota blocks after turnning it off e5641f02dc9e wil6210: fix freeing of rx buffers in EDMA mode d8ab4185ea55 btrfs: tracepoints: Fix wrong parameter order for qgroup events 6bcbe35027e2 btrfs: qgroup: Always free PREALLOC META reserve in btrfs_delalloc_release_extents() 96b9b94647b0 Btrfs: fix memory leak due to concurrent append writes with fiemap 692aa7d55ff8 Btrfs: fix inode cache block reserve leak on failure to allocate data space a8afda7774a3 dm snapshot: rework COW throttling to fix deadlock 223f1af69da8 dm snapshot: introduce account_start_copy() and account_end_copy() 0ca37291020e zram: fix race between backing_dev_show and backing_dev_store ef244c308885 Linux 4.19.81 27414f90ff6e RDMA/cxgb4: Do not dma memory off of the stack 054441182b51 blk-rq-qos: fix first node deletion of rq_qos_del() 2ada40308a0d PCI: PM: Fix pci_power_up() ccb02adf3293 xen/netback: fix error path of xenvif_connect_data() 89ab39da1452 cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown 5f19cbb3ab3f memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()' 0b95aaae783f btrfs: tracepoints: Fix bad entry members of qgroup events 1b921b5bc47f Btrfs: check for the full sync flag while holding the inode lock during fsync ac6bae2b524d Btrfs: add missing extents release on file extent cluster relocation error 6cd5be9832eb btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group() a5a10f7800ed pinctrl: armada-37xx: swap polarity on LED group e0e489aa5bd0 pinctrl: armada-37xx: fix control of pins 32 and up 5e9d71802ddc pinctrl: cherryview: restore Strago DMI workaround for all versions 4dedaa73c4c4 x86/apic/x2apic: Fix a NULL pointer deref when handling a dying cpu 1709917289cd x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area e49c84c51c3a dm cache: fix bugs when a GFP_NOWAIT allocation fails 5ce7528c4d4a tracing: Fix race in perf_trace_buf initialization 96202569b9fe perf/aux: Fix AUX output stopping 01332b037066 CIFS: Fix use after free of file info structures 71cf88165ff0 CIFS: avoid using MID 0xFFFF 4292745536d2 arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT d97e4a6d2b2f EDAC/ghes: Fix Use after free in ghes_edac remove path ca65fe21981b parisc: Fix vmap memory leak in ioremap()/iounmap() 19e2ed7bfabe xtensa: drop EXPORT_SYMBOL for outs*/ins* 30cff8ab6ed7 mm/memory-failure: poison read receives SIGKILL instead of SIGBUS if mmaped more than once 91eec7692b94 hugetlbfs: don't access uninitialized memmaps in pfn_range_valid_gigantic() f712e3066f75 mm/page_owner: don't access uninitialized memmaps when reading /proc/pagetypeinfo bb6932c5a473 mm/slub: fix a deadlock in show_slab_objects() 9792afbd630b mm/memory-failure.c: don't access uninitialized memmaps in memory_failure() 01a44055a48a mmc: cqhci: Commit descriptors before setting the doorbell 6ea856efef9f fs/proc/page.c: don't access uninitialized memmaps in fs/proc/page.c 43a2a6c2f0fb drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store() 4d5307c099af drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1 11377c3e997e drm/ttm: Restore ttm prefaulting 33af2a8ee304 drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50 24ca62892032 mac80211: Reject malformed SSID elements 73c066a9552a cfg80211: wext: avoid copying malformed SSIDs 83dc16707f6d ACPI: CPPC: Set pcc_data[pcc_ss_id] to NULL in acpi_cppc_processor_exit() 8e367b029e61 ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting b0dd6a24255e Input: synaptics-rmi4 - avoid processing unknown IRQs aa9402c14df6 Input: da9063 - fix capability and drop KEY_SLEEP e254d4359259 scsi: ch: Make it possible to open a ch device multiple times again 0c6905197c5b scsi: core: try to get module before removing device 2a675e73dfec scsi: core: save/restore command resid for error handling 0cea86f270e9 scsi: sd: Ignore a failure to sync cache due to lack of authorization 3638ccda1009 scsi: zfcp: fix reaction on bit error threshold notification d07c028d2bc9 staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS 4034a5030589 MIPS: tlbex: Fix build_restore_pagemask KScratch restore 9f7e157464cd USB: ldusb: fix read info leaks 3b73a0e453bd USB: usblp: fix use-after-free on disconnect 28ab2c5f5899 USB: ldusb: fix memleak on disconnect edd3e9c71cc8 USB: serial: ti_usb_3410_5052: fix port-close races 068fcbe895cd usb: udc: lpc32xx: fix bad bit shift operation 7ed43d2eb0ec ALSA: hda - Force runtime PM on Nvidia HDMI codecs 7dda74810c9a ALSA: usb-audio: Disable quirks for BOSS Katana amplifiers 6c8a9a46ec57 ALSA: hda/realtek - Enable headset mic on Asus MJ401TA 30a83eb0a09d ALSA: hda/realtek - Add support for ALC711 5366778bf0ed USB: legousbtower: fix memleak on disconnect 99b45e7a1ba1 memfd: Fix locking when tagging pins 2770f80afde7 sctp: change sctp_prot .no_autobind with true cd8c21ca7022 net: stmmac: disable/enable ptp_ref_clk in suspend/resume flow da4f0aed87d5 net: ipv6: fix listify ip6_rcv_finish in case of forwarding cc2d858b3f73 net/ibmvnic: Fix EOI when running in XIVE mode. 3f9d4e3c2954 net: i82596: fix dma_alloc_attr for sni_82596 da0baae9a725 net: bcmgenet: Set phydev->dev_flags only for internal PHYs c0f5839a483f net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 16d67acad815 net: avoid potential infinite loop in tc_ctl_action() 2fa80e64de33 ipv4: Return -ENETUNREACH if we can't create route but saddr is valid 2ec0df4e3fee ipv4: fix race condition between route lookup and invalidation 0d3ad773b445 ocfs2: fix panic due to ocfs2_wq is null 0933b0db7fb2 Revert "drm/radeon: Fix EEH during kexec" 9457994a53d1 md/raid0: fix warning message for parameter default_layout 51f0c10890aa libata/ahci: Fix PCS quirk application 9bc5a4db9aa9 namespace: fix namespace.pl script to support relative paths 6acbcd1429f1 r8152: Set macpassthru in reset_resume callback 0cb5c7b06a0a lib: textsearch: fix escapes in example code 50699af3609c net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write() db1e664e2d80 mips: Loongson: Fix the link time qualifier of 'serial_exit()' b43bf6b10344 net: dsa: rtl8366rb: add missing of_node_put after calling of_get_child_by_name a16a9c10b2b0 netfilter: nft_connlimit: disable bh on garbage collection 13104599d07f mac80211: fix txq null pointer dereference 09c5a5bb0f26 nl80211: fix null pointer dereference 90a886b68faa xen/efi: Set nonblocking callbacks 5d880444955e MIPS: dts: ar9331: fix interrupt-controller size 6d0da953bd8e net: dsa: qca8k: Use up to 7 ports for all operations 1cd24f5edab8 ARM: dts: am4372: Set memory bandwidth limit for DISPC 960019214539 ieee802154: ca8210: prevent memory leak ec3817c62ede ARM: OMAP2+: Fix warnings with broken omap2_set_init_voltage() a23cd06c2cd2 ARM: OMAP2+: Fix missing reset done flag for am3 and am43 fcff55e25593 scsi: qla2xxx: Fix unbound sleep in fcport delete path. c3d475c7d9b9 scsi: megaraid: disable device when probe failed after enabled device c6d91bd3fa35 scsi: ufs: skip shutdown if hba is not powered db783e05df55 nvme-pci: Fix a race in controller removal c3038e718a19 Linux 4.19.80 0603d82bcae4 perf/hw_breakpoint: Fix arch_hw_breakpoint use-before-initialization 91849adc9f90 PCI: vmd: Fix config addressing when using bus offsets cd4b60e57a7a x86/asm: Fix MWAITX C-state hint value 99ada52ce213 hwmon: Fix HWMON_P_MIN_ALARM mask b9040fab5f36 tracing: Get trace_array reference for available_tracers files a6c9fb2c2ce4 ftrace: Get a reference counter for the trace_array on filter files b7f758631d69 tracing/hwlat: Don't ignore outer-loop duration when calculating max_latency 6271cbff9309 tracing/hwlat: Report total time spent in all NMIs during the sample 3766c9d9c47c arm64/sve: Fix wrong free for task->thread.sve_state 6f64aa703c0c media: stkwebcam: fix runtime PM after driver unbind 664ec2db3b1f Fix the locking in dcache_readdir() and friends a64241ba496c arm64: topology: Use PPTT to determine if PE is a thread b098a4cd99ff ACPI/PPTT: Add support for ACPI 6.3 thread flag a73306414fcd ACPICA: ACPI 6.3: PPTT add additional fields in Processor Structure Flags 34ab38cd8098 MIPS: elf_hwcap: Export userspace ASEs aaa81d9e6523 MIPS: Disable Loongson MMI instructions for kernel build e9360f393d7b NFS: Fix O_DIRECT accounting of number of bytes read/written e0805d7f7f1b btrfs: fix uninitialized ret in ref-verify f7313de46e46 btrfs: fix incorrect updating of log root tree a8de7090805d cifs: use cifsInodeInfo->open_file_lock while iterating to avoid a panic f6c715708fb8 iio: adc: stm32-adc: fix a race when using several adcs with dma and irq a9968a4d6399 iio: adc: stm32-adc: move registers definitions 410ab742a503 gpiolib: don't clear FLAG_IS_OUT when emulating open-drain/open-source b41013b51870 firmware: google: increment VPD key_len properly 491a39dcee44 mm/vmpressure.c: fix a signedness bug in vmpressure_register_event() 7bbe6eefdbb3 kernel/sysctl.c: do not override max_threads provided by userspace 230b339a7c75 CIFS: Force reval dentry if LOOKUP_REVAL flag is set 0bc78de461b4 CIFS: Force revalidate inode when dentry is stale d72c2115108f CIFS: Gracefully handle QueryInfo errors during open 345c03a0defb blk-wbt: fix performance regression in wbt scale_up/scale_down d855a5f2dec7 perf inject jit: Fix JIT_CODE_MOVE filename 47a4e4decddd perf llvm: Don't access out-of-scope array ee7ee6cfc3af efivar/ssdt: Don't iterate over EFI vars if no SSDT override was specified c9a182ddf2d4 iio: light: opt3001: fix mutex unlock race 811616a6400d iio: adc: axp288: Override TS pin bias current for some models 99757b1d9c17 iio: adc: ad799x: fix probe error handling 2cb6f0417ee1 iio: adc: hx711: fix bug in sampling of data 2f9a82e2d2e6 staging: vt6655: Fix memory leak in vt6655_probe df455ed36901 Staging: fbtft: fix memory leak in fbtft_framebuffer_alloc d58d477c5852 gpio: eic: sprd: Fix the incorrect EIC offset when toggling ce20fd3e1530 mei: avoid FW version request on Ibex Peak and earlier d7e57796b6c0 mei: me: add comet point (lake) LP device ids f931791751d3 USB: legousbtower: fix use-after-free on release e3f445666f51 USB: legousbtower: fix open after failed reset request 99c0c615ff98 USB: legousbtower: fix potential NULL-deref on disconnect fe471bf16720 USB: legousbtower: fix deadlock on disconnect 4fde6c982393 USB: legousbtower: fix slab info leak at probe dff3bc5edcf6 usb: renesas_usbhs: gadget: Fix usb_ep_set_{halt,wedge}() behavior 55efffb294d2 usb: renesas_usbhs: gadget: Do not discard queues in usb_ep_set_{halt,wedge}() 3b089cef3cc1 USB: dummy-hcd: fix power budget for SuperSpeed mode ab8d87d14d82 USB: microtek: fix info-leak at probe 0f14e44ebc0e USB: usblcd: fix I/O after disconnect 58c2b4c5610d USB: serial: fix runtime PM after driver unbind 8dcda04939fd USB: serial: option: add support for Cinterion CLS8 devices f7ab1c54c1a4 USB: serial: option: add Telit FN980 compositions 13b0420eb2ea USB: serial: ftdi_sio: add device IDs for Sienna and Echelon PL-20 a463d20a5772 USB: serial: keyspan: fix NULL-derefs on open() and write() 21917fcb05d1 serial: uartlite: fix exit path null pointer 0c999b4b00db USB: ldusb: fix NULL-derefs on driver unbind 39fe586c4069 USB: chaoskey: fix use-after-free on release 2f2b039530ea USB: usblp: fix runtime PM after driver unbind 2095532522d1 USB: iowarrior: fix use-after-free after driver unbind 7f93c8c89541 USB: iowarrior: fix use-after-free on release 2fdcf7e19bde USB: iowarrior: fix use-after-free on disconnect ab162d331cc1 USB: adutux: fix use-after-free on release ca9c18c00a95 USB: adutux: fix NULL-derefs on disconnect 316f51d77597 USB: adutux: fix use-after-free on disconnect ea7255663398 xhci: Increase STS_SAVE timeout in xhci_suspend() cbc5abaa6f30 xhci: Prevent deadlock when xhci adapter breaks during init fde058a17c18 usb: xhci: wait for CNR controller not ready bit in xhci resume 13e793da4f70 xhci: Fix USB 3.1 capability detection on early xHCI 1.1 spec based hosts d6bdd4686ffc xhci: Check all endpoints for LPM timeout faa0502a5be5 xhci: Prevent device initiated U1/U2 link pm if exit latency is too long 077855ba2df2 xhci: Fix false warning message about wrong bounce buffer write length 31604075ceb4 USB: usb-skeleton: fix NULL-deref on disconnect dcabc48fe0ac USB: usb-skeleton: fix runtime PM after driver unbind 571a14063619 USB: yurex: fix NULL-derefs on disconnect a8fe336f20b9 USB: yurex: Don't retry on unexpected errors 86575b7f636f USB: rio500: Remove Rio 500 kernel driver 95bcc0d980ae f2fs: use EINVAL for superblock with invalid magic 7d1688c6731b panic: ensure preemption is disabled during panic() dafd634415a7 Linux 4.19.79 1bd17a737c9e nl80211: validate beacon head 527ba5d7634b cfg80211: Use const more consistently in for_each_element macros ad180cace853 cfg80211: add and use strongly typed element iteration macros 3dab5ba6d7ae staging: erofs: detect potential multiref due to corrupted images 8b4341f9b80b staging: erofs: add two missing erofs_workgroup_put for corrupted images 596bbc4e0edf staging: erofs: some compressed cluster should be submitted for corrupted images e7c44410387c staging: erofs: fix an error handling in erofs_readdir() 1b94c1e80ca8 coresight: etm4x: Use explicit barriers on enable/disable effad578c23f vfs: Fix EOVERFLOW testing in put_compat_statfs64 d976344d27f7 arm64/speculation: Support 'mitigations=' cmdline option af33d746286c arm64: Use firmware to detect CPUs that are not affected by Spectre-v2 17d1acc4c61d arm64: Force SSBS on context switch fe22ea561ce0 arm64: ssbs: Don't treat CPUs with SSBS as unaffected by SSB dada3a4abb43 arm64: add sysfs vulnerability show for speculative store bypass f41df38898ec arm64: add sysfs vulnerability show for spectre-v2 9d1bb39cdd96 arm64: Always enable spectre-v2 vulnerability detection b1a33cfd8034 arm64: Advertise mitigation of Spectre-v2, or lack thereof 59a6dc262c85 arm64: Provide a command line to disable spectre_v2 mitigation c131623b1e9d arm64: Always enable ssb vulnerability detection 47a11f2eafcc arm64: enable generic CPU vulnerabilites support 512158d0c67e arm64: add sysfs vulnerability show for meltdown 047aac35fd1a arm64: Add sysfs vulnerability show for spectre-v1 edfc026626d6 arm64: fix SSBS sanitization 09c22781dd2c arm64: docs: Document SSBS HWCAP a59d42ac50a1 KVM: arm64: Set SCTLR_EL2.DSSBS if SSBD is forcefully disabled and !vhe 1eaff33e2441 arm64: ssbd: Add support for PSTATE.SSBS rather than trapping to EL3 d286a37471b6 riscv: Avoid interrupts being erroneously enabled in handle_exception() 5b67a4721ddd perf stat: Reset previous counts on repeat with interval 15c57bf9dcf8 perf tools: Fix segfault in cpu_cache_level__read() e5331c37c08b tick: broadcast-hrtimer: Fix a race in bc_set_next 140acbb09384 tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on failure d1e4b4cc3bba powerpc/book3s64/radix: Rename CPU_FTR_P9_TLBIE_BUG feature flag f5f31a6ea558 powerpc/pseries: Fix cpu_hotplug_lock acquisition in resize_hpt() c688982ffaeb nbd: fix crash when the blksize is zero 63bb8b76ed62 KVM: nVMX: Fix consistency check on injected exception error code 34b13ff69668 KVM: PPC: Book3S HV: XIVE: Free escalation interrupts before disabling the VP 1b155b4fe8b4 drm/radeon: Bail earlier when radeon.cik_/si_support=0 is passed 04e0c84f137d nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs 575a5bb3d372 perf unwind: Fix libunwind build failure on i386 systems b0aaf65bb16a kernel/elfcore.c: include proper prototypes bab46480e6f9 perf build: Add detection of java-11-openjdk-devel package 46ff0e2f869f sched/core: Fix migration to invalid CPU in __set_cpus_allowed_ptr() 6cb7aa1b4f94 sched/membarrier: Fix private expedited registration check e250f2b6aa9e sched/membarrier: Call sync_core only before usermode for same mm 9f33b178cbb2 libnvdimm/nfit_test: Fix acpi_handle redefinition 7b4f541fcd1c fuse: fix memleak in cuse_channel_open 2e93d24ac75e libnvdimm/region: Initialize bad block for volatile namespaces 9025adf37ee8 thermal_hwmon: Sanitize thermal_zone type c01a9dbec18a thermal: Fix use-after-free when unregistering thermal zone device 55ebeb4e865d ntb: point to right memory window index 9dabade5c197 x86/purgatory: Disable the stackleak GCC plugin for the purgatory 65348659535d pwm: stm32-lp: Add check in case requested period cannot be achieved 19b1c70e911c pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors 1c70ae6a91f9 drm/amdgpu: Check for valid number of registers to read e0af3b19ad77 drm/amdgpu: Fix KFD-related kernel oops on Hawaii f7ace7f25214 netfilter: nf_tables: allow lookups in dynamic sets f217883bbc92 watchdog: aspeed: Add support for AST2600 520c2a64fc78 ceph: reconnect connection if session hang in opening state 0275113fc09a ceph: fix directories inode i_blkbits initialization 2bc2a90a083a xen/pci: reserve MCFG areas earlier 18dd2b05f349 9p: avoid attaching writeback_fid on mmap with type PRIVATE 07f3596ce344 9p: Transport error uninitialized 448deb13ab9e fs: nfs: Fix possible null-pointer dereferences in encode_attrs() 4753e7a824cb ima: fix freeing ongoing ahash_request b69c3085fcc6 ima: always return negative code for error 6df3c66de09d arm64: cpufeature: Detect SSBS and advertise to userspace 3a0e673305e2 cfg80211: initialize on-stack chandefs 16c75eb13a72 s390/cio: avoid calling strlen on null pointer 3f41e88f4bd4 ieee802154: atusb: fix use-after-free at disconnect 975859bb69b2 xen/xenbus: fix self-deadlock after killing user process e409b81d9ddb Revert "locking/pvqspinlock: Don't wait if vCPU is preempted" 7ed2867ceb41 mmc: sdhci-of-esdhc: set DMA snooping based on DMA coherence 4509a19d5082 mmc: sdhci: improve ADMA error reporting 873f49d6a4e8 drm/i915/gvt: update vgpu workload head pointer correctly 198bc7040c48 drm/nouveau/kms/nv50-: Don't create MSTMs for eDP connectors 7a85c8673551 drm/msm/dsi: Fix return value check for clk_get_parent 0e45633f49ef drm/omap: fix max fclk divider for omap36xx 90ac4028739c perf stat: Fix a segmentation fault when using repeat forever 22f28afd3d77 watchdog: imx2_wdt: fix min() calculation in imx2_wdt_set_timeout e7cf8cc79f93 PCI: Restore Resizable BAR size bits correctly for 1MB BARs 956ce989c41f PCI: vmd: Fix shadow offsets to reflect spec changes 06f250215beb timer: Read jiffies once when forwarding base clk 12c6c4a50f66 usercopy: Avoid HIGHMEM pfn warning e010c9835183 tracing: Make sure variable reference alias has correct var_ref_idx 022ca58f109e power: supply: sbs-battery: only return health when battery present 5cb6dd823127 power: supply: sbs-battery: use correct flags field fb93ccde081e MIPS: Treat Loongson Extensions as ASEs a0dc60ac6bef crypto: ccree - use the full crypt length value f5c087a0d9a0 crypto: ccree - account for TEE not ready to report 561bf9309209 crypto: caam - fix concurrency issue in givencrypt descriptor 3683dd7074dc crypto: cavium/zip - Add missing single_release() cd8e0a5d94fb crypto: skcipher - Unmap pages after an external error 9349108ae499 crypto: qat - Silence smp_processor_id() warning 532920b26678 tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file 4aaea17d3c31 can: mcp251x: mcp251x_hw_reset(): allow more time after a reset 9124eac41a67 powerpc/book3s64/mm: Don't do tlbie fixup for some hardware revisions 19c12f12093e powerpc/powernv/ioda: Fix race in TCE level allocation 032ce7d766a9 powerpc/powernv: Restrict OPAL symbol map to only be readable by root ba3ca9fcb0e7 powerpc/mce: Schedule work from irq_work ee6eeeb88e79 powerpc/mce: Fix MCE handling for huge pages 1284f2073415 ASoC: sgtl5000: Improve VAG power and mute control 50090b75fa89 ASoC: Define a set of DAPM pre/post-up events 42b888f63333 PM / devfreq: tegra: Fix kHz to Hz conversion 9f0f39c92e4f nbd: fix max number of supported devs eff3a54aae68 KVM: nVMX: handle page fault in vmread fix 21874027e1de KVM: X86: Fix userspace set invalid CR4 30fbe0d380aa KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9 4faa7f05af75 KVM: PPC: Book3S HV: Check for MMU ready on piggybacked virtual cores 577a5119d7af KVM: PPC: Book3S HV: Fix race in re-enabling XIVE escalation interrupts 46cb14a57088 s390/cio: exclude subchannels with no parent from pseudo check 9aa823b3c0a6 s390/topology: avoid firing events before kobjs are created ddfef75f877b KVM: s390: Test for bad access register and size at the start of S390_MEM_OP 8b41a30f91db s390/process: avoid potential reading of freed stack Signed-off-by: Bruce Ashfield (cherry picked from commit e23a86fa40be2e1dfe50baeebe787e98f793cc5b) Signed-off-by: Armin Kuster (cherry picked from commit 8a36666265002805134cc3786c0e81bc709d8d10) Signed-off-by: Armin Kuster --- .../linux/linux-yocto-rt_4.19.bb | 6 +++--- .../linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index 8e36d9aa48..f588d7f522 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "0e4a79e608e92830693e511a3dd282ce7c3b3f41" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine ?= "f272b39688fbec016d91b5c0c9d1bb7b5bc3b2ca" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 2af79874e8..0f3b0d569b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "be50001808f00efee538c2a3e7c0a5a2a2df65da" -SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine_qemuarm ?= "d971adf5221e18df3ba46bddee4719c85f98977a" +SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 73f1715b13..17620c74b5 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "7fde51abcaf389193ce5d87ebfb8e8fb66a9271a" -SRCREV_machine_qemuarm64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemumips ?= "8ac68d42beb24b275ac0d2a54a0a2291970e5dde" -SRCREV_machine_qemuppc ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemux86 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemux86-64 ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_machine_qemumips64 ?= "ea2cb8731306f734bf0227575e04cafac7dfade0" -SRCREV_machine ?= "a915fbeae8ed987402f69666d90bef15a01c5823" -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" +SRCREV_machine_qemuarm ?= "425023bd5cfe4f4f7b950c84f62861de600d4f6c" +SRCREV_machine_qemuarm64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemumips ?= "6273d88ca69ada3ae4684fc6301e39381f4cd3e4" +SRCREV_machine_qemuppc ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemux86 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemux86-64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_machine_qemumips64 ?= "f9368853646be5ce9f122adb733cbf8225641e8c" +SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" +SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.78" +LINUX_VERSION ?= "4.19.84" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:27 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:27 -0800 Subject: [OE-core] [warrior 08/14] python2: add ntpath In-Reply-To: References: Message-ID: <3e69681857b88be44797d1d302b9e44a46a7634d.1582253544.git.akuster808@gmail.com> python3 has this but python is missing this. [Yocto #13740] Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie (cherry picked from commit af41a2238beec0c34c1c1e5f25eed55f2a214643) Signed-off-by: Armin Kuster --- meta/recipes-devtools/python/python/python2-manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python/python2-manifest.json b/meta/recipes-devtools/python/python/python2-manifest.json index eb52e862ab..fd98774d00 100644 --- a/meta/recipes-devtools/python/python/python2-manifest.json +++ b/meta/recipes-devtools/python/python/python2-manifest.json @@ -267,6 +267,7 @@ "${libdir}/python2.7/lib-dynload/xreadlines.so", "${libdir}/python2.7/linecache.py", "${libdir}/python2.7/new.py", + "${libdir}/python2.7/ntpath.py", "${libdir}/python2.7/os.py", "${libdir}/python2.7/platform.py", "${libdir}/python2.7/posixpath.py", -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:28 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:28 -0800 Subject: [OE-core] [warrior 09/14] timezone: update to 2019b In-Reply-To: References: Message-ID: <1d1dcea1d2de02cb49950235586adbe4593f0eb7.1582253544.git.akuster808@gmail.com> Briefly: Brazil no longer observes DST. 'zic -b slim' outputs smaller TZif files; please try it out. Palestine's 2019 spring-forward transition was on 03-29, not 03-30. Changes to future timestamps Brazil has canceled DST and will stay on standard time indefinitely. (Thanks to Steffen Thorsen, Marcus Diniz, and Daniel Soares de Oliveira.) Predictions for Morocco now go through 2087 instead of 2037, to work around a problem on newlib when using TZif files output by zic 2019a or earlier. (Problem reported by David Gauchard.) Changes to past and future timestamps Palestine's 2019 spring transition was 03-29 at 00:00, not 03-30 at 01:00. (Thanks to Sharef Mustafa and Even Scharning.) Guess future transitions to be March's last Friday at 00:00. Changes to past timestamps Hong Kong's 1941-06-15 spring-forward transition was at 03:00, not 03:30. Its 1945 transition from JST to HKT was on 11-18 at 02:00, not 09-15 at 00:00. In 1946 its spring-forward transition was on 04-21 at 00:00, not the previous day at 03:30. From 1946 through 1952 its fall-back transitions occurred at 04:30, not at 03:30. In 1947 its fall-back transition was on 11-30, not 12-30. (Thanks to P Chan.) Changes to past time zone abbreviations Italy's 1866 transition to Rome Mean Time was on December 12, not September 22. This affects only the time zone abbreviation for Europe/Rome between those dates. (Thanks to Stephen Trainor and Luigi Rosa.) Changes affecting metadata only Add info about the Crimea situation in zone1970.tab and zone.tab. (Problem reported by Serhii Demediuk.) Changes to code zic's new -b option supports a way to control data bloat and to test for year-2038 bugs in software that reads TZif files. 'zic -b fat' and 'zic -b slim' generate larger and smaller output; for example, changing from fat to slim shrinks the Europe/London file from 3648 to 1599 bytes, saving about 56%. Fat and slim files represent the same set of timestamps and use the same TZif format as documented in tzfile(5) and in Internet RFC 8536. Fat format attempts to work around bugs or incompatibilities in older software, notably software that mishandles 64-bit TZif data or uses obsolete TZ strings like "EET-2EEST" that lack DST rules. Slim format is more efficient and does not work around 64-bit bugs or obsolete TZ strings. Currently zic defaults to fat format unless you compile with -DZIC_BLOAT_DEFAULT=\"slim\"; this out-of-the-box default is intended to change in future releases as the buggy software often mishandles timestamps anyway. zic no longer treats a set of rules ending in 2037 specially. Previously, zic assumed that such a ruleset meant that future timestamps could not be predicted, and therefore omitted a POSIX-like TZ string in the TZif output. The old behavior is no longer needed for current tzdata, and caused problems with newlib when used with older tzdata (reported by David Gauchard). zic no longer generates some artifact transitions. For example, Europe/London no longer has a no-op transition in January 1996. Changes to build procedure tzdata.zi now assumes zic 2017c or later. This shrinks tzdata.zi by a percent or so. Changes to documentation and commentary The Makefile now documents the POSIXRULES macro as being obsolete, and similarly, zic's -p POSIXRULES option is now documented as being obsolete. Although the POSIXRULES feature still exists and works as before, in practice it is rarely used for its intended purpose, and it does not work either in the default reference implementation (for timestamps after 2037) or in common implementations such as GNU/Linux (for contemporary timestamps). Since POSIXRULES was designed primarily as a temporary transition facility for System V platforms that died off decades ago, it is being decommissioned rather than institutionalized. New info on Bonin Islands and Marcus (thanks to Wakaba and Phake Nick). Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie (cherry picked from commit bbbb985808e5c301cdb7fdb1ff677706e99b4785) Signed-off-by: Armin Kuster --- meta/recipes-extended/timezone/timezone.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 1ade0075e6..ce16524ebb 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "PD & BSD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2019a" +PV = "2019b" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -12,7 +12,7 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.md5sum] = "27585a20bc5401324f42c8deb6e4677f" -SRC_URI[tzcode.sha256sum] = "8739f162bc30cdfb482435697f969253abea49595541a0afd5f443fbae433ff5" -SRC_URI[tzdata.md5sum] = "288f7b1e43018c633da108f13b27cf91" -SRC_URI[tzdata.sha256sum] = "90366ddf4aa03e37a16cd49255af77f801822310b213f195e2206ead48c59772" +SRC_URI[tzcode.md5sum] = "91e0978d947496fd6aaf46d351f9c41d" +SRC_URI[tzcode.sha256sum] = "2e479d409337da41408629ce6c3b4d8410b10ba6d4431d862e22d2b137d7756d" +SRC_URI[tzdata.md5sum] = "b26b5d7d844cb96c73ed2fb6d588daaf" +SRC_URI[tzdata.sha256sum] = "05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:26 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:26 -0800 Subject: [OE-core] [warrior 07/14] linux-yocto/4.19: update to v4.19.87 In-Reply-To: References: Message-ID: From: Bruce Ashfield Updating linux-yocto/4.19 to the latest korg -stable release that comprises the following commits: 174651bdf802 Linux 4.19.87 6938a9da7ff8 PM / devfreq: Fix kernel oops on governor module load 345712c95eec KVM: PPC: Book3S HV: Flush link stack on guest exit to host kernel 0a60d4bddc0b powerpc/book3s64: Fix link stack flush on context switch 19d98b4d55b0 powerpc/64s: support nospectre_v2 cmdline option b7e2a040d9fc staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error 4101916e9f08 USB: serial: option: add support for Foxconn T77W968 LTE modules 62aca6645c08 USB: serial: option: add support for DW5821e with eSIM support 3349ed266ae2 USB: serial: mos7840: fix remote wakeup abbda35d6a6e USB: serial: mos7720: fix remote wakeup 84743898d60b USB: serial: mos7840: add USB ID to support Moxa UPort 2210 356440a79b6b appledisplay: fix error handling in the scheduled work 0439d6b90187 USB: chaoskey: fix error case of a timeout a18675e5d5f7 usb-serial: cp201x: support Mark-10 digital force gauge 61f6a3fac394 usbip: Fix uninitialized symbol 'nents' in stub_recv_cmd_submit() 375b26a86481 usbip: tools: fix fd leakage in the function of read_attr_usbip_status e70448b92253 USBIP: add config dependency for SGL_ALLOC 5d0b56f6725d virtio_ring: fix return code on DMA mapping fails 78260a294c04 media: imon: invalid dereference in imon_touch_event 94a94b605916 media: cxusb: detect cxusb_ctrl_msg error in query 8b42c263ec1a media: b2c2-flexcop-usb: add sanity checking 56be9f1b8733 media: uvcvideo: Fix error path in control parsing failure 61e73cf57ed8 cpufreq: Add NULL checks to show() and store() methods of cpufreq f217cef919da media: usbvision: Fix races among open, close, and disconnect 467052f6ea5a media: vivid: Fix wrong locking that causes race conditions on streaming stop b73b28b1b2cb media: vivid: Set vid_cap_streaming and vid_out_streaming to true af8071f50f46 nfc: port100: handle command failure cleanly 3510fb7947d5 ALSA: usb-audio: Fix NULL dereference at parsing BADD 2819f4030f43 futex: Prevent robust futex exit race d3f8c58d701c y2038: futex: Move compat implementation into futex.c 344966da99c9 nbd: prevent memory leak ed7a3dde0aa2 x86/speculation: Fix redundant MDS mitigation message 0af5ae268e24 x86/speculation: Fix incorrect MDS/TAA mitigation status ed7312096a1f x86/insn: Fix awk regexp warnings 99b933bbc7b0 ARC: perf: Accommodate big-endian CPU e02f1448282b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary 046f0fcf7397 ocfs2: remove ocfs2_is_o2cb_active() 36bef080b55f net: phy: dp83867: increase SGMII autoneg timer duration 87997a7800a1 net: phy: dp83867: fix speed 10 in sgmii mode 5779cbc98369 mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() a268d985f089 md/raid10: prevent access of uninitialized resync_pages offset f8dc0350d32b ath9k_hw: fix uninitialized variable data f0cfe98332d6 ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe 4ae7392ab6f4 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved 03bf4876a593 Bluetooth: Fix invalid-free in bcsp_close() 006360ec33d9 mm/page_io.c: do not free shared swap slots 16a300fb1dbb cfg80211: call disconnect_wk when AP stops 2b3541ffdd05 ipv6: Fix handling of LLA with VRF and sockets bound to VRF 091ed093c9c8 mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock 896f7398152b i2c: uniphier-f: fix timeout error after reading 8 bytes 1efa17ab9cb8 spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch 1b0f1b2dde06 nvme-pci: fix surprise removal 597a37d01b69 PCI: keystone: Use quirk to limit MRRS for K2G c0418c4a61aa pinctrl: zynq: Use define directive for PIN_CONFIG_IO_STANDARD 0858006cda38 pinctrl: lpc18xx: Use define directive for PIN_CONFIG_GPIO_PIN_INT 5efa36e7f04a pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL bad4da12b797 pinctrl: qcom: spmi-gpio: fix gpio-hog related boot issues c24fe7807320 cfg80211: Prevent regulatory restore during STA disconnect in concurrent interfaces ee7d2473812b tools: bpftool: pass an argument to silence open_obj_pinned() 367e64ce11fc of: unittest: initialize args before calling of_*parse_*() e4547e028547 of: unittest: allow base devicetree to have symbol metadata 1303c938c953 net: bcmgenet: return correct value 'ret' from bcmgenet_power_down 1d6a0dd6aa53 ACPICA: Use %d for signed int print formatting instead of %u d15b8b691725 clk: tegra20: Turn EMC clock gate into divider 91c5f99d131e vrf: mark skb for multicast or link-local as enslaved to VRF 5c2a3997ae5b dlm: don't leak kernel pointer to userspace afb4717ab81b dlm: fix invalid free 30fc13ae88b2 usb: typec: tcpm: charge current handling for sink during hard reset 5e989b6cad68 scsi: lpfc: Correct loss of fc4 type on remote port address change a391709b636e scsi: lpfc: Fix odd recovery in duplicate FLOGIs in point-to-point 05678af01a33 scsi: lpfc: fcoe: Fix link down issue after 1000+ link bounces e6d0262e1628 scsi: megaraid_sas: Fix goto labels in error handling 83e679606e78 scsi: megaraid_sas: Fix msleep granularity ff997bf13c1e scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11 80224e3b08ff scsi: mpt3sas: Don't modify EEDPTagMode field setting on SAS3.5 HBA devices 5553e2bdcb02 scsi: mpt3sas: Fix Sync cache command failure during driver unload 5f2dc610eb28 net: dsa: bcm_sf2: Turn on PHY to allow successful registration 2ac94b9e902f rtlwifi: rtl8192de: Fix misleading REG_MCUFWDL information 13d434fed1a2 wireless: airo: potential buffer overflow in sprintf() fad934bb2e47 brcmsmac: never log "tid x is not agg'able" by default bdb61fa50b70 rtl8xxxu: Fix missing break in switch 06ed77066838 wlcore: Fix the return value in case of error in 'wlcore_vendor_cmd_smart_config_start()' c68a499448e1 ath10k: snoc: fix unbalanced clock error handling c262dc0655df wil6210: fix locking in wmi_call ccb2390e8933 wil6210: fix RGF_CAF_ICR address for Talyn-MB 0e1304ae42c2 wil6210: fix L2 RX status handling aa2112d57152 wil6210: fix debugfs memory access alignment ea136e61e4df btrfs: avoid link error with CONFIG_NO_AUTO_INLINE 4a035f2643c6 media: ov13858: Check for possible null pointer 3ee72f30c163 nds32: Fix bug in bitfield.h e6c6c0439a93 net: bpfilter: fix iptables failure if bpfilter_umh is disabled 811c8141d663 sock_diag: fix autoloading of the raw_diag module 3c69a033b416 audit: print empty EXECVE args 5dc441fbef91 soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL 9cdfff0a5e61 clk: sunxi-ng: enable so-said LDOs for A64 SoC's pll-mipi clock a2e6fe1f647f ARM: dts: imx6sx-sdb: Fix enet phy regulator 465073e44fda openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS 31bced01fe77 sched/fair: Don't increase sd->balance_interval on newidle balance ed023646c2cf sched/topology: Fix off by one bug f9fca78e6cf2 net: do not abort bulk send on BQL status 0d3b9ac2844f ocfs2: fix clusters leak in ocfs2_defrag_extent() 6c150df9c2e8 ocfs2: don't put and assigning null to bh allocated outside 6fd469d06eb8 ocfs2: don't use iocb when EIOCBQUEUED returns abc7968b86b1 ocfs2: without quota support, avoid calling quota recovery 6a2245d828e4 mm: handle no memcg case in memcg_kmem_charge() properly 08f07d9f5b17 tools/power turbosat: fix AMD APIC-id output b167fee4e45d arm64: makefile fix build of .i file in external module case fa7f1bce27c0 nvme-pci: fix conflicting p2p resource adds 0bbb8382db4c irq/matrix: Fix memory overallocation ad8298fccd70 ntb: intel: fix return value for ndev_vec_mask() 3bd4422af874 ntb_netdev: fix sleep time mismatch 8dbecf6c2f17 net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read 12eeb72afac2 net: hns3: bugfix for is_valid_csq_clean_head() e3345108409c net: hns3: bugfix for reporting unknown vector0 interrupt repeatly problem b0465d06d4c6 net: hns3: bugfix for buffer not free problem during resetting 3d9bc014c519 fm10k: ensure completer aborts are marked as non-fatal after a resume 2fed73906e97 igb: shorten maximum PHC timecounter update interval 3081ae5e378f powerpc/powernv: hold device_hotplug_lock when calling device_online() 17523d7a1cc8 mm/memory_hotplug: fix online/offline_pages called w.o. mem_hotplug_lock 02735d5987b9 mm/memory_hotplug: make add_memory() take the device_hotplug_lock 023c071f101c kernel/panic.c: do not append newline to the stack protector panic string 1914e5edd811 fs/hfs/extent.c: fix array out of bounds read of array extent a9f38975eb98 hfs: update timestamp on truncate() 0013adceb521 hfsplus: update timestamps on truncate() 38e7b916daa2 hfs: fix return value of hfs_get_block() 550da9ee35fd hfsplus: fix return value of hfsplus_get_block() 8687d57d247a hfs: prevent btree data loss on ENOSPC 0b54b59d8541 hfsplus: prevent btree data loss on ENOSPC 7beaf6105e2e hfs: fix BUG on bnode parent update 1df96949ebfb hfsplus: fix BUG on bnode parent update 08751e477f0e lib/bitmap.c: fix remaining space computation in bitmap_print_to_pagebuf 1d5834945945 linux/bitmap.h: fix type of nbits in bitmap_shift_right() 8deaaf77ce2e linux/bitmap.h: handle constant zero-size bitmaps correctly 30598425aecc mm/gup_benchmark.c: prevent integer overflow in ioctl 9663d294ae28 block: call rq_qos_exit() after queue is frozen a125df22d134 selftests/powerpc/cache_shape: Fix out-of-tree build 024cd793bbe1 selftests/powerpc/switch_endian: Fix out-of-tree build a4a660f7abd9 selftests/powerpc/signal: Fix out-of-tree build f74f406bbd0b selftests/powerpc/ptrace: Fix out-of-tree build 57aab8f0a33d powerpc/xmon: Relax frame size for clang 32d7474b7a08 ipv4/igmp: fix v1/v2 switchback timeout based on rfc3376, 8.12 691bd94c15b1 vfs: avoid problematic remapping requests into partial EOF block cdc45f204775 um: Make line/tty semantics use true write IRQ a17e3bbfb97c i2c: uniphier-f: fix race condition when IRQ is cleared a118403a5ecc i2c: uniphier-f: fix occasional timeout error 1466eae37a9f i2c: uniphier-f: make driver robust against concurrency 10807b374663 block: fix the DISCARD request merge b948d56951be macsec: let the administrator set UP state even if lowerdev is down f5bdad7106fc macsec: update operstate when lower device changes 4291e97c69f6 mm: thp: fix MADV_DONTNEED vs migrate_misplaced_transhuge_page race condition ac1cad79bcad tools/testing/selftests/vm/gup_benchmark.c: fix 'write' flag usage 2d9d6c099eaf mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock bcba80f38a00 fs/ocfs2/dlm/dlmdebug.c: fix a sleep-in-atomic-context bug in dlm_print_one_mle() 99b3146b799a arm64: lib: use C string functions with KASAN enabled b84e965c7edb sparc64: Rework xchg() definition to avoid warnings. 4e4cad4365e0 powerpc/process: Fix flush_all_to_thread for SPE 54299e1cf379 bpf, btf: fix a missing check bug in btf_parse 8044e741eee4 bpf: devmap: fix wrong interface selection in notifier_call 7b557dbdc519 net: ethernet: cadence: fix socket buffer corruption problem 3681b901e94a thermal: rcar_thermal: Prevent hardware access during system suspend 436e610bf195 thermal: rcar_thermal: fix duplicate IRQ request 51aa1a10fbac selftests: fix warning: "_GNU_SOURCE" redefined c62be4108883 selftests: kvm: Fix -Wformat warnings 5802cb25de86 selftests: watchdog: Fix error message. 74685702363c selftests: watchdog: fix message when /dev/watchdog open fails 58ceffabad41 selftests/ftrace: Fix to test kprobe $comm arg only if available adcb6d9ff121 spi: uniphier: fix incorrect property items 6c2075f792c6 fs/cifs: fix uninitialised variable warnings c5621fbd6560 net: socionext: Stop PHY before resetting netsec 0a6fa6119ab1 mfd: max8997: Enale irq-wakeup unconditionally 5a04242e8c23 mfd: intel_soc_pmic_bxtwc: Chain power button IRQs as well dd72391c9a53 mfd: mc13xxx-core: Fix PMIC shutdown when reading ADC values 02c9ec11860f mfd: arizona: Correct calling of runtime_put_sync e79d230832d0 net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode 7c011435110f qlcnic: fix a return in qlcnic_dcb_get_capability() 321c40dce581 mISDN: Fix type of switch control variable in ctrl_teimanager 074af1668038 f2fs: spread f2fs_set_inode_flags() e7f81efae3b5 f2fs: fix to spread clear_cold_data() 733fddc34651 thermal: armada: fix a test in probe() bb925b9bece2 RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap 829aa617bf6e rtc: s35390a: Change buf's type to u8 in s35390a_init 8112f3d4ed03 ceph: only allow punch hole mode in fallocate 146fb4b0d4fe ceph: fix dentry leak in ceph_readdir_prepopulate 083757d84859 tools: bpftool: fix completion for "bpftool map update" 570c05378d97 selftests/bpf: fix return value comparison for tests in test_libbpf.sh 3173e226ca41 powerpc/64s/radix: Fix radix__flush_tlb_collapsed_pmd double flushing pmd b43c5287f6bc powerpc/mm/radix: Fix small page at boundary when splitting b499fa070ee4 powerpc/mm/radix: Fix overuse of small pages in splitting logic 434551e9fd44 powerpc/mm/radix: Fix off-by-one in split mapping logic ee35e01b0f08 powerpc/pseries: Export raw per-CPU VPA data via debugfs 9ed143cf730d scsi: hisi_sas: Fix NULL pointer dereference ff6618e06cb4 sparc: Fix parport build warnings. 3d02e3bb3cfe x86/intel_rdt: Prevent pseudo-locking from using stale pointers b6e44f743951 spi: omap2-mcspi: Set FIFO DMA trigger level to word length ad9a4e963c92 swiotlb: do not panic on mapping failures 9b572e8bc038 s390/perf: Return error when debug_register fails 641f1f798c80 atm: zatm: Fix empty body Clang warnings f9304c6277ed sunrpc: safely reallow resvport min/max inversion 7983dea8c368 SUNRPC: Fix a compile warning for cmpxchg64() a0ec7f6eabe8 selftests/bpf: fix file resource leak in load_kallsyms 56b8b1832122 dm raid: avoid bitmap with raid4/5/6 journal device 4de506d51177 sctp: use sk_wmem_queued to check for writable space 1f7f2a0666a3 usbip: tools: fix atoi() on non-null terminated string 283d9618e22b USB: misc: appledisplay: fix backlight update_status return code 80a23f70d546 PCI: vmd: Detach resources after stopping root bus b0f69ccfff3a macintosh/windfarm_smu_sat: Fix debug output 86f63146f886 ALSA: i2c/cs8427: Fix int to char conversion 46729b27706a PM / Domains: Deal with multiple states but no governor in genpd cf800f2b630b ACPI / scan: Create platform device for INT33FE ACPI nodes cb6a3096ec2f kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack f0f842a1a9f9 xfs: clear ail delwri queued bufs on unmount of shutdown fs bb64349b6f56 xfs: fix use-after-free race in xfs_buf_rele e0e8d83e4878 net: ena: Fix Kconfig dependency on X86 7ac437558e4a net: fix warning in af_unix 5e110ec2d924 net: dsa: mv88e6xxx: Fix 88E6141/6341 2500mbps SERDES speed 274726bcf5ba scsi: zorro_esp: Limit DMA transfers to 65535 bytes 1f13afca914f scsi: dc395x: fix DMA API usage in sg_update_list e95ec662b126 scsi: dc395x: fix dma API usage in srb_done 95655b10529d ASoC: tegra_sgtl5000: fix device_node refcounting f1f1002a9987 clk: at91: audio-pll: fix audio pmc type f15b802890bb clk: mmp2: fix the clock id for sdh2_clk and sdh3_clk 6391dd5eb0ef PCI: mediatek: Fixup MSI enablement logic by enabling MSI before clocks 305c262fb8ee nvme-pci: fix hot removal during error handling 4e4b97f59050 nvmet-fcloop: suppress a compiler warning 2f1e4e65ba41 nvmet: avoid integer overflow in the discard code 30ca1af49481 crypto: ccree - avoid implicit enum conversion 5bbeb4fcf39a scsi: iscsi_tcp: Explicitly cast param in iscsi_sw_tcp_host_get_param 06815ae5e27f scsi: bfa: Avoid implicit enum conversion in bfad_im_post_vendor_event f4bf2dc77826 scsi: isci: Change sci_controller_start_task's return type to sci_status 3a40068dc831 scsi: isci: Use proper enumerated type in atapi_d2h_reg_frame_handler 6288f52ed258 clk: tegra: Fixes for MBIST work around 5a487f40e717 KVM/x86: Fix invvpid and invept register operand size in 64-bit mode 7392aa08f8a4 KVM: nVMX: move check_vmentry_postreqs() call to nested_vmx_enter_non_root_mode() 9fe573d539a8 KVM: nVMX: reset cache/shadows when switching loaded VMCS cec14148c1a9 nfp: bpf: protect against mis-initializing atomic counters bfe01cddb81a scsi: ips: fix missing break in switch 073f454cc28c qed: Align local and global PTT to propagate through the APIs. 45f89cf0f329 amiflop: clean up on errors during setup 4043bc0f634b pwm: lpss: Only set update bit if we are actually changing the settings ad78a958663a pinctrl: sunxi: Fix a memory leak in 'sunxi_pinctrl_build_state()' fae3cf8874c3 RDMA/bnxt_re: Avoid resource leak in case the NQ registration fails b1bf1e424dcb RDMA/bnxt_re: Fix qp async event reporting 2f241e333f7b RDMA/bnxt_re: Avoid NULL check after accessing the pointer bbeeadb7bab4 scsi: hisi_sas: Free slot later in slot_complete_vx_hw() 628cae51693a scsi: hisi_sas: Fix the race between IO completion and timeout for SMP/internal IO d10b7dd14a37 scsi: hisi_sas: Feed back linkrate(max/min) when re-attached 92ac0e324974 m68k: fix command-line parsing when passed from u-boot 4ab1594e699e w1: IAD Register is yet readable trough iad sys file. Fix snprintf (%u for unsigned, count for max size). d11d985d0a82 misc: mic: fix a DMA pool free failure a2204a295554 gsmi: Fix bug in append_to_eventlog sysfs handler cc08097f2619 btrfs: handle error of get_old_root 1b49c453a564 btrfs: defrag: use btrfs_mod_outstanding_extents in cluster_pages_for_defrag 9325e8f4688c PCI: mediatek: Fix class type for MT7622 to PCI_CLASS_BRIDGE_PCI dfffae314a02 mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail e2c158f58522 mmc: mediatek: fill the actual clock for mmc debugfs e3fa491211c4 spi: sh-msiof: fix deferred probing 2cd0b70c55b0 cdrom: don't attempt to fiddle with cdo->capability 0c5c34c1aaf3 skd: fixup usage of legacy IO API 196b007ac0a6 ath10k: allocate small size dma memory in ath10k_pci_diag_write_mem 17fbe3c91ad4 ath10k: set probe request oui during driver start 8111f99f7c44 brcmsmac: AP mode: update beacon when TIM changes 20e42ddf6c1d mt76x0: phy: fix restore phase in mt76x0_phy_recalibrate_after_assoc 8cb568162524 mt76: do not store aggregation sequence number for null-data frames b95998fb6c50 EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr() 97aab1a43a2f powerpc/eeh: Fix use of EEH_PE_KEEP on wrong field bd2a7e53cd6e powerpc/eeh: Fix null deref for devices removed during EEH 16e4657a1d25 powerpc/boot: Disable vector instructions 5346c8403733 powerpc/boot: Fix opal console in boot wrapper 4505cff2ef4a powerpc: Fix signedness bug in update_flash_db() 93b943c0602f synclink_gt(): fix compat_ioctl() 8d67a4ecb473 pty: fix compat ioctls fa3fe5f442ab gfs2: Fix marking bitmaps non-full 26a4c6a562ce PCI: cadence: Write MSI data with 32bits ca71f9c8adc2 pinctrl: madera: Fix uninitialized variable bug in madera_mux_set_mux 4465a916eaa7 printk: fix integer overflow in setup_log_buf() 90d73768ddb6 printk: lock/unlock console only for new logbuf entries 8888689bd433 crypto: testmgr - fix sizeof() on COMP_BUF_SIZE 3757657af27e ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback 49a9643b5e8d mwifiex: Fix NL80211_TX_POWER_LIMITED e80e88ef6057 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() a0ee03bb5269 drm/i915/pmu: "Frequency" is reported as accumulated cycles 8a67fbf65971 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs e8d355befc42 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() b28da9da6e51 Revert "fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()" 67380639dfdb virtio_console: allocate inbufs in add_port() only if it is needed 65d153c8ed65 nbd:fix memory leak in nbd_get_socket() 036588ec6888 tools: gpio: Correctly add make dependencies for gpio_utils 7cb8ee734c18 gpio: max77620: Fixup debounce delays 70d594d17ebb vhost/vsock: split packets to send using multiple buffers 48bc34efbc65 net/mlx5: Fix auto group size calculation 28a4cc2b5d6f net/mlxfw: Verify FSM error code translation doesn't exceed array size 7c1a53817782 net/mlx5e: Fix set vf link state error flow 1ff2a0f8692f sfc: Only cancel the PPS workqueue if it exists 13512a5eb818 net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key 2ba6a4f5402e net/sched: act_pedit: fix WARN() in the traffic path 9f6de5cf5390 net: rtnetlink: prevent underflows in do_setvfinfo() ebcb0840a76b net/mlx4_en: Fix wrong limitation for number of TX rings 5408138df1db net/mlx4_en: fix mlx4 ethtool -N insertion baa888ca02db mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel 14260788bbb9 Linux 4.19.86 2e1f151cd2d9 x86/resctrl: Fix rdt_find_domain() return value and checks d64b58520670 mmc: tmio: fix SCC error handling to avoid false positive CRC error e2a37708cfca powerpc/time: Fix clockevent_decrementer initalisation for PR KVM ff36ace6c107 tools: PCI: Fix broken pcitest compilation 4039b5dd0f67 PM / devfreq: Fix static checker warning in try_then_request_governor 903cfafe0874 ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate 6491a2d26c08 tcp: start receiver buffer autotuning sooner ef0811ef95ea ARM: dts: omap5: Fix dual-role mode on Super-Speed port 183f9ae8c4d2 mlxsw: spectrum_switchdev: Check notification relevance based on upper device 16ad1c43196a spi: rockchip: initialize dma_slave_config properly f28abe5a3695 mac80211: minstrel: fix sampling/reporting of CCK rates in HT mode 83ea4ccdb9eb mac80211: minstrel: fix CCK rate group streams value 8bbedf4dffe9 mac80211: minstrel: fix using short preamble CCK rates on HT clients 5d017065cec9 misc: cxl: Fix possible null pointer dereference 9089b2f0049e netfilter: nft_compat: do not dump private area e6c540bf9786 net: sched: avoid writing on noop_qdisc b80939a47413 selftests: forwarding: Have lldpad_app_wait_set() wait for unknown, too a119952d4be6 hwmon: (npcm-750-pwm-fan) Change initial pwm target to 255 4bbc8deedd89 hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros 5bdad12ab211 hwmon: (pwm-fan) Silence error on probe deferral 0cb6525b75e1 hwmon: (nct6775) Fix names of DIMM temperature sources a58d5770493c hwmon: (k10temp) Support all Family 15h Model 6xh and Model 7xh processors 1301b861cf50 scsi: arcmsr: clean up clang warning on extraneous parentheses b0c75ea8d372 pinctrl: gemini: Fix up TVC clock group 2a6c8fc0af64 orangefs: rate limit the client not running info message 336793832f26 x86/mm: Do not warn about PCI BIOS W+X mappings 1eeb7407d233 ARM: 8802/1: Call syscall_trace_exit even when system call skipped e616dd603c29 spi: spidev: Fix OF tree warning logic 4fabd2e530ab pinctrl: gemini: Mask and set properly 8aa36b8a7684 spi: fsl-lpspi: Prevent FIFO under/overrun by default 07ed61a0a711 gpio: syscon: Fix possible NULL ptr usage 312de5a09d10 net: fix generic XDP to handle if eth header was mangled 014045888a74 bpf: btf: Fix a missing check bug 85f996c36e15 x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error 3f4f4c639f29 lightnvm: pblk: consider max hw sectors supported for max_write_pgs d4ab0df8d5dd lightnvm: pblk: fix error handling of pblk_lines_init() cdf73455471a lightnvm: do no update csecs and sos on 1.2 1fb60da4d736 lightnvm: pblk: guarantee mw_cunits on read buffer 1e9796622bc7 lightnvm: pblk: fix write amplificiation calculation d56fe8f59a23 lightnvm: pblk: guarantee emeta on line close c7e49f73152f lightnvm: pblk: fix incorrect min_write_pgs ced6b5dae1dc lightnvm: pblk: fix rqd.error return value in pblk_blk_erase_sync e99956093f70 ALSA: hda/ca0132 - Fix input effect controls for desktop cards 9c30ea2dda5d media: venus: vdec: fix decoded data size 5b388c45c3e5 media: cx231xx: fix potential sign-extension overflow on large shift 4d7cf69b77ce GFS2: Flush the GFS2 delete workqueue before stopping the kernel threads 1adde6589b4a media: isif: fix a NULL pointer dereference bug 3404019d6d0f printk: Give error on attempt to set log buffer length to over 2G b2d6db3e572a mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable b0c6a78a8a5a backlight: lm3639: Unconditionally call led_classdev_unregister 94764e3ae569 proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted() e78c55ad6657 s390/kasan: avoid user access code instrumentation ef5ad4f11e74 s390/kasan: avoid instrumentation of early C code 5228d07c4f92 s390/kasan: avoid vdso instrumentation 0046af383099 mmc: mmci: expand startbiterr to irqmask and error check 322f530fd959 x86/intel_rdt: CBM overlap should also check for overlap with CDP peer 36cf91317ca9 x86/intel_rdt: Introduce utility to obtain CDP peer f9a2a8b8a5d4 mtd: devices: m25p80: Make sure WRITE_EN is issued before each write 6664533b4fc1 mtd: spi-nor: cadence-quadspi: Use proper enum for dma_[un]map_single 370dbbc7b5cb media: cx18: Don't check for address of video_dev 76765353043b media: dw9807-vcm: Fix probe error handling 96134bbea649 media: dw9714: Fix error handling in probe function 2103ebde9ac0 platform/x86: mlx-platform: Properly use mlxplat_mlxcpld_msn201x_items 04d38fa8436b bcache: recal cached_dev_sectors on detach 65910055b560 bcache: account size of buckets used in uuid write to ca->meta_sectors_written 16c2d36b1123 reset: Fix potential use-after-free in __of_reset_control_get() 84b787e35482 fbdev: fix broken menu dependencies 21bb43c0dd86 fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() e57ba9db8c5f fbdev: sbuslib: use checked version of put_user() 964cd867ef63 atmel_lcdfb: support native-mode display-timings a3a76b5d22f0 mmc: renesas_sdhi_internal_dmac: set scatter/gather max segment size e8853ef02e2d mmc: tmio: Fix SCC error detection 01395b5f089b mmc: renesas_sdhi_internal_dmac: Whitelist r8a774a1 500c933055e7 x86/fsgsbase/64: Fix ptrace() to read the FS/GS base accurately b17ddbdc6035 xsk: proper AF_XDP socket teardown ordering 29fda86178fe iwlwifi: mvm: don't send keys when entering D3 d43b7b99fe77 ACPI / SBS: Fix rare oops when removing modules 7f02606367b3 xfrm: use correct size to initialise sp->ovec 6b9c4eddb3be crypto: mxs-dcp - Fix AES issues 70ecd0459d03 crypto: mxs-dcp - Fix SHA null hashes and output length fef30612e23c dmaengine: rcar-dmac: set scatter/gather max segment size af23231acaf6 x86/olpc: Fix build error with CONFIG_MFD_CS5535=m 624cd074631a kexec: Allocate decrypted control pages for kdump if SME is enabled 59e5269c692e remoteproc: qcom: q6v5: Fix a race condition on fatal crash 4b8c7bce49ca remoteproc: Check for NULL firmwares in sysfs interface e4aecc15d7c4 tc-testing: fix build of eBPF programs d653bd939cb1 net: hns3: Fix for rx vlan id handle to support Rev 0x21 hardware 3bef7420e129 soc: fsl: bman_portals: defer probe after bman's probe 090122baa262 Input: silead - try firmware reload after unsuccessful resume c13b00c39464 Input: st1232 - set INPUT_PROP_DIRECT property 205ae6b06288 i2c: zx2967: use core to detect 'no zero length' quirk 1698ed9f0e2f i2c: tegra: use core to detect 'no zero length' quirk d511166558a4 i2c: qup: use core to detect 'no zero length' quirk e0d9c58c49e6 i2c: omap: use core to detect 'no zero length' quirk f3afad5d1eff gfs2: slow the deluge of io error messages 35c8125cbea4 media: cec-gpio: select correct Signal Free Time 58d0a3dbad2b media: ov5640: fix framerate update 47dd538e9c44 dmaengine: ioat: fix prototype of ioat_enumerate_channels 90d73c1cadb8 NFSv4.x: fix lock recovery during delegation recall 799c98cba071 printk: Correct wrong casting e7ff1141b60c i2c: brcmstb: Allow enabling the driver on DSL SoCs 8b3e444fe8d0 clk: samsung: Use clk_hw API for calling clk framework from clk notifiers 599d5350f123 clk: samsung: exynos5420: Define CLK_SECKEY gate clock only or Exynos5420 06da39429640 clk: samsung: Use NOIRQ stage for Exynos5433 clocks suspend/resume fe46630cd2a1 qtnfmac: drop error reports for out-of-bounds key indexes 4ecc631d975c qtnfmac: inform wireless core about supported extended capabilities 28d5342b2ae4 qtnfmac: pass sgi rate info flag to wireless core 5554e47a2946 qtnfmac: request userspace to do OBSS scanning if FW can not 75a1e8dec421 brcmfmac: fix full timeout waiting for action frame on-channel tx c01258a2ad7d brcmfmac: reduce timeout for action frame scan 89cf2472a295 cpu/SMT: State SMT is disabled even with nosmt and without "=force" 8fce141f4805 mtd: physmap_of: Release resources on error d46cd42b4ffa usb: dwc2: disable power_down on rockchip devices 3ad0531dbe0c USB: serial: cypress_m8: fix interrupt-out transfer length 24ce099a5388 KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR 8b6021ca47a3 bnxt_en: return proper error when FW returns HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED 6e454b0ad02d ALSA: hda/sigmatel - Disable automute for Elo VuPoint 6925a5afc148 media: i2c: adv748x: Support probing a single output a02bad04d110 media: rcar-vin: fix redeclaration of symbol 14dc7aeef3f4 media: pxa_camera: Fix check for pdev->dev.of_node 7672ca60a14a media: rc: ir-rc6-decoder: enable toggle bit for Kathrein RCU-676 remote 01e9e39f4f61 qed: Avoid implicit enum conversion in qed_ooo_submit_tx_buffers d1dff747758f ata: ep93xx: Use proper enums for directions 6a70c66a84e0 powerpc/64s/radix: Explicitly flush ERAT with local LPID invalidation 9e4649e443e2 powerpc/time: Use clockevents_register_device(), fixing an issue with large decrementer d7e546d06182 ASoC: qdsp6: q6asm-dai: checking NULL vs IS_ERR() 27ab8f1648ac cpuidle: menu: Fix wakeup statistics updates for polling state 38ad2aa9331b ACPICA: Never run _REG on system_memory and system_IO 216929d15b2c OPP: Return error on error from dev_pm_opp_get_opp_count() 3d0c72f99efc msm/gpu/a6xx: Force of_dma_configure to setup DMA for GMU 674b223d7a48 rpmsg: glink: smem: Support rx peak for size less than 4 bytes ec9fc981de57 IB/mlx4: Avoid implicit enumerated type conversion d5d78049b7a4 RDMA/hns: Limit the size of extend sge of sq 010af7a8d0ae RDMA/hns: Bugfix for CM test 5b7064adfb4b RDMA/hns: Submit bad wr when post send wr exception af76265532a8 RDMA/hns: Bugfix for reserved qp number 350703fae672 IB/rxe: avoid srq memory leak e3db306d1fda IB/mthca: Fix error return code in __mthca_init_one() 1b86b8ad6e47 ixgbe: Fix crash with VFs and flow director on interface flap 0e1fd69cff75 i40e: Use proper enum in i40e_ndo_set_vf_link_state 22b8d7e3bcb5 ixgbe: Fix ixgbe TX hangs with XDP_TX beyond queue limit b69cfc4f2665 md: allow metadata updates while suspending an array - fix 4aa110048087 ice: Fix forward to queue group logic d97a02b84879 clocksource/drivers/sh_cmt: Fix clocksource width for 32-bit machines 31fb5ea6ed1b clocksource/drivers/sh_cmt: Fixup for 64-bit machines 0e8855ba9f9a tools: PCI: Fix compilation warnings 9372023e10ee PM / hibernate: Check the success of generating md5 digest before hibernation ed896ddfae94 mtd: rawnand: sh_flctl: Use proper enum for flctl_dma_fifo0_transfer 83cda9ea1876 ARM: dts: at91: sama5d2_ptc_ek: fix bootloader env offsets 10551e574d79 ARM: dts: at91: at91sam9x5cm: fix addressable nand flash size 825d176a1049 ARM: dts: at91: sama5d4_xplained: fix addressable nand flash size ab9928588283 powerpc/xive: Move a dereference below a NULL test 38d7fa28157e powerpc/pseries: Fix how we iterate over the DTL entries a3576a228404 powerpc/pseries: Fix DTL buffer registration b28aa87d081c cxgb4: Use proper enum in IEEE_FAUX_SYNC efdacf2b7aa7 cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update 743ccf759e8e mei: samples: fix a signedness bug in amt_host_if_call() cc7d996a4428 x86/PCI: Apply VMD's AERSID fixup generically 6cedfaffb4ac sunrpc: Fix connect metrics 7e4602eac666 clk: keystone: Enable TISCI clocks if K3_ARCH 6c487c0e877a ext4: fix build error when DX_DEBUG is defined f2877a3c332d ALSA: hda: Fix mismatch for register mask and value in ext controller. ae3765a0a33d dmaengine: timb_dma: Use proper enum in td_prep_slave_sg 0c21aa9b5651 dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction 671ce9f892b9 printk: CON_PRINTBUFFER console registration is a bit racy cd120df118d7 printk: Do not miss new messages when replaying the log 5a6f7274e67b KVM: PPC: Inform the userspace about TCE update failures 38374aa3c916 watchdog: w83627hf_wdt: Support NCT6796D, NCT6797D, NCT6798D 96505abd2435 watchdog: sama5d4: fix timeout-sec usage 26d6e542dc47 watchdog: renesas_wdt: stop when unregistering f4cfb7eeae62 watchdog: core: fix null pointer dereference when releasing cdev a9f36455edc1 irqchip/irq-mvebu-icu: Fix wrong private data retrieval be4f5457a5fd nl80211: Fix a GET_KEY reply attribute 21ba66937e0d usb: dwc3: gadget: Check ENBLSLPM before sending ep command 639fce0bc8b5 usb: gadget: udc: fotg210-udc: Fix a sleep-in-atomic-context bug in fotg210_get_status() f22a4d8cf049 selftests/tls: Fix recv(MSG_PEEK) & splice() test cases 475398b72984 ath9k: fix reporting calculated new FFT upper max f6ec4fccbf9a PM / devfreq: stopping the governor before device_unregister() fc491a1e77be PM / devfreq: Fix handling of min/max_freq == 0 b5add975c871 PM / devfreq: Fix devfreq_add_device() when drivers are built as modules. 5f5a8d36749f ata: ahci_brcm: Allow using driver or DSL SoCs 4cfcb5379a9c rtlwifi: btcoex: Use proper enumerated types for Wi-Fi only interface e5895e41aeb3 ath10k: fix vdev-start timeout on error 06cb99e6399d arm64/numa: Report correct memblock range for the dummy node 256a29480733 kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table bae080e72e92 iommu/arm-smmu-v3: Fix unexpected CMD_SYNC timeout 2bab3df8f506 iommu/io-pgtable-arm: Fix race handling in split_blk_unmap() 741a445a88e4 mt76: fix handling ps-poll frames ddb4299f1d78 mt76x2: disable WLAN core before probe b14825a5c652 mt76x2: fix tx power configuration for VHT mcs 9 449b9ae3504c IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds e0dee1c839e3 IB/hfi1: Error path MAD response size is incorrect 8d93707e7195 f2fs: keep lazytime on remount a5f7bf0379d3 ACPI / LPSS: Resume BYT/CHT I2C controllers from resume_noirq aa39d53f2b89 ACPI / LPSS: Make acpi_lpss_find_device() also find PCI devices 9372a40b54d0 SUNRPC: Fix priority queue fairness 43876b1ce42b tcp: up initial rmem to 128KB and SYN rwin to around 64KB d2cacb6ac4ff ARM: dts: sun8i: h3: bpi-m2-plus: Fix address for external RGMII Ethernet PHY ed220d3dcc79 ARM: dts: sun8i: h3-h5: ir register size should be the whole memory block ac02379889e2 f2fs: return correct errno in f2fs_gc 7cbac9d598a7 net: hns3: Fix loss of coal configuration while doing reset af98283da9e9 net: hns3: Fix for netdev not up problem when setting mtu 7a1f314e3c80 ARM: dts: omap5: enable OTG role for DWC3 controller 789d29044793 ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode 6d286faeee74 net: xen-netback: fix return type of ndo_start_xmit function c234566f1ea0 net: ovs: fix return type of ndo_start_xmit function d51d9605888d bpf, x32: Fix bug for BPF_JMP | {BPF_JSGT, BPF_JSLE, BPF_JSLT, BPF_JSGE} f3c40792cf4b bpf, x32: Fix bug with ALU64 {LSH, RSH, ARSH} BPF_K shift by 0 a085f797449e bpf, x32: Fix bug with ALU64 {LSH, RSH, ARSH} BPF_X shift by 0 860a7d18b9e6 bpf, x32: Fix bug for BPF_ALU64 | BPF_NEG 03543b9c5573 fbdev: Ditch fb_edid_add_monspecs 703662598b9c arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault f8b09a043685 mm/memory_hotplug: fix updating the node span 6631def3ee38 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() a16a3669273b idr: Fix idr_get_next race with idr_remove 4c62337d8f17 net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size() 17a82bc67728 Revert "OPP: Protect dev_list with opp_table lock" 4f4ab0b49cf2 tee: optee: add missing of_node_put after of_device_is_available 2008d0e3d364 i2c: mediatek: modify threshold passed to i2c_get_dma_safe_msg_buf() 976e944e005f spi: mediatek: use correct mata->xfer_len when in fifo transfer c63ee2939dc1 Linux 4.19.85 e99d64837815 slcan: Fix memory leak in error path e4cc9c81e230 memfd: Use radix_tree_deref_slot_protected to avoid the warning. 914834a73b16 net: phy: mdio-bcm-unimac: mark PM functions as __maybe_unused 2ed924f2782f s390/vdso: correct vdso mapping for compat tasks 1b904b2eb9c1 media: ov2680: fix null dereference at power on 0c3e32230bcc IB/iser: Fix possible NULL deref at iser_inv_desc() d7b412e1448e fuse: use READ_ONCE on congestion_threshold and max_background 2e72489c822e usb: usbtmc: uninitialized symbol 'actual' in usbtmc_ioctl_clear eb9b6c203870 usb: xhci-mtk: fix ISOC error when interval is zero 8ddec6aaad86 netfilter: masquerade: don't flush all conntracks if only one address deleted on device ba8c4cc746a5 rtc: armada38x: fix possible race condition 44bb1b1256b5 rtc: tx4939: fixup nvmem name and register size e7ab2bab7e60 rtc: isl1208: avoid possible sysfs race 70f0ead5c6af ARM: dts: lpc32xx: Fix SPI controller node names 8e359bce724c arm64: dts: lg: Fix SPI controller node names f52a34b5b111 arm64: dts: amd: Fix SPI bus warnings b26edaa53496 scsi: NCR5380: Check for bus reset 080b37aacd2b scsi: NCR5380: Handle BUS FREE during reselection aa45f4ab86a2 scsi: NCR5380: Don't call dsprintk() following reselection interrupt 23635cf271a3 scsi: NCR5380: Don't clear busy flag when abort fails aeb0ed2e5bb9 scsi: NCR5380: Check for invalid reselection target 98c6d8f8a401 scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data 1a46e4d3da31 scsi: NCR5380: Withhold disconnect privilege for REQUEST SENSE 624f60251f1a scsi: NCR5380: Have NCR5380_select() return a bool 873506e566ef scsi: NCR5380: Clear all unissued commands on host reset fe5ef5fe3e19 iwlwifi: mvm: Allow TKIP for AP mode c4a3dcb0a273 iwlwifi: mvm: use correct FIFO length d395b6f51cf7 iwlwifi: pcie: fit reclaim msg to MAX_MSG_LEN 08d2000d2162 iwlwifi: pcie: gen2: build A-MSDU only for GSO f4f0909f3d3f iwlwifi: api: annotate compressed BA notif array sizes e455ecaf52da iwlwifi: pcie: read correct prph address for newer devices c5eafde04ad3 iwlwifi: fix non_shared_ant for 22000 devices f73c75560ffd iwlwifi: dbg: don't crash if the firmware crashes in the middle of a debug dump 98ca4f397feb crypto: fix a memory leak in rsa-kcs1pad's encryption mode 975b3c8dd182 crypto: s5p-sss: Fix Fix argument list alignment ef089d9b58a7 crypto: s5p-sss: Fix race in error handling d34465e722e7 x86/hyperv: Suppress "PCI: Fatal: No config space access function found" 23a4059cd6b8 Bluetooth: btrsi: fix bt tx timeout issue 245b2765e87c Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS 2c8946462f07 Bluetooth: hci_serdev: clear HCI_UART_PROTO_READY to avoid closing proto races f416fe070ec1 firmware: dell_rbu: Make payload memory uncachable 5d3675e3e6d1 ARM: dts: realview: Fix SPI controller node names 57b78e41a397 EDAC: Raise the maximum number of memory controllers 352668d32cd5 RDMA: Fix dependencies for rdma_user_mmap_io 36ffc9a76df9 f2fs: mark inode dirty explicitly in recover_inode() a4bd303d6774 f2fs: fix to recover inode's project id during POR 7bae8b6b73e4 f2fs: update i_size after DIO completion 9de276a804c7 PCI/ERR: Run error recovery callbacks for all affected devices 8738fd312e63 net: faraday: fix return type of ndo_start_xmit function 8ff333f3f819 net: smsc: fix return type of ndo_start_xmit function 4481669a3a95 ARM: dts: paz00: fix wakeup gpio keycode 4e9cf62e8ffb ARM: tegra: colibri_t30: fix mcp2515 can controller interrupt polarity 63c28c08e485 ARM: tegra: apalis_t30: fix mcp2515 can controller interrupt polarity 2241b82d7b3f ARM: tegra: apalis_t30: fix mmc1 cmd pull-up 1717eca134f2 ARM: dts: tegra20: restore address order 619f46726e66 ARM: dts: tegra30: fix xcvr-setup-use-fuses 70c4b0fb4fd5 arm64: tegra: I2C on Tegra194 is not compatible with Tegra114 e821b710b58d ARM: dts: imx51-zii-rdu1: Fix the rtc compatible string a09b6731c4dd arm64: dts: fsl: Fix I2C and SPI bus warnings 2d6b885ba741 phy: lantiq: Fix compile warning 6fce50c100c8 f2fs: fix remount problem of option io_bits c4a33c4ecc1f scsi: libsas: always unregister the old device if going to discover new 2f9d0f703b9c iw_cxgb4: Use proper enumerated type in c4iw_bar2_addrs 1ae5bfee6cff vfio/pci: Mask buggy SR-IOV VF INTx support dde3433de9a0 vfio/pci: Fix potential memory leak in vfio_msi_cap_len 86f886e91dcf vmbus: keep pointer to ring buffer page 728a7552dc49 misc: genwqe: should return proper error value. 6707b1ba53be misc: kgdbts: Fix restrict error 890bee675729 silmbus: ngd: register controller after power up. 932980ed5b77 slimbus: ngd: return proper error code instead of zero 9874abd5c878 slimbus: ngd: register ngd driver only once. 614744f4e80e coresight: dynamic-replicator: Handle multiple connections 36aa9cd28c59 coresight: tmc: Fix byte-address alignment for RRP 0bb87d413aef coresight: etm4x: Configure EL2 exception level when kernel is running in HYP a0e0ec0a5544 coresight: tmc-etr: Handle driver mode specific ETR buffers 1099665125ed coresight: perf: Disable trace path upon source error 87e382c3f706 coresight: perf: Fix per cpu path management 25deeb3c1b9f coresight: Fix handling of sinks 59a488998caf coresight: Use ERR_CAST instead of ERR_PTR 240293e02123 usb: gadget: uvc: Only halt video streaming endpoint in bulk mode bb7c36e91d45 usb: gadget: uvc: Factor out video USB request queueing c4635c27d3ac ARM: dts: imx6ull: update vdd_soc voltage for 900MHz operating point a9c11660389c phy: phy-twl4030-usb: fix denied runtime access 6e176dd0e4c2 phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs f0525581df5f phy: brcm-sata: allow PHY_BRCM_SATA driver to be built for DSL SoCs ff0eabfaf4a4 ARM: at91: pm: call put_device instead of of_node_put in at91_pm_config_ws 1b23c28d87e7 gpiolib: Fix gpio_direction_* for single direction GPIOs ec0b30347e4a i2c: aspeed: fix invalid clock parameters for very large divisors de2875336ee8 ARM: dts: exynos: Correct audio subsystem parent clock on Peach Chromebooks 4e6c65624090 usb: gadget: uvc: configfs: Sort frame intervals upon writing d036103870c6 usb: gadget: uvc: configfs: Prevent format changes after linking header e6e1ad1e2537 usb: gadget: uvc: configfs: Drop leaked references to config items b7ffda42d720 ARM: dts: rockchip: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock 0b08daf034cc media: davinci: Fix implicit enum conversion warning 0994d0cb86ec media: au0828: Fix incorrect error messages 0e63f5db54d8 media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init() 2dacea472335 media: imx: work around false-positive warning, again 1b73ea8377da mlxsw: Make MLXSW_SP1_FWREV_MINOR a hard requirement 9d2ce0611ad5 arm64: dts: rockchip: Fix microSD in rk3399 sapphire board 46a9bbe9d579 MIPS: kexec: Relax memory restriction 3b9528b302a6 EDAC: Correct DIMM capacity unit symbol e897dd4cfdde x86/CPU: Change query logic so CPUID is enabled before testing d26ad73be70f x86/CPU: Use correct macros for Cyrix calls fd3f592b2af6 net: freescale: fix return type of ndo_start_xmit function cab175f881c5 net: micrel: fix return type of ndo_start_xmit function 590ee2e0aec7 net: phy: mdio-bcm-unimac: Allow configuring MDIO clock divider 73cb54858021 samples/bpf: fix compilation failure 3536c05af6f4 PCI/ERR: Use slot reset if available 0729c5944eee PCI/AER: Don't read upstream ports below fatal errors f3f55d83ea0d PCI/AER: Take reference on error devices 40ebd8b31fea bnx2x: Ignore bandwidth attention in single function mode 0769f445afa4 ARM: dts: stm32: Fix SPI controller node names c6305dfb214b ARM: dts: clearfog: fix sdhci supply property name b939d8b914d8 ARM: dts: stm32: enable display on stm32mp157c-ev1 board 098e12f385f9 x86/mce-inject: Reset injection struct after injection aa190837bec5 ARM: dts: marvell: Fix SPI and I2C bus warnings ccc8bf41dac8 crypto: arm/crc32 - avoid warning when compiling with Clang 9e70da12d01f cpufeature: avoid warning when compiling with clang ad28c2ba4318 crypto: chacha20 - Fix chacha20_block() keystream alignment (again) af4749d23d46 spi: pic32: Use proper enum in dmaengine_prep_slave_rg c2f76a19fbc8 ARM: dts: ste: Fix SPI controller node names 4d22878d5894 ARM: dts: ux500: Fix LCDA clock line muxing 8be4d596d3f2 ARM: dts: ux500: Correct SCU unit address dfc81686a642 f2fs: fix to recover inode's uid/gid during POR c783946ea9b1 f2fs: avoid infinite loop in f2fs_alloc_nid caab324d1b01 ARM: dts: ti: Fix SPI and I2C bus warnings 2cf6352a6d4c ARM: dts: am335x-evm: fix number of cpsw 1eeee2fd2e0c PCI: portdrv: Initialize service drivers directly 38bee3f3f280 mlxsw: spectrum: Init shaper for TCs 8..15 636cbdec5cf4 brcmsmac: Use kvmalloc() for ucode allocations 2980b6a81378 brcmfmac: increase buffer for obtaining firmware capabilities 59d6e59f32cc s390/vdso: correct CFI annotations of vDSO functions 84bfa03445bc s390/vdso: avoid 64-bit vdso mapping for compat tasks 3d510bdf35c2 s390/zcrypt: enable AP bus scan without a valid default domain 5e9923e85e1c usb: usbtmc: Fix ioctl USBTMC_IOCTL_ABORT_BULK_OUT 92aeb3756c43 usb: chipidea: Fix otg event handler 979f541851d9 usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started b39e733da3f8 nfp: provide a better warning when ring allocation fails 883843b5a912 net: hns3: Fix parameter type for q_id in hclge_tm_q_to_qs_map_cfg() a1b2c39f3ec7 net: hns3: Fix client initialize state issue when roce client initialize failed 20f2b72faff0 net: hns3: Clear client pointer when initialize client failed or unintialize finished ae95237256de net: hns3: Fix cmdq registers initialization issue for vf 110de23fc502 net: hns3: Fix for setting speed for phy failed problem bd23121daecf net: sun: fix return type of ndo_start_xmit function 5d52c10c345d net: amd: fix return type of ndo_start_xmit function 0cd3edaf82e6 net: broadcom: fix return type of ndo_start_xmit function 63a0e0512dba net: xilinx: fix return type of ndo_start_xmit function df9f5c799d85 net: toshiba: fix return type of ndo_start_xmit function e50d7274104c net: marvell: fix return type of ndo_start_xmit function 28fae2d588be net: mvpp2: fix the number of queues per cpu for PPv2.2 0ede78b3576c power: supply: twl4030_charger: disable eoc interrupt on linear charge 773fb69e4307 power: supply: twl4030_charger: fix charging current out-of-bounds 0729f87b840a libfdt: Ensure INT_MAX is defined in libfdt_env.h e000de3f01c5 of/unittest: Fix I2C bus unit-address error 4c64ce947cfa OPP: Protect dev_list with opp_table lock 51e509caf5fa ARM: dts: atmel: Fix I2C and SPI bus warnings 7cfb3b04d096 RDMA/i40iw: Fix incorrect iterator type eb355ccfdf1d powerpc: Fix duplicate const clang warning in user access code e7b37640916f powerpc/pseries: Disable CPU hotplug across migrations 9271304c26fc powerpc/pseries/memory-hotplug: Only update DT once per memory DLPAR request 0ab2545aa404 powerpc/64s/hash: Fix stab_rr off by one initialization a3581509e890 selftests/powerpc: Do not fail with reschedule 089b169ceb80 powerpc/iommu: Avoid derefence before pointer check 13d5bc50f405 net: ibm: fix return type of ndo_start_xmit function efe22c12087d net: cavium: fix return type of ndo_start_xmit function 279a4f77546a net: hns3: fix return type of ndo_start_xmit function dd4b87a945c1 ipmi: fix return value of ipmi_set_my_LUN ea944c71360f ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address 438bf726def0 ipmi_si: fix potential integer overflow on large shift 78538bae1dab ipmi_si_pci: fix NULL device in ipmi_si error message 5ab64c1633f6 ASoC: rt5682: Fix the boost volume at the begining of playback 6237e9d0715a spi: mediatek: Don't modify spi_transfer when transfer. 779c96ef3fac spi/bcm63xx-hsspi: keep pll clk enabled eaa4d5ac4403 samples/bpf: fix a compilation failure feb52253d738 arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2 1ea4603cc812 tty: serial: qcom_geni_serial: Fix serial when not used as console 87153f7a04c9 serial: mxs-auart: Fix potential infinite loop 400caa3d02ea serial: samsung: Enable baud clock for UART reset procedure in resume 30cfa3ebc0ed serial: uartps: Fix suspend functionality bad4e6d3d40d ARM: dts: xilinx: Fix I2C and SPI bus warnings d15e5038213e PCI: mediatek: Fix unchecked return value 80ec7fcb04a0 net: socionext: Fix two sleep-in-atomic-context bugs in ave_rxfifo_reset() 176f6203a4f4 PCI/ACPI: Correct error message for ASPM disabling 525552a0e849 media: ov2680: don't register the v4l2 subdevice before checking chip ID f4683c89808f media: vsp1: Fix YCbCr planar formats pitch calculation ee5a1460f271 media: vsp1: Fix vsp1_regs.h license header 2d7578285958 s390/qeth: invoke softirqs after napi_schedule() 66fb291b264d s390/qeth: uninstall IRQ handler on device removal ccc1e600844d ath9k: Fix a locking bug in ath9k_add_interface() e97d09277b77 netfilter: nf_tables: avoid BUG_ON usage d1440f1a38eb ACPI / LPSS: Exclude I2C busses shared with PUNIT from pmc_atom_d3_mask 75fd1aec33c6 arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou 5fc9af407fc5 ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 0592c2178e3c scsi: ufshcd: Fix NULL pointer dereference for in ufshcd_init 6745591c8da9 ip_gre: fix parsing gre header in ipgre_err ada2a0f1ac54 kernfs: Fix range checks in kernfs_get_target_path 5fba81510697 component: fix loop condition to call unbind() if bind() fails 925c19a8c6bb power: supply: max8998-charger: Fix platform data retrieval 82d8a34470e9 power: reset: at91-poweroff: do not procede if at91_shdwc is allocated 1fb3d279a384 power: supply: ab8500_fg: silence uninitialized variable warnings c9398259cf85 arm64: dts: meson: Fix erroneous SPI bus warnings 89f4d27c1bcd blok, bfq: do not plug I/O if all queues are weight-raised 6c9a79651bff block, bfq: inject other-queue I/O into seeky idle queues on NCQ flash 6d7757f04866 arm64: fix for bad_mode() handler to always result in panic 7f49a2210e85 cxgb4: Fix endianness issue in t4_fwcache() b0cb2d8164d0 android: binder: no outgoing transaction when thread todo has transaction 31e470f92d9e ARM: dts: sun9i: Fix I2C bus warnings 0989aa65bc37 pinctrl: at91: don't use the same irqchip with multiple gpiochips d1b9d321df35 ARM: dts: sunxi: Fix I2C bus warnings 8ac08053744c ARM: dts: socfpga: Fix I2C bus unit-address error e70ccd8a13a9 powerpc/vdso: Correct call frame information 11d7842812f8 ARM: dts: aspeed: Fix I2C bus warnings 5a8130ed237f ARM: dts: bcm: Fix SPI bus warnings 08ffefc8e7ed arm64: dts: broadcom: Fix I2C and SPI bus warnings 174e8262f08a drivers: qcom: rpmh-rsc: clear wait_for_compl after use 09c8a33ed766 soc: qcom: apr: Avoid string overflow 6651ecf92f3c soc: qcom: wcnss_ctrl: Avoid string overflow 4a2c4d1a0b6b soc: qcom: geni: geni_se_clk_freq_match() should always accept multiples 331ed266987e soc: qcom: geni: Don't ignore clk_round_rate() errors in geni_se_clk_tbl_get() b0826d4774c2 ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value 9a484516a410 llc: avoid blocking in llc_sap_close() 50e40ebcaa32 pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map() 3f57f7387db2 arm64: dts: renesas: r8a77965: Fix clock/reset for usb2_phy1 7ed1974d2b03 arm64: dts: renesas: r8a77965: Fix HS-USB compatible dc521bf8ffda arm64: dts: renesas: r8a77965: Attach the SYS-DMAC to the IPMMU 1badf45f08b3 arm64: dts: renesas: salvator-common: adv748x: Override secondary addresses 20f93eb9194c ALSA: intel8x0m: Register irq handler after register initializations e80e83fb0106 arm64: dts: meson-axg: use the proper compatible for ethmac 2694107888a5 arm64: dts: meson: libretech: update board model 3804f9dd8f76 net: bcmgenet: Fix speed selection for reverse MII 914282c62ab2 media: dvb: fix compat ioctl translation 03056f8c725a media: fix: media: pci: meye: validate offset to avoid arbitrary access fe384ab1496c ALSA: hda: Fix implicit definition of pci_iomap() on SH 6281d021bbb3 media: dt-bindings: adv748x: Fix decimal unit addresses 88e9f8198dd5 nvmem: core: return error code instead of NULL from nvmem_device_get b0d54e40f3c4 Drivers: hv: vmbus: Fix synic per-cpu context initialization a1d374ea1e95 net: aquantia: fix hw_atl_utils_fw_upload_dwords a9cab0fe6e26 kprobes: Don't call BUG_ON() if there is a kprobe in use on free list 7aea0bd886ae scsi: pm80xx: Fixed system hang issue during kexec boot a66a544dca32 scsi: pm80xx: Corrected dma_unmap_sg() parameter ac892349e21b ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set 86d5ceaea04c scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir() 66b2e4c7afd0 scsi: lpfc: Fix errors in log messages. 87c32dbd7eff scsi: lpfc: Correct invalid EQ doorbell write on if_type=6 8caed6a5d385 scsi: lpfc: Fix GFT_ID and PRLI logic for RSCN 050e019c2d69 scsi: qla2xxx: Fix duplicate switch's Nport ID entries c7ddd7ba1d05 scsi: qla2xxx: Fix dropped srb resource. 8c32664a6a0d scsi: qla2xxx: Fix port speed display on chip reset 3e3a2c5c4569 scsi: qla2xxx: Check for Register disconnect 3a7ec92a5b2a scsi: qla2xxx: Increase abort timeout value 5320b946687a scsi: qla2xxx: Fix deadlock between ATIO and HW lock 6f6e01ff7413 scsi: qla2xxx: Terminate Plogi/PRLI if WWN is 0 f91811dd9501 scsi: qla2xxx: Defer chip reset until target mode is enabled 667bdc46aa4e scsi: qla2xxx: Fix iIDMA error ca35c5a1cb21 scsi: qla2xxx: Use correct qpair for ABTS/CMD a1f14df33c05 f2fs: fix setattr project check upon fssetxattr ioctl 7b55102cdc61 f2fs: fix memory leak of percpu counter in fill_super() 883037308018 f2fs: fix memory leak of write_io in fill_super() e5b515f56626 signal: Properly deliver SIGSEGV from x86 uprobes 91c3a88054c1 signal: Properly deliver SIGILL from uprobes 3b5681d39fa4 signal: Always ignore SIGKILL and SIGSTOP sent to the global init 93ae4ded2abe IB/hfi1: Missing return value in error path for user sdma 45d0ddf97448 RDMA/hns: Fix an error code in hns_roce_v2_init_eq_table() 8edddc2cf3c1 dmaengine: at_xdmac: remove a stray bottom half unlock 9234fbbd7782 ath9k: add back support for using active monitor interfaces for tx99 82663f99cbdf rtc: pl030: fix possible race condition 5a869e9828e8 rtc: mt6397: fix possible race condition 0773f03aebdd EDAC, sb_edac: Return early on ADDRV bit and address type test fc7be6308364 dmaengine: dma-jz4780: Further residue status fix f6d4561cae3a dmaengine: dma-jz4780: Don't depend on MACH_JZ4780 a34ea3ddc763 usb: mtu3: disable vbus rise/fall interrupts of ltssm a5d1ffee2f2f ARM: dts: exynos: Disable pull control for PMIC IRQ line on Artik5 board 67e477d8eaa0 arm64: dts: rockchip: Fix VCC5V0_HOST_EN on rk3399-sapphire 4c884128b414 firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings d786bf93f0c5 sched/debug: Use symbolic names for task state constants e4e522609854 sched/debug: Explicitly cast sched_feat() to bool 0ddcbbf4cd47 failover: Fix error return code in net_failover_create eca5b74e0080 f2fs: submit bio after shutdown 0f9c9a216288 ARM: dts: omap3-gta04: keep vpll2 always on d59817b0ca62 ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot 6b268c233df7 ARM: dts: omap3-gta04: fix touchscreen tsc2007 96907aa1ab3c ARM: dts: omap3-gta04: tvout: enable as display1 alias 8f03a5116e9d ARM: dts: omap3-gta04: fixes for tvout / venc 5cacb026fe26 ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files 69116e3bae2b of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC cc5f462c1b08 ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA 3d5d2f7806a9 ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation 0376916b7b2c ASoC: dapm: Avoid uninitialised variable warning 0204720dde67 udf: Fix crash during mount 52cda4c1d9cd mips: txx9: fix iounmap related issue f63587cbb091 RDMA/core: Follow correct unregister order between sysfs and cgroup 6b827d38cead RDMA/core: Rate limit MAD error messages a618cca0438b IB/ipoib: Ensure that MTU isn't less than minimum permitted 2543eeba256a IB/mlx5: Don't hold spin lock while checking device state 4d8d651e1c5f i2c: mediatek: Use DMA safe buffers for i2c transactions d0d8f0efb6bd ath10k: wmi: disable softirq's while calling ieee80211_rx 14c9bc4be084 ARM: dts: exynos: Disable pull control for S5M8767 PMIC 588822fcb313 ath10k: avoid possible memory access violation 34293775f117 ASoC: sgtl5000: avoid division by zero if lo_vag is zero 6cbd0932ab9a rtnetlink: move type calculation out of loop 4b702fdd6e7e net: lan78xx: Bail out if lan78xx_get_endpoints fails 23ad83c399b0 f2fs: avoid wrong decrypted data from disk b6410b95c224 cfg80211: validate wmm rule when setting 8d705195a9a3 mac80211: fix saving a few HE values 4d146d72687e qxl: fix null-pointer crash during suspend f5ee703ff92c IB/mlx5: Change TX affinity assignment in RoCE LAG mode 5128ea974c22 mtd: rawnand: qcom: don't include dma-direct.h d6ebf70120c6 mtd: rawnand: fsl_ifc: fixup SRAM init for newer ctrl versions 29535bafb64b mtd: rawnand: fsl_ifc: check result of SRAM initialization 6ae8c86ee458 mtd: rawnand: marvell: use regmap_update_bits() for syscon access 6c7644ad22ae ARM: dts: meson8b: fix the clock controller register size e39779f6ea67 ARM: dts: meson8: fix the clock controller register size 6da9a4a98215 net: phy: mscc: read 'vsc8531, edge-slowdown' as an u32 77f9e263e296 net: phy: mscc: read 'vsc8531,vddmac' as an u32 5dc1cbcff700 net/mlx5: Fix atomic_mode enum values b5f6d6de5b12 net: hns3: Change the dst mac addr of loopback packet f995b2efa439 net: hns3: Fix for loopback selftest failed problem d01caf35564c net: hns3: Fix error of checking used vlan id 4aea8f76727e net: hns3: Fix for multicast failure e5f48f8eff66 ASoC: rsnd: ssi: Fix issue in dma data address assignment 0b8e8bddc5c0 soc: imx: gpc: fix PDN delay 7f88d806443f mt76: Fix comparisons with invalid hardware key index 1f54ec5b3047 brcmfmac: fix wrong strnchr usage f05f8607622c mwifex: free rx_cmd skb in suspended state 6c27b9267a84 mwifiex: do no submit URB in suspended state cd554b025c09 rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument c495a8c78b50 ARM: dts: pxa: fix power i2c base address 72e13203c56d ARM: dts: pxa: fix the rtc controller fe9048c7bb38 media: ov772x: Disable clk on error path b489c1e010e4 media: i2c: Fix pm_runtime_get_if_in_use() usage in sensor drivers 5a21c7a0b592 media: vicodec: fix out-of-range values when decoding 17743861edc7 iwlwifi: mvm: avoid sending too many BARs 75de80e11e6b iwlwifi: don't WARN on trying to dump dead firmware ecedae02e89d iwlwifi: drop packets with bad status in CD 02adbecf542e IB/rxe: fixes for rdma read retry cad889676bdb IB/rxe: avoid back-to-back retries ac0ab821c4d5 i40e: Prevent deleting MAC address from VF when set by PF 712d35e0d2c1 i40evf: cancel workqueue sync for adminq when a VF is removed e5d3afbe3a5c i40e: hold the rtnl lock on clearing interrupt scheme f9a84bbd3ca6 i40evf: Don't enable vlan stripping when rx offload is turned on fe301cf64f7e i40e: Check and correct speed values for link on open 8d7e6ab3b5d2 i40evf: set IFF_UNICAST_FLT flag for the VF 015fc5251996 i40e: use correct length for strncpy a90fcbdb9b22 i40evf: Validate the number of queues a PF sends 2da61f212f4d ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks d4e5c8aeb198 arm64: dts: stratix10: i2c clock running out of spec b0bac46b52a9 liquidio: fix race condition in instruction completion processing b2e427c268f3 ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook 0b53b56287ab ARM: dts: exynos: Fix HDMI-HPD line handling on Arndale 0baa3fe5805e ARM: dts: exynos: Use i2c-gpio for HDMI-DDC on Arndale 8e6acc5ee14d MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3 7c68184fced7 pinctrl: ingenic: Probe driver at subsys_initcall 8ddea21d4c0b ASoC: AMD: Change MCLK to 48Mhz bdb7368ac333 ASoC: meson: axg-fifo: report interrupt request failure aac9381b2ca8 ASoC: dpcm: Properly initialise hw->rate_max ac66c0c470a3 ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl d3a45d4d6f2d ice: Fix and update driver version string 48b128cddb91 gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated 9ca72984d7c0 ice: Prevent control queue operations during reset a881088f512e ice: Update request resource command to latest specification f71230e6898e ath10k: limit available channels via DT ieee80211-freq-limit 8cad5d80f8d0 wil6210: fix invalid memory access for rx_buff_mgmt debugfs bcaabaa75eeb wil6210: prevent usage of tx ring 0 for eDMA acf041edec0a wil6210: set edma variables only for Talyn-MB devices be039c973093 wil6210: drop Rx multicast packets that are looped-back to STA 1b0581bf379f ath9k: fix tx99 with monitor mode interface a618e2069783 ath10k: skip resetting rx filter for WCN3990 f7b2312c68a8 ALSA: seq: Do error checks at creating system ports c2f459d3340f cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set d377d63a9228 extcon: cht-wc: Return from default case to avoid warnings 7575a34ed101 remoteproc/davinci: Use %zx for formating size_t c2dca83e9e83 rtc: rv8803: fix the rv8803 id in the OF table 5a408693b414 rtc: sysfs: fix NULL check in rtc_add_groups() a01d6a320440 ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45 ea6a25cd2d41 ARM: dts: rcar: Correct SATA device sizes to 2 MiB 32d3fe68d20e y2038: make do_gettimeofday() and get_seconds() inline 5a830803b593 arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply a124e7f2fecf soc/tegra: pmc: Fix pad voltage configuration for Tegra186 90cfef191a30 ALSA: pcm: signedness bug in snd_pcm_plug_alloc() e84cb5882da6 arm64: dts: allwinner: a64: NanoPi-A64: Fix DCDC1 voltage 3bbce894d52d arm64: dts: allwinner: a64: Olinuxino: fix DRAM voltage d304218f959e arm64: dts: allwinner: a64: Orange Pi Win: Fix SD card node 030f6397eb89 soundwire: intel: Fix uninitialized adev deref 4b4153b7d6af soundwire: Initialize completion for defer messages 38d1ecc23e3e clk: sunxi-ng: h6: fix PWM gate/reset offset 6c0fcc727ff0 iio: dac: mcp4922: fix error handling in mcp4922_write_raw f125d1831402 ath10k: fix kernel panic by moving pci flush after napi_disable 75a600d7f062 tee: optee: take DT status property into account cd3de5870c80 iio: adc: max9611: explicitly cast gain_selectors a6bb63183de2 mmc: sdhci-of-at91: fix quirk2 overwrite b4bc6498c39b mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() bb1bc2d8231c mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() 653d9e0c55bf mm: mempolicy: fix the wrong return value and potential pages leak of mbind 5b1c342fc3e0 iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros 29dcbbb5ab0a net: ethernet: dwmac-sun8i: Use the correct function in exit path bdae2f7b2031 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either beb3860c2e0e ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable 1a48aaabf1cd i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present 9ace24bba657 IB/hfi1: Use a common pad buffer for 9B and 16B packets 6ec4a5498ee5 IB/hfi1: Ensure full Gen3 speed in a Gen4 system 1f3bbf9f0adc Input: synaptics-rmi4 - destroy F54 poller workqueue when removing 5c9fd709c5f5 Input: synaptics-rmi4 - clear IRQ enables for F54 fbe9849f79aa Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) 924a8f2c745a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver 8e347aa4e04b Input: synaptics-rmi4 - fix video buffer size c02230815282 Input: ff-memless - kill timer in destroy() 47d06a15f25a Btrfs: fix log context list corruption after rename exchange operation f2465526866a ALSA: usb-audio: Fix incorrect size check for processing/extension units 420433f6cf5c ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk() ab2ee4299b7e ALSA: usb-audio: not submit urb for stopped endpoint a2c763cd9609 ALSA: usb-audio: Fix missing error check at mixer resolution test edc471038b48 slip: Fix memory leak in slip_open error path 4cd50a31ac9e net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules 0a772b2ac696 net: gemini: add missed free_netdev 66daa05750a9 ipmr: Fix skb headroom in ipmr_get_route(). 20beeb30083e ax88172a: fix information leak on short answers c4a0f567e652 scsi: core: Handle drivers which set sg_tablesize to zero 81adf034d5d6 MIPS: BCM63XX: fix switch core reset on BCM6368 dbf1ef2dc0d5 KVM: x86: introduce is_pae_paging Signed-off-by: Bruce Ashfield (cherry picked from commit 064811c18fe26c7d9bc84f86047325e25e2a1001) Signed-off-by: Armin Kuster (cherry picked from commit 7e944cca62851689f9ddf8a5308ee3331f763957) Signed-off-by: Armin Kuster --- .../linux/linux-yocto-rt_4.19.bb | 6 +++--- .../linux/linux-yocto-tiny_4.19.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index f588d7f522..7b89a24223 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "f272b39688fbec016d91b5c0c9d1bb7b5bc3b2ca" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine ?= "d3fb163023de0a5a57a021e58b55976f68142fc0" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 0f3b0d569b..9cde2c2342 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "d971adf5221e18df3ba46bddee4719c85f98977a" -SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine_qemuarm ?= "6e7574e9a9b41143e0c42fcb31b13802529602f0" +SRCREV_machine ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 17620c74b5..aab30a981e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "425023bd5cfe4f4f7b950c84f62861de600d4f6c" -SRCREV_machine_qemuarm64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemumips ?= "6273d88ca69ada3ae4684fc6301e39381f4cd3e4" -SRCREV_machine_qemuppc ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemux86 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemux86-64 ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_machine_qemumips64 ?= "f9368853646be5ce9f122adb733cbf8225641e8c" -SRCREV_machine ?= "acde437f3893a7b2eb8f1b2ec5f1e42176a90e4a" -SRCREV_meta ?= "e3efe5a5f9ded629a0df5e6b42eaddfab0ec2891" +SRCREV_machine_qemuarm ?= "4d9d89763cde098e4a8b879e8c831e35a5f39ae6" +SRCREV_machine_qemuarm64 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemumips ?= "1f0855745653c8cb7d72ea2d03197889cc82a410" +SRCREV_machine_qemuppc ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemux86 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemux86-64 ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_machine_qemumips64 ?= "5ed73d6e6dc7d4ad8184de8eb6641bdb265ae2ea" +SRCREV_machine ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" +SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.84" +LINUX_VERSION ?= "4.19.87" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:29 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:29 -0800 Subject: [OE-core] [warrior 10/14] timezone:upgrade 2019b -> 2019c In-Reply-To: References: Message-ID: <0d58f5a01c7d49765d66a7e2d73eef0adb868eac.1582253544.git.akuster808@gmail.com> From: Zang Ruochen -tzdata : upgrade from 2019b to 2019c. -tzcode-native : upgrade from 2019b to 2019c. -tzdata.bb and tzcode-native.bb require timezone.inc. Signed-off-by: Zang Ruochen Signed-off-by: Ross Burton (cherry picked from commit c5a382429d18642d35d40a4df6a58b971c724603) Signed-off-by: Armin Kuster --- meta/recipes-extended/timezone/timezone.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index ce16524ebb..f6bab1acb4 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "PD & BSD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2019b" +PV = "2019c" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -12,7 +12,7 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.md5sum] = "91e0978d947496fd6aaf46d351f9c41d" -SRC_URI[tzcode.sha256sum] = "2e479d409337da41408629ce6c3b4d8410b10ba6d4431d862e22d2b137d7756d" -SRC_URI[tzdata.md5sum] = "b26b5d7d844cb96c73ed2fb6d588daaf" -SRC_URI[tzdata.sha256sum] = "05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64" +SRC_URI[tzcode.md5sum] = "195a17454c5db05cab96595380650391" +SRC_URI[tzcode.sha256sum] = "f6ebd3668e02d5ed223d3b7b1947561bf2d2da2f4bd1db61efefd9e06c167ed4" +SRC_URI[tzdata.md5sum] = "f6987e6dfdb2eb83a1b5076a50b80894" +SRC_URI[tzdata.sha256sum] = "79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:30 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:30 -0800 Subject: [OE-core] [warrior 11/14] linux-firmware: bump to 20190618 In-Reply-To: References: Message-ID: <1c16c37e907f4712f40aa70d62c6a526e5228195.1582253544.git.akuster808@gmail.com> From: Oleksandr Kravchuk Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie (cherry picked from commit 4cbb7392c729a2436c26308c2320fdae5c450d7a) Signed-off-by: Armin Kuster --- .../{linux-firmware_git.bb => linux-firmware_20190618.bb} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_git.bb => linux-firmware_20190618.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_git.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb index 8b6ad96dba..acaca955be 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb @@ -92,7 +92,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ - file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ + file://LICENCE.Marvell;md5=28b6ed8bd04ba105af6e4dcd6e997772 \ file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ @@ -123,7 +123,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=b6e44adf71bc37e5f26ebfe5a08b5490 \ + file://WHENCE;md5=55814698bbae7c7dd40c9fbde91af0a8 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -190,9 +190,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "711d3297bac870af42088a467459a0634c1970ca" -PE = "1" -PV = "0.0+git${SRCPV}" +SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:31 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:31 -0800 Subject: [OE-core] [warrior 12/14] linux-firmware: add PE back In-Reply-To: References: Message-ID: From: Oleksandr Kravchuk Add PE (package epoch) from the previous version of the recipe to avoid problems with package upgrade due to changed versioning scheme. See: http://lists.openembedded.org/pipermail/openembedded-core/2019-August/285633.html Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie (cherry picked from commit 8b6ec55da696087c8ea7bacc042307ee652afd9e) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb index acaca955be..9afaad73f3 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb @@ -190,6 +190,8 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" +PE = "1" + SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:32 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:32 -0800 Subject: [OE-core] [warrior 13/14] linux-firmware: Upgrade 20190618 -> 20190815 In-Reply-To: References: Message-ID: <34428eca5f845293b648801bf61957afd249b315.1582253544.git.akuster808@gmail.com> From: Otavio Salvador License-Update: - WHENCE: New firmware files additions and version updates Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton (cherry picked from commit b4c8f2f139d0eeb2ebef3dc5f8309486afdea3d4) Signed-off-by: Armin Kuster --- ...{linux-firmware_20190618.bb => linux-firmware_20190815.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20190618.bb => linux-firmware_20190815.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb index 9afaad73f3..518638806f 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190618.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb @@ -123,7 +123,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=55814698bbae7c7dd40c9fbde91af0a8 \ + file://WHENCE;md5=37a01e379219d1e06dbccfa90a8fc0ad \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -192,7 +192,7 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "0731d06eadc7d9c52e58f354727101813b8da6ea" +SRCREV = "07b925b450bfb4cf3e141c612ec5b104658cd020" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -- 2.17.1 From akuster808 at gmail.com Fri Feb 21 02:53:33 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 20 Feb 2020 18:53:33 -0800 Subject: [OE-core] [warrior 14/14] linux-firmware: update packaging for brcm files In-Reply-To: References: Message-ID: <8063a1277433c58a9df43f0185bb89c79f865aa9.1582253544.git.akuster808@gmail.com> From: Samuli Piippo Add new package for bcm4366c and include available NVRAM config files into the corrent bcm* packages. Signed-off-by: Samuli Piippo Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster (cherry picked from commit 957c3d39b63f57d896ee89d727007ac2ce6672e3) Signed-off-by: Armin Kuster --- .../linux-firmware/linux-firmware_20190815.bb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb index 518638806f..d83000b64f 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb @@ -273,6 +273,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-bcm4358 \ ${PN}-bcm43602 \ ${PN}-bcm4366b \ + ${PN}-bcm4366c \ ${PN}-bcm4371 \ ${PN}-bcm4373 \ ${PN}-bcm43xx \ @@ -571,7 +572,7 @@ FILES_${PN}-bcm43xx-hdr = "${nonarch_base_libdir}/firmware/brcm/bcm43xx_hdr-0.fw FILES_${PN}-bcm4329-fullmac = "${nonarch_base_libdir}/firmware/brcm/bcm4329-fullmac-4.bin" FILES_${PN}-bcm43236b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43236b.bin" FILES_${PN}-bcm4329 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4329-sdio.bin" -FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin" +FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*" FILES_${PN}-bcm4334 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin" FILES_${PN}-bcm4335 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4335-sdio.bin" FILES_${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin" @@ -582,8 +583,8 @@ FILES_${PN}-bcm43242a = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43242a.bin FILES_${PN}-bcm43143 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43143.bin \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin \ " -FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.bin" -FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.bin" +FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*" +FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.*" FILES_${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin" FILES_${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin" FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.bin" @@ -594,6 +595,7 @@ FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie. ${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.ap.bin \ " FILES_${PN}-bcm4366b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366b-pcie.bin" +FILES_${PN}-bcm4366c = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366c-pcie.bin" FILES_${PN}-bcm4371 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4371-pcie.bin" # for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e "LICENSE_\${PN}-$pkg = \"Firmware-broadcom_bcm43xx\"\nRDEPENDS_\${PN}-$pkg += \"\${PN}-broadcom-license\""; done @@ -647,6 +649,8 @@ LICENSE_${PN}-bcm43602 = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm43602 += "${PN}-broadcom-license" LICENSE_${PN}-bcm4366b = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm4366b += "${PN}-broadcom-license" +LICENSE_${PN}-bcm4366c = "Firmware-broadcom_bcm43xx" +RDEPENDS_${PN}-bcm4366c += "${PN}-broadcom-license" LICENSE_${PN}-bcm4371 = "Firmware-broadcom_bcm43xx" RDEPENDS_${PN}-bcm4371 += "${PN}-broadcom-license" @@ -656,11 +660,11 @@ LICENSE_${PN}-cypress-license = "Firmware-cypress" FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress" FILES_${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd" -FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.bin" -FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.bin" -FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin" +FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.*" +FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.*" +FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.*" FILES_${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin" -FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.bin" +FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.*" FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ " -- 2.17.1 From wangmy at cn.fujitsu.com Fri Feb 21 10:09:15 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 21 Feb 2020 02:09:15 -0800 Subject: [OE-core] [PATCH] shadow: upgrade 4.8 -> 4.8.1 Message-ID: <1582279755-21189-1-git-send-email-wangmy@cn.fujitsu.com> 0001-Do-not-check-for-validity-of-shell-executable.patch CVE-2019-19882.patch Removed since they are included in 4.8.1. Signed-off-by: Wang Mingyu --- ...eck-for-validity-of-shell-executable.patch | 29 ---------- .../shadow/files/CVE-2019-19882.patch | 55 ------------------- meta/recipes-extended/shadow/shadow.inc | 6 +- .../shadow/{shadow_4.8.bb => shadow_4.8.1.bb} | 0 4 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch delete mode 100644 meta/recipes-extended/shadow/files/CVE-2019-19882.patch rename meta/recipes-extended/shadow/{shadow_4.8.bb => shadow_4.8.1.bb} (100%) diff --git a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch b/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch deleted file mode 100644 index 2d15ff0673..0000000000 --- a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 4 Dec 2019 19:28:48 +0100 -Subject: [PATCH] Do not check for validity of shell executable. - -This kind of check fails when building a rootfs. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - src/useradd.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/useradd.c b/src/useradd.c -index 4af0f7c..898fe02 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv) - if ( ( !VALID (optarg) ) - || ( ('\0' != optarg[0]) - && ('/' != optarg[0]) -- && ('*' != optarg[0]) ) -- || (stat(optarg, &st) != 0) -- || (S_ISDIR(st.st_mode)) -- || (access(optarg, X_OK) != 0)) { -+ && ('*' != optarg[0]) )) { - fprintf (stderr, - _("%s: invalid shell '%s'\n"), - Prog, optarg); diff --git a/meta/recipes-extended/shadow/files/CVE-2019-19882.patch b/meta/recipes-extended/shadow/files/CVE-2019-19882.patch deleted file mode 100644 index 894d867680..0000000000 --- a/meta/recipes-extended/shadow/files/CVE-2019-19882.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 66b7bc0dcfda12d7f58eba993bd02872cae1d713 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Mon, 16 Dec 2019 14:11:23 -0500 -Subject: [PATCH] Don't auto-enable ACCT_TOOLS_SETUID if PAM is detected - -Here's a sad story: - -* 70971457 is merged into shadow, allowing newgidmap/newuidmap to be -installed with file caps rather than setuid. -* https://bugs.archlinux.org/task/63248 is filed to take advantage of -this. -* The arch maintainer of the 'shadow' package notices that this doesn't -work, and submits a pull request to fix this in shadow. -* edf7547ad5 is merged, fixing the post install hooks. - -The problem here is that distros have been building shadow with PAM for -O(years), but the install hooks have silently failed due to the -combination of the directory mismatch (suidubins vs suidsbins) and later -success with setuid'ing newgidmap/newuidmap. - -With the install hooks fixed, those of us (Arch[1] and Gentoo[2] so far) -who never built shadow explicitly with --enable-account-tools-setuid are -now getting setuid account tools, and don't have PAM configuration -suitable for use with setuid account management tools. - -It's entirely unclear to me why you'd want this, but I assume there's -some reason out there for it existing. Regardless, setuid binaries are -dangerous and shouldn't be enabled by default without good reason. - -[1] https://bugs.archlinux.org/task/64836 -[2] https://bugs.gentoo.org/702252 - -Upstream-Status: Backport -CVE: CVE-2019-19882 -Signed-off-by: Li Zhou ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e3ed3b43..d6e2bfbd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,7 +226,7 @@ AC_ARG_ENABLE(account-tools-setuid, - *) AC_MSG_ERROR(bad value ${enableval} for --enable-account-tools-setuid) - ;; - esac], -- [enable_acct_tools_setuid="maybe"] -+ [enable_acct_tools_setuid="no"] - ) - - AC_ARG_ENABLE(utmpx, --- -2.17.1 - diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 3bfa39e6ff..f86e5e03c0 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -13,7 +13,6 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}. file://shadow-4.1.3-dots-in-usernames.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://shadow-relaxed-usernames.patch \ - file://CVE-2019-19882.patch \ " SRC_URI_append_class-target = " \ @@ -25,14 +24,13 @@ SRC_URI_append_class-native = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ file://0002-Allow-for-setting-password-in-clear-text.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ - file://0001-Do-not-check-for-validity-of-shell-executable.patch \ " SRC_URI_append_class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a" -SRC_URI[sha256sum] = "82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4" +SRC_URI[md5sum] = "3d97f11e66bfb0b14702b115fa8be480" +SRC_URI[sha256sum] = "3ee3081fbbcbcfea5c8916419e46bc724807bab271072104f23e7a29e9668f3a" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ diff --git a/meta/recipes-extended/shadow/shadow_4.8.bb b/meta/recipes-extended/shadow/shadow_4.8.1.bb similarity index 100% rename from meta/recipes-extended/shadow/shadow_4.8.bb rename to meta/recipes-extended/shadow/shadow_4.8.1.bb -- 2.17.1 From wangmy at cn.fujitsu.com Fri Feb 21 10:09:39 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 21 Feb 2020 02:09:39 -0800 Subject: [OE-core] [PATCH] nspr: upgrade 4.24 -> 4.25 Message-ID: <1582279780-21243-1-git-send-email-wangmy@cn.fujitsu.com> Signed-off-by: Wang Mingyu --- meta/recipes-support/nspr/{nspr_4.24.bb => nspr_4.25.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/nspr/{nspr_4.24.bb => nspr_4.25.bb} (97%) diff --git a/meta/recipes-support/nspr/nspr_4.24.bb b/meta/recipes-support/nspr/nspr_4.25.bb similarity index 97% rename from meta/recipes-support/nspr/nspr_4.24.bb rename to meta/recipes-support/nspr/nspr_4.25.bb index e98fe83ed3..1de26e1eed 100644 --- a/meta/recipes-support/nspr/nspr_4.24.bb +++ b/meta/recipes-support/nspr/nspr_4.25.bb @@ -23,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "d630c2111e1db6d2ec2069aad22b4121" -SRC_URI[sha256sum] = "90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0" +SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" +SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" CVE_PRODUCT = "netscape_portable_runtime" -- 2.17.1 From wangmy at cn.fujitsu.com Fri Feb 21 10:09:40 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 21 Feb 2020 02:09:40 -0800 Subject: [OE-core] [PATCH] nss: upgrade 3.49.1 -> 3.50 In-Reply-To: <1582279780-21243-1-git-send-email-wangmy@cn.fujitsu.com> References: <1582279780-21243-1-git-send-email-wangmy@cn.fujitsu.com> Message-ID: <1582279780-21243-2-git-send-email-wangmy@cn.fujitsu.com> refresh the following patch: 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch Signed-off-by: Wang Mingyu --- ...freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch | 4 ++-- meta/recipes-support/nss/{nss_3.49.1.bb => nss_3.50.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/nss/{nss_3.49.1.bb => nss_3.50.bb} (98%) diff --git a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index 803c06b218..c380c14491 100644 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -42,8 +42,8 @@ Signed-off-by: Alexander Kanavin /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -28,6 +29,7 @@ - * that compiler uses -mfpu=neon only. */ +@@ -25,6 +26,7 @@ + /* We don't test on big endian platform, so disable this on big endian. */ #define USE_ARM_GCM #endif +#endif diff --git a/meta/recipes-support/nss/nss_3.49.1.bb b/meta/recipes-support/nss/nss_3.50.bb similarity index 98% rename from meta/recipes-support/nss/nss_3.49.1.bb rename to meta/recipes-support/nss/nss_3.50.bb index b16ade9f62..e9855d7a7e 100644 --- a/meta/recipes-support/nss/nss_3.49.1.bb +++ b/meta/recipes-support/nss/nss_3.50.bb @@ -34,8 +34,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[md5sum] = "6b92ac02dcf9e9e44df5390f6814c157" -SRC_URI[sha256sum] = "d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e" +SRC_URI[md5sum] = "e0366615e12b147cebc136c915baea37" +SRC_URI[sha256sum] = "185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" -- 2.17.1 From patchwork at patchwork.openembedded.org Fri Feb 21 03:01:55 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 21 Feb 2020 03:01:55 -0000 Subject: [OE-core] =?utf-8?b?4pyXIHBhdGNodGVzdDogZmFpbHVyZSBmb3IgIlt2M10g?= =?utf-8?q?gstreamer1=2E0-plugins-good=2E=2E=2E=22_and_1_more?= In-Reply-To: <1582252918-89191-1-git-send-email-anuj.mittal@intel.com> References: <1582252918-89191-1-git-send-email-anuj.mittal@intel.com> Message-ID: <20200221030155.2276.71490@do> == Series Details == Series: "[v3] gstreamer1.0-plugins-good..." and 1 more Revision: 1 URL : https://patchwork.openembedded.org/series/22812/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 10c2216cb6) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From anuj.mittal at intel.com Fri Feb 21 03:29:27 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 21 Feb 2020 11:29:27 +0800 Subject: [OE-core] [zeus][PATCH] openssh: backport patch to fix "cert not yet valid" test Message-ID: <1582255767-74523-1-git-send-email-anuj.mittal@intel.com> Fixes [YOCTO #13796] Signed-off-by: Anuj Mittal --- ...at-bozo-decided-to-use-2020-as-a-future-d.patch | 46 ++++++++++++++++++++++ meta/recipes-connectivity/openssh/openssh_8.0p1.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch diff --git a/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch new file mode 100644 index 0000000..e2930c3 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch @@ -0,0 +1,46 @@ +From 3cccc0a2ab597b8273bddf08e9a3cc5551d7e530 Mon Sep 17 00:00:00 2001 +From: "djm at openbsd.org" +Date: Fri, 3 Jan 2020 03:02:26 +0000 +Subject: [PATCH] upstream: what bozo decided to use 2020 as a future date in a + regress + +test? + +OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a + +Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381] + +[Dropped the script version and copyright year change at the top] + +Signed-off-by: Anuj Mittal +--- + regress/cert-hostkey.sh | 2 +- + regress/cert-userkey.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh +index 3ce7779..74d5a53 100644 +--- a/regress/cert-hostkey.sh ++++ b/regress/cert-hostkey.sh +@@ -248,7 +248,7 @@ test_one() { + test_one "user-certificate" failure "-n $HOSTS" + test_one "empty principals" success "-h" + test_one "wrong principals" failure "-h -n foo" +-test_one "cert not yet valid" failure "-h -V20200101:20300101" ++test_one "cert not yet valid" failure "-h -V20300101:20320101" + test_one "cert expired" failure "-h -V19800101:19900101" + test_one "cert valid interval" success "-h -V-1w:+2w" + test_one "cert has constraints" failure "-h -Oforce-command=false" +diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh +index 6849e99..de455b8 100644 +--- a/regress/cert-userkey.sh ++++ b/regress/cert-userkey.sh +@@ -327,7 +327,7 @@ test_one() { + test_one "correct principal" success "-n ${USER}" + test_one "host-certificate" failure "-n ${USER} -h" + test_one "wrong principals" failure "-n foo" +-test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" ++test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" + test_one "cert expired" failure "-n ${USER} -V19800101:19900101" + test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" + test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" diff --git a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb index 2ffbc9a..3d16f9d 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb @@ -25,6 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://sshd_check_keys \ file://add-test-support-for-busybox.patch \ file://0001-upstream-fix-integer-overflow-in-XMSS-private-key-pa.patch \ + file://0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch \ " SRC_URI[md5sum] = "bf050f002fe510e1daecd39044e1122d" SRC_URI[sha256sum] = "bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68" -- 2.7.4 From wangmy at cn.fujitsu.com Fri Feb 21 15:24:50 2020 From: wangmy at cn.fujitsu.com (Wang Mingyu) Date: Fri, 21 Feb 2020 07:24:50 -0800 Subject: [OE-core] [PATCH] shadow: upgrade 4.8 -> 4.8.1 Message-ID: <1582298690-25947-1-git-send-email-wangmy@cn.fujitsu.com> 0001-Do-not-check-for-validity-of-shell-executable.patch CVE-2019-19882.patch Removed since they are included in 4.8.1. Signed-off-by: Wang Mingyu --- ...eck-for-validity-of-shell-executable.patch | 29 ---------- .../shadow/files/CVE-2019-19882.patch | 55 ------------------- meta/recipes-extended/shadow/shadow.inc | 6 +- .../shadow/{shadow_4.8.bb => shadow_4.8.1.bb} | 0 4 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch delete mode 100644 meta/recipes-extended/shadow/files/CVE-2019-19882.patch rename meta/recipes-extended/shadow/{shadow_4.8.bb => shadow_4.8.1.bb} (100%) diff --git a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch b/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch deleted file mode 100644 index 2d15ff0673..0000000000 --- a/meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 4 Dec 2019 19:28:48 +0100 -Subject: [PATCH] Do not check for validity of shell executable. - -This kind of check fails when building a rootfs. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - src/useradd.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/useradd.c b/src/useradd.c -index 4af0f7c..898fe02 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv) - if ( ( !VALID (optarg) ) - || ( ('\0' != optarg[0]) - && ('/' != optarg[0]) -- && ('*' != optarg[0]) ) -- || (stat(optarg, &st) != 0) -- || (S_ISDIR(st.st_mode)) -- || (access(optarg, X_OK) != 0)) { -+ && ('*' != optarg[0]) )) { - fprintf (stderr, - _("%s: invalid shell '%s'\n"), - Prog, optarg); diff --git a/meta/recipes-extended/shadow/files/CVE-2019-19882.patch b/meta/recipes-extended/shadow/files/CVE-2019-19882.patch deleted file mode 100644 index 894d867680..0000000000 --- a/meta/recipes-extended/shadow/files/CVE-2019-19882.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 66b7bc0dcfda12d7f58eba993bd02872cae1d713 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Mon, 16 Dec 2019 14:11:23 -0500 -Subject: [PATCH] Don't auto-enable ACCT_TOOLS_SETUID if PAM is detected - -Here's a sad story: - -* 70971457 is merged into shadow, allowing newgidmap/newuidmap to be -installed with file caps rather than setuid. -* https://bugs.archlinux.org/task/63248 is filed to take advantage of -this. -* The arch maintainer of the 'shadow' package notices that this doesn't -work, and submits a pull request to fix this in shadow. -* edf7547ad5 is merged, fixing the post install hooks. - -The problem here is that distros have been building shadow with PAM for -O(years), but the install hooks have silently failed due to the -combination of the directory mismatch (suidubins vs suidsbins) and later -success with setuid'ing newgidmap/newuidmap. - -With the install hooks fixed, those of us (Arch[1] and Gentoo[2] so far) -who never built shadow explicitly with --enable-account-tools-setuid are -now getting setuid account tools, and don't have PAM configuration -suitable for use with setuid account management tools. - -It's entirely unclear to me why you'd want this, but I assume there's -some reason out there for it existing. Regardless, setuid binaries are -dangerous and shouldn't be enabled by default without good reason. - -[1] https://bugs.archlinux.org/task/64836 -[2] https://bugs.gentoo.org/702252 - -Upstream-Status: Backport -CVE: CVE-2019-19882 -Signed-off-by: Li Zhou ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e3ed3b43..d6e2bfbd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,7 +226,7 @@ AC_ARG_ENABLE(account-tools-setuid, - *) AC_MSG_ERROR(bad value ${enableval} for --enable-account-tools-setuid) - ;; - esac], -- [enable_acct_tools_setuid="maybe"] -+ [enable_acct_tools_setuid="no"] - ) - - AC_ARG_ENABLE(utmpx, --- -2.17.1 - diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 3bfa39e6ff..f86e5e03c0 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -13,7 +13,6 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}. file://shadow-4.1.3-dots-in-usernames.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://shadow-relaxed-usernames.patch \ - file://CVE-2019-19882.patch \ " SRC_URI_append_class-target = " \ @@ -25,14 +24,13 @@ SRC_URI_append_class-native = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ file://0002-Allow-for-setting-password-in-clear-text.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ - file://0001-Do-not-check-for-validity-of-shell-executable.patch \ " SRC_URI_append_class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a" -SRC_URI[sha256sum] = "82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4" +SRC_URI[md5sum] = "3d97f11e66bfb0b14702b115fa8be480" +SRC_URI[sha256sum] = "3ee3081fbbcbcfea5c8916419e46bc724807bab271072104f23e7a29e9668f3a" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ diff --git a/meta/recipes-extended/shadow/shadow_4.8.bb b/meta/recipes-extended/shadow/shadow_4.8.1.bb similarity index 100% rename from meta/recipes-extended/shadow/shadow_4.8.bb rename to meta/recipes-extended/shadow/shadow_4.8.1.bb -- 2.17.1 From alex.kanavin at gmail.com Fri Feb 21 09:27:29 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 21 Feb 2020 10:27:29 +0100 Subject: [OE-core] [PATCH] p11-kit: upgrade 0.23.18.1 -> 0.23.20 Message-ID: <20200221092729.6733-1-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} (87%) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb similarity index 87% rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 19895ec269..54b8cc6a70 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -2,14 +2,14 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" -inherit meson gettext pkgconfig gtk-doc +inherit meson gettext pkgconfig gtk-doc bash-completion DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" -- 2.25.0 From richard.purdie at linuxfoundation.org Fri Feb 21 11:27:43 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 21 Feb 2020 11:27:43 +0000 Subject: [OE-core] [zeus][PATCH] openssh: backport patch to fix "cert not yet valid" test In-Reply-To: <1582255767-74523-1-git-send-email-anuj.mittal@intel.com> References: <1582255767-74523-1-git-send-email-anuj.mittal@intel.com> Message-ID: <80d58477f0a13b2218d351c61f9ca7d54491b8ac.camel@linuxfoundation.org> On Fri, 2020-02-21 at 11:29 +0800, Anuj Mittal wrote: > Fixes [YOCTO #13796] > > Signed-off-by: Anuj Mittal Is this issue already addressed in master (maybe through upgrade)? Cheers, Richard From praveen at linumiz.com Fri Feb 21 13:03:32 2020 From: praveen at linumiz.com (praveen at linumiz.com) Date: Fri, 21 Feb 2020 13:03:32 +0000 Subject: [OE-core] [PATCH] alsa-utils: upgrade 1.2.1 -> 1.2.2 In-Reply-To: <20200220193640.5482-1-praveen@linumiz.com> References: <20200220193640.5482-1-praveen@linumiz.com> Message-ID: Signed-off-by: Praveen Muthusamy --- ...lsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} | 0 .../alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} (100%) rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} (97%) diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb similarity index 100% rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb index 9144af628a..8bbc5d3ef3 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb @@ -21,8 +21,8 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" -SRC_URI[md5sum] = "c4628bae7632937eac2de4cf2a3de82e" -SRC_URI[sha256sum] = "0b110ba71ef41d3009db1bc4dcae0cf79efb99cb5426fa19d0312470560a2c0d" +SRC_URI[md5sum] = "00612234ff4722c8f7f8f7a83ff9bc63" +SRC_URI[sha256sum] = "44807bd578c5f6df6e91a11b8d37e546424a5a1ea8d8e659ee359fe01730e4f3" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with From patchwork at patchwork.openembedded.org Fri Feb 21 13:32:28 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 21 Feb 2020 13:32:28 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_alsa-utils?= =?utf-8?b?OiB1cGdyYWRlIDEuMi4xIC0+IDEuMi4yIChyZXYyKQ==?= In-Reply-To: <20200220193640.5482-1-praveen@linumiz.com> References: <20200220193640.5482-1-praveen@linumiz.com> Message-ID: <20200221133228.2276.53541@do> == Series Details == Series: alsa-utils: upgrade 1.2.1 -> 1.2.2 (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22793/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] Suggested fix Create the series again using git-format-patch and ensure it can be applied using git am Diff line "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at ffa91ff19f) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From alex.kiernan at gmail.com Fri Feb 21 14:57:33 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Fri, 21 Feb 2020 14:57:33 +0000 Subject: [OE-core] [zeus][PATCH] openssh: backport patch to fix "cert not yet valid" test In-Reply-To: <80d58477f0a13b2218d351c61f9ca7d54491b8ac.camel@linuxfoundation.org> References: <1582255767-74523-1-git-send-email-anuj.mittal@intel.com> <80d58477f0a13b2218d351c61f9ca7d54491b8ac.camel@linuxfoundation.org> Message-ID: On Fri, Feb 21, 2020 at 11:28 AM Richard Purdie wrote: > > On Fri, 2020-02-21 at 11:29 +0800, Anuj Mittal wrote: > > Fixes [YOCTO #13796] > > > > Signed-off-by: Anuj Mittal > > Is this issue already addressed in master (maybe through upgrade)? > We already had that patch in master which I dropped that patch as part of the move to 8.2p1 (was 0001-Manually-applied-upstream-fix-for-openssh-test.patch) -- Alex Kiernan From akuster808 at gmail.com Fri Feb 21 16:12:05 2020 From: akuster808 at gmail.com (akuster808) Date: Fri, 21 Feb 2020 08:12:05 -0800 Subject: [OE-core] [zeus][PATCH] openssh: backport patch to fix "cert not yet valid" test In-Reply-To: <1582255767-74523-1-git-send-email-anuj.mittal@intel.com> References: <1582255767-74523-1-git-send-email-anuj.mittal@intel.com> Message-ID: On 2/20/20 7:29 PM, Anuj Mittal wrote: > Fixes [YOCTO #13796] Could you please take ownership of the bug. Its weird we both worked on the same issue and had a fix done about the same time. Ill replace my version in stable/zeus-nut with this patch. - Armin > > Signed-off-by: Anuj Mittal > --- > ...at-bozo-decided-to-use-2020-as-a-future-d.patch | 46 ++++++++++++++++++++++ > meta/recipes-connectivity/openssh/openssh_8.0p1.bb | 1 + > 2 files changed, 47 insertions(+) > create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch > > diff --git a/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch > new file mode 100644 > index 0000000..e2930c3 > --- /dev/null > +++ b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch > @@ -0,0 +1,46 @@ > +From 3cccc0a2ab597b8273bddf08e9a3cc5551d7e530 Mon Sep 17 00:00:00 2001 > +From: "djm at openbsd.org" > +Date: Fri, 3 Jan 2020 03:02:26 +0000 > +Subject: [PATCH] upstream: what bozo decided to use 2020 as a future date in a > + regress > + > +test? > + > +OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a > + > +Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381] > + > +[Dropped the script version and copyright year change at the top] > + > +Signed-off-by: Anuj Mittal > +--- > + regress/cert-hostkey.sh | 2 +- > + regress/cert-userkey.sh | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh > +index 3ce7779..74d5a53 100644 > +--- a/regress/cert-hostkey.sh > ++++ b/regress/cert-hostkey.sh > +@@ -248,7 +248,7 @@ test_one() { > + test_one "user-certificate" failure "-n $HOSTS" > + test_one "empty principals" success "-h" > + test_one "wrong principals" failure "-h -n foo" > +-test_one "cert not yet valid" failure "-h -V20200101:20300101" > ++test_one "cert not yet valid" failure "-h -V20300101:20320101" > + test_one "cert expired" failure "-h -V19800101:19900101" > + test_one "cert valid interval" success "-h -V-1w:+2w" > + test_one "cert has constraints" failure "-h -Oforce-command=false" > +diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh > +index 6849e99..de455b8 100644 > +--- a/regress/cert-userkey.sh > ++++ b/regress/cert-userkey.sh > +@@ -327,7 +327,7 @@ test_one() { > + test_one "correct principal" success "-n ${USER}" > + test_one "host-certificate" failure "-n ${USER} -h" > + test_one "wrong principals" failure "-n foo" > +-test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" > ++test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" > + test_one "cert expired" failure "-n ${USER} -V19800101:19900101" > + test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" > + test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" > diff --git a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb > index 2ffbc9a..3d16f9d 100644 > --- a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb > +++ b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb > @@ -25,6 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar > file://sshd_check_keys \ > file://add-test-support-for-busybox.patch \ > file://0001-upstream-fix-integer-overflow-in-XMSS-private-key-pa.patch \ > + file://0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch \ > " > SRC_URI[md5sum] = "bf050f002fe510e1daecd39044e1122d" > SRC_URI[sha256sum] = "bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68" From raj.khem at gmail.com Fri Feb 21 16:34:20 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 08:34:20 -0800 Subject: [OE-core] [PATCH] musl: Update to final 1.2.0 release Message-ID: <20200221163420.2383120-1-raj.khem@gmail.com> Detailed log [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=a662220df547e5c2446518e74440a7d834f9ebe6..040c1d16b468c50c04fc94edff521f1637708328 Signed-off-by: Khem Raj --- meta/recipes-core/musl/musl_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index b6ec6fe9af..afc8446547 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,9 +4,9 @@ require musl.inc inherit linuxloader -SRCREV = "a662220df547e5c2446518e74440a7d834f9ebe6" +SRCREV = "040c1d16b468c50c04fc94edff521f1637708328" -BASEVER = "1.1.24" +BASEVER = "1.2.0" PV = "${BASEVER}+git${SRCPV}" -- 2.25.1 From alex.kiernan at gmail.com Fri Feb 21 16:35:21 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Fri, 21 Feb 2020 16:35:21 +0000 Subject: [OE-core] [OE-Core][PATCH] libxcrypt: Enable static builds In-Reply-To: References: <20200122071934.60789-1-alex.kiernan@gmail.com> <15178a56a7fff6877d13b52312ffc8b898a60f3f.camel@linuxfoundation.org> Message-ID: On Tue, Jan 28, 2020 at 8:07 PM Andre McCurdy wrote: > > On Tue, Jan 28, 2020 at 4:48 AM Alex Kiernan wrote: > > > > Let me have a look at that - what got me here was trying to get a > > static busybox so I could OSTree's tests to pass, which all turned out > > to be way harder than I expected; this was just one of the things I > > tripped over. > > Busybox shouldn't need to link with libxcrypt if USE_BB_CRYPT is > enabled (which it is in OE's default Busybox defconfig). > > There's a long standing bug in Busybox whereby crypt.h gets included > unconditionally (instead of being guarded by #if ENABLE_USE_BB_CRYPT > etc) so the Busybox recipe still needs to depend on virtual/crypt but > it's only a compile time dependency. It looks like that might've been fixed: 4767a5375e66 libbb: include only if necessary If I drop virtual/crypt, I still get the same link time failure to find crypt, which I think we're getting because this test https://git.busybox.net/busybox/tree/Makefile.flags#n149 passes: CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) Not quite sure how that can pass tbh... This ugly hack avoids needing a static crypt: diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 1a82f23b0f3a..7335a846038f 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -18,7 +18,7 @@ BUSYBOX_SPLIT_SUID ?= "1" export EXTRA_CFLAGS = "${CFLAGS}" export EXTRA_LDFLAGS = "${LDFLAGS}" -EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y HOSTCC='${BUILD_CC}' HOSTCPP='${BUILD_CPP}'" +EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y HOSTCC='${BUILD_CC}' HOSTCPP='${BUILD_CPP}' CRYPT_AVAILABLE=n" PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" Not sure how to get that integrated nicely... -- Alex Kiernan From matthew.zeng at windriver.com Fri Feb 21 16:54:42 2020 From: matthew.zeng at windriver.com (Mingde (Matthew) Zeng) Date: Fri, 21 Feb 2020 11:54:42 -0500 Subject: [OE-core] [zeus][PATCH] openssh: backport patch to fix "cert not yet valid" test In-Reply-To: References: <1582255767-74523-1-git-send-email-anuj.mittal@intel.com> Message-ID: <878skvev8t.fsf@windriver.com> >> Fixes [YOCTO #13796] > Could you please take ownership of the bug. Its weird we both worked on > the same issue and had a fix done about the same time. What's weirder is that we three worked on this same issue, and it was merged to master last month. https://git.openembedded.org/openembedded-core/commit/meta/recipes-connectivity/openssh?id=f0a949fe33da47fd0a587abb942ff60f0a56ed0d > > Ill replace my version in stable/zeus-nut with this patch. > > - Armin I think it's reasonable to simply port this commit from master into zeus. Regards, Matthew >> >> Signed-off-by: Anuj Mittal >> --- >> ...at-bozo-decided-to-use-2020-as-a-future-d.patch | 46 ++++++++++++++++++++++ >> meta/recipes-connectivity/openssh/openssh_8.0p1.bb | 1 + >> 2 files changed, 47 insertions(+) >> create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch >> >> diff --git a/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch >> new file mode 100644 >> index 0000000..e2930c3 >> --- /dev/null >> +++ b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch >> @@ -0,0 +1,46 @@ >> +From 3cccc0a2ab597b8273bddf08e9a3cc5551d7e530 Mon Sep 17 00:00:00 2001 >> +From: "djm at openbsd.org" >> +Date: Fri, 3 Jan 2020 03:02:26 +0000 >> +Subject: [PATCH] upstream: what bozo decided to use 2020 as a future date in a >> + regress >> + >> +test? >> + >> +OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a >> + >> +Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381] >> + >> +[Dropped the script version and copyright year change at the top] >> + >> +Signed-off-by: Anuj Mittal >> +--- >> + regress/cert-hostkey.sh | 2 +- >> + regress/cert-userkey.sh | 2 +- >> + 2 files changed, 2 insertions(+), 2 deletions(-) >> + >> +diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh >> +index 3ce7779..74d5a53 100644 >> +--- a/regress/cert-hostkey.sh >> ++++ b/regress/cert-hostkey.sh >> +@@ -248,7 +248,7 @@ test_one() { >> + test_one "user-certificate" failure "-n $HOSTS" >> + test_one "empty principals" success "-h" >> + test_one "wrong principals" failure "-h -n foo" >> +-test_one "cert not yet valid" failure "-h -V20200101:20300101" >> ++test_one "cert not yet valid" failure "-h -V20300101:20320101" >> + test_one "cert expired" failure "-h -V19800101:19900101" >> + test_one "cert valid interval" success "-h -V-1w:+2w" >> + test_one "cert has constraints" failure "-h -Oforce-command=false" >> +diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh >> +index 6849e99..de455b8 100644 >> +--- a/regress/cert-userkey.sh >> ++++ b/regress/cert-userkey.sh >> +@@ -327,7 +327,7 @@ test_one() { >> + test_one "correct principal" success "-n ${USER}" >> + test_one "host-certificate" failure "-n ${USER} -h" >> + test_one "wrong principals" failure "-n foo" >> +-test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" >> ++test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" >> + test_one "cert expired" failure "-n ${USER} -V19800101:19900101" >> + test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" >> + test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" >> diff --git a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb >> index 2ffbc9a..3d16f9d 100644 >> --- a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb >> +++ b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb >> @@ -25,6 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar >> file://sshd_check_keys \ >> file://add-test-support-for-busybox.patch \ >> file://0001-upstream-fix-integer-overflow-in-XMSS-private-key-pa.patch \ >> + file://0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch \ >> " >> SRC_URI[md5sum] = "bf050f002fe510e1daecd39044e1122d" >> SRC_URI[sha256sum] = "bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68" -- Mingde (Matthew) Zeng From matthew.zeng at windriver.com Fri Feb 21 17:05:55 2020 From: matthew.zeng at windriver.com (Mingde (Matthew) Zeng) Date: Fri, 21 Feb 2020 12:05:55 -0500 Subject: [OE-core] [zeus][PATCH] openssh: backport patch to fix "cert not yet valid" test In-Reply-To: References: <1582255767-74523-1-git-send-email-anuj.mittal@intel.com> <80d58477f0a13b2218d351c61f9ca7d54491b8ac.camel@linuxfoundation.org> Message-ID: <874kvjdg5o.fsf@windriver.com> Alex Kiernan writes: > On Fri, Feb 21, 2020 at 11:28 AM Richard Purdie > wrote: >> >> On Fri, 2020-02-21 at 11:29 +0800, Anuj Mittal wrote: >> > Fixes [YOCTO #13796] >> > >> > Signed-off-by: Anuj Mittal >> >> Is this issue already addressed in master (maybe through upgrade)? >> > > We already had that patch in master which I dropped that patch as part > of the move to 8.2p1 (was > 0001-Manually-applied-upstream-fix-for-openssh-test.patch) Right, there was an upgrade to 8.2p1. We can do the same for zeus. > > -- > Alex Kiernan -- Mingde (Matthew) Zeng From bruce.ashfield at gmail.com Fri Feb 21 17:45:52 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:45:52 -0500 Subject: [OE-core] [PATCH 00/10] linux-yocto: conslidated pull request Message-ID: From: Bruce Ashfield Hi all, This is the latest in the ongoing efforts to stablize v5.4 and the reference kernel for the upcoming release. This has now passed multiple AB runs for me, with only a single reprodicibility issue popping up (that doesn't look related to the new kernel). Note: I'll remove v5.2 shortly as well, but I'm only dropping 4.19 in this series to keep things simpler. Note2: I'll send a separate series to the yocto lists to bump the defaults in those layers as well. Cheers, Bruce The following changes since commit 0f54a2fd69c9513cb857a3a0436bd8b75332f4e9: oescripts.py: use unittest.SkipUnless for class skip (2020-02-20 13:00:28 +0000) are available in the Git repository at: git://git.yoctoproject.org/poky-contrib zedd/kernel http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (10): linux-yocto/5.4: update to v5.4.18 linux-yocto/5.4: update to v5.4.20 linux-yocto/5.2: update to v5.2.29 linux-yocto: fix PV devsrc: fix objtool generation for v5.4+ linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix linux-yocto: perf: Make perf able to build with latest libbfd linux-yocto/5.4: update to -rt11 linux-yocto: drop 4.19 recipes qemu: bump default reference kernel to v5.4 meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarmv5.conf | 2 +- meta/recipes-kernel/linux/kernel-devsrc.bb | 5 ++ .../linux/linux-yocto-rt_4.19.bb | 44 ---------------- .../linux/linux-yocto-rt_5.2.bb | 6 +-- .../linux/linux-yocto-rt_5.4.bb | 8 +-- .../linux/linux-yocto-tiny_4.19.bb | 32 ------------ .../linux/linux-yocto-tiny_5.2.bb | 8 +-- .../linux/linux-yocto-tiny_5.4.bb | 10 ++-- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 50 ------------------- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 ++++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 24 ++++----- 12 files changed, 46 insertions(+), 167 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_4.19.bb -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:45:53 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:45:53 -0500 Subject: [OE-core] [PATCH 01/10] linux-yocto/5.4: update to v5.4.18 In-Reply-To: References: Message-ID: <3ad4a6c58cd6215718ddf81ae7abe5a47b15a816.1582306887.git.bruce.ashfield@gmail.com> From: Bruce Ashfield Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 58c72057f662 Linux 5.4.18 3353852afe1e tracing/uprobe: Fix to make trace_uprobe_filter alignment safe 5f9b8c5a4618 Revert "rsi: fix potential null dereference in rsi_probe()" 09d4a9c83c68 ASoC: topology: fix soc_tplg_fe_link_create() - link->dobj initialization order 52cf138f5cc1 mm/migrate.c: also overwrite error when it is bigger than zero 20e1bbe5cfd7 perf report: Fix no libunwind compiled warning break s390 issue e16b302f691c dm thin: fix use-after-free in metadata_pre_commit_callback 35511d9471be flow_dissector: Fix to use new variables for port ranges in bpf hook f42407a7906b cpuidle: teo: Avoid using "early hits" incorrectly c5e3c887dfc0 btrfs: do not zero f_bavail if we have available space 420e4a521c0e net: Fix skb->csum update in inet_proto_csum_replace16(). e853e3f9f9d4 netfilter: nf_tables_offload: fix check the chain offload flag 17d56cef7f93 netfilter: conntrack: sctp: use distinct states for new SCTP connections b71636ee37fa l2t_seq_next should increase position index 148a71a8ece8 seq_tab_next() should increase position index 0c9a3ab865c3 net: fsl/fman: rename IF_MODE_XGMII to IF_MODE_10G e2c797b72e01 net/fsl: treat fsl,erratum-a011043 1ce13ed0a5de powerpc/fsl/dts: add fsl,erratum-a011043 6ee3feac65ea qlcnic: Fix CPU soft lockup while collecting firmware dump d693255105b6 ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1 06b5e1087103 r8152: disable DelayPhyPwrChg 510818ae0f38 r8152: avoid the MCU to clear the lanwake 3a128650b47a r8152: disable test IO for RTL8153B bc2ef2e9d142 r8152: Disable PLA MCU clock speed down b05091c3ae99 r8152: disable U2P3 for RTL8153B 26a581fafceb r8152: get default setting of WOL before initializing 281f32e34382 tee: optee: Fix compilation issue with nommu 0703666b9658 led: max77650: add of_match table 313151afdf4c ARM: 8955/1: virt: Relax arch timer version check during early boot edb6590b1b2c scsi: fnic: do not queue commands during fwreset 3075e636b368 Input: max77650-onkey - add of_match table c3a49824165c xfrm: interface: do not confirm neighbor when do pmtu update b38dd235a4bd xfrm interface: fix packet tx through bpf_redirect() c8e04566db7f vti[6]: fix packet tx through bpf_redirect() 5743a3a8a4c7 ARM: dts: am335x-boneblack-common: fix memory size c15ea8e4150d Input: evdev - convert kzalloc()/vzalloc() to kvzalloc() 220ee13d017c iwlwifi: dbg: force stop the debug monitor HW 27cf25a0b87a iwlwifi: Don't ignore the cap field upon mcc update 4df1389ff7b5 iwlwifi: pcie: allocate smaller dev_cmd for TX headers 08022255a9ee XArray: Fix xas_pause at ULONG_MAX b267caf5e51f riscv: delete temporary files 8f2fa34a52c5 perf/x86/intel/uncore: Remove PCIe3 unit for SNR aae7d5784c53 perf/x86/intel/uncore: Add PCI ID of IMC for Xeon E3 V5 Family 86982620f28b wireless: wext: avoid gcc -O3 warning b308d93dd5b3 mac80211: Fix TKIP replay protection immediately after key setup e233cbaf8ecc cfg80211: Fix radar event during another phy CAC 01c2c23d3d5f wireless: fix enabling channel 12 for custom regulatory domain 9e62f296dbae lkdtm/bugs: fix build error in lkdtm_UNSET_SMEP 0b06c373db8a parisc: Use proper printk format for resource_size_t e1133c1796a1 qmi_wwan: Add support for Quectel RM500Q 422566f37e37 ASoC: sti: fix possible sleep-in-atomic 99ced2ecfe9e ASoC: hdac_hda: Fix error in driver removal after failed probe e43ab59fb1aa ASoC: SOF: Intel: fix HDA codec driver probe with multiple controllers 70149813320f platform/x86: intel_pmc_core: update Comet Lake platform driver 689233e8f998 platform/x86: GPD pocket fan: Allow somewhat lower/higher temperature limits 7790a471e80c iavf: remove current MAC address filter on VF reset 73613ce39d59 igb: Fix SGMII SFP module discovery for 100FX/LX. fd335ee1e9e2 ixgbe: Fix calculation of queue with VFs and flow director on interface flap 5113ff357d81 ixgbevf: Remove limit of 10 entries for unicast filter list be87d4f313e3 i40e: Fix virtchnl_queue_select bitmap validation 557fda798eab s390/zcrypt: move ap device reset from bus to driver code 1a18f3a7dbbf ASoC: rt5640: Fix NULL dereference on module unload aab165d61cb4 clk: mmp2: Fix the order of timer mux parents 8b4e524dc02b mac80211: mesh: restrict airtime metric to peered established plinks 096837d4b495 clk: sunxi-ng: h6-r: Fix AR100/R_APB2 parent order e619af70d133 clk: sunxi-ng: sun8i-r: Fix divider on APB0 clock 95c892061e90 rseq: Unregister rseq for clone CLONE_VM 91f91139d32f tools lib traceevent: Fix memory leakage in filter_event 22946b839768 soc: ti: wkup_m3_ipc: Fix race condition with rproc_boot adba4a2a5273 ARM: dts: beagle-x15-common: Model 5V0 regulator 8a14c121d4e4 ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for endpoint dt nodes b5cbe8ad1b60 ARM: dts: sun8i: a83t: Correct USB3503 GPIOs polarity e8b0d16e4c7f arm64: dts: meson-sm1-sei610: add gpio bluetooth interrupt f0a7b02147ad clk: sunxi-ng: v3s: Fix incorrect number of hw_clks. 3ea87219a9c7 cgroup: Prevent double killing of css when enabling threaded cgroup 07d00820bf98 Bluetooth: Fix race condition in hci_release_sock() f39406a925b0 ttyprintk: fix a potential deadlock in interrupt context issue 99652ee9c516 tomoyo: Use atomic_t for statistics counter 81b3fd0cb421 media: dvb-usb/dvb-usb-urb.c: initialize actlen to 0 f416aac94c12 media: gspca: zero usb_buf d35ef79fbc97 media: vp7045: do not read uninitialized values if usb transfer fails 0c7cc4c9c2bb media: af9005: uninitialized variable printked 5b256eea1ae6 media: digitv: don't continue if remote control state can't be read 761a10b67a11 reiserfs: Fix memory leak of journal device string 9bcdb8ba5a3d mm/mempolicy.c: fix out of bounds write in mpol_parse_str() 7965bc367e70 arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean' e77625d1f8ff tools lib: Fix builds when glibc contains strlcpy() da1321fc1405 PM / devfreq: Add new name attribute for sysfs e9fac0046579 perf c2c: Fix return type for histogram sorting comparision functions 73774def78ec gfs2: Another gfs2_find_jhead fix d635e7c4b34e e1000e: Revert "e1000e: Make watchdog use delayed work" 21c613793972 e1000e: Drop unnecessary __E1000_DOWN bit twiddling 5ca5637ec665 x86/resctrl: Fix use-after-free due to inaccurate refcount of rdtgroup 40300f986e47 x86/resctrl: Fix use-after-free when deleting resource groups 2dd2e4722922 x86/resctrl: Fix a deadlock due to inaccurate reference cd0826719560 cifs: fix soft mounts hanging in the reconnect code 2c38e6140126 vfs: fix do_last() regression 313c8460cf02 Linux 5.4.17 831919b4c481 power/supply: ingenic-battery: Don't change scale if there's only one dd350f3918be Revert "um: Enable CONFIG_CONSTRUCTORS" a775f67b4b61 KVM: arm64: Write arch.mdcr_el2 changes since last vcpu_load on VHE 00d58d0b58bc crypto: pcrypt - Fix user-after-free on module unload 9f6d555f58f3 crypto: caam - do not reset pointer size from MCFGR register 3b52ada5b82c crypto: vmx - reject xts inputs that are too short 9d9b578ffef3 crypto: af_alg - Use bh_lock_sock in sk_destruct ac39443b7b49 rsi: fix non-atomic allocation in completion handler 1f04209d19c5 rsi: fix memory leak on failed URB submission 2d367468ecdf rsi: fix use-after-free on probe errors d8902b43745f rsi: fix use-after-free on failed probe and unbind 99d9138295cb bus: ti-sysc: Fix missing force mstandby quirk handling 58b09300ee1b Bluetooth: btbcm: Use the BDADDR_PROPERTY quirk d1e5f8c5156e Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks d273ee188a4a ALSA: hda/realtek - Move some alc236 pintbls to fallback table 050072c0f798 usb-storage: Disable UAS on JMicron SATA enclosure a2e6217bd8ea bus: ti-sysc: Add module enable quirk for audio AESS 0c101a22fec5 mmc: sdhci-pci: Add support for Intel JSL ac342e0a1f18 mmc: sdhci-pci: Quirk for AMD SDHC Device 0x7906 142356a63872 ARM: OMAP2+: SmartReflex: add omap_sr_pdata definition f3020d789311 ARM: config: aspeed-g5: Enable 8250_DW quirks 4f8f8f31c505 mfd: intel-lpss: Add Intel Comet Lake PCH-H PCI IDs 81909bd070db perf/imx_ddr: Add enhanced AXI ID filter support b02b0a6bcc81 iommu/amd: Support multiple PCI DMA aliases in IRQ Remapping 1f03a258f20f iommu/amd: Support multiple PCI DMA aliases in device table d7937ea02315 spi: pxa2xx: Add support for Intel Comet Lake-H c90ed6e66288 bus: ti-sysc: Use swsup quirks also for am335x musb 48b038c9d54a bus: ti-sysc: Handle mstandby quirk and use it for musb 6d34eacd8348 media: dvbsky: add support for eyeTV Geniatech T2 lite fef41f3a82ea PCI: Add DMA alias quirk for Intel VCA NTB f8aaefd5510a platform/x86: dell-laptop: disable kbd backlight on Inspiron 10xx 21fd877300b0 staging: mt7621-pci: add quirks for 'E2' revision using 'soc_device_attribute' c9ddede0a9fc libbpf: Fix BTF-defined map's __type macro handling of arrays d40471b727e8 drm/amdgpu/SRIOV: add navi12 pci id for SRIOV (v2) 791e3ec642ce ASoC: Intel: cht_bsw_rt5645: Add quirk for boards using pmc_plt_clk_0 48617aa63951 extcon-intel-cht-wc: Don't reset USB data connection at probe de850e86d2e1 HID: steam: Fix input device disappearing b60d320dc363 atm: eni: fix uninitialized variable warning f4691c14d449 stmmac: debugfs entry name is not be changed when udev rename device name. 9d54646059b2 drm/amd/display: Reduce HDMI pixel encoding if max clock is exceeded a347d66cbec7 iommu/dma: fix variable 'cookie' set but not used 4fe14f9db5c9 gpio: max77620: Add missing dependency on GPIOLIB_IRQCHIP dfe190e77862 net: wan: sdla: Fix cast from pointer to integer of different size eea2b2bb502f drivers/net/b44: Change to non-atomic bit operations on pwol_mask c2ae3ce351be net: Google gve: Remove dma_wmb() before ringing doorbell 7db4e6c728cb spi: spi-dw: Add lock protect dw_spi rx/tx to prevent concurrent calls db10c64764eb can: tcan4x5x: tcan4x5x_parse_config(): reset device before register access 68d199fc8e66 usb: musb: jz4740: Silence error if code is -EPROBE_DEFER 3ecda03a5c13 watchdog: orion: fix platform_get_irq() complaints b39f38f0ebed watchdog: rn5t618_wdt: fix module aliases 27757bfb8c72 watchdog: max77620_wdt: fix potential build errors 5399714dc2a1 HID: intel-ish-hid: ipc: Add Tiger Lake PCI device ID e5900bc22253 phy: cpcap-usb: Prevent USB line glitches from waking up modem 98aedb893555 ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime() 68b74847c8bc ASoC: fsl_audmix: add missed pm_runtime_disable a0636e211f8e phy: qcom-qmp: Increase PHY ready timeout b826ffe45a27 drivers/hid/hid-multitouch.c: fix a possible null pointer access. 32a369776bd5 ASoC: SOF: Intel: hda: hda-dai: fix oops on hda_link .hw_free eedf205f0267 ASoC: SOF: fix fault at driver unload after failed probe 8cc2de41a529 HID: wacom: Recognize new MobileStudio Pro PID b55f9e9760c8 HID: intel-ish-hid: ipc: add CMP device id 22aa1db061d2 HID: Add quirk for incorrect input length on Lenovo Y720 854f39866e2f HID: asus: Ignore Asus vendor-page usage-code 0xff events 49de93b4018b HID: ite: Add USB id match for Acer SW5-012 keyboard dock 05c33c23d0b6 HID: Add quirk for Xin-Mo Dual Controller ae9484c6fb60 arc: eznps: fix allmodconfig kconfig warning f5adacf21c6e HID: multitouch: Add LG MELF0410 I2C touchscreen support b576b27f7ba4 rxrpc: Fix use-after-free in rxrpc_receive_data() d3da5e90665a net: include struct nhmsg size in nh nlmsg size 73226c74746d mlxsw: minimal: Fix an error handling path in 'mlxsw_m_port_create()' 3c8c966cc718 udp: segment looped gso packets correctly 87c681943725 net: socionext: fix xdp_result initialization in netsec_process_rx b7eda225ebc1 net: socionext: fix possible user-after-free in netsec_process_rx 717abad86460 net_sched: walk through all child classes in tc_bind_tclass() 55ec468d3093 net_sched: fix ops->bind_class() implementations 2d0b854393af net_sched: ematch: reject invalid TCF_EM_SIMPLE 79c13c063720 zd1211rw: fix storage endpoint lookup 226ed25115b7 rtl8xxxu: fix interface sanity check 670a39aeb07b brcmfmac: fix interface sanity check b896fe1da14f ath9k: fix storage endpoint lookup e08884197082 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() b396ec7241ed cifs: set correct max-buffer-size for smb2_ioctl_init() d65b067c2546 CIFS: Fix task struct use-after-free on reconnect 4f753389bcdc crypto: chelsio - fix writing tfm flags to wrong place 9ba7636fdb42 driver core: Fix test_async_driver_probe if NUMA is disabled 3811bd2b93af iio: st_gyro: Correct data for LSM9DS0 gyro a6d19450c314 iio: adc: stm32-dfsdm: fix single conversion 29795e4f6a36 mei: me: add comet point (lake) H device ids 9272a0797833 mei: hdcp: bind only with i915 on the same PCH 7d46883724e0 binder: fix log spam for existing debugfs file creation. 3e832cf807e8 component: do not dereference opaque pointer in debugfs 6826af9a5c3f debugfs: Return -EPERM when locked down 3b16600e1fd4 serial: imx: fix a race condition in receive path f54b5d4a1abc serial: 8250_bcm2835aux: Fix line mismatch on driver unbind 0710da067387 staging: vt6656: Fix false Tx excessive retries reporting. a56c0f7d5f15 staging: vt6656: use NULLFUCTION stack on mac80211 1a80cc38db42 staging: vt6656: correct packet types for CTS protect, mode. 3a5bff77f48c staging: wlan-ng: ensure error return is actually returned b5e5d81230ec staging: most: net: fix buffer overflow 9ba5957e034d usb: typec: fusb302: fix "op-sink-microwatt" default that was in mW 9bfa308e95b1 usb: typec: wcove: fix "op-sink-microwatt" default that was in mW 445839bc7fa3 usb: dwc3: turn off VBUS when leaving host mode 1fe175772b99 USB: serial: ir-usb: fix IrLAP framing c9b7dcee64c1 USB: serial: ir-usb: fix link-speed handling 85eec8cf9d22 USB: serial: ir-usb: add missing endpoint sanity check 380a352cd3e9 usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186 f841bbcf8130 usb: dwc3: pci: add ID for the Intel Comet Lake -V variant 566264c8b6e3 rsi_91x_usb: fix interface sanity check c48a89147160 orinoco_usb: fix interface sanity check 619c458f8f39 Bluetooth: btusb: fix non-atomic allocation in completion handler 60b6aa2b71ef Linux 5.4.16 d8a11e0f4e26 net/x25: fix nonblocking connect ce75dd3abbc8 netfilter: nf_tables: autoload modules from the abort path 07ac418120ae netfilter: nf_tables: add __nft_chain_type_get() ea52197c9c4b netfilter: ipset: use bitmap infrastructure completely d5fd8ac3fcc5 media: v4l2-ioctl.c: zero reserved fields for S/TRY_FMT 40b1747b0368 libertas: Fix two buffer overflows at parsing bss descriptor 74389183b671 net/sonic: Prevent tx watchdog timeout 58c0c4b122b1 net/sonic: Fix CAM initialization 079e7e775895 net/sonic: Fix command register usage 4d391c40c295 net/sonic: Quiesce SONIC before re-initializing descriptor memory 9f638adb9f1a net/sonic: Fix receive buffer replenishment 3a0c502d4535 net/sonic: Improve receive descriptor status flag check 3a2137846347 net/sonic: Avoid needless receive descriptor EOL flag updates f6ecc13bea2b net/sonic: Fix receive buffer handling e7092fbffc34 net/sonic: Fix interface error stats collection c5a85f05e462 net/sonic: Use MMIO accessors c463d5a17032 net/sonic: Clear interrupt flags immediately 091c1715f9dd net/sonic: Add mutual exclusion for accessing shared state ab94448beeab readdir: be more conservative with directory entry names 454759886d0b do_last(): fetch directory ->i_mode and ->i_uid before it's too late 5d001c4f74e0 net, sk_msg: Don't check if sock is locked when tearing down psock b2e061912c3e xfrm: support output_mark for offload ESP packets 4e1572b19c64 drm/i915/userptr: fix size calculation 503b54ab9666 iwlwifi: mvm: fix potential SKB leak on TXQ TX 1e3c082df320 iwlwifi: mvm: fix SKB leak on invalid queue 68ee631ba110 tracing: xen: Ordered comparison of function pointers 3c6a183d3108 scsi: RDMA/isert: Fix a recently introduced regression related to logout bbf0d37947f7 hwmon: (nct7802) Fix non-working alarm on voltages 515b97c73447 hwmon: (nct7802) Fix voltage limits to wrong registers 54b818246b03 hsr: Fix a compilation error 5440678b5acb leds: gpio: Fix uninitialized gpio label for fwnode based probe 376b860334d2 readdir: make user_access_begin() use the real access range 16aab32ff8b3 iommu/amd: Fix IOMMU perf counter clobbering during init 9f6216862a20 lib: Reduce user_access_begin() boundaries in strncpy_from_user() and strnlen_user() 9e2e1a5abccd netfilter: nft_osf: add missing check for DREG attribute 373ffce2337b Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register 21aa01da9dba Input: pegasus_notetaker - fix endpoint sanity check c65dfef27803 Input: aiptek - fix endpoint sanity check 56ded4adf16e Input: gtco - fix endpoint sanity check 3e629da150b5 Input: sur40 - fix interface sanity checks 68c2bc4da098 Input: pm8xxx-vib - fix handling of separate enable register c3f6abfe2f11 net/tls: fix async operation c9cb4f2bea44 mlxsw: switchx2: Do not modify cloned SKBs during xmit 77d323cc3783 mmc: sdhci_am654: Reset Command and Data line after tuning d5bb81660456 mmc: sdhci_am654: Remove Inverted Write Protect flag d8bc6ac2db28 mmc: sdhci: fix minimum clock rate for v3 controller 723f200e19bd mmc: tegra: fix SDR50 tuning override bccb1568bae8 ARM: 8950/1: ftrace/recordmcount: filter relocation types ff847d466bdb Revert "Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers" cec754961758 Input: keyspan-remote - fix control-message timeouts 5d1973adcfff iommu/vt-d: Call __dmar_remove_one_dev_info with valid pointer d4616a9f8ee9 pinctrl: sunrisepoint: Add missing Interrupt Status register offset dd05cf12c72f XArray: Fix xas_find returning too many entries db38561288b7 XArray: Fix xa_find_after with multi-index entries a5135ca1f92a XArray: Fix infinite loop with entry at ULONG_MAX b8560e3d90af iwlwifi: mvm: don't send the IWL_MVM_RXQ_NSSN_SYNC notif to Rx queues 4e7d8cd6a1a8 Revert "iwlwifi: mvm: fix scan config command size" 7cf7a7d02587 powerpc/xive: Discard ESB load value when interrupt is invalid 6145307fa693 powerpc/mm/hash: Fix sharing context ids between kernel & userspace bf470f051556 tracing: Fix histogram code when expression has same var as value 07af0d03e8b2 tracing: Do not set trace clock if tracefs lockdown is in effect 67551f958458 tracing/uprobe: Fix double perf_event linking on multiprobe uprobe 44eebad10496 tracing: trigger: Replace unneeded RCU-list traversals b1302cbe530b PM: hibernate: fix crashes with init_on_free=1 d63b777d8145 drm/i915: Align engine->uabi_class/instance with i915_drm.h 3e041c27b990 drm/panfrost: Add the panfrost_gem_mapping concept 8c40a8d7d384 PCI: Mark AMD Navi14 GPU rev 0xc5 ATS as broken fdd0f3b0e98b ceph: hold extra reference to r_parent over life of request 19d0cd212742 hwmon: (core) Do not use device managed functions for memory allocations 0387ee1b95d1 hwmon: (adt7475) Make volt2reg return same reg as reg2volt input 2d00fec60c8d afs: Fix characters allowed into cell names b29d143a690a Revert "io_uring: only allow submit from owning task" 29ce06b6b6d4 ipv4: Detect rollover in specific fib table dump 9bd7ae7eab7c net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path 43eda24c6f75 net/mlx5e: kTLS, Remove redundant posts in TX resync flow 384faad2ad5a net/mlx5e: kTLS, Fix corner-case checks in TX resync flow 7ae31c620dcc net/mlx5: DR, use non preemptible call to get the current cpu number 8a3b1a86d4f3 net/mlx5: E-Switch, Prevent ingress rate configuration of uplink rep b20f5fb7d473 net/mlx5: DR, Enable counter on non-fwd-dest objects ffc574c95e5b net/mlx5: Update the list of the PCI supported devices 36940c4daad0 net/mlx5: Fix lowest FDB pool size d18d22ce8f62 net: Fix packet reordering caused by GRO and listified RX cooperation 8bc302520616 fou: Fix IPv6 netlink policy e7b6ef675c46 mlxsw: spectrum_acl: Fix use-after-free during reload ef3c0a1660a7 airo: Add missing CAP_NET_ADMIN check in AIROOLDIOCTL/SIOCDEVPRIVATE 9975b19b8d82 airo: Fix possible info leak in AIROOLDIOCTL/SIOCDEVPRIVATE a802ddbf41a3 tun: add mutex_unlock() call and napi.skb clearing in tun_get_user() 69486bfa064e tcp: do not leave dangling pointers in tp->highest_sack 562a7c35049c tcp_bbr: improve arithmetic division in bbr_update_bw() 41c230ae2aa4 Revert "udp: do rmem bulk free even if the rx sk queue is empty" 63635790a891 net: usb: lan78xx: Add .ndo_features_check d6f7ed61fa6e net-sysfs: Fix reference count leak 9b60a32108e2 net_sched: use validated TCA_KIND attribute in tc_new_tfilter() b6a9a954b3fe net_sched: fix datalen for ematch 888934af187c net: rtnetlink: validate IFLA_MTU attribute in rtnl_create_link() 500869d71822 net, ip_tunnel: fix namespaces move ead0377f601e net, ip6_tunnel: fix namespaces move 7943bb0f0636 net: ip6_gre: fix moving ip6gre between namespaces c6e524f4fad3 net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM 32df8d0bf461 net: bcmgenet: Use netif_tx_napi_add() for TX NAPI e2bd33937c50 ipv6: sr: remove SKB_GSO_IPXIP6 on End.D* actions 6cbb9683d743 gtp: make sure only SOCK_DGRAM UDP sockets are accepted 80a4c81c6791 firestream: fix memory leaks 34545cad8e04 can, slip: Protect tty->disc_data in write_wakeup and close with RCU Signed-off-by: Bruce Ashfield --- .../linux/linux-yocto-rt_5.4.bb | 6 ++--- .../linux/linux-yocto-tiny_5.4.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 52f0e3b833..5901ba4c47 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5d5d4070c5f8b10a4c6bda37e77071ce37f102d5" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine ?= "d8831a265698a000bb7305e0234dcaa302cf25a5" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index a028b37548..9a18c63c94 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "9eeafafc19278b5c5376ba1fd9eae26626730458" -SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine_qemuarm ?= "e144b0946f1a159a8b5770f1fcedaebf8eadac84" +SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" PV = "5.4.15" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 9fbc47d79e..eea4f2045b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "637086def651a00b1274a80cd3ca740e271eb0f9" -SRCREV_machine_qemuarm64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemumips ?= "bfe04753d00b0f36848bb8204020b69d0e78f02a" -SRCREV_machine_qemuppc ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemuriscv64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemux86 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemux86-64 ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_machine_qemumips64 ?= "81cd255c72add4dcf06603250869f739bb4f05cb" -SRCREV_machine ?= "cdda35317561d2741b396efa623ace0bd2212c16" -SRCREV_meta ?= "a48522779fae4887c47268e5f650bf10c94a165c" +SRCREV_machine_qemuarm ?= "ab36b8853718cf0c92d6c37a62568d34424234e8" +SRCREV_machine_qemuarm64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemumips ?= "f9d6dd093282ef21a11d170660bb06ec81908836" +SRCREV_machine_qemuppc ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemuriscv64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemux86 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemux86-64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_machine_qemumips64 ?= "8b16e493669ee19054a6407d331da75a32ed45b2" +SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" +SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.15" +LINUX_VERSION ?= "5.4.18" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:45:54 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:45:54 -0500 Subject: [OE-core] [PATCH 02/10] linux-yocto/5.4: update to v5.4.20 In-Reply-To: References: Message-ID: <27db6ae5a9f4acf45ab191d8b713ee4226d177f1.1582306887.git.bruce.ashfield@gmail.com> From: Bruce Ashfield Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 27dfbcc2f53d Linux 5.4.20 2d8fdc5744ff selinux: fall back to ref-walk if audit is required ae7f404d9227 libertas: make lbs_ibss_join_existing() return error code on rates overflow 61087dce64a5 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 3c822e1f3118 mwifiex: Fix possible buffer overflows in mwifiex_cmd_append_vsie_tlv() c5b071e3f44d mwifiex: Fix possible buffer overflows in mwifiex_ret_wmm_get_status() 2cf2b620af7b dmaengine: axi-dmac: add a check for devm_regmap_init_mmio eada328f7f9b clk: meson: g12a: fix missing uart2 in regmap table 3cfb0b360b37 mfd: max77650: Select REGMAP_IRQ in Kconfig 3b9586e82c90 regmap: fix writes to non incrementing registers 4eb12ef7491d pinctrl: sh-pfc: r8a7778: Fix duplicate SDSELF_B and SD1_CLK_B 7b07d15aa5b4 pinctrl: sh-pfc: r8a77965: Fix DU_DOTCLKIN3 drive/bias control 875e01dd8a97 selinux: fix regression introduced by move_mount(2) syscall 3b2e595dfe2b selinux: revert "stop passing MAY_NOT_BLOCK to the AVC upon follow_link" 837c36e0451f bcache: avoid unnecessary btree nodes flushing in btree_flush_write() 7c71d438e7e5 dt-bindings: iio: adc: ad7606: Fix wrong maxItems value d15a2930f6d7 media: i2c: adv748x: Fix unsafe macros 30dd20c6d0e3 drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe 8dfa11837606 crypto: caam/qi2 - fix typo in algorithm's driver name 1f42c6de7b94 crypto: atmel-sha - fix error handling when setting hmac key fb42d3f4ec86 crypto: artpec6 - return correct error code for failed setkey() ee1c6b1aa9dc crypto: testmgr - don't try to decrypt uninitialized buffers 771fd0b2e8bf mtd: sharpslpart: Fix unsigned comparison to zero 1765aaef1753 mtd: onenand_base: Adjust indentation in onenand_read_ops_nolock 7df80a021f66 arm64: nofpsmid: Handle TIF_FOREIGN_FPSTATE flag cleanly 0ec337059d71 KVM: arm64: Treat emulated TVAL TimerValue as a signed 32-bit integer a17d21640453 KVM: arm64: pmu: Fix chained SW_INCR counters a6229d1b5c22 KVM: arm64: pmu: Don't increment SW_INCR if PMCR.E is unset 93a509cf1182 KVM: arm: Make inject_abt32() inject an external abort instead 9cce31930ad3 KVM: arm: Fix DFSR setting for non-LPAE aarch32 guests 48f9ec2020b3 KVM: arm/arm64: Fix young bit from mmu notifier 537493f1460a arm64: ptrace: nofpsimd: Fail FP/SIMD regset operations 37014cee458c arm64: cpufeature: Set the FP/SIMD compat HWCAP bits properly 1a2b07a2c3dd arm64: cpufeature: Fix the type of no FP/SIMD capability ba95651cefe1 sched/uclamp: Fix a bug in propagating uclamp value in new cgroups 5d42957c9045 ARM: 8949/1: mm: mark free_memmap as __init 199808393ef7 KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections c406e5352155 ARM: at91: pm: use of_device_id array to find the proper shdwc node 69f08f44b4c1 ARM: at91: pm: use SAM9X60 PMC's compatible 451b91d88a1d iommu/arm-smmu-v3: Populate VMID field for CMDQ_OP_TLBI_NH_VA c4faf627c76e powerpc/pseries: Allow not having ibm, hypertas-functions::hcall-multi-tce for DDW cff30edec932 powerpc/pseries/vio: Fix iommu_table use-after-free refcount warning 5ca556d5edfd powerpc/papr_scm: Fix leaking 'bus_desc.provider_name' in some paths 05a23f436471 powerpc/ptdump: Only enable PPC_CHECK_WX with STRICT_KERNEL_RWX 17f37249d7db powerpc/ptdump: Fix W+X verification call in mark_rodata_ro() 6d7edac1469e Revert "powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests" 45c764da005a soc: qcom: rpmhpd: Set 'active_only' for active only power domains 0bf48acf4338 tools/power/acpi: fix compilation error 5d3453a5660b ARM: dts: at91: sama5d3: define clock rate range for tcb1 581a5fbf4f6d ARM: dts: at91: sama5d3: fix maximum peripheral clock rates 8e8802c93509 ARM: dts: meson8b: use the actual frequency for the GPU's 364MHz OPP 16665fffafee ARM: dts: meson8: use the actual frequency for the GPU's 182.1MHz OPP 3d2d8cd29c1b arm64: dts: marvell: clearfog-gt-8k: fix switch cpu port node c44134c2a287 arm64: dts: renesas: r8a77990: ebisu: Remove clkout-lr-synchronous from sound 6f9da85057c1 ARM: dts: am43xx: add support for clkout1 clock bd13285419b9 ARM: dts: at91: Reenable UART TX pull-ups d01521db86ac arm64: dts: uDPU: fix broken ethernet 5ee40005f420 arm64: dts: qcom: msm8998: Fix tcsr syscon size bc684844e7e0 platform/x86: intel_mid_powerbtn: Take a copy of ddata b09e3d3e79cf ARC: [plat-axs10x]: Add missing multicast filter number to GMAC node 2de1af2bcba0 watchdog: qcom: Use platform_get_irq_optional() for bark irq f599ae7529e6 rtc: cmos: Stop using shared IRQ 7a3aa58c0e02 rtc: hym8563: Return -EINVAL if the time is known to be invalid ffad5982ce58 x86/boot: Handle malformed SRAT tables during early ACPI parsing f4818129947c NFSv4.0: nfs4_do_fsinfo() should not do implicit lease renewals cf360732f811 NFSv4: try lease recovery on NFS4ERR_EXPIRED 5d0a6d77b69c NFSv4: pnfs_roc() must use cred_fscmp() to compare creds 86065de0eb0a NFS: Fix fix of show_nfs_errors 5d7030939d22 NFS/pnfs: Fix pnfs_generic_prepare_to_resend_writes() 1ef47a06d2d4 NFS: Revalidate the file size on a fatal write error b7560b5b72a2 nfs: NFS_SWAP should depend on SWAP 7842c7b30d75 bpf, sockmap: Check update requirements after locking 45d7b0e316d9 bpf: Improve bucket_log calculation logic cb675fde4c44 selftests/bpf: Test freeing sockmap/sockhash with a socket in it 1098f9696152 bpf, sockhash: Synchronize_rcu before free'ing map 657a17ce530e bpf, sockmap: Don't sleep while holding RCU lock on tear-down 1dfc34bd009a bpftool: Don't crash on missing xlated program instructions ec81471a70d1 iwlwifi: mvm: avoid use after free for pmsr request b706a4986382 PCI/AER: Initialize aer_fifo b51ac6e721d5 PCI: Don't disable bridge BARs when assigning bus resources 67016624a0be PCI: tegra: Fix afi_pex2_ctrl reg offset for Tegra30 df26f04f23bd PCI/switchtec: Fix vep_vector_number ioread width b72b8d0725b0 PCI/switchtec: Use dma_set_mask_and_coherent() 15818c08ca79 ath10k: pci: Only dump ATH10K_MEM_REGION_TYPE_IOREG when safe 4f0e6425a2da PCI/IOV: Fix memory leak in pci_iov_add_virtfn() da268240fb0a scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails 21702236f352 RDMA/umem: Fix ib_umem_find_best_pgsz() 56b22525ab80 RDMA/cma: Fix unbalanced cm_id reference count during address resolve b73401025a14 RDMA/uverbs: Verify MR access flags 78923675151e RDMA/core: Fix locking in ib_uverbs_event_read 33daaea78a1f RDMA/i40iw: fix a potential NULL pointer dereference b1f90d263a3b RDMA/netlink: Do not always generate an ACK for some netlink operations 839fb9e04cd7 IB/mlx4: Fix leak in id_map_find_del 996dc3d50add IB/srp: Never use immediate data if it is disabled by a user 56f5f41e80b3 IB/mlx4: Fix memory leak in add_gid error flow b96c27b1891b hv_sock: Remove the accept port restriction f7775193b643 ASoC: pcm: update FE/BE trigger order based on the command d6591ea2dd1a Linux 5.4.19 866323ccc138 powerpc/kuap: Fix set direction in allow/prevent_user_access() 3556d66be3f1 regulator fix for "regulator: core: Add regulator_is_equal() helper" 0f51165c22e4 rxrpc: Fix service call disconnection 743823969080 perf/core: Fix mlock accounting in perf_mmap() d1318034e9e9 clocksource: Prevent double add_timer_on() for watchdog_timer d15b033e9603 x86/apic/msi: Plug non-maskable MSI affinity race b64d7f7af8f9 cifs: fail i/o on soft mounts if sessionsetup errors out 3e3e8551a5a2 KVM: Play nice with read-only memslots when querying host page size 7426ddf01f16 KVM: Use vcpu-specific gva->hva translation when querying host page size 09bd0033df05 KVM: nVMX: vmread should not set rflags to specify success in case of #PF 1d6cfa003c21 KVM: x86: fix overlap between SPTE_MMIO_MASK and generation 8a1cd01bee30 KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on 32-bit KVM fc46f8a115e5 KVM: x86: use CPUID to locate host page table reserved bits f805ec37828b KVM: x86/mmu: Apply max PA check for MMIO sptes to 32-bit KVM 59593aed7e9e drm/dp_mst: Remove VCPI while disabling topology mgr 498742625716 btrfs: free block groups after free'ing fs trees 26ca39ac5593 btrfs: use bool argument in free_root_pointers() d0d327fe37cc x86/timer: Don't skip PIT setup when APIC is disabled or in legacy mode 8fbabd15bdbc mfd: bd70528: Fix hour register mask 555b3025e8fa mfd: rn5t618: Mark ADC control register volatile 3cf5733a2db7 mfd: da9062: Fix watchdog compatible string 9af68afd832f ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug 207014751cd1 net/mlx5: Deprecate usage of generic TLS HW capability bit 70b68add8d65 net/mlx5: Fix deadlock in fs_core 0fea83e06f12 drop_monitor: Do not cancel uninitialized work item 2b2de489c823 qed: Fix timestamping issue for L2 unicast ptp packets. 036ecba2eb99 ipv6/addrconf: fix potential NULL deref in inet6_set_link_af() 7fd6c4da37d4 taprio: Fix dropping packets when using taprio + ETF offloading a5b959885c45 taprio: Use taprio_reset_tc() to reset Traffic Classes configuration ee6adcf2c318 taprio: Add missing policy validation for flags d544302521af taprio: Fix still allowing changing the flags during runtime 47578c894979 taprio: Fix enabling offload with wrong number of traffic classes 4c4153375b67 net: macb: Limit maximum GEM TX length in TSO 96ad794892e7 net: macb: Remove unnecessary alignment check for TSO 9211b26dcfee net/mlx5: IPsec, fix memory leak at mlx5_fpga_ipsec_delete_sa_ctx 0be678f179e0 net/mlx5: IPsec, Fix esp modify function attribute 74888191bb13 net: systemport: Avoid RBUF stuck in Wake-on-LAN mode 8526c3b6e753 net: stmmac: fix a possible endless loop ebf9cdfbcd38 net_sched: fix a resource leak in tcindex_set_parms() 6994d92ed59a net: mvneta: move rx_dropped and rx_errors in per-cpu stats 76e828ceafee net: dsa: microchip: enable module autoprobe 07d7fcb1dd29 net: dsa: bcm_sf2: Only 7278 supports 2Gb/sec IMP port 84e4db766fc6 net: dsa: b53: Always use dev->vlan_enabled in b53_configure_vlan() fddb5a50801a dpaa_eth: support all modes with rate adapting PHYs 3f90dce11916 devlink: report 0 after hitting end in region read 6978e2935c74 bonding/alb: properly access headers in bond_alb_xmit() 0a56a2e1624a ASoC: sgtl5000: Fix VDDA and VDDIO comparison 67d5b7a1f971 regulator: core: Add regulator_is_equal() helper c533cf50fdf6 ubifs: Fix memory leak from c->sup_node fa70d4f7f8e0 ubi: Fix an error pointer dereference in error handling code 6f362620793b ubi: fastmap: Fix inverted logic in seen selfcheck c6d07f6e50e4 virtio_balloon: Fix memory leaks on errors in virtballoon_probe() 3ac13462f55a virtio-balloon: Fix memory leak when unloading while hinting is in progress 7eece787ed82 nfsd: Return the correct number of bytes written to the file e94829641e69 nfsd: fix jiffies/time_t mixup in LRU list 9f3fa8bea96d nfsd: fix delay timer on 32-bit architectures 0d1dacfda0e5 IB/core: Fix ODP get user pages flow 320a24fae280 IB/mlx5: Fix outstanding_pi index for GSI qps b4d104ce6dfe net: tulip: Adjust indentation in {dmfe, uli526x}_init_module 9b14bd934ce3 net: smc911x: Adjust indentation in smc911x_phy_configure 761b51409246 ppp: Adjust indentation into ppp_async_input bd1bac782d92 NFC: pn544: Adjust indentation in pn544_hci_check_presence da535ca18ef5 drm: msm: mdp4: Adjust indentation in mdp4_dsi_encoder_enable bf45386cef7e powerpc/44x: Adjust indentation in ibm4xx_denali_fixup_memsize 0a7473b27eb9 ext2: Adjust indentation in ext2_fill_super 421b77ae26f4 phy: qualcomm: Adjust indentation in read_poll_timeout 55a268cf341f mtd: spi-nor: Split mt25qu512a (n25q512a) entry into two 3c9edf55817a scsi: ufs: Recheck bkops level if bkops is disabled 5f8c02d32223 scsi: qla4xxx: Adjust indentation in qla4xxx_mem_free bdc7651e6164 scsi: csiostor: Adjust indentation in csio_device_reset 454db8d6163b scsi: qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type 05dceb5a62ce ASoC: meson: axg-fifo: fix fifo threshold setup 7c662f69fa05 percpu: Separate decrypted varaibles anytime encryption can be enabled 59c458d51099 broken ping to ipv6 linklocal addresses on debian buster 07fbef9a6e18 fix up iter on short count in fuse_direct_io() e0fc65ef8a60 virtio-pci: check name when counting MSI-X vectors f603b3714e4e virtio-balloon: initialize all vq callbacks fe84d084b2e9 drm/amd/dm/mst: Ignore payload update failures f4bda8b61e7c clk: tegra: Mark fuse clock as critical 806cabd3117f mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush 091c96151279 arm64: dts: qcom: qcs404-evb: Set vdd_apc regulator in high power mode ed53278ee834 mm/page_alloc.c: fix uninitialized memmaps on a partially populated last section 03c03090c3aa ocfs2: fix oops when writing cloned file 6e41b5499960 KVM: s390: do not clobber registers during guest reset/store status b1f9f9b84374 KVM: x86: Revert "KVM: X86: Fix fpu state crash in kvm guest" 58e1e7514f06 KVM: x86: Ensure guest's FPU state is loaded when accessing for emulation a6ff6e0546d0 KVM: x86: Handle TIF_NEED_FPU_LOAD in kvm_{load,put}_guest_fpu() e3a37628c46d KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails 9d9933f7f3f4 KVM: x86: Don't let userspace set host-reserved cr4 bits 715f9f9a0768 KVM: VMX: Add non-canonical check on writes to RTIT address MSRs 2aebc6ed84ef x86/KVM: Clean up host's steal time structure f7c1a6c67ff3 x86/kvm: Cache gfn to pfn translation d71eef9fcc0b x86/KVM: Make sure KVM_VCPU_FLUSH_TLB flag is not missed a3db2949904b x86/kvm: Introduce kvm_(un)map_gfn() 68460ceba319 x86/kvm: Be careful not to clear KVM_VCPU_FLUSH_TLB bit d0671151c2b9 kvm/svm: PKU not currently supported 9213699efd1f KVM: PPC: Book3S PR: Free shared page if mmu initialization fails b2301deda8ce KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails 0718e2d3dc54 KVM: x86: Fix potential put_fpu() w/o load_fpu() on MPX platform 72324a1db6a1 KVM: x86: Protect MSR-based index computations in fixed_msr_to_seg_unit() from Spectre-v1/L1TF attacks 2fb35312c070 KVM: x86: Protect x86_decode_insn from Spectre-v1/L1TF attacks f2a514318263 KVM: x86: Protect MSR-based index computations from Spectre-v1/L1TF attacks in x86.c a07fdd5fcb30 KVM: x86: Protect ioapic_read_indirect() from Spectre-v1/L1TF attacks c09be769b48d KVM: x86: Protect MSR-based index computations in pmu.h from Spectre-v1/L1TF attacks 2f8a13754e05 KVM: x86: Protect ioapic_write_indirect() from Spectre-v1/L1TF attacks c8a6b5918942 KVM: x86: Protect kvm_hv_msr_[get|set]_crash_data() from Spectre-v1/L1TF attacks bf13472e5c05 KVM: x86: Protect kvm_lapic_reg_write() from Spectre-v1/L1TF attacks 8b73ccf4b475 KVM: x86: Protect DR-based index computations from Spectre-v1/L1TF attacks c2b02d093a08 KVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks 79777eb82c23 KVM: x86: Refactor prefix decoding to prevent Spectre-v1/L1TF attacks 443fd0049dcf KVM: x86: Refactor picdev_write() to prevent Spectre-v1/L1TF attacks 8dcbf26833cc aio: prevent potential eventfd recursion on poll 844d2025b68d eventfd: track eventfd_signal() recursion depth d5d6b5887241 bcache: add readahead cache policy options via sysfs interface f158399c1fe9 watchdog: fix UAF in reboot notifier handling in watchdog core code c157da57304e xen/balloon: Support xend-based toolstack take two 726599c63799 tools/kvm_stat: Fix kvm_exit filter name 7a19bd6fe21b media: rc: ensure lirc is initialized before registering input device fd52d88c1dd8 media: iguanair: fix endpoint sanity check ae116f21b24a drm/rect: Avoid division by zero 5b442859ab80 drm: atmel-hlcdc: prefer a lower pixel-clock than requested d065ae83dff8 drm: atmel-hlcdc: enable clock before configuring timing engine 6421785d17e1 drm: atmel-hlcdc: use double rate for pixel clock only if supported ae35ac3c4b08 gfs2: fix O_SYNC write handling 637348690865 gfs2: move setting current->backing_dev_info c61b93fae603 gfs2: fix gfs2_find_jhead that returns uninitialized jhead with seq 0 65afa6958134 sunrpc: expiry_time should be seconds not timeval 301763168c5f mwifiex: fix unbalanced locking in mwifiex_process_country_ie() 535a755d6e6d iwlwifi: don't throw error when trying to remove IGTK cbe53807a14d ARM: tegra: Enable PLLP bypass during Tegra124 LP1 9e78c0e74261 btrfs: Correctly handle empty trees in find_first_clear_extent_bit d82ff2d6406d btrfs: flush write bio if we loop in extent_write_cache_pages 5e7a9ad78d56 Btrfs: fix race between adding and putting tree mod seq elements and nodes ce066845584a btrfs: drop log root for dropped roots 7baf8f665b77 btrfs: set trans->drity in btrfs_commit_transaction 78748f249199 Btrfs: fix infinite loop during fsync after rename operations 79a29dee9024 Btrfs: make deduplication with range including the last block work ddb36ab79b11 Btrfs: fix missing hole after hole punching and fsync when using NO_HOLES f0edd3abee0d ext4: fix race conditions in ->d_compare() and ->d_hash() d44fa04f0864 ext4: fix deadlock allocating crypto bounce page from mempool b19f130269c0 jbd2_seq_info_next should increase position index 6282102dbcbf nfsd: fix filecache lookup 4544a6912416 NFS: Directory page cache pages need to be locked when read 293cdcd89b6c NFS: Fix memory leaks and corruption in readdir 8d313c04b425 scsi: qla2xxx: Fix unbound NVME response length 246a54895ac6 powerpc/futex: Fix incorrect user access blocking eee7a67c0391 crypto: picoxcell - adjust the position of tasklet_init and fix missed tasklet_kill e057d64f86d4 crypto: api - Fix race condition in crypto_spawn_alg 12a15e1c544e crypto: atmel-aes - Fix counter overflow in CTR mode 2c4d8203ff0c crypto: pcrypt - Do not clear MAY_SLEEP flag in original request ded7c73a2b8c crypto: arm64/ghash-neon - bump priority to 150 3a35871603a6 crypto: ccp - set max RSA modulus size for v3 platform devices as well 58d8f2dec6ab crypto: hisilicon - Use the offset fields in sqe to avoid need to split scatterlists a791fc62a574 crypto: api - fix unexpectedly getting generic implementation 1f5f3f65f956 selftests: bpf: Ignore FIN packets for reuseport tests 44a522bf5edc selftests: bpf: Use a temporary file in test_sockmap da43712a7262 selftests/bpf: Skip perf hw events test if the setup disabled it 49437ecf9f30 selftests/bpf: Fix test_attach_probe c0ada6ad3ec5 samples/bpf: Xdp_redirect_cpu fix missing tracepoint attach a69af866bd35 samples/bpf: Don't try to remove user's homedir on clean fbee8f61747f tc-testing: fix eBPF tests failure on linux fresh clones f7a2ccc00a36 libbpf: Fix realloc usage in bpf_core_find_cands ab48c14a444b bpf, devmap: Pass lockdep expression to RCU lists 77bb53cb0948 selftests/bpf: Fix perf_buffer test on systems w/ offline CPUs 5b0e9b563c01 riscv, bpf: Fix broken BPF tail calls f3107a3c9b84 btrfs: Handle another split brain scenario with metadata uuid feature dd9837259de0 btrfs: fix improper setting of scanned for range cyclic write cache pages b4c8ed0bf977 crypto: pcrypt - Avoid deadlock by using per-instance padata queues c8e9dafe668d ftrace: Protect ftrace_graph_hash with ftrace_sync 6a652ed941aa ftrace: Add comment to why rcu_dereference_sched() is open coded c9dc142b39a8 tracing: Annotate ftrace_graph_notrace_hash pointer with __rcu 024537c7548f tracing: Annotate ftrace_graph_hash pointer with __rcu df57920d6e18 ASoC: SOF: core: release resources on errors in probe_continue 3145862d8f9e ASoC: SOF: Introduce state machine for FW boot 0b84591fdd5e scsi: qla2xxx: Fix stuck login session using prli_pend_timer 78cbd2c397bf dm: fix potential for q->make_request_fn NULL pointer 1426201af047 dm thin metadata: use pool locking at end of dm_pool_metadata_close 40d3d8d6eb64 dm crypt: fix benbi IV constructor crash if used in authenticated mode b805ec7d089f dm crypt: fix GFP flags passed to skcipher_request_alloc() 1781fa54a4ea dm writecache: fix incorrect flush sequence when doing SSD mode commit a8d99d630117 dm space map common: fix to ensure new block isn't already in use 188f9b710ff1 dm zoned: support zone sizes smaller than 128MiB ad7c38abe8ba ARM: dma-api: fix max_pfn off-by-one error in __dma_supported() bae74e7ac842 of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc f5f68d165dc0 cpufreq: Avoid creating excessively large stack frames 7dce99d3182a PM: core: Fix handling of devices deleted during system-wide resume e9116299ffac f2fs: fix race conditions in ->d_compare() and ->d_hash() 6d722cd2e387 f2fs: fix dcache lookup of !casefolded directories f4803553aae6 f2fs: code cleanup for f2fs_statfs_project() b1de9ec0e788 f2fs: fix miscounted block limit in f2fs_statfs_project() ae2cb41583a9 f2fs: choose hardlimit when softlimit is larger than hardlimit in f2fs_statfs_project() 08846286bf28 ovl: fix lseek overflow on 32bit 809e16a6eeb3 ovl: fix wrong WARN_ON() in ovl_cache_update_ino() 03572189d61c power: supply: ltc2941-battery-gauge: fix use-after-free 6f33d59ae165 power: supply: axp20x_ac_power: Fix reporting online status 4eed5d3bb14a cpupower: Revert library ABI changes from commit ae2917093fb60bdc1ed3e 2b27acfde9b2 scsi: qla2xxx: Fix mtcp dump collection failure edd15b154653 scsi: megaraid_sas: Do not initiate OCR if controller is not in ready state 3728834fff19 erofs: fix out-of-bound read for shifted uncompressed block 3ebbfdf41d26 scripts/find-unused-docs: Fix massive false positives a421f513779c fs: allow deduplication of eof block into the end of the destination file 5fefc9b3e358 padata: Remove broken queue flushing 5f63963669ec crypto: ccree - fix PM race condition 5e33535cf13c crypto: ccree - fix FDE descriptor sequence d8760030e701 crypto: ccree - fix pm wrongful error reporting 70439e8b7ccf crypto: ccree - fix AEAD decrypt auth fail 80c660892c24 crypto: ccree - fix backlog memory leak d2b1dcd5430f crypto: api - Check spawn->alg under lock in crypto_drop_spawn 0ed43162f578 nvmem: core: fix memory abort in cleanup path 6bdd1a0ed111 mfd: axp20x: Mark AXP20X_VBUS_IPSOUT_MGMT as volatile 385c61a41cf9 hv_balloon: Balloon up according to request page number 570a29b1f75b ASoC: SOF: core: free trace on errors 84c9efd2f855 mmc: sdhci-of-at91: fix memleak on clk_get failure 65e6f63ebfb9 ubifs: Fix deadlock in concurrent bulk-read and writepage e3a561aa5376 ubifs: Fix FS_IOC_SETFLAGS unexpectedly clearing encrypt flag 91f96a9cdd82 ubifs: Fix wrong memory allocation 0119c617ebb6 ubifs: don't trigger assertion on invalid no-key filename 9220bf17ae18 fscrypt: don't print name of busy file when removing key ad270734193e alarmtimer: Unregister wakeup source when module get fails 05b147599f9d ACPI / battery: Deal better with neither design nor full capacity not being reported 7b86d05d1b02 ACPI / battery: Use design-cap for capacity calculations if full-cap is not available 93bba324c28a ACPI / battery: Deal with design or full capacity being reported as -1 832d6f76f268 ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards 44f6e43924f8 mmc: spi: Toggle SPI polarity, do not hardcode it 47bdd025b921 PCI: keystone: Fix error handling when "num-viewport" DT property is not populated a8b56e222300 PCI: keystone: Fix link training retries initiation 6700c0d9ae92 PCI: keystone: Fix outbound region mapping 05d56da81d94 PCI: tegra: Fix return value check of pm_runtime_get_sync() 38b67e60b6b5 tracing: Fix now invalid var_ref_vals assumption in trace action 5b92f86c8492 powerpc/32s: Fix CPU wake-up from sleep mode 4135a03fdf2e powerpc/32s: Fix bad_kuap_fault() 1bd3b871af57 powerpc/pseries: Advance pfn if section is not present in lmb_is_removable() 02c4699fb664 powerpc/xmon: don't access ASDR in VMs 796085dbe323 powerpc/ptdump: Fix W+X verification 2cabe61ab8ae powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case 63098a93063a s390/mm: fix dynamic pagetable upgrade for hugetlbfs e25f00c69039 MIPS: boot: fix typo in 'vmlinux.lzma.its' target bd9abdfd68b2 MIPS: fix indentation of the 'RELOCS' message 6b29d4a1f832 MIPS: syscalls: fix indentation of the 'SYSNR' message 6cca9100db90 KVM: arm64: Only sign-extend MMIO up to register width 4dd5c62d2e4c KVM: arm/arm64: Correct AArch32 SPSR on exception entry b0e01e9d2353 KVM: arm/arm64: Correct CPSR on exception entry cc7931dc766f KVM: arm64: Correct PSTATE on exception entry 5222ded5c72c arm64: acpi: fix DAIF manipulation with pNMI 79c56db06547 ALSA: hda: Add JasperLake PCI ID and codec vid 3d938d9febd1 ALSA: hda: Add Clevo W65_67SB the power_save blacklist 6cb7581f5702 ALSA: hda: Apply aligned MMIO access only conditionally 68efc422c547 platform/x86: intel_scu_ipc: Fix interrupt support 5bf25f3828a2 x86/cpu: Update cached HLE state on write to TSX_CTRL_CPUID_CLEAR 146f086a409b irqdomain: Fix a memory leak in irq_domain_push_irq() db165906cad5 lib/test_kasan.c: fix memory leak in kmalloc_oob_krealloc_more() 9cbcbfc67b25 media: v4l2-rect.h: fix v4l2_rect_map_inside() top/left adjustments 965ccdedf1bf media: v4l2-core: compat: ignore native command codes d2db1cbc751f media/v4l2-core: set pages dirty upon releasing DMA buffers d364e9b37cc9 mm: move_pages: report the number of non-attempted pages 95419e7ef266 mm: thp: don't need care deferred split queue in memcg charge move path aab4189dfdb1 mm/memory_hotplug: fix remove_memory() lockdep splat cb33e477a50b utimes: Clamp the timestamps in notify_change() 73031a617ac3 mmc: sdhci-pci: Make function amd_sdhci_reset static af823232b018 mm/sparse.c: reset section's mem_map when fully deactivated c2c814fc9aee memcg: fix a crash in wb_workfn when a device disappears 39fac95159b4 ALSA: dummy: Fix PCM format loop in proc output 6edf790e9e51 ALSA: usb-audio: Annotate endianess in Scarlett gen2 quirk 85dbab63b461 ALSA: usb-audio: Fix endianess in descriptor validation 2068fbb20b9f usb: gadget: f_ecm: Use atomic_t to track in-flight request a7d00597e0b7 usb: gadget: f_ncm: Use atomic_t to track in-flight request 683b53b5aa12 usb: gadget: legacy: set max_speed to super-speed 063daad1412e usb: gadget: f_fs: set req->num_sgs as 0 for non-sg transfer 47dbff795049 objtool: Silence build output 72a533fc29e1 usb: typec: tcpci: mask event interrupts when remove driver 91cfedb762bd usb: dwc3: gadget: Delay starting transfer 1dc0d21fc1e6 usb: dwc3: gadget: Check END_TRANSFER completion 4e5d1bf6e68f brcmfmac: Fix memory leak in brcmf_usbdev_qinit 1c8c75275f97 Bluetooth: btusb: Disable runtime suspend on Realtek devices 1bfecb50771d Bluetooth: btusb: fix memory leak on fw 21780d1fd65b nvmet: Fix controller use after free 6243cb9e32d2 nvmet: Fix error print message at nvmet_install_queue function 6a4fea54ab46 rcu: Use READ_ONCE() for ->expmask in rcu_read_unlock_special() c71706a5ffff srcu: Apply *_ONCE() to ->srcu_last_gp_end dcad7270b2c7 rcu: Avoid data-race in rcu_gp_fqs_check_wake() a523031513b7 rcu: Use *_ONCE() to protect lockless ->expmask accesses d42b2370f28a tracing: Fix sched switch start/stop refcount racy updates e39351c52efb tracing/kprobes: Have uname use __get_str() in print_fmt 59b2e64b16bb ipc/msg.c: consolidate all xxxctl_down() functions 8ce07d95d67a netfilter: ipset: fix suspicious RCU usage in find_set_and_id 7bad0dda8164 mfd: dln2: More sanity checking for endpoints 6fcbff54ded1 media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors 9f5c4fac341c bnxt_en: Fix logic that disables Bus Master during firmware reset. fddd3f73ad08 netdevsim: fix stack-out-of-bounds in nsim_dev_debugfs_init() f146529c0049 MAINTAINERS: correct entries for ISDN/mISDN section 096df4720ab6 ionic: fix rxq comp packet type mask b6a7ba0e8622 tcp: clear tp->segs_{in|out} in tcp_disconnect() 31fceaf08597 tcp: clear tp->data_segs{in|out} in tcp_disconnect() 2fc4773b6af7 tcp: clear tp->delivered in tcp_disconnect() c9b6c6d07e5c tcp: clear tp->total_retrans in tcp_disconnect() 269a3c472a6f rxrpc: Fix NULL pointer deref due to call->conn being cleared on disconnect 843e115de475 rxrpc: Fix missing active use pinning of rxrpc_local object 524cba2f8de5 rxrpc: Fix insufficient receive notification generation 62221a9b1c9a rxrpc: Fix use-after-free in rxrpc_put_local() 5fa06c956821 bnxt_en: Fix TC queue mapping. 8566221e46eb net: stmmac: Delete txtimer in suspend() dd8142a6fa52 net_sched: fix an OOB access in cls_tcindex 919f13c56485 net: hsr: fix possible NULL deref in hsr_handle_frame() f3dea4cea67a l2tp: Allow duplicate session creation with UDP b080bc8481d9 gtp: use __GFP_NOWARN to avoid memalloc warning 0f8f0429a299 cls_rsvp: fix rsvp_policy 097ef8be69a3 bnxt_en: Move devlink_register before registering netdev aaf5369c72e9 sparc32: fix struct ipc64_perm type definition Signed-off-by: Bruce Ashfield --- .../linux/linux-yocto-rt_5.4.bb | 6 ++--- .../linux/linux-yocto-tiny_5.4.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 5901ba4c47..fc31dc869a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "d8831a265698a000bb7305e0234dcaa302cf25a5" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine ?= "a9334277f632a96eca9d037e9bc077a855d0908d" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 9a18c63c94..cfecf986fb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "e144b0946f1a159a8b5770f1fcedaebf8eadac84" -SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" +SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "5.4.15" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index eea4f2045b..aa17380d00 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ab36b8853718cf0c92d6c37a62568d34424234e8" -SRCREV_machine_qemuarm64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemumips ?= "f9d6dd093282ef21a11d170660bb06ec81908836" -SRCREV_machine_qemuppc ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemuriscv64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemux86 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemux86-64 ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_machine_qemumips64 ?= "8b16e493669ee19054a6407d331da75a32ed45b2" -SRCREV_machine ?= "2b9d420a9eef51b0f3bd7471b2a2cc442c367a12" -SRCREV_meta ?= "6c39661411aaa83f23b5a0b35da193ae819e7428" +SRCREV_machine_qemuarm ?= "0eb0f3620fc93699d1d8adafa2b07174733c7c98" +SRCREV_machine_qemuarm64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemumips ?= "933d80248406c58efdfe32d130479f59d56727be" +SRCREV_machine_qemuppc ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuriscv64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemux86 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemux86-64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemumips64 ?= "db201874e886742eb7a5adf450f5be1293fb83c2" +SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.18" +LINUX_VERSION ?= "5.4.20" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:45:55 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:45:55 -0500 Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: From: Bruce Ashfield Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: 928ea9c56927 Linux 5.2.29 4e41907620bc slip: Fix use-after-free Read in slip_open d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE modules c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support 4ac031b15d86 USB: serial: mos7840: fix remote wakeup 4d44a218aea6 USB: serial: mos7720: fix remote wakeup 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 13a33fb9debe appledisplay: fix error handling in the scheduled work 0cd437d7c16b USB: chaoskey: fix error case of a timeout 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status 726510907c68 USBIP: add config dependency for SGL_ALLOC 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer 1e4921f684ca media: imon: invalid dereference in imon_touch_event d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of cpufreq 767facdefa23 media: usbvision: Fix races among open, close, and disconnect ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true 57f2b5c44f02 nfc: port100: handle command failure cleanly 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD c938307a439a futex: Prevent robust futex exit race 8b0f13ee2b7b nbd: prevent memory leak 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" 53eaf5993eea ath9k_hw: fix uninitialized variable data 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() 01d151b7e74e virtio_balloon: fix shrinker count caae62219805 virtio_ring: fix return code on DMA mapping fails 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed abce58c3af15 nbd:fix memory leak in nbd_get_socket() 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils 3608aa07bac2 gpio: max77620: Fixup debounce delays c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers 95a617d1f70c net/mlx5: Update the list of the PCI supported devices febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode f8bddf0e192a net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6 e049e3c43308 taprio: don't reject same mqprio settings 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress 27845a1dd06b net/mlx5: Fix auto group size calculation ec6d299939c3 net/mlx5e: Fix set vf link state error flow bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array size 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel da957117e731 fbdev: Ditch fb_edid_add_monspecs 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault 0063e9b69796 mm/memory_hotplug: fix updating the node span d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any process 045a481acd16 slcan: Fix memory leak in error path 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite 8505966cdc7e mm/page_io.c: do not free shared swap slots 349d5ccf8971 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak of mbind c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb 364436976763 slip: Fix memory leak in slip_open error path b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() b392b2d28e58 net: gemini: add missed free_netdev 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). 5fa89b3526c5 ax88172a: fix information leak on short answers 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL 0593a806b430 x86/entry/32: Use %ss segment where required 26ce03ac3327 x86/entry/32: Fix IRET exception f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit 41cb303e1436 x86/pti/32: Size initial_page_table correctly 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV 37880a369c68 x86/speculation: Fix redundant MDS mitigation message 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status c77d64c158c6 x86/insn: Fix awk regexp warnings 41bbdde13b43 x86: Use CONFIG_PREEMPTION 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value 8ccce28352fe x86/mm, tracing: Fix CR2 corruption 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap 7801660649a0 x86/entry/64: Simplify idtentry a little 5d305a697f40 x86/entry/32: Simplify common_exception 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption e4a8155be9bd x86/ldt: Initialize the context lock for init_mm f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() 22334402db00 x86/stackframe/32: Provide consistent pt_regs ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to asm/frame.h c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path ce394d5e28c6 x86/asm: Pin sensitive CR0 bits b3327106585c x86/asm: Pin sensitive CR4 bits e3534ce1de0c Documentation/x86: Fix path to entry_32.S 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is enabled Signed-off-by: Bruce Ashfield --- .../linux/linux-yocto-rt_5.2.bb | 6 ++--- .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 5391e052c5..79da8c14b3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index 986dd6e351..d88cb5d742 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 358c0ad80a..59cc08e9a3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" -SRCREV_machine_qemuarm64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemuriscv64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemux86-64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemumips64 ?= "894ee953d9c4036003f41e0800315efe3bab8492" -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" +SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:45:56 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:45:56 -0500 Subject: [OE-core] [PATCH 04/10] linux-yocto: fix PV In-Reply-To: References: Message-ID: <01bd9d3d2a0acc1bfd4e4eddabafabf8729bf003.1582306887.git.bruce.ashfield@gmail.com> From: Bruce Ashfield For whatever reason, the creation of the 5.4 recipes missed the PV that we've always had in linux-yocto. PV follows the LINUX_VERSION variable and clearly indicates that we have git commits in our tree above the -stable releases. Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index fc31dc869a..ab93f1bf55 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index cfecf986fb..097357d9c0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index aa17380d00..0b2a2305f1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -35,7 +35,7 @@ LINUX_VERSION ?= "5.4.20" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -PV = "5.4.15" +PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:45:57 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:45:57 -0500 Subject: [OE-core] [PATCH 05/10] devsrc: fix objtool generation for v5.4+ In-Reply-To: References: Message-ID: From: Bruce Ashfield commit 6ec14aa7a58a1c2fb303692f8cb1ff82d9abd10a [objtool: Silence build output] was added to -stable in v5.4.19. This change was meant to ensure that build output was truly silent when required. But the trailing "cd -" in the tools script was ensuring that a success return code was always returned from the sync script. As such, some missing files for x86 were being masked. We add those files to ensure that objtool can be regenerated as required Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/kernel-devsrc.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 2fa4be67cc..2888236628 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -200,6 +200,7 @@ do_install() { cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs_common.c $kerneldir/build/ cp -a --parents arch/x86/tools/relocs.h $kerneldir/build/ + cp -a --parents arch/x86/tools/gen-insn-attr-x86.awk $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/purgatory/purgatory.c $kerneldir/build/ # 4.18 + have unified the purgatory files, so we ignore any errors if @@ -215,6 +216,10 @@ do_install() { cp -a --parents arch/x86/boot/string.c $kerneldir/build/ cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/ + + # objtool requires these files + cp -a --parents arch/x86/lib/inat.c $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/x86/lib/insn.c $kerneldir/build/ 2>/dev/null || : fi if [ "${ARCH}" = "mips" ]; then -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:45:58 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:45:58 -0500 Subject: [OE-core] [PATCH 06/10] linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix In-Reply-To: References: Message-ID: From: Bruce Ashfield Bumping the SRCREVs to pickup the VDSO fix by Victor Kamensky. We need it to avoid segfaults in SDK testing as well as the standard mips image test cases. Signed-off-by: Bruce Ashfield --- .../recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- .../linux/linux-yocto-tiny_5.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index ab93f1bf55..94a8e052e7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "a9334277f632a96eca9d037e9bc077a855d0908d" +SRCREV_machine ?= "2f533134cfb54b0f77e39a9a9108836aafc3eea1" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 097357d9c0..622f5e60c0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" -SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuarm ?= "b73dad53d5bfa6b53f56a9022dd9f965d47c93e2" +SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 0b2a2305f1..feb89780ea 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "0eb0f3620fc93699d1d8adafa2b07174733c7c98" -SRCREV_machine_qemuarm64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemumips ?= "933d80248406c58efdfe32d130479f59d56727be" -SRCREV_machine_qemuppc ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemuriscv64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemux86 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemux86-64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" -SRCREV_machine_qemumips64 ?= "db201874e886742eb7a5adf450f5be1293fb83c2" -SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" +SRCREV_machine_qemuarm ?= "65ea2729e3e6a8db8512a80a9838a975ca38f1b3" +SRCREV_machine_qemuarm64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemumips ?= "75b3ff96ee76cdfbf5320ddf97b1c929bb8400c8" +SRCREV_machine_qemuppc ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuriscv64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemux86 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemux86-64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemumips64 ?= "419af24bb95f01a2106b7cf25b0adc965368d486" +SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:45:59 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:45:59 -0500 Subject: [OE-core] [PATCH 07/10] linux-yocto: perf: Make perf able to build with latest libbfd In-Reply-To: References: Message-ID: <5528a17947c2b33032d6d051b99c53927c64f3b9.1582306887.git.bruce.ashfield@gmail.com> From: Bruce Ashfield Khem pointed out that we need to backport the following change to get perf building with the latest binutils: commit 0ada120c883d4f1f6 upstream: [ Subject: perf: Make perf able to build with latest libbfd libbfd has changed the bfd_section_* macros to inline functions bfd_section_ since 2019-09-18. See below two commits: o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html This fix make perf able to build with both old and new libbfd. Signed-off-by: Changbin Du Acked-by: Jiri Olsa Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du at gmail.com Signed-off-by: Arnaldo Carvalho de Melo ] Reported-by: Khem Raj Signed-off-by: Bruce Ashfield --- .../recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- .../linux/linux-yocto-tiny_5.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 94a8e052e7..2a35e33830 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "2f533134cfb54b0f77e39a9a9108836aafc3eea1" +SRCREV_machine ?= "97cb5fe4e4fa529a5b8165c4f84182d2d4751b39" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 622f5e60c0..463451fa35 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b73dad53d5bfa6b53f56a9022dd9f965d47c93e2" -SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuarm ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" +SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index feb89780ea..5dd7b68063 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "65ea2729e3e6a8db8512a80a9838a975ca38f1b3" -SRCREV_machine_qemuarm64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemumips ?= "75b3ff96ee76cdfbf5320ddf97b1c929bb8400c8" -SRCREV_machine_qemuppc ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemuriscv64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemux86 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemux86-64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" -SRCREV_machine_qemumips64 ?= "419af24bb95f01a2106b7cf25b0adc965368d486" -SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" +SRCREV_machine_qemuarm ?= "aa91aac123d12d9d4f420862238a437781fe3825" +SRCREV_machine_qemuarm64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemumips ?= "6cb162ab5262318fc52a7cbef86afcf48c6b2449" +SRCREV_machine_qemuppc ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemuriscv64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemux86 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemux86-64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" +SRCREV_machine_qemumips64 ?= "fcbec8b4f0f2f24a31ce5c6e6439c69f7512fb31" +SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" # remap qemuarm to qemuarma15 for the 5.4 kernel -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:46:00 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:46:00 -0500 Subject: [OE-core] [PATCH 08/10] linux-yocto/5.4: update to -rt11 In-Reply-To: References: Message-ID: <91fa1c088cb62a5b4df46737b4a342bbf16b0c2b.1582306887.git.bruce.ashfield@gmail.com> From: Bruce Ashfield Integrating the -rt11 changes into the linux-yocto-rt branches: e3a0470f1ebe (HEAD -> v5.4/standard/preempt-rt/base, origin/v5.4/standard/preempt-rt/base) v5.4.19-rt11 2748be173948 bpf/stackmap: Don't trylock mmap_sem with PREEMPT_RT and interrupts disabled d721d73cb752 bpf, lpm: Make locking RT friendly dc53d4c7fad3 bpf: Prepare hashtab locking for PREEMPT_RT a13a53a8ae75 bpf: Factor out hashtab bucket lock operations 96a25d8a5a2d bpf: Use migrate_disable() in sys_bpf() bb8a96d7e701 bpf: Use migrate_disable() in hashtab code 615cc5998661 bpf: Use migrate_disable/enable in array macros and cgroup/lirc code. c3a06a1ab3d4 bpf/tests: Use migrate disable instead of preempt disable 0717741a61e6 trace/bpf: Use migrate disable in trace_call_bpf() b528161bf4e0 bpf: Use BPF_PROG_RUN_PIN_ON_CPU() at simple call sites. a3b5b903f04f bpf: Replace cant_sleep() with cant_migrate() dd708fd4fb18 bpf: Provide BPF_PROG_RUN_PIN_ON_CPU() macro 6ccad68939c7 bpf: Don't iterate over possible CPUs with interrupts disabled 055b62ad0b2c perf/bpf: Remove preempt disable around BPF invocation 7848f4a45054 bpf/tracing: Remove redundant preempt_disable() in __bpf_trace_run() caf8a5d6b42f bpf: Update locking comment in hashtab code 2ddd1653369d sched: Provide cant_migrate() 37b6c8361d28 sched: Provide migrate_disable/enable() inlines 2a1c4980a1e6 drm/i915/gt: use a LOCAL_IRQ_LOCK in __timeline_mark_lock() 84a119be5c68 v5.4.19-rt10 bb5e8418fb66 v5.4.17-rt9 bf976f5d86e7 locallock: Include header for the `current' macro 7a00b04683bd mm/memcontrol: Move misplaced local_unlock_irqrestore() b647f8807169 sched: migrate_enable: Remove __schedule() call 2b321530c794 sched: migrate_enable: Use per-cpu cpu_stop_work 22b448083286 locking: Percpu-rwsem rewrite f5d550cc9950 v5.4.17-rt8 Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 2a35e33830..37282b2e05 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "97cb5fe4e4fa529a5b8165c4f84182d2d4751b39" +SRCREV_machine ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:46:01 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:46:01 -0500 Subject: [OE-core] [PATCH 09/10] linux-yocto: drop 4.19 recipes In-Reply-To: References: Message-ID: <2d24da0fda13bbe9ebc8ee1273ecaf9092487733.1582306887.git.bruce.ashfield@gmail.com> From: Bruce Ashfield 5.4 is the next LTS kernel, so we drop the 4.19 recipes from master. Signed-off-by: Bruce Ashfield --- .../linux/linux-yocto-rt_4.19.bb | 44 ---------------- .../linux/linux-yocto-tiny_4.19.bb | 32 ------------ meta/recipes-kernel/linux/linux-yocto_4.19.bb | 50 ------------------- 3 files changed, 126 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_4.19.bb diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb deleted file mode 100644 index b6e0a1e9e2..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "v4.19/standard/preempt-rt/base" - -require recipes-kernel/linux/linux-yocto.inc - -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying -# to build multiple virtual/kernel providers, e.g. as dependency of -# core-image-rt-sdk, core-image-rt. -python () { - if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": - raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") -} - -SRCREV_machine ?= "2fbf678238302f33b3aec5a2cba829f260744f24" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" - -LINUX_VERSION ?= "4.19.87" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb deleted file mode 100644 index e2626ab4c9..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ /dev/null @@ -1,32 +0,0 @@ -KBRANCH ?= "v4.19/standard/tiny/base" -KBRANCH_qemuarm ?= "v4.19/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "4.19.87" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -SRCREV_machine_qemuarm ?= "bd239fb802a15c2759ea456dd1f09f5e106fc88a" -SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" - -COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" - -# Functionality flags -KERNEL_FEATURES = "" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb deleted file mode 100644 index c6e482a984..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ /dev/null @@ -1,50 +0,0 @@ -KBRANCH ?= "v4.19/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v4.19/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v4.19/standard/qemuarm64" -KBRANCH_qemumips ?= "v4.19/standard/mti-malta32" -KBRANCH_qemuppc ?= "v4.19/standard/qemuppc" -KBRANCH_qemux86 ?= "v4.19/standard/base" -KBRANCH_qemux86-64 ?= "v4.19/standard/base" -KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "19fa1657d1d82d01647c6f73a2bbf39305505294" -SRCREV_machine_qemuarm64 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemumips ?= "8fb7ab96b84852ee3d9e1d9d9e7bc35e1249b653" -SRCREV_machine_qemuppc ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemux86 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemux86-64 ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_machine_qemumips64 ?= "c8a036abd7d469013dddab15a23e0d2dde1d0000" -SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656" -SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.87" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" - -COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" -- 2.19.1 From bruce.ashfield at gmail.com Fri Feb 21 17:46:02 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Fri, 21 Feb 2020 12:46:02 -0500 Subject: [OE-core] [PATCH 10/10] qemu: bump default reference kernel to v5.4 In-Reply-To: References: Message-ID: From: Bruce Ashfield Now that the 5.4 recipes are available, we bump the default versions to use them. Signed-off-by: Bruce Ashfield --- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarmv5.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index da56cc3574..a72714711d 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc @@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "5.2%" +PREFERRED_VERSION_linux-yocto ??= "5.4%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index fb4789fdac..7f72048065 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -17,7 +17,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -PREFERRED_VERSION_linux-yocto ??= "5.2%" +PREFERRED_VERSION_linux-yocto ??= "5.4%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE_qemuarmv5 = "qemuarm" -- 2.19.1 From bunk at stusta.de Fri Feb 21 19:11:58 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 21:11:58 +0200 Subject: [OE-core] [PATCH] musl: Update to final 1.2.0 release In-Reply-To: <20200221163420.2383120-1-raj.khem@gmail.com> References: <20200221163420.2383120-1-raj.khem@gmail.com> Message-ID: <20200221191158.GA20464@localhost> On Fri, Feb 21, 2020 at 08:34:20AM -0800, Khem Raj wrote: >... > -BASEVER = "1.1.24" > +BASEVER = "1.2.0" > > PV = "${BASEVER}+git${SRCPV}" >... The +git should be removed from PV. cu Adrian From raj.khem at gmail.com Fri Feb 21 19:34:11 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 11:34:11 -0800 Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: Now that 5.4 is available, should this be dropped, I wonder On Fri, Feb 21, 2020 at 9:47 AM wrote: > > From: Bruce Ashfield > > Updating linux-yocto/5.2 to the latest korg -stable release that comprises > the following commits: > > 928ea9c56927 Linux 5.2.29 > 4e41907620bc slip: Fix use-after-free Read in slip_open > d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open > 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices > 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected > 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error > d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE modules > c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support > 4ac031b15d86 USB: serial: mos7840: fix remote wakeup > 4d44a218aea6 USB: serial: mos7720: fix remote wakeup > 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 > 13a33fb9debe appledisplay: fix error handling in the scheduled work > 0cd437d7c16b USB: chaoskey: fix error case of a timeout > 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge > 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status > 726510907c68 USBIP: add config dependency for SGL_ALLOC > 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer > 1e4921f684ca media: imon: invalid dereference in imon_touch_event > d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query > ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking > e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure > 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of cpufreq > 767facdefa23 media: usbvision: Fix races among open, close, and disconnect > ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect > 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true > 57f2b5c44f02 nfc: port100: handle command failure cleanly > 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD > c938307a439a futex: Prevent robust futex exit race > 8b0f13ee2b7b nbd: prevent memory leak > 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary > a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset > 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" > 53eaf5993eea ath9k_hw: fix uninitialized variable data > 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe > 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility > ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection > 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() > c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() > 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles > c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs > 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven > ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface > 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() > 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() > 01d151b7e74e virtio_balloon: fix shrinker count > caae62219805 virtio_ring: fix return code on DMA mapping fails > 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed > abce58c3af15 nbd:fix memory leak in nbd_get_socket() > 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils > 3608aa07bac2 gpio: max77620: Fixup debounce delays > c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers > 95a617d1f70c net/mlx5: Update the list of the PCI supported devices > febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode > f8bddf0e192a net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6 > e049e3c43308 taprio: don't reject same mqprio settings > 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family > 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress > 27845a1dd06b net/mlx5: Fix auto group size calculation > ec6d299939c3 net/mlx5e: Fix set vf link state error flow > bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array size > 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists > a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key > 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path > 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() > 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings > ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion > 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel > da957117e731 fbdev: Ditch fb_edid_add_monspecs > 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault > 0063e9b69796 mm/memory_hotplug: fix updating the node span > d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() > 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any process > 045a481acd16 slcan: Fix memory leak in error path > 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite > 8505966cdc7e mm/page_io.c: do not free shared swap slots > 349d5ccf8971 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() > cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() > eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak of mbind > c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros > 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path > 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation > f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either > 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable > 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms > a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present > ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets > b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system > 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR > 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA > d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet > e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved > 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing > 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 > f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) > 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver > 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size > 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() > a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation > 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint > c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test > ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer > 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb > 364436976763 slip: Fix memory leak in slip_open error path > b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules > c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() > b392b2d28e58 net: gemini: add missed free_netdev > 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). > 5fa89b3526c5 ax88172a: fix information leak on short answers > 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero > efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 > a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise > 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel > 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test > 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX > 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry > 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL > 0593a806b430 x86/entry/32: Use %ss segment where required > 26ce03ac3327 x86/entry/32: Fix IRET exception > f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit > 41cb303e1436 x86/pti/32: Size initial_page_table correctly > 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler > 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() > 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout > ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV > 37880a369c68 x86/speculation: Fix redundant MDS mitigation message > 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status > c77d64c158c6 x86/insn: Fix awk regexp warnings > 41bbdde13b43 x86: Use CONFIG_PREEMPTION > 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() > 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value > 8ccce28352fe x86/mm, tracing: Fix CR2 corruption > 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap > 7801660649a0 x86/entry/64: Simplify idtentry a little > 5d305a697f40 x86/entry/32: Simplify common_exception > 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE > bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line > 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant > 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption > e4a8155be9bd x86/ldt: Initialize the context lock for init_mm > f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest > 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() > 22334402db00 x86/stackframe/32: Provide consistent pt_regs > ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations > 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations > ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to asm/frame.h > c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path > ce394d5e28c6 x86/asm: Pin sensitive CR0 bits > b3327106585c x86/asm: Pin sensitive CR4 bits > e3534ce1de0c Documentation/x86: Fix path to entry_32.S > 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c > 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is enabled > > Signed-off-by: Bruce Ashfield > --- > .../linux/linux-yocto-rt_5.2.bb | 6 ++--- > .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- > meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++---------- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > index 5391e052c5..79da8c14b3 100644 > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > @@ -11,13 +11,13 @@ python () { > raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > } > > -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > -LINUX_VERSION ?= "5.2.28" > +LINUX_VERSION ?= "5.2.29" > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > index 986dd6e351..d88cb5d742 100644 > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" > > require recipes-kernel/linux/linux-yocto.inc > > -LINUX_VERSION ?= "5.2.28" > +LINUX_VERSION ?= "5.2.29" > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" > KMETA = "kernel-meta" > KCONF_BSP_AUDIT_LEVEL = "2" > > -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > PV = "${LINUX_VERSION}+git${SRCPV}" > > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > index 358c0ad80a..59cc08e9a3 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" > KBRANCH_qemux86-64 ?= "v5.2/standard/base" > KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" > > -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" > -SRCREV_machine_qemuarm64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" > -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemuriscv64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemux86-64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemumips64 ?= "894ee953d9c4036003f41e0800315efe3bab8492" > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" > +SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" > +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > # remap qemuarm to qemuarma15 for the 5.2 kernel > # KMACHINE_qemuarm ?= "qemuarma15" > @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > -LINUX_VERSION ?= "5.2.28" > +LINUX_VERSION ?= "5.2.29" > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > DEPENDS += "openssl-native util-linux-native" > -- > 2.19.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From bruce.ashfield at gmail.com Fri Feb 21 19:53:24 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Fri, 21 Feb 2020 14:53:24 -0500 Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: On Fri, Feb 21, 2020 at 2:34 PM Khem Raj wrote: > > Now that 5.4 is available, should this be dropped, I wonder see my 0/10 for comments on that. Bruce > > On Fri, Feb 21, 2020 at 9:47 AM wrote: > > > > From: Bruce Ashfield > > > > Updating linux-yocto/5.2 to the latest korg -stable release that comprises > > the following commits: > > > > 928ea9c56927 Linux 5.2.29 > > 4e41907620bc slip: Fix use-after-free Read in slip_open > > d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open > > 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices > > 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected > > 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error > > d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE modules > > c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support > > 4ac031b15d86 USB: serial: mos7840: fix remote wakeup > > 4d44a218aea6 USB: serial: mos7720: fix remote wakeup > > 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 > > 13a33fb9debe appledisplay: fix error handling in the scheduled work > > 0cd437d7c16b USB: chaoskey: fix error case of a timeout > > 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge > > 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status > > 726510907c68 USBIP: add config dependency for SGL_ALLOC > > 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer > > 1e4921f684ca media: imon: invalid dereference in imon_touch_event > > d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query > > ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking > > e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure > > 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of cpufreq > > 767facdefa23 media: usbvision: Fix races among open, close, and disconnect > > ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect > > 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true > > 57f2b5c44f02 nfc: port100: handle command failure cleanly > > 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD > > c938307a439a futex: Prevent robust futex exit race > > 8b0f13ee2b7b nbd: prevent memory leak > > 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary > > a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset > > 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" > > 53eaf5993eea ath9k_hw: fix uninitialized variable data > > 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe > > 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility > > ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection > > 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() > > c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() > > 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles > > c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs > > 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven > > ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface > > 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() > > 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() > > 01d151b7e74e virtio_balloon: fix shrinker count > > caae62219805 virtio_ring: fix return code on DMA mapping fails > > 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed > > abce58c3af15 nbd:fix memory leak in nbd_get_socket() > > 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils > > 3608aa07bac2 gpio: max77620: Fixup debounce delays > > c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers > > 95a617d1f70c net/mlx5: Update the list of the PCI supported devices > > febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode > > f8bddf0e192a net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6 > > e049e3c43308 taprio: don't reject same mqprio settings > > 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family > > 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress > > 27845a1dd06b net/mlx5: Fix auto group size calculation > > ec6d299939c3 net/mlx5e: Fix set vf link state error flow > > bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array size > > 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists > > a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key > > 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path > > 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() > > 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings > > ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion > > 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel > > da957117e731 fbdev: Ditch fb_edid_add_monspecs > > 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault > > 0063e9b69796 mm/memory_hotplug: fix updating the node span > > d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() > > 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any process > > 045a481acd16 slcan: Fix memory leak in error path > > 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite > > 8505966cdc7e mm/page_io.c: do not free shared swap slots > > 349d5ccf8971 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() > > cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() > > eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak of mbind > > c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros > > 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path > > 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation > > f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either > > 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable > > 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms > > a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present > > ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets > > b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system > > 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR > > 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA > > d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet > > e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved > > 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing > > 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 > > f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) > > 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver > > 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size > > 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() > > a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation > > 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint > > c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test > > ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer > > 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb > > 364436976763 slip: Fix memory leak in slip_open error path > > b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules > > c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() > > b392b2d28e58 net: gemini: add missed free_netdev > > 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). > > 5fa89b3526c5 ax88172a: fix information leak on short answers > > 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero > > efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 > > a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise > > 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel > > 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test > > 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX > > 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry > > 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL > > 0593a806b430 x86/entry/32: Use %ss segment where required > > 26ce03ac3327 x86/entry/32: Fix IRET exception > > f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit > > 41cb303e1436 x86/pti/32: Size initial_page_table correctly > > 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler > > 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() > > 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout > > ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV > > 37880a369c68 x86/speculation: Fix redundant MDS mitigation message > > 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status > > c77d64c158c6 x86/insn: Fix awk regexp warnings > > 41bbdde13b43 x86: Use CONFIG_PREEMPTION > > 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() > > 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value > > 8ccce28352fe x86/mm, tracing: Fix CR2 corruption > > 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap > > 7801660649a0 x86/entry/64: Simplify idtentry a little > > 5d305a697f40 x86/entry/32: Simplify common_exception > > 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE > > bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line > > 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant > > 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption > > e4a8155be9bd x86/ldt: Initialize the context lock for init_mm > > f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest > > 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() > > 22334402db00 x86/stackframe/32: Provide consistent pt_regs > > ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations > > 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations > > ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to asm/frame.h > > c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path > > ce394d5e28c6 x86/asm: Pin sensitive CR0 bits > > b3327106585c x86/asm: Pin sensitive CR4 bits > > e3534ce1de0c Documentation/x86: Fix path to entry_32.S > > 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c > > 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is enabled > > > > Signed-off-by: Bruce Ashfield > > --- > > .../linux/linux-yocto-rt_5.2.bb | 6 ++--- > > .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- > > meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++---------- > > 3 files changed, 18 insertions(+), 18 deletions(-) > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > index 5391e052c5..79da8c14b3 100644 > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > @@ -11,13 +11,13 @@ python () { > > raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > > } > > > > -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > -LINUX_VERSION ?= "5.2.28" > > +LINUX_VERSION ?= "5.2.29" > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > index 986dd6e351..d88cb5d742 100644 > > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" > > > > require recipes-kernel/linux/linux-yocto.inc > > > > -LINUX_VERSION ?= "5.2.28" > > +LINUX_VERSION ?= "5.2.29" > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" > > KMETA = "kernel-meta" > > KCONF_BSP_AUDIT_LEVEL = "2" > > > > -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > PV = "${LINUX_VERSION}+git${SRCPV}" > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > index 358c0ad80a..59cc08e9a3 100644 > > --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" > > KBRANCH_qemux86-64 ?= "v5.2/standard/base" > > KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" > > > > -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" > > -SRCREV_machine_qemuarm64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" > > -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemuriscv64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemux86-64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemumips64 ?= "894ee953d9c4036003f41e0800315efe3bab8492" > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" > > +SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" > > +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > # remap qemuarm to qemuarma15 for the 5.2 kernel > > # KMACHINE_qemuarm ?= "qemuarma15" > > @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA > > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > -LINUX_VERSION ?= "5.2.28" > > +LINUX_VERSION ?= "5.2.29" > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > DEPENDS += "openssl-native util-linux-native" > > -- > > 2.19.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From raj.khem at gmail.com Fri Feb 21 19:58:43 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 11:58:43 -0800 Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: On Fri, Feb 21, 2020 at 11:53 AM Bruce Ashfield wrote: > > On Fri, Feb 21, 2020 at 2:34 PM Khem Raj wrote: > > > > Now that 5.4 is available, should this be dropped, I wonder > > see my 0/10 for comments on that. ah so you don't want to give multiple shocks together :) > > Bruce > > > > > > On Fri, Feb 21, 2020 at 9:47 AM wrote: > > > > > > From: Bruce Ashfield > > > > > > Updating linux-yocto/5.2 to the latest korg -stable release that comprises > > > the following commits: > > > > > > 928ea9c56927 Linux 5.2.29 > > > 4e41907620bc slip: Fix use-after-free Read in slip_open > > > d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open > > > 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices > > > 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected > > > 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error > > > d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE modules > > > c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support > > > 4ac031b15d86 USB: serial: mos7840: fix remote wakeup > > > 4d44a218aea6 USB: serial: mos7720: fix remote wakeup > > > 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 > > > 13a33fb9debe appledisplay: fix error handling in the scheduled work > > > 0cd437d7c16b USB: chaoskey: fix error case of a timeout > > > 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge > > > 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status > > > 726510907c68 USBIP: add config dependency for SGL_ALLOC > > > 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer > > > 1e4921f684ca media: imon: invalid dereference in imon_touch_event > > > d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query > > > ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking > > > e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure > > > 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of cpufreq > > > 767facdefa23 media: usbvision: Fix races among open, close, and disconnect > > > ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect > > > 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true > > > 57f2b5c44f02 nfc: port100: handle command failure cleanly > > > 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD > > > c938307a439a futex: Prevent robust futex exit race > > > 8b0f13ee2b7b nbd: prevent memory leak > > > 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary > > > a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset > > > 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" > > > 53eaf5993eea ath9k_hw: fix uninitialized variable data > > > 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe > > > 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility > > > ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection > > > 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() > > > c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() > > > 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles > > > c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs > > > 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven > > > ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface > > > 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() > > > 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() > > > 01d151b7e74e virtio_balloon: fix shrinker count > > > caae62219805 virtio_ring: fix return code on DMA mapping fails > > > 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed > > > abce58c3af15 nbd:fix memory leak in nbd_get_socket() > > > 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils > > > 3608aa07bac2 gpio: max77620: Fixup debounce delays > > > c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers > > > 95a617d1f70c net/mlx5: Update the list of the PCI supported devices > > > febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode > > > f8bddf0e192a net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6 > > > e049e3c43308 taprio: don't reject same mqprio settings > > > 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family > > > 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress > > > 27845a1dd06b net/mlx5: Fix auto group size calculation > > > ec6d299939c3 net/mlx5e: Fix set vf link state error flow > > > bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array size > > > 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists > > > a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key > > > 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path > > > 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() > > > 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings > > > ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion > > > 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel > > > da957117e731 fbdev: Ditch fb_edid_add_monspecs > > > 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault > > > 0063e9b69796 mm/memory_hotplug: fix updating the node span > > > d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() > > > 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any process > > > 045a481acd16 slcan: Fix memory leak in error path > > > 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite > > > 8505966cdc7e mm/page_io.c: do not free shared swap slots > > > 349d5ccf8971 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() > > > cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() > > > eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak of mbind > > > c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros > > > 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path > > > 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation > > > f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either > > > 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable > > > 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms > > > a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present > > > ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets > > > b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system > > > 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR > > > 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA > > > d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet > > > e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved > > > 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing > > > 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 > > > f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) > > > 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver > > > 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size > > > 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() > > > a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation > > > 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint > > > c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test > > > ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer > > > 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb > > > 364436976763 slip: Fix memory leak in slip_open error path > > > b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules > > > c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() > > > b392b2d28e58 net: gemini: add missed free_netdev > > > 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). > > > 5fa89b3526c5 ax88172a: fix information leak on short answers > > > 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero > > > efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 > > > a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise > > > 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel > > > 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test > > > 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX > > > 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry > > > 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL > > > 0593a806b430 x86/entry/32: Use %ss segment where required > > > 26ce03ac3327 x86/entry/32: Fix IRET exception > > > f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit > > > 41cb303e1436 x86/pti/32: Size initial_page_table correctly > > > 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler > > > 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() > > > 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout > > > ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV > > > 37880a369c68 x86/speculation: Fix redundant MDS mitigation message > > > 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status > > > c77d64c158c6 x86/insn: Fix awk regexp warnings > > > 41bbdde13b43 x86: Use CONFIG_PREEMPTION > > > 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() > > > 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value > > > 8ccce28352fe x86/mm, tracing: Fix CR2 corruption > > > 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap > > > 7801660649a0 x86/entry/64: Simplify idtentry a little > > > 5d305a697f40 x86/entry/32: Simplify common_exception > > > 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE > > > bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line > > > 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant > > > 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption > > > e4a8155be9bd x86/ldt: Initialize the context lock for init_mm > > > f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest > > > 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() > > > 22334402db00 x86/stackframe/32: Provide consistent pt_regs > > > ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations > > > 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations > > > ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to asm/frame.h > > > c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path > > > ce394d5e28c6 x86/asm: Pin sensitive CR0 bits > > > b3327106585c x86/asm: Pin sensitive CR4 bits > > > e3534ce1de0c Documentation/x86: Fix path to entry_32.S > > > 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c > > > 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is enabled > > > > > > Signed-off-by: Bruce Ashfield > > > --- > > > .../linux/linux-yocto-rt_5.2.bb | 6 ++--- > > > .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- > > > meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++---------- > > > 3 files changed, 18 insertions(+), 18 deletions(-) > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > index 5391e052c5..79da8c14b3 100644 > > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > @@ -11,13 +11,13 @@ python () { > > > raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > > > } > > > > > > -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > > > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > > > -LINUX_VERSION ?= "5.2.28" > > > +LINUX_VERSION ?= "5.2.29" > > > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > index 986dd6e351..d88cb5d742 100644 > > > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" > > > > > > require recipes-kernel/linux/linux-yocto.inc > > > > > > -LINUX_VERSION ?= "5.2.28" > > > +LINUX_VERSION ?= "5.2.29" > > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" > > > KMETA = "kernel-meta" > > > KCONF_BSP_AUDIT_LEVEL = "2" > > > > > > -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" > > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" > > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > PV = "${LINUX_VERSION}+git${SRCPV}" > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > index 358c0ad80a..59cc08e9a3 100644 > > > --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" > > > KBRANCH_qemux86-64 ?= "v5.2/standard/base" > > > KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" > > > > > > -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" > > > -SRCREV_machine_qemuarm64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" > > > -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemuriscv64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemux86-64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemumips64 ?= "894ee953d9c4036003f41e0800315efe3bab8492" > > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" > > > +SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" > > > +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" > > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > # remap qemuarm to qemuarma15 for the 5.2 kernel > > > # KMACHINE_qemuarm ?= "qemuarma15" > > > @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA > > > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > -LINUX_VERSION ?= "5.2.28" > > > +LINUX_VERSION ?= "5.2.29" > > > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > DEPENDS += "openssl-native util-linux-native" > > > -- > > > 2.19.1 > > > > > > -- > > > _______________________________________________ > > > Openembedded-core mailing list > > > Openembedded-core at lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II From alex.kanavin at gmail.com Fri Feb 21 20:15:42 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 21 Feb 2020 21:15:42 +0100 Subject: [OE-core] [PATCH 1/2] jquery: fix upstream version check Message-ID: <20200221201543.4364-1-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/jquery/jquery_3.4.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/jquery/jquery_3.4.1.bb b/meta/recipes-devtools/jquery/jquery_3.4.1.bb index e1080aec1d..1bf6ef5c98 100644 --- a/meta/recipes-devtools/jquery/jquery_3.4.1.bb +++ b/meta/recipes-devtools/jquery/jquery_3.4.1.bb @@ -14,6 +14,8 @@ SRC_URI[js.sha256sum] = "5a93a88493aa32aab228bf4571c01207d3b42b0002409a454d404b4 SRC_URI[min.sha256sum] = "0925e8ad7bd971391a8b1e98be8e87a6971919eb5b60c196485941c3c1df089a" SRC_URI[map.sha256sum] = "8da74aec0fcdd7678a2663b3cc9bafbaf009e6d6929b28bb3dd95bced18206f6" +UPSTREAM_CHECK_REGEX = "jquery-(?P\d+(\.\d+)+)\.js" + inherit allarch do_install() { -- 2.25.0 From alex.kanavin at gmail.com Fri Feb 21 20:15:43 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 21 Feb 2020 21:15:43 +0100 Subject: [OE-core] [PATCH 2/2] oeqa/logparser: correctly set test result markers In-Reply-To: <20200221201543.4364-1-alex.kanavin@gmail.com> References: <20200221201543.4364-1-alex.kanavin@gmail.com> Message-ID: <20200221201543.4364-2-alex.kanavin@gmail.com> I spotted this by noticing ptests started to unexpectedly pass, which shouldn't happen yet. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/utils/logparser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/logparser.py b/meta/lib/oeqa/utils/logparser.py index 5403721073..60e16d500e 100644 --- a/meta/lib/oeqa/utils/logparser.py +++ b/meta/lib/oeqa/utils/logparser.py @@ -26,7 +26,7 @@ class PtestParser(object): section_regex['timeout'] = re.compile(r"^TIMEOUT: .*/(.+)/ptest") # Cache markers so we don't take the re.search() hit all the time. - markers = ("PASSED", "FAILED", "SKIPPED", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") + markers = ("PASS:", "FAIL:", "SKIP:", "BEGIN:", "END:", "DURATION:", "ERROR: Exit", "TIMEOUT:") def newsection(): return { 'name': "No-section", 'log': [] } -- 2.25.0 From jpuhlman at mvista.com Fri Feb 21 20:20:15 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 21 Feb 2020 12:20:15 -0800 Subject: [OE-core] [PATCH] toolchain-shar-extract: ignore timestamp on decompress Message-ID: <20200221202015.32647-1-jpuhlman@mvista.com> From: Jeremy Puhlman Installing on centos7, which the extended version of the buildtools tarball is supposed to fix and with reproducable builds turned on, all the time stamps are for epoch. This results in the following output for every file: tar: ./sysroots/x86_64-pokysdk-linux/usr/include/c++/9.2.0/cstdalign: implausibly old time stamp 1969-12-31 16:00:00 tar: ./sysroots/x86_64-pokysdk-linux/usr/lib/libstdc++.so.6: implausibly old time stamp 1969-12-31 16:00:00 Ignore the timestamps during the uncompession step. Signed-off-by: Jeremy Puhlman --- meta/files/toolchain-shar-extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index ccc4f4e1ac..4c4b4deb4c 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -249,7 +249,7 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 + tail -n +$payload_offset $0| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" -- 2.13.3 From bruce.ashfield at gmail.com Fri Feb 21 20:49:49 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Fri, 21 Feb 2020 15:49:49 -0500 Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: On Fri, Feb 21, 2020 at 2:59 PM Khem Raj wrote: > > On Fri, Feb 21, 2020 at 11:53 AM Bruce Ashfield > wrote: > > > > On Fri, Feb 21, 2020 at 2:34 PM Khem Raj wrote: > > > > > > Now that 5.4 is available, should this be dropped, I wonder > > > > see my 0/10 for comments on that. > > ah so you don't want to give multiple shocks together :) Yup. Something always breaks, I'd rather handle one at a time :P Bruce > > > > > Bruce > > > > > > > > > > On Fri, Feb 21, 2020 at 9:47 AM wrote: > > > > > > > > From: Bruce Ashfield > > > > > > > > Updating linux-yocto/5.2 to the latest korg -stable release that comprises > > > > the following commits: > > > > > > > > 928ea9c56927 Linux 5.2.29 > > > > 4e41907620bc slip: Fix use-after-free Read in slip_open > > > > d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open > > > > 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices > > > > 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected > > > > 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error > > > > d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE modules > > > > c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support > > > > 4ac031b15d86 USB: serial: mos7840: fix remote wakeup > > > > 4d44a218aea6 USB: serial: mos7720: fix remote wakeup > > > > 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 > > > > 13a33fb9debe appledisplay: fix error handling in the scheduled work > > > > 0cd437d7c16b USB: chaoskey: fix error case of a timeout > > > > 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge > > > > 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status > > > > 726510907c68 USBIP: add config dependency for SGL_ALLOC > > > > 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer > > > > 1e4921f684ca media: imon: invalid dereference in imon_touch_event > > > > d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query > > > > ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking > > > > e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure > > > > 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of cpufreq > > > > 767facdefa23 media: usbvision: Fix races among open, close, and disconnect > > > > ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect > > > > 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true > > > > 57f2b5c44f02 nfc: port100: handle command failure cleanly > > > > 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD > > > > c938307a439a futex: Prevent robust futex exit race > > > > 8b0f13ee2b7b nbd: prevent memory leak > > > > 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary > > > > a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset > > > > 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" > > > > 53eaf5993eea ath9k_hw: fix uninitialized variable data > > > > 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe > > > > 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility > > > > ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection > > > > 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() > > > > c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() > > > > 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles > > > > c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs > > > > 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven > > > > ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface > > > > 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() > > > > 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() > > > > 01d151b7e74e virtio_balloon: fix shrinker count > > > > caae62219805 virtio_ring: fix return code on DMA mapping fails > > > > 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed > > > > abce58c3af15 nbd:fix memory leak in nbd_get_socket() > > > > 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils > > > > 3608aa07bac2 gpio: max77620: Fixup debounce delays > > > > c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers > > > > 95a617d1f70c net/mlx5: Update the list of the PCI supported devices > > > > febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode > > > > f8bddf0e192a net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6 > > > > e049e3c43308 taprio: don't reject same mqprio settings > > > > 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family > > > > 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress > > > > 27845a1dd06b net/mlx5: Fix auto group size calculation > > > > ec6d299939c3 net/mlx5e: Fix set vf link state error flow > > > > bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array size > > > > 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists > > > > a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key > > > > 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path > > > > 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() > > > > 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings > > > > ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion > > > > 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel > > > > da957117e731 fbdev: Ditch fb_edid_add_monspecs > > > > 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault > > > > 0063e9b69796 mm/memory_hotplug: fix updating the node span > > > > d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() > > > > 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any process > > > > 045a481acd16 slcan: Fix memory leak in error path > > > > 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite > > > > 8505966cdc7e mm/page_io.c: do not free shared swap slots > > > > 349d5ccf8971 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() > > > > cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() > > > > eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak of mbind > > > > c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros > > > > 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path > > > > 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation > > > > f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either > > > > 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable > > > > 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms > > > > a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present > > > > ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets > > > > b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system > > > > 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR > > > > 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA > > > > d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet > > > > e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved > > > > 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing > > > > 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 > > > > f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) > > > > 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver > > > > 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size > > > > 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() > > > > a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation > > > > 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint > > > > c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test > > > > ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer > > > > 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb > > > > 364436976763 slip: Fix memory leak in slip_open error path > > > > b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules > > > > c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() > > > > b392b2d28e58 net: gemini: add missed free_netdev > > > > 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). > > > > 5fa89b3526c5 ax88172a: fix information leak on short answers > > > > 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero > > > > efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 > > > > a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise > > > > 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel > > > > 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test > > > > 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX > > > > 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry > > > > 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL > > > > 0593a806b430 x86/entry/32: Use %ss segment where required > > > > 26ce03ac3327 x86/entry/32: Fix IRET exception > > > > f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit > > > > 41cb303e1436 x86/pti/32: Size initial_page_table correctly > > > > 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler > > > > 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() > > > > 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout > > > > ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV > > > > 37880a369c68 x86/speculation: Fix redundant MDS mitigation message > > > > 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status > > > > c77d64c158c6 x86/insn: Fix awk regexp warnings > > > > 41bbdde13b43 x86: Use CONFIG_PREEMPTION > > > > 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() > > > > 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value > > > > 8ccce28352fe x86/mm, tracing: Fix CR2 corruption > > > > 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap > > > > 7801660649a0 x86/entry/64: Simplify idtentry a little > > > > 5d305a697f40 x86/entry/32: Simplify common_exception > > > > 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE > > > > bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line > > > > 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant > > > > 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption > > > > e4a8155be9bd x86/ldt: Initialize the context lock for init_mm > > > > f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest > > > > 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() > > > > 22334402db00 x86/stackframe/32: Provide consistent pt_regs > > > > ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations > > > > 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations > > > > ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to asm/frame.h > > > > c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path > > > > ce394d5e28c6 x86/asm: Pin sensitive CR0 bits > > > > b3327106585c x86/asm: Pin sensitive CR4 bits > > > > e3534ce1de0c Documentation/x86: Fix path to entry_32.S > > > > 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c > > > > 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is enabled > > > > > > > > Signed-off-by: Bruce Ashfield > > > > --- > > > > .../linux/linux-yocto-rt_5.2.bb | 6 ++--- > > > > .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- > > > > meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++---------- > > > > 3 files changed, 18 insertions(+), 18 deletions(-) > > > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > > index 5391e052c5..79da8c14b3 100644 > > > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > > @@ -11,13 +11,13 @@ python () { > > > > raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > > > > } > > > > > > > > -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" > > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > > +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" > > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > > > SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ > > > > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > > > > > -LINUX_VERSION ?= "5.2.28" > > > > +LINUX_VERSION ?= "5.2.29" > > > > > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > > index 986dd6e351..d88cb5d742 100644 > > > > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > > @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" > > > > > > > > require recipes-kernel/linux/linux-yocto.inc > > > > > > > > -LINUX_VERSION ?= "5.2.28" > > > > +LINUX_VERSION ?= "5.2.29" > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > > @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" > > > > KMETA = "kernel-meta" > > > > KCONF_BSP_AUDIT_LEVEL = "2" > > > > > > > > -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" > > > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > > +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" > > > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > > > PV = "${LINUX_VERSION}+git${SRCPV}" > > > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > > index 358c0ad80a..59cc08e9a3 100644 > > > > --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > > +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > > @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" > > > > KBRANCH_qemux86-64 ?= "v5.2/standard/base" > > > > KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" > > > > > > > > -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" > > > > -SRCREV_machine_qemuarm64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > > -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" > > > > -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > > -SRCREV_machine_qemuriscv64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > > -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > > -SRCREV_machine_qemux86-64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > > -SRCREV_machine_qemumips64 ?= "894ee953d9c4036003f41e0800315efe3bab8492" > > > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > > +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" > > > > +SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" > > > > +SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" > > > > +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" > > > > +SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" > > > > +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" > > > > +SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" > > > > +SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" > > > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > > > # remap qemuarm to qemuarma15 for the 5.2 kernel > > > > # KMACHINE_qemuarm ?= "qemuarma15" > > > > @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA > > > > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > -LINUX_VERSION ?= "5.2.28" > > > > +LINUX_VERSION ?= "5.2.29" > > > > > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > > DEPENDS += "openssl-native util-linux-native" > > > > -- > > > > 2.19.1 > > > > > > > > -- > > > > _______________________________________________ > > > > Openembedded-core mailing list > > > > Openembedded-core at lists.openembedded.org > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > > > -- > > - Thou shalt not follow the NULL pointer, for chaos and madness await > > thee at its end > > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bunk at stusta.de Fri Feb 21 20:59:41 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 22:59:41 +0200 Subject: [OE-core] [zeus][PATCH] ncurses: add CVE_VERSION Message-ID: <20200221205942.27168-2-bunk@stusta.de> From: Anuj Mittal Include the version number in a format that is comparable to what we get from NVD. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- meta/recipes-core/ncurses/ncurses_6.1+20190803.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb b/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb index e638a3737c..c3a89f1c4f 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb @@ -10,3 +10,5 @@ SRCREV = "3c9b2677c96c645496997321bf2fe465a5e7e21f" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" + +CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" -- 2.17.1 From bunk at stusta.de Fri Feb 21 20:59:42 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 22:59:42 +0200 Subject: [OE-core] [zeus][PATCH] ppp: Security fix CVE-2020-8597 Message-ID: <20200221205942.27168-3-bunk@stusta.de> From: Yi Zhao CVE-2020-8597: eap.c in pppd in ppp 2.4.2 through 2.4.8 has an rhostname buffer overflow in the eap_request and eap_response functions. References: https://nvd.nist.gov/vuln/detail/CVE-2020-8597 Patch from: https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426 Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- ...01-pppd-Fix-bounds-check-in-EAP-code.patch | 47 +++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch new file mode 100644 index 0000000000..b7ba7ba643 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch @@ -0,0 +1,47 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] + +CVE: CVE-2020-8597 + +Signed-off-by: Yi Zhao +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f5..1b93db0 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +-- +2.17.1 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 644cde4562..60c56dd0bd 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -33,6 +33,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ file://ppp-2.4.7-DES-openssl.patch \ + file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " SRC_URI_append_libc-musl = "\ -- 2.17.1 From bunk at stusta.de Fri Feb 21 20:59:40 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 22:59:40 +0200 Subject: [OE-core] [zeus][PATCH] sqlite: fix numerous CVEs Message-ID: <20200221205942.27168-1-bunk@stusta.de> From: Ross Burton Fix the following CVEs: - CVE-2019-19244 - CVE-2019-19880 - CVE-2019-19923 - CVE-2019-19924 - CVE-2019-19925 - CVE-2019-19926 - CVE-2019-19959 - CVE-2019-20218 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- .../sqlite/sqlite3/CVE-2019-19244.patch | 33 ++++++++++ .../sqlite/sqlite3/CVE-2019-19880.patch | 33 ++++++++++ .../sqlite/sqlite3/CVE-2019-19923.patch | 50 ++++++++++++++ .../sqlite/sqlite3/CVE-2019-19924.patch | 65 +++++++++++++++++++ .../sqlite/sqlite3/CVE-2019-19925.patch | 33 ++++++++++ .../sqlite/sqlite3/CVE-2019-19926.patch | 31 +++++++++ .../sqlite/sqlite3/CVE-2019-19959.patch | 46 +++++++++++++ .../sqlite/sqlite3/CVE-2019-20218.patch | 31 +++++++++ meta/recipes-support/sqlite/sqlite3_3.29.0.bb | 11 +++- 9 files changed, 332 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch new file mode 100644 index 0000000000..3f70979acc --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch @@ -0,0 +1,33 @@ +CVE: CVE-2019-19244 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 0f690d4ae5ffe656762fdbb7f36cc4c2dcbb2d9d Mon Sep 17 00:00:00 2001 +From: dan +Date: Fri, 22 Nov 2019 10:14:01 +0000 +Subject: [PATCH] Fix a crash that could occur if a sub-select that uses both + DISTINCT and window functions also used an ORDER BY that is the same as its + select list. + +Amalgamation version of the patch: +FossilOrigin-Name: bcdd66c1691955c697f3d756c2b035acfe98f6aad72e90b0021bab6e9023b3ba +--- + sqlite3.c | 5 +++-- + sqlite3.h | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 8fd740b..db1c649 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( + */ + if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct + && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 ++ && p->pWin==0 + ){ + p->selFlags &= ~SF_Distinct; + pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch new file mode 100644 index 0000000000..ca5c31c57b --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch @@ -0,0 +1,33 @@ +CVE: CVE-2019-19880 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 3622d20ad10dfac9586d4423547ed960cbc66fcf Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Wed, 18 Dec 2019 00:05:50 +0000 +Subject: [PATCH] When processing constant integer values in ORDER BY clauses + of window definitions (see check-in [7e4 --- + +--- + sqlite3.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sqlite3.c b/sqlite3.c +index db1c649..a83b3d2 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -147584,9 +147584,11 @@ static ExprList *exprListAppendList( + int nInit = pList ? pList->nExpr : 0; + for(i=0; inExpr; i++){ + Expr *pDup = sqlite3ExprDup(pParse->db, pAppend->a[i].pExpr, 0); ++ assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) ); + if( bIntToNull && pDup && pDup->op==TK_INTEGER ){ + pDup->op = TK_NULL; + pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse); ++ pDup->u.zToken = 0; + } + pList = sqlite3ExprListAppend(pParse, pList, pDup); + if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags; +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch new file mode 100644 index 0000000000..b1b866b250 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch @@ -0,0 +1,50 @@ +CVE: CVE-2019-19923 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From b64463719dc53bde98b0ce3930b10a32560c3a02 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Wed, 18 Dec 2019 20:51:58 +0000 +Subject: [PATCH] Continue to back away from the LEFT JOIN optimization of + check-in [41c27bc0ff1d3135] by disallowing query flattening if the outer + query is DISTINCT. Without this fix, if an index scan is run on the table + within the view on the right-hand side of the LEFT JOIN, stale result + registers might be accessed yielding incorrect results, and/or an + OP_IfNullRow opcode might be invoked on the un-opened table, resulting in a + NULL-pointer dereference. This problem was found by the Yongheng and Rui + fuzzer. + +FossilOrigin-Name: 862974312edf00e9d1068115d1a39b7235b7db68b6d86b81d38a12f025a4748e +--- + sqlite3.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index d29da07..5bc06c8 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -129216,6 +129216,7 @@ static void substSelect( + ** (3b) the FROM clause of the subquery may not contain a virtual + ** table and + ** (3c) the outer query may not be an aggregate. ++** (3d) the outer query may not be DISTINCT. + ** + ** (4) The subquery can not be DISTINCT. + ** +@@ -129412,8 +129413,11 @@ static int flattenSubquery( + */ + if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){ + isLeftJoin = 1; +- if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){ +- /* (3a) (3c) (3b) */ ++ if( pSubSrc->nSrc>1 /* (3a) */ ++ || isAgg /* (3b) */ ++ || IsVirtual(pSubSrc->a[0].pTab) /* (3c) */ ++ || (p->selFlags & SF_Distinct)!=0 /* (3d) */ ++ ){ + return 0; + } + } +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch new file mode 100644 index 0000000000..80d5edbb0c --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch @@ -0,0 +1,65 @@ +CVE: CVE-2019-19924 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 854fe21e8a987f84da81f6bb9e90abc5355c6621 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Thu, 19 Dec 2019 20:37:32 +0000 +Subject: [PATCH] When an error occurs while rewriting the parser tree for + window functions in the sqlite3WindowRewrite() routine, make sure that + pParse->nErr is set, and make sure that this shuts down any subsequent code + generation that might depend on the transformations that were implemented. + This fixes a problem discovered by the Yongheng and Rui fuzzer. + +Amalgamation format of backported patch +FossilOrigin-Name: e2bddcd4c55ba3cbe0130332679ff4b048630d0ced9a8899982edb5a3569ba7f +--- + sqlite3.c | 16 +++++++++++----- + sqlite3.h | 2 +- + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 408ec4c..857c28e 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -77798,7 +77798,8 @@ SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse *pParse, Index *pIdx){ + */ + static void vdbeVComment(Vdbe *p, const char *zFormat, va_list ap){ + assert( p->nOp>0 || p->aOp==0 ); +- assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed ); ++ assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed ++ || p->pParse->nErr>0 ); + if( p->nOp ){ + assert( p->aOp ); + sqlite3DbFree(p->db, p->aOp[p->nOp-1].zComment); +@@ -97872,6 +97873,7 @@ static int codeCompare( + int addr; + CollSeq *p4; + ++ if( pParse->nErr ) return 0; + p4 = sqlite3BinaryCompareCollSeq(pParse, pLeft, pRight); + p5 = binaryCompareP5(pLeft, pRight, jumpIfNull); + addr = sqlite3VdbeAddOp4(pParse->pVdbe, opcode, in2, dest, in1, +@@ -147627,7 +147629,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ + + pTab = sqlite3DbMallocZero(db, sizeof(Table)); + if( pTab==0 ){ +- return SQLITE_NOMEM; ++ return sqlite3ErrorToParser(db, SQLITE_NOMEM); + } + + p->pSrc = 0; +@@ -147731,6 +147733,10 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ + sqlite3DbFree(db, pTab); + } + ++ if( rc && pParse->nErr==0 ){ ++ assert( pParse->db->mallocFailed ); ++ return sqlite3ErrorToParser(pParse->db, SQLITE_NOMEM); ++ } + return rc; + } + +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch new file mode 100644 index 0000000000..ffc2c6afff --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch @@ -0,0 +1,33 @@ +CVE: CVE-2019-19925 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From e92580434d2cdca228649d32f76167492de4f512 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Thu, 19 Dec 2019 15:15:40 +0000 +Subject: [PATCH] Fix the zipfile extension so that INSERT works even if the + pathname of the file being inserted is a NULL. Bug discovered by the + Yongheng and Rui fuzzer. + +FossilOrigin-Name: a80f84b511231204658304226de3e075a55afc2e3f39ac063716f7a57f585c06 +--- + shell.c | 1 + + sqlite3.c | 4 ++-- + sqlite3.h | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/shell.c b/shell.c +index 053180c..404a8d4 100644 +--- a/shell.c ++++ b/shell.c +@@ -5827,6 +5827,7 @@ static int zipfileUpdate( + + if( rc==SQLITE_OK ){ + zPath = (const char*)sqlite3_value_text(apVal[2]); ++ if( zPath==0 ) zPath = ""; + nPath = (int)strlen(zPath); + mTime = zipfileGetTime(apVal[4]); + } +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch new file mode 100644 index 0000000000..92bc7908bc --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch @@ -0,0 +1,31 @@ +CVE: CVE-2019-19926 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 4165b1e1e0001165ace9051a70f938099505eadc Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Thu, 19 Dec 2019 22:08:19 +0000 +Subject: [PATCH] Continuation of [e2bddcd4c55ba3cb]: Add another spot where it + is necessary to abort early due to prior errors in sqlite3WindowRewrite(). + +FossilOrigin-Name: cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2 +--- + sqlite3.c | 7 ++++--- + sqlite3.h | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 857c28e..19a474d 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -128427,6 +128427,7 @@ static int multiSelect( + } + #endif + } ++ if( pParse->nErr ) goto multi_select_end; + + /* Compute collating sequences used by + ** temporary tables needed to implement the compound select. +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch new file mode 100644 index 0000000000..cba8ec9d30 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch @@ -0,0 +1,46 @@ +CVE: CVE-2019-19959 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From f83f7e8141ee7cbbf7f2dc8985279a7372b259b6 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Mon, 23 Dec 2019 21:04:33 +0000 +Subject: [PATCH] Fix the zipfile() function in the zipfile extension so that + it is able to deal with goofy filenames that contain embedded zeros. + +FossilOrigin-Name: cc0fb00a128fd0773db5ff7891f7aa577a3671d570166d2cbb30df922344adcf +--- + shell.c | 4 ++-- + sqlite3.c | 4 ++-- + sqlite3.h | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/shell.c b/shell.c +index 404a8d4..48065e9 100644 +--- a/shell.c ++++ b/shell.c +@@ -5841,7 +5841,7 @@ static int zipfileUpdate( + zFree = sqlite3_mprintf("%s/", zPath); + if( zFree==0 ){ rc = SQLITE_NOMEM; } + zPath = (const char*)zFree; +- nPath++; ++ nPath = (int)strlen(zPath); + } + } + +@@ -6242,11 +6242,11 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){ + }else{ + if( zName[nName-1]!='/' ){ + zName = zFree = sqlite3_mprintf("%s/", zName); +- nName++; + if( zName==0 ){ + rc = SQLITE_NOMEM; + goto zipfile_step_out; + } ++ nName = (int)strlen(zName); + }else{ + while( nName>1 && zName[nName-2]=='/' ) nName--; + } +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch new file mode 100644 index 0000000000..fb6cd6df2d --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch @@ -0,0 +1,31 @@ +CVE: CVE-2019-20218 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 6bbd76d34f29f61483791231f2ce579dcadab8a5 Mon Sep 17 00:00:00 2001 +From: Dan Kennedy +Date: Fri, 27 Dec 2019 20:54:42 +0000 +Subject: [PATCH] Do not attempt to unwind the WITH stack in the Parse object + following an error. This fixes a separate case to [de6e6d68]. + +FossilOrigin-Name: d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92 +--- + sqlite3.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 5bc06c8..408ec4c 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -130570,7 +130570,7 @@ static int selectExpander(Walker *pWalker, Select *p){ + + /* Process NATURAL keywords, and ON and USING clauses of joins. + */ +- if( db->mallocFailed || sqliteProcessJoin(pParse, p) ){ ++ if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){ + return WRC_Abort; + } + +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3_3.29.0.bb b/meta/recipes-support/sqlite/sqlite3_3.29.0.bb index 34066fbe89..61145851be 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.29.0.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.29.0.bb @@ -4,6 +4,15 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://0001-Fix-CVE-2019-16168.patch" + file://0001-Fix-CVE-2019-16168.patch \ + file://CVE-2019-19244.patch \ + file://CVE-2019-19880.patch \ + file://CVE-2019-19923.patch \ + file://CVE-2019-19924.patch \ + file://CVE-2019-19925.patch \ + file://CVE-2019-19926.patch \ + file://CVE-2019-19959.patch \ + file://CVE-2019-20218.patch \ +" SRC_URI[md5sum] = "8f3dfe83387e62ecb91c7c5c09c688dc" SRC_URI[sha256sum] = "8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b" -- 2.17.1 From bunk at stusta.de Fri Feb 21 21:00:31 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:00:31 +0200 Subject: [OE-core] [zeus][PATCH 1/2] libxml2: fix CVE-2020-7595 Message-ID: <20200221210032.3414-1-bunk@stusta.de> From: Anuj Mittal Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- .../libxml/libxml2/CVE-2020-7595.patch | 36 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch new file mode 100644 index 0000000000..facfefd362 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch @@ -0,0 +1,36 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Thu, 12 Dec 2019 17:30:55 +0800 +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities + +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef +return NULL which cause a infinite loop in xmlStringLenDecodeEntities + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076] +CVE: CVE-2020-7595 +Signed-off-by: Anuj Mittal +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index d1c31963..a34bb6cd 100644 +--- a/parser.c ++++ b/parser.c +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + else + c = 0; + while ((c != 0) && (c != end) && /* non input consuming loop */ +- (c != end2) && (c != end3)) { ++ (c != end2) && (c != end3) && ++ (ctxt->instate != XML_PARSER_EOF)) { + + if (c == 0) break; + if ((c == '&') && (str[1] == '#')) { +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index c44a90b1c2..5797dd6bee 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ file://Fix-CVE-2019-19956.patch \ + file://CVE-2020-7595.patch \ " SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6" -- 2.17.1 From bunk at stusta.de Fri Feb 21 21:00:32 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:00:32 +0200 Subject: [OE-core] [zeus][PATCH 2/2] libxml2: Fix CVE-2019-20388 In-Reply-To: <20200221210032.3414-1-bunk@stusta.de> References: <20200221210032.3414-1-bunk@stusta.de> Message-ID: <20200221210032.3414-2-bunk@stusta.de> From: Lee Chee Yang see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- .../libxml/libxml2/CVE-2019-20388.patch | 37 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000000..4ee2d4fe62 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,37 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +CVE: CVE-2019-20388 + +Signed-off-by: Zhipeng Xie +Signed-off-by: Lee Chee Yang +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index 5797dd6bee..1d898ab020 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb @@ -22,6 +22,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-execution-of-ptests.patch \ file://Fix-CVE-2019-19956.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6" -- 2.17.1 From bunk at stusta.de Fri Feb 21 21:03:10 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:03:10 +0200 Subject: [OE-core] [warrior][PATCH v2] libsoup: set CVE_PRODUCT Message-ID: <20200221210310.3596-1-bunk@stusta.de> From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb index b095397ec2..b33a47be6a 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb @@ -15,6 +15,8 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ SRC_URI[md5sum] = "cac755dc6c6acd6e0c70007f547548f5" SRC_URI[sha256sum] = "75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6" +CVE_PRODUCT = "libsoup" + S = "${WORKDIR}/libsoup-${PV}" inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc -- 2.17.1 From jpewhacker at gmail.com Fri Feb 21 21:43:00 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Fri, 21 Feb 2020 15:43:00 -0600 Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs In-Reply-To: <20200214035737.9975-1-zhe.he@windriver.com> References: <20200214035737.9975-1-zhe.he@windriver.com> Message-ID: On Thu, Feb 13, 2020 at 9:58 PM wrote: > > From: He Zhe > > To make the native python3 is always used, > > - Use sed one-liner instead > - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the > following warning. > > File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix > _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) > ModuleNotFoundError: No module named '_sysconfigdata' > > This issue is first reported by Joel Stanley > The sed one-liner is credited to Anuj Mittal > > Signed-off-by: He Zhe > --- > meta/recipes-kernel/perf/perf.bb | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > index 6d1b06693d..a6fb51d3db 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -239,11 +239,8 @@ do_configure_prepend () { > fi > > # use /usr/bin/env instead of version specific python > - for s in `find ${S}/tools/perf/ -name '*.py'`; do > - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do Do we have to hard code bpf_helpers_doc.py? It doesn't exist in older versions (e.g. 4.14) and causes do_configure to fail. > + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} > done > > # unistd.h can be out of sync between libc-headers and the captured version in the perf source > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From bunk at stusta.de Fri Feb 21 21:56:23 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:56:23 +0200 Subject: [OE-core] [warrior][PATCH 1/2] sqlite3: fix CVE-2019-16168 Message-ID: <20200221215624.4102-1-bunk@stusta.de> From: "Qi.Chen at windriver.com" Signed-off-by: Chen Qi Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- .../files/0001-Fix-CVE-2019-16168.patch | 40 +++++++++++++++++++ meta/recipes-support/sqlite/sqlite3_3.27.2.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-support/sqlite/files/0001-Fix-CVE-2019-16168.patch diff --git a/meta/recipes-support/sqlite/files/0001-Fix-CVE-2019-16168.patch b/meta/recipes-support/sqlite/files/0001-Fix-CVE-2019-16168.patch new file mode 100644 index 0000000000..7c4a65b3cd --- /dev/null +++ b/meta/recipes-support/sqlite/files/0001-Fix-CVE-2019-16168.patch @@ -0,0 +1,40 @@ +From fcf06b0b426e6c243d6ca2d6c6a02830717ab6a3 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 15 Oct 2019 13:22:52 +0800 +Subject: [PATCH] Fix CVE-2019-16168 + +CVE: CVE-2019-16168 + +Upstream-Status: Backport [https://www.sqlite.org/src/vpatch?from=4f5b2d938194fab7&to=98357d8c1263920b] + +Signed-off-by: Chen Qi +--- + sqlite3.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 61bfdeb..b3e6ae2 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -105933,7 +105933,9 @@ static void decodeIntArray( + if( sqlite3_strglob("unordered*", z)==0 ){ + pIndex->bUnordered = 1; + }else if( sqlite3_strglob("sz=[0-9]*", z)==0 ){ +- pIndex->szIdxRow = sqlite3LogEst(sqlite3Atoi(z+3)); ++ int sz = sqlite3Atoi(z+3); ++ if( sz<2 ) sz = 2; ++ pIndex->szIdxRow = sqlite3LogEst(sz); + }else if( sqlite3_strglob("noskipscan*", z)==0 ){ + pIndex->noSkipScan = 1; + } +@@ -143260,6 +143262,7 @@ static int whereLoopAddBtreeIndex( + ** it to pNew->rRun, which is currently set to the cost of the index + ** seek only. Then, if this is a non-covering index, add the cost of + ** visiting the rows in the main table. */ ++ assert( pSrc->pTab->szTabRow>0 ); + rCostIdx = pNew->nOut + 1 + (15*pProbe->szIdxRow)/pSrc->pTab->szTabRow; + pNew->rRun = sqlite3LogEstAdd(rLogSize, rCostIdx); + if( (pNew->wsFlags & (WHERE_IDX_ONLY|WHERE_IPK))==0 ){ +-- +2.17.1 + diff --git a/meta/recipes-support/sqlite/sqlite3_3.27.2.bb b/meta/recipes-support/sqlite/sqlite3_3.27.2.bb index 4bdb04f4d1..2888a56ee9 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.27.2.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.27.2.bb @@ -7,6 +7,7 @@ SRC_URI = "\ http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \ file://CVE-2019-9936.patch \ file://CVE-2019-9937.patch \ + file://0001-Fix-CVE-2019-16168.patch \ " SRC_URI[md5sum] = "1f72631ce6e8efa5b4a6e55a43b3bdc0" -- 2.17.1 From bunk at stusta.de Fri Feb 21 21:56:24 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:56:24 +0200 Subject: [OE-core] [warrior][PATCH 2/2] sqlite: fix numerous CVEs In-Reply-To: <20200221215624.4102-1-bunk@stusta.de> References: <20200221215624.4102-1-bunk@stusta.de> Message-ID: <20200221215624.4102-2-bunk@stusta.de> From: Ross Burton Fix the following CVEs: - CVE-2019-19244 - CVE-2019-19923 - CVE-2019-19925 - CVE-2019-19926 - CVE-2019-19959 - CVE-2019-20218 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie [ removed the CVE-2019-19880 and CVE-2019-19924 fixes that did not apply cleanly ] Signed-off-by: Adrian Bunk --- .../sqlite/sqlite3/CVE-2019-19244.patch | 33 ++++++++++++ .../sqlite/sqlite3/CVE-2019-19923.patch | 50 +++++++++++++++++++ .../sqlite/sqlite3/CVE-2019-19925.patch | 33 ++++++++++++ .../sqlite/sqlite3/CVE-2019-19926.patch | 31 ++++++++++++ .../sqlite/sqlite3/CVE-2019-19959.patch | 46 +++++++++++++++++ .../sqlite/sqlite3/CVE-2019-20218.patch | 31 ++++++++++++ meta/recipes-support/sqlite/sqlite3_3.27.2.bb | 6 +++ 7 files changed, 230 insertions(+) create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch new file mode 100644 index 0000000000..3f70979acc --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch @@ -0,0 +1,33 @@ +CVE: CVE-2019-19244 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 0f690d4ae5ffe656762fdbb7f36cc4c2dcbb2d9d Mon Sep 17 00:00:00 2001 +From: dan +Date: Fri, 22 Nov 2019 10:14:01 +0000 +Subject: [PATCH] Fix a crash that could occur if a sub-select that uses both + DISTINCT and window functions also used an ORDER BY that is the same as its + select list. + +Amalgamation version of the patch: +FossilOrigin-Name: bcdd66c1691955c697f3d756c2b035acfe98f6aad72e90b0021bab6e9023b3ba +--- + sqlite3.c | 5 +++-- + sqlite3.h | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 8fd740b..db1c649 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( + */ + if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct + && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 ++ && p->pWin==0 + ){ + p->selFlags &= ~SF_Distinct; + pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch new file mode 100644 index 0000000000..b1b866b250 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch @@ -0,0 +1,50 @@ +CVE: CVE-2019-19923 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From b64463719dc53bde98b0ce3930b10a32560c3a02 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Wed, 18 Dec 2019 20:51:58 +0000 +Subject: [PATCH] Continue to back away from the LEFT JOIN optimization of + check-in [41c27bc0ff1d3135] by disallowing query flattening if the outer + query is DISTINCT. Without this fix, if an index scan is run on the table + within the view on the right-hand side of the LEFT JOIN, stale result + registers might be accessed yielding incorrect results, and/or an + OP_IfNullRow opcode might be invoked on the un-opened table, resulting in a + NULL-pointer dereference. This problem was found by the Yongheng and Rui + fuzzer. + +FossilOrigin-Name: 862974312edf00e9d1068115d1a39b7235b7db68b6d86b81d38a12f025a4748e +--- + sqlite3.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index d29da07..5bc06c8 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -129216,6 +129216,7 @@ static void substSelect( + ** (3b) the FROM clause of the subquery may not contain a virtual + ** table and + ** (3c) the outer query may not be an aggregate. ++** (3d) the outer query may not be DISTINCT. + ** + ** (4) The subquery can not be DISTINCT. + ** +@@ -129412,8 +129413,11 @@ static int flattenSubquery( + */ + if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){ + isLeftJoin = 1; +- if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){ +- /* (3a) (3c) (3b) */ ++ if( pSubSrc->nSrc>1 /* (3a) */ ++ || isAgg /* (3b) */ ++ || IsVirtual(pSubSrc->a[0].pTab) /* (3c) */ ++ || (p->selFlags & SF_Distinct)!=0 /* (3d) */ ++ ){ + return 0; + } + } +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch new file mode 100644 index 0000000000..ffc2c6afff --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch @@ -0,0 +1,33 @@ +CVE: CVE-2019-19925 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From e92580434d2cdca228649d32f76167492de4f512 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Thu, 19 Dec 2019 15:15:40 +0000 +Subject: [PATCH] Fix the zipfile extension so that INSERT works even if the + pathname of the file being inserted is a NULL. Bug discovered by the + Yongheng and Rui fuzzer. + +FossilOrigin-Name: a80f84b511231204658304226de3e075a55afc2e3f39ac063716f7a57f585c06 +--- + shell.c | 1 + + sqlite3.c | 4 ++-- + sqlite3.h | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/shell.c b/shell.c +index 053180c..404a8d4 100644 +--- a/shell.c ++++ b/shell.c +@@ -5827,6 +5827,7 @@ static int zipfileUpdate( + + if( rc==SQLITE_OK ){ + zPath = (const char*)sqlite3_value_text(apVal[2]); ++ if( zPath==0 ) zPath = ""; + nPath = (int)strlen(zPath); + mTime = zipfileGetTime(apVal[4]); + } +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch new file mode 100644 index 0000000000..92bc7908bc --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch @@ -0,0 +1,31 @@ +CVE: CVE-2019-19926 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 4165b1e1e0001165ace9051a70f938099505eadc Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Thu, 19 Dec 2019 22:08:19 +0000 +Subject: [PATCH] Continuation of [e2bddcd4c55ba3cb]: Add another spot where it + is necessary to abort early due to prior errors in sqlite3WindowRewrite(). + +FossilOrigin-Name: cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2 +--- + sqlite3.c | 7 ++++--- + sqlite3.h | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 857c28e..19a474d 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -128427,6 +128427,7 @@ static int multiSelect( + } + #endif + } ++ if( pParse->nErr ) goto multi_select_end; + + /* Compute collating sequences used by + ** temporary tables needed to implement the compound select. +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch new file mode 100644 index 0000000000..cba8ec9d30 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch @@ -0,0 +1,46 @@ +CVE: CVE-2019-19959 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From f83f7e8141ee7cbbf7f2dc8985279a7372b259b6 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Mon, 23 Dec 2019 21:04:33 +0000 +Subject: [PATCH] Fix the zipfile() function in the zipfile extension so that + it is able to deal with goofy filenames that contain embedded zeros. + +FossilOrigin-Name: cc0fb00a128fd0773db5ff7891f7aa577a3671d570166d2cbb30df922344adcf +--- + shell.c | 4 ++-- + sqlite3.c | 4 ++-- + sqlite3.h | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/shell.c b/shell.c +index 404a8d4..48065e9 100644 +--- a/shell.c ++++ b/shell.c +@@ -5841,7 +5841,7 @@ static int zipfileUpdate( + zFree = sqlite3_mprintf("%s/", zPath); + if( zFree==0 ){ rc = SQLITE_NOMEM; } + zPath = (const char*)zFree; +- nPath++; ++ nPath = (int)strlen(zPath); + } + } + +@@ -6242,11 +6242,11 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){ + }else{ + if( zName[nName-1]!='/' ){ + zName = zFree = sqlite3_mprintf("%s/", zName); +- nName++; + if( zName==0 ){ + rc = SQLITE_NOMEM; + goto zipfile_step_out; + } ++ nName = (int)strlen(zName); + }else{ + while( nName>1 && zName[nName-2]=='/' ) nName--; + } +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch new file mode 100644 index 0000000000..fb6cd6df2d --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch @@ -0,0 +1,31 @@ +CVE: CVE-2019-20218 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 6bbd76d34f29f61483791231f2ce579dcadab8a5 Mon Sep 17 00:00:00 2001 +From: Dan Kennedy +Date: Fri, 27 Dec 2019 20:54:42 +0000 +Subject: [PATCH] Do not attempt to unwind the WITH stack in the Parse object + following an error. This fixes a separate case to [de6e6d68]. + +FossilOrigin-Name: d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92 +--- + sqlite3.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 5bc06c8..408ec4c 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -130570,7 +130570,7 @@ static int selectExpander(Walker *pWalker, Select *p){ + + /* Process NATURAL keywords, and ON and USING clauses of joins. + */ +- if( db->mallocFailed || sqliteProcessJoin(pParse, p) ){ ++ if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){ + return WRC_Abort; + } + +-- +2.24.1 + diff --git a/meta/recipes-support/sqlite/sqlite3_3.27.2.bb b/meta/recipes-support/sqlite/sqlite3_3.27.2.bb index 2888a56ee9..32e367d889 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.27.2.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.27.2.bb @@ -8,6 +8,12 @@ SRC_URI = "\ file://CVE-2019-9936.patch \ file://CVE-2019-9937.patch \ file://0001-Fix-CVE-2019-16168.patch \ + file://CVE-2019-19244.patch \ + file://CVE-2019-19923.patch \ + file://CVE-2019-19925.patch \ + file://CVE-2019-19926.patch \ + file://CVE-2019-19959.patch \ + file://CVE-2019-20218.patch \ " SRC_URI[md5sum] = "1f72631ce6e8efa5b4a6e55a43b3bdc0" -- 2.17.1 From bunk at stusta.de Fri Feb 21 21:57:22 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:57:22 +0200 Subject: [OE-core] [warrior][PATCH 1/2] libxml2: fix CVE-2020-7595 Message-ID: <20200221215723.4233-1-bunk@stusta.de> From: Anuj Mittal Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- .../libxml/libxml2/CVE-2020-7595.patch | 36 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch new file mode 100644 index 0000000000..facfefd362 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch @@ -0,0 +1,36 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Thu, 12 Dec 2019 17:30:55 +0800 +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities + +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef +return NULL which cause a infinite loop in xmlStringLenDecodeEntities + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076] +CVE: CVE-2020-7595 +Signed-off-by: Anuj Mittal +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index d1c31963..a34bb6cd 100644 +--- a/parser.c ++++ b/parser.c +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + else + c = 0; + while ((c != 0) && (c != end) && /* non input consuming loop */ +- (c != end2) && (c != end3)) { ++ (c != end2) && (c != end3) && ++ (ctxt->instate != XML_PARSER_EOF)) { + + if (c == 0) break; + if ((c == '&') && (str[1] == '#')) { +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 67c2d4fafb..618f307214 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb @@ -24,6 +24,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-CVE-2018-14404.patch \ file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ file://fix-CVE-2019-19956.patch \ + file://CVE-2020-7595.patch \ " SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" -- 2.17.1 From bunk at stusta.de Fri Feb 21 21:57:23 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:57:23 +0200 Subject: [OE-core] [warrior][PATCH 2/2] libxml2: Fix CVE-2019-20388 In-Reply-To: <20200221215723.4233-1-bunk@stusta.de> References: <20200221215723.4233-1-bunk@stusta.de> Message-ID: <20200221215723.4233-2-bunk@stusta.de> From: Lee Chee Yang see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- .../libxml/libxml2/CVE-2019-20388.patch | 37 +++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000000..4ee2d4fe62 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,37 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +CVE: CVE-2019-20388 + +Signed-off-by: Zhipeng Xie +Signed-off-by: Lee Chee Yang +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb index 618f307214..ab47a50c56 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb @@ -25,6 +25,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Fix-infinite-loop-in-LZMA-decompression.patch \ file://fix-CVE-2019-19956.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d" -- 2.17.1 From bunk at stusta.de Fri Feb 21 21:58:39 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:58:39 +0200 Subject: [OE-core] [warrior][PATCH] ncurses: add CVE_VERSION Message-ID: <20200221215840.4363-1-bunk@stusta.de> From: Anuj Mittal Include the version number in a format that is comparable to what we get from NVD. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- meta/recipes-core/ncurses/ncurses_6.1+20181013.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb b/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb index ef6ca9879b..90f6b4695c 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb @@ -9,3 +9,5 @@ SRCREV = "7a97a7f937762ba342d5b2fd7cd090885a809835" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" + +CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" -- 2.17.1 From bunk at stusta.de Fri Feb 21 21:58:40 2020 From: bunk at stusta.de (Adrian Bunk) Date: Fri, 21 Feb 2020 23:58:40 +0200 Subject: [OE-core] [warrior][PATCH] ppp: Security fix CVE-2020-8597 Message-ID: <20200221215840.4363-2-bunk@stusta.de> From: Yi Zhao CVE-2020-8597: eap.c in pppd in ppp 2.4.2 through 2.4.8 has an rhostname buffer overflow in the eap_request and eap_response functions. References: https://nvd.nist.gov/vuln/detail/CVE-2020-8597 Patch from: https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426 Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk --- ...01-pppd-Fix-bounds-check-in-EAP-code.patch | 47 +++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch new file mode 100644 index 0000000000..b7ba7ba643 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch @@ -0,0 +1,47 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] + +CVE: CVE-2020-8597 + +Signed-off-by: Yi Zhao +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f5..1b93db0 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +-- +2.17.1 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 644cde4562..60c56dd0bd 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -33,6 +33,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ file://ppp-2.4.7-DES-openssl.patch \ + file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " SRC_URI_append_libc-musl = "\ -- 2.17.1 From raj.khem at gmail.com Fri Feb 21 22:15:44 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 14:15:44 -0800 Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs In-Reply-To: References: <20200214035737.9975-1-zhe.he@windriver.com> Message-ID: <74a29374-e918-807e-c01d-ff29132f0c82@gmail.com> On 2/21/20 1:43 PM, Joshua Watt wrote: > On Thu, Feb 13, 2020 at 9:58 PM wrote: >> >> From: He Zhe >> >> To make the native python3 is always used, >> >> - Use sed one-liner instead >> - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the >> following warning. >> >> File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix >> _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) >> ModuleNotFoundError: No module named '_sysconfigdata' >> >> This issue is first reported by Joel Stanley >> The sed one-liner is credited to Anuj Mittal >> >> Signed-off-by: He Zhe >> --- >> meta/recipes-kernel/perf/perf.bb | 7 ++----- >> 1 file changed, 2 insertions(+), 5 deletions(-) >> >> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb >> index 6d1b06693d..a6fb51d3db 100644 >> --- a/meta/recipes-kernel/perf/perf.bb >> +++ b/meta/recipes-kernel/perf/perf.bb >> @@ -239,11 +239,8 @@ do_configure_prepend () { >> fi >> >> # use /usr/bin/env instead of version specific python >> - for s in `find ${S}/tools/perf/ -name '*.py'`; do >> - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" >> - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" >> - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" >> - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" >> + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do > > Do we have to hard code bpf_helpers_doc.py? It doesn't exist in older > versions (e.g. 4.14) and causes do_configure to fail. Probably not, I also stumbled into this problem. > >> + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} >> done >> >> # unistd.h can be out of sync between libc-headers and the captured version in the perf source >> -- >> 2.24.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From bruce.ashfield at gmail.com Fri Feb 21 22:23:08 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Fri, 21 Feb 2020 17:23:08 -0500 Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs In-Reply-To: <74a29374-e918-807e-c01d-ff29132f0c82@gmail.com> References: <20200214035737.9975-1-zhe.he@windriver.com> <74a29374-e918-807e-c01d-ff29132f0c82@gmail.com> Message-ID: On Fri, Feb 21, 2020 at 5:16 PM Khem Raj wrote: > > > > On 2/21/20 1:43 PM, Joshua Watt wrote: > > On Thu, Feb 13, 2020 at 9:58 PM wrote: > >> > >> From: He Zhe > >> > >> To make the native python3 is always used, > >> > >> - Use sed one-liner instead > >> - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the > >> following warning. > >> > >> File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix > >> _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) > >> ModuleNotFoundError: No module named '_sysconfigdata' > >> > >> This issue is first reported by Joel Stanley > >> The sed one-liner is credited to Anuj Mittal > >> > >> Signed-off-by: He Zhe > >> --- > >> meta/recipes-kernel/perf/perf.bb | 7 ++----- > >> 1 file changed, 2 insertions(+), 5 deletions(-) > >> > >> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb > >> index 6d1b06693d..a6fb51d3db 100644 > >> --- a/meta/recipes-kernel/perf/perf.bb > >> +++ b/meta/recipes-kernel/perf/perf.bb > >> @@ -239,11 +239,8 @@ do_configure_prepend () { > >> fi > >> > >> # use /usr/bin/env instead of version specific python > >> - for s in `find ${S}/tools/perf/ -name '*.py'`; do > >> - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" > >> - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" > >> - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" > >> - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" > >> + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do > > > > Do we have to hard code bpf_helpers_doc.py? It doesn't exist in older > > versions (e.g. 4.14) and causes do_configure to fail. > > Probably not, I also stumbled into this problem. Yah, We can either just do the entire directory (but during the review, we were talking about the fact that since we aren't using them, we don't actually know if they are py3 safe, so blindly converting the shebang isnt' a great idea either). But the solution we use in the devsrc recipe would work easily enough here, just do $(find . -name ${S}/scripts/bpf_helpers_doc.py) and let it return nothing for those older kernels. Bruce > > > > >> + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} > >> done > >> > >> # unistd.h can be out of sync between libc-headers and the captured version in the perf source > >> -- > >> 2.24.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From raj.khem at gmail.com Fri Feb 21 22:30:00 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 14:30:00 -0800 Subject: [OE-core] [PATCH v3] perf: Correct the substitution of python shebangs In-Reply-To: References: <20200214035737.9975-1-zhe.he@windriver.com> <74a29374-e918-807e-c01d-ff29132f0c82@gmail.com> Message-ID: <9c19e3eb-d6de-a3eb-05ae-9c33f2a51000@gmail.com> On 2/21/20 2:23 PM, Bruce Ashfield wrote: > On Fri, Feb 21, 2020 at 5:16 PM Khem Raj wrote: >> >> >> >> On 2/21/20 1:43 PM, Joshua Watt wrote: >>> On Thu, Feb 13, 2020 at 9:58 PM wrote: >>>> >>>> From: He Zhe >>>> >>>> To make the native python3 is always used, >>>> >>>> - Use sed one-liner instead >>>> - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the >>>> following warning. >>>> >>>> File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix >>>> _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) >>>> ModuleNotFoundError: No module named '_sysconfigdata' >>>> >>>> This issue is first reported by Joel Stanley >>>> The sed one-liner is credited to Anuj Mittal >>>> >>>> Signed-off-by: He Zhe >>>> --- >>>> meta/recipes-kernel/perf/perf.bb | 7 ++----- >>>> 1 file changed, 2 insertions(+), 5 deletions(-) >>>> >>>> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb >>>> index 6d1b06693d..a6fb51d3db 100644 >>>> --- a/meta/recipes-kernel/perf/perf.bb >>>> +++ b/meta/recipes-kernel/perf/perf.bb >>>> @@ -239,11 +239,8 @@ do_configure_prepend () { >>>> fi >>>> >>>> # use /usr/bin/env instead of version specific python >>>> - for s in `find ${S}/tools/perf/ -name '*.py'`; do >>>> - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" >>>> - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" >>>> - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" >>>> - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" >>>> + for s in `find ${S}/tools/perf/ -name '*.py'` ${S}/scripts/bpf_helpers_doc.py; do >>> >>> Do we have to hard code bpf_helpers_doc.py? It doesn't exist in older >>> versions (e.g. 4.14) and causes do_configure to fail. >> >> Probably not, I also stumbled into this problem. > > Yah, > > We can either just do the entire directory (but during the review, we > were talking about the fact that since we aren't using them, we don't > actually know if they are py3 safe, so blindly converting the shebang > isnt' a great idea either). > > But the solution we use in the devsrc recipe would work easily enough > here, just do $(find . -name ${S}/scripts/bpf_helpers_doc.py) and let > it return nothing for those older kernels. then perhaps its better to callout each script by name and check if that file exists, so older kernels can ignore that > > Bruce > >> >>> >>>> + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} >>>> done >>>> >>>> # unistd.h can be out of sync between libc-headers and the captured version in the perf source >>>> -- >>>> 2.24.1 >>>> >>>> -- >>>> _______________________________________________ >>>> Openembedded-core mailing list >>>> Openembedded-core at lists.openembedded.org >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > From raj.khem at gmail.com Fri Feb 21 22:45:33 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 14:45:33 -0800 Subject: [OE-core] [PATCH 0/4] Misc AUH suggested package upgrades Message-ID: <20200221224537.4052134-1-raj.khem@gmail.com> My share of pending updates Khem Raj (3): libxcrypt: Upgrade to 4.4.14 release go: Upgrade to 1.13.8 minor release gmp: Upgrade to 6.2.0 Upgrade Helper (1): ninja: upgrade 1.9.0 -> 1.10.0 ...t_4.4.12.bb => libxcrypt-compat_4.4.14.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- ...ibxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} | 0 meta/recipes-devtools/go/go-1.13.inc | 7 ++- .../ninja/ninja/fix-musl.patch | 46 ------------------- .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- .../recipes-support/gmp/gmp-6.1.2/amd64.patch | 18 -------- ...provided-flags-to-the-auto-detected-.patch | 0 ...-Believe-the-cflags-from-environment.patch | 16 +++---- .../{gmp-6.1.2 => gmp}/use-includedir.patch | 3 ++ .../gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} | 5 +- 11 files changed, 19 insertions(+), 84 deletions(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} (100%) delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch rename meta/recipes-devtools/ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} (87%) delete mode 100644 meta/recipes-support/gmp/gmp-6.1.2/amd64.patch rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch (100%) rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/0001-confiure.ac-Believe-the-cflags-from-environment.patch (80%) rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/use-includedir.patch (83%) rename meta/recipes-support/gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} (86%) -- 2.25.1 From raj.khem at gmail.com Fri Feb 21 22:45:34 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 14:45:34 -0800 Subject: [OE-core] [PATCH 1/4] libxcrypt: Upgrade to 4.4.14 release In-Reply-To: <20200221224537.4052134-1-raj.khem@gmail.com> References: <20200221224537.4052134-1-raj.khem@gmail.com> Message-ID: <20200221224537.4052134-2-raj.khem@gmail.com> Signed-off-by: Khem Raj --- .../{libxcrypt-compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../libxcrypt/{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.12.bb => libxcrypt-compat_4.4.14.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.12.bb => libxcrypt_4.4.14.bb} (100%) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 59744c0cf8..416205cd5c 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "21f93470aad8634fcf39f72db0b62642c7073a0c" +SRCREV = "5c43f7d56a31667bcdaa334bbb4edafb75672872" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb -- 2.25.1 From raj.khem at gmail.com Fri Feb 21 22:45:35 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 14:45:35 -0800 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: <20200221224537.4052134-1-raj.khem@gmail.com> References: <20200221224537.4052134-1-raj.khem@gmail.com> Message-ID: <20200221224537.4052134-3-raj.khem@gmail.com> From: Upgrade Helper Signed-off-by: Khem Raj --- .../ninja/ninja/fix-musl.patch | 46 ------------------- .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch rename meta/recipes-devtools/ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} (87%) diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch deleted file mode 100644 index 7fd779110d..0000000000 --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 -From: makepost -Date: Mon, 24 Dec 2018 03:13:16 +0200 -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 - -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward -compatibility macro. Should help avoid hardcoding platform detection. - -Signed-off-by: Oleksandr Kravchuk - -Upstream-Status: Pending ---- - src/disk_interface.cc | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/src/disk_interface.cc b/src/disk_interface.cc -index d4c2fb0..dc297c4 100644 ---- a/src/disk_interface.cc -+++ b/src/disk_interface.cc -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { - // that it doesn't exist. - if (st.st_mtime == 0) - return 1; --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) -+#if defined(_AIX) -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; -+#elif defined(__APPLE__) - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + - st.st_mtimespec.tv_nsec); --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar -- // For bionic, C and POSIX API is always enabled. -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; --#elif defined(_AIX) -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; - #else - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; - #endif --- -2.17.1 - diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb similarity index 87% rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb index f1236e8ac8..bdc6365052 100644 --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" DEPENDS = "re2c-native ninja-native" -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ - file://fix-musl.patch \ -" +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" S = "${WORKDIR}/git" -- 2.25.1 From raj.khem at gmail.com Fri Feb 21 22:45:36 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 14:45:36 -0800 Subject: [OE-core] [PATCH 3/4] go: Upgrade to 1.13.8 minor release In-Reply-To: <20200221224537.4052134-1-raj.khem@gmail.com> References: <20200221224537.4052134-1-raj.khem@gmail.com> Message-ID: <20200221224537.4052134-4-raj.khem@gmail.com> Signed-off-by: Khem Raj --- meta/recipes-devtools/go/go-1.13.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.13.inc index 39dbd742ec..7780aced89 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.13.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.13" -GO_MINOR = ".5" +GO_MINOR = ".8" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,6 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "ecd1729313608d3ef352ea4fd9ea42cd" -SRC_URI[main.sha256sum] = "27d356e2a0b30d9983b60a788cf225da5f914066b37a6b4f69d457ba55a626ff" - +SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" +SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" -- 2.25.1 From raj.khem at gmail.com Fri Feb 21 22:45:37 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 21 Feb 2020 14:45:37 -0800 Subject: [OE-core] [PATCH 4/4] gmp: Upgrade to 6.2.0 In-Reply-To: <20200221224537.4052134-1-raj.khem@gmail.com> References: <20200221224537.4052134-1-raj.khem@gmail.com> Message-ID: <20200221224537.4052134-5-raj.khem@gmail.com> Drop amd64 patch, the bsfq has been replaced with bsfl for count_trailing_zeros Forward port rest of patches to 6.2.0 Signed-off-by: Khem Raj --- meta/recipes-support/gmp/gmp-6.1.2/amd64.patch | 18 ------------------ ...-provided-flags-to-the-auto-detected-.patch | 0 ...c-Believe-the-cflags-from-environment.patch | 16 ++++++++-------- .../{gmp-6.1.2 => gmp}/use-includedir.patch | 3 +++ .../gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} | 5 ++--- 5 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-support/gmp/gmp-6.1.2/amd64.patch rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch (100%) rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/0001-confiure.ac-Believe-the-cflags-from-environment.patch (80%) rename meta/recipes-support/gmp/{gmp-6.1.2 => gmp}/use-includedir.patch (83%) rename meta/recipes-support/gmp/{gmp_6.1.2.bb => gmp_6.2.0.bb} (86%) diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch deleted file mode 100644 index 3935589f8b..0000000000 --- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - -Index: gmp-6.1.2/longlong.h -=================================================================== ---- gmp-6.1.2.orig/longlong.h -+++ gmp-6.1.2/longlong.h -@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype - count is only an int. */ - #define count_trailing_zeros(count, x) \ - do { \ -+ UDItype __cbtmp; \ - ASSERT ((x) != 0); \ -- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ -+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ -+ (count) = __cbtmp; \ - } while (0) - #endif /* __amd64__ */ - diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch similarity index 100% rename from meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch rename to meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch similarity index 80% rename from meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch rename to meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch index 1e47924ccc..56564db505 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -18,13 +18,11 @@ Upstream-Status: Inappropriate[OE-Specific] configure.ac | 11 ----------- 1 file changed, 11 deletions(-) -Index: gmp-6.1.2/configure.ac -=================================================================== ---- gmp-6.1.2.orig/configure.ac -+++ gmp-6.1.2/configure.ac -@@ -604,15 +604,6 @@ case $host in - any_32_testlist="sizeof-long-4" - any_64_testlist="sizeof-long-8" +--- a/configure.ac ++++ b/configure.ac +@@ -625,17 +625,6 @@ case $host in + any_32_testlist="sizeof-void*-4" + any_64_testlist="sizeof-void*-8" - # This is needed for clang, which is not content with flags like -mfpu=neon - # alone. @@ -33,12 +31,14 @@ Index: gmp-6.1.2/configure.ac - gcc_cflags_fpmode="-mfloat-abi=softfp" ;; - *-*-*eabihf) - gcc_cflags_fpmode="-mfloat-abi=hard" ;; +- *-*-mingw*) +- limb_64=longlong ;; - esac - # FIXME: We make mandatory compiler options optional here. We should # either enforce them, or organise to strip paths as the corresponding # options fail. -@@ -746,8 +737,6 @@ case $host in +@@ -780,8 +769,6 @@ case $host in ;; *) path="arm" diff --git a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/meta/recipes-support/gmp/gmp/use-includedir.patch similarity index 83% rename from meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch rename to meta/recipes-support/gmp/gmp/use-includedir.patch index 6b089cf39c..d27317cdf6 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch +++ b/meta/recipes-support/gmp/gmp/use-includedir.patch @@ -1,4 +1,7 @@ +exec includedir should be pointing to general yocto includdir + Upstream-Status: Pending +Signed-off-by: Khem Raj Index: gmp-6.1.2/Makefile.am =================================================================== diff --git a/meta/recipes-support/gmp/gmp_6.1.2.bb b/meta/recipes-support/gmp/gmp_6.2.0.bb similarity index 86% rename from meta/recipes-support/gmp/gmp_6.1.2.bb rename to meta/recipes-support/gmp/gmp_6.2.0.bb index c745dbbfe7..a19c74fca8 100644 --- a/meta/recipes-support/gmp/gmp_6.1.2.bb +++ b/meta/recipes-support/gmp/gmp_6.2.0.bb @@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ REVISION = "" SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ - file://amd64.patch \ file://use-includedir.patch \ file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ " -SRC_URI[md5sum] = "8ddbb26dc3bd4e2302984debba1406a5" -SRC_URI[sha256sum] = "5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2" +SRC_URI[md5sum] = "c24161e0dd44cae78cd5f67193492a21" +SRC_URI[sha256sum] = "f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea" acpaths = "" -- 2.25.1 From patchwork at patchwork.openembedded.org Fri Feb 21 23:02:27 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 21 Feb 2020 23:02:27 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_Misc_AUH_s?= =?utf-8?q?uggested_package_upgrades?= In-Reply-To: <20200221224537.4052134-1-raj.khem@gmail.com> References: <20200221224537.4052134-1-raj.khem@gmail.com> Message-ID: <20200221230227.2274.27731@do> == Series Details == Series: Misc AUH suggested package upgrades Revision: 1 URL : https://patchwork.openembedded.org/series/22856/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [2/4] ninja: upgrade 1.9.0 -> 1.10.0 Issue Invalid author in commit message [test_non_auh_upgrade] Suggested fix Resend the series with a valid patch's author If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From zhe.he at windriver.com Sat Feb 22 03:37:24 2020 From: zhe.he at windriver.com (zhe.he at windriver.com) Date: Sat, 22 Feb 2020 11:37:24 +0800 Subject: [OE-core] [PATCH v4] perf: Correct the substitution of python shebangs Message-ID: <1582342644-105534-1-git-send-email-zhe.he@windriver.com> From: He Zhe To make the native python3 always used, - Use sed one-liner instead - Add substitution for ${S}/scripts/bpf_helpers_doc.py to fix the following warning. File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' This issue is first reported by Joel Stanley The sed one-liner is credited to Anuj Mittal Signed-off-by: He Zhe --- v4: Use find to make it also work with older kernels that does not have bpf_helpers_doc.py meta/recipes-kernel/perf/perf.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6d1b06693d..10a5b88260 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -239,11 +239,8 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" - sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` `find ${S}/scripts/ -name 'bpf_helpers_doc.py'`; do + sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${s} done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- 2.24.1 From schnitzeltony at gmail.com Sat Feb 22 11:26:27 2020 From: schnitzeltony at gmail.com (=?UTF-8?q?Andreas=20M=C3=BCller?=) Date: Sat, 22 Feb 2020 12:26:27 +0100 Subject: [OE-core] [PATCH] webkitgtk: enable gobject-introspection for armv7a Message-ID: <20200222112627.17589-1-schnitzeltony@gmail.com> Tested with cortex-a9 machine * before this patch -> no gir * after: gir was built without issues Signed-off-by: Andreas M?ller --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a1dba73c51..a48a976f94 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -124,9 +124,5 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" -# qemu: uncaught target signal 11 (Segmentation fault) - core dumped -# Segmentation fault -GI_DATA_ENABLED_armv7a = "False" - # Can't be built with ccache CCACHE_DISABLE = "1" -- 2.21.0 From jupiter.hce at gmail.com Sat Feb 22 12:11:28 2020 From: jupiter.hce at gmail.com (JH) Date: Sat, 22 Feb 2020 23:11:28 +1100 Subject: [OE-core] Yocto systemd service have different enviornment than the root Message-ID: Hi, Where is the systemd service environment set from? Here is the systemd service env: SHLVL=1 JOURNAL_STREAM=8:30355 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin INVOCATION_ID=fbd7ba8782544a828902301423a98196 LANG=C PWD=/ How can I set up systemd service to use the root environment set up by /etc/profile? It is not neccesary to set up in my.service file, it can set up in a shell script my.sh called by service file: ExecStart=/usr/bin/my.sh Here is the root environment I login to it, set up in /etc/profile: # env USER=root SYSTEMD_PAGER=cat SHLVL=1 LD_LIBRARY_PATH=/data/lib HOME=/home/root OLDPWD=/data HUSHLOGIN=FALSE PS1=\u@\h:\w\$ LOGNAME=root TERM=xterm PATH=/usr/local/bin:/usr/bin:/bin:/data/bin:/data/sbin:/usr/local/sbin:/usr/sbin:/sbin LANG=C HZ=100 SHELL=/bin/sh PWD=/data/log EDITOR=vi Thank you. - jh From richard.purdie at linuxfoundation.org Sat Feb 22 14:01:56 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 22 Feb 2020 14:01:56 +0000 Subject: [OE-core] [PATCH 1/2] binutils: Fix x86_64 override usage Message-ID: <20200222140157.253097-1-richard.purdie@linuxfoundation.org> This override was applying to binutils-native meaning it would behave differently depending upon the host it was building on. This is not a good idea and we have tests to detect it which failed: oe-selftest -r sstatetests.SStateTests.test_sstate_32_64_same_hash binutils-native already enables all targets so we can avoid issues by not setting this option in the native case. Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 5b4a3392092..6ed40a14861 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -75,9 +75,12 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ --enable-deterministic-archives \ --enable-plugins \ ${LDGOLD} \ + ${EXTRA_TARGETS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" -EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS = "" +EXTRA_TARGETS_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS_class-native = "" LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" -- 2.25.0 From richard.purdie at linuxfoundation.org Sat Feb 22 14:01:57 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 22 Feb 2020 14:01:57 +0000 Subject: [OE-core] [PATCH 2/2] psplash: Add missing dependency to systemd service In-Reply-To: <20200222140157.253097-1-richard.purdie@linuxfoundation.org> References: <20200222140157.253097-1-richard.purdie@linuxfoundation.org> Message-ID: <20200222140157.253097-2-richard.purdie@linuxfoundation.org> Avoid: qemux86-64 psplash-systemd[135]: Error unable to open fifo by adding the missing dependency on /run/ where the fifo resides. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-systemd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service index e14f42032d8..e6de450882f 100644 --- a/meta/recipes-core/psplash/files/psplash-systemd.service +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -2,6 +2,7 @@ Description=Start psplash-systemd progress communication helper DefaultDependencies=no After=systemd-start.service +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash-systemd -- 2.25.0 From richard.purdie at linuxfoundation.org Sat Feb 22 14:11:21 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 22 Feb 2020 14:11:21 +0000 Subject: [OE-core] [PATCH V2] alsa-utils: upgrade 1.2.1 -> 1.2.2 In-Reply-To: <20200220182537.4423-1-praveen@linumiz.com> References: <20200220182537.4423-1-praveen@linumiz.com> Message-ID: <054a99af2dfbeed2fcf000423304959f17f0be96.camel@linuxfoundation.org> On Thu, 2020-02-20 at 23:55 +0530, Praveen Muthusamy wrote: > Signed-off-by: Praveen Muthusamy > --- > ...lsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} | 0 > .../alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} | 4 > ++-- > 2 files changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.1.bb => > alsa-utils-scripts_1.2.2.bb} (100%) > rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.1.bb => alsa- > utils_1.2.2.bb} (97%) Thanks for the patch. Unfortunately there is something wrong somewhere as this seemed to cause this failure: https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1600 Cheers, Richard From patchwork at patchwork.openembedded.org Sat Feb 22 14:32:33 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sat, 22 Feb 2020 14:32:33 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_=22binutil?= =?utf-8?q?s=3A_Fix_x86=5F64_override_=2E=2E=2E=22_and_1_more?= In-Reply-To: <20200222140157.253097-1-richard.purdie@linuxfoundation.org> References: <20200222140157.253097-1-richard.purdie@linuxfoundation.org> Message-ID: <20200222143233.2277.77222@do> == Series Details == Series: "binutils: Fix x86_64 override ..." and 1 more Revision: 1 URL : https://patchwork.openembedded.org/series/22862/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 1d8e5d1bc1) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From alex.kanavin at gmail.com Sat Feb 22 15:30:18 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 22 Feb 2020 16:30:18 +0100 Subject: [OE-core] [PATCH] wayland: add a patch to address build errors due to incorrect deps Message-ID: <20200222153018.11874-1-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...missing-dependencies-on-protocol-hea.patch | 115 ++++++++++++++++++ .../wayland/wayland_1.18.0.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch diff --git a/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch new file mode 100644 index 0000000000..61de0e04e8 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch @@ -0,0 +1,115 @@ +From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Sat, 15 Feb 2020 02:03:45 +0000 +Subject: [PATCH] meson/tests: add missing dependencies on protocol headers + +In file included from ../tests/connection-test.c:43: +In file included from ../tests/test-compositor.h:30: +../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found + #include "wayland-client-protocol.h" + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from ../tests/display-test.c:45: +In file included from ../src/wayland-server.h:104: +src/wayland-server-protocol.h:4454:2: error: unterminated /* comment + /** + ^ +In file included from ../tests/cpp-compile-test.cpp:2: +In file included from src/wayland-server-protocol.h:8: +In file included from ../src/wayland-server.h:104: +src/wayland-server-protocol.h:3:2: error: unterminated conditional directive + #ifndef WAYLAND_SERVER_PROTOCOL_H + ^ +../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h! + #error including wayland-server-protocol.h did not include wayland-server.h! + ^ +In file included from ../tests/headers-protocol-test.c:26: +In file included from src/wayland-client-protocol.h:8: +In file included from ../src/wayland-client.h:40: +src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive + #ifndef WL_SHM_FORMAT_ENUM + ^ +In file included from ../tests/protocol-logger-test.c:34: +In file included from ../src/wayland-client.h:40: +src/wayland-client-protocol.h:2613:1: error: unterminated /* comment +/** +^ +../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface' + res = wl_resource_create(client, &wl_seat_interface, 4, 0); + ^ +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + tests/meson.build | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index c28a2a3..f1af7b4 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -69,7 +69,7 @@ test( + executable( + 'cpp-compile-test', + 'cpp-compile-test.cpp', +- wayland_server_protocol_core_h, ++ wayland_server_protocol_h, + include_directories: src_inc + ) + ) +@@ -91,17 +91,25 @@ tests = { + 'array-test': [], + 'client-test': [ wayland_server_protocol_h ], + 'display-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + tests_server_protocol_h, + tests_client_protocol_c, + tests_protocol_c, + ], +- 'connection-test': [ wayland_server_protocol_h ], ++ 'connection-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, ++ ], + 'event-loop-test': [ wayland_server_protocol_h ], + 'fixed-test': [], + 'interface-test': [ wayland_client_protocol_h ], + 'list-test': [], + 'map-test': [], +- 'sanity-test' : [ wayland_server_protocol_h ], ++ 'sanity-test' : [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, ++ ], + 'socket-test': [ + wayland_client_protocol_h, + wayland_server_protocol_h, +@@ -116,7 +124,7 @@ tests = { + files('../src/wayland-server.c'), + wayland_server_protocol_h, + ], +- 'resources-test': [ wayland_server_protocol_core_h ], ++ 'resources-test': [ wayland_server_protocol_h ], + 'message-test': [ + wayland_client_protocol_h, + wayland_server_protocol_h, +@@ -126,14 +134,16 @@ tests = { + wayland_server_protocol_h, + ], + 'protocol-logger-test': [ +- wayland_server_protocol_core_h, +- wayland_client_protocol_core_h, ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + ], + 'headers-test': [ ++ wayland_client_protocol_h, ++ wayland_server_protocol_h, + 'headers-protocol-test.c', +- 'headers-protocol-core-test.c', +- wayland_server_protocol_core_h, + wayland_client_protocol_core_h, ++ wayland_server_protocol_core_h, ++ 'headers-protocol-core-test.c', + ], + 'os-wrappers-test': [], + } diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 6a6e7495b5..5dc31163da 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -16,6 +16,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ + file://0001-meson-tests-add-missing-dependencies-on-protocol-hea.patch \ " SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65" SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d" -- 2.25.0 From richard.purdie at linuxfoundation.org Sat Feb 22 15:48:25 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 22 Feb 2020 15:48:25 +0000 Subject: [OE-core] [PATCH 2/2] psplash: Add missing dependency to systemd service In-Reply-To: <20200222140157.253097-2-richard.purdie@linuxfoundation.org> References: <20200222140157.253097-1-richard.purdie@linuxfoundation.org> <20200222140157.253097-2-richard.purdie@linuxfoundation.org> Message-ID: On Sat, 2020-02-22 at 14:01 +0000, Richard Purdie wrote: > Avoid: > qemux86-64 psplash-systemd[135]: Error unable to open fifo > > by adding the missing dependency on /run/ where the fifo resides. > > Signed-off-by: Richard Purdie > --- > meta/recipes-core/psplash/files/psplash-systemd.service | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service > b/meta/recipes-core/psplash/files/psplash-systemd.service > index e14f42032d8..e6de450882f 100644 > --- a/meta/recipes-core/psplash/files/psplash-systemd.service > +++ b/meta/recipes-core/psplash/files/psplash-systemd.service > @@ -2,6 +2,7 @@ > Description=Start psplash-systemd progress communication helper > DefaultDependencies=no > After=systemd-start.service > +RequiresMountsFor=/run > > [Service] > ExecStart=/usr/bin/psplash-systemd This doesn't help, the dependencies between the service files are reversed as well. Working on a new version. Cheers, Richard From praveen.lisieux2011 at gmail.com Sat Feb 22 17:19:32 2020 From: praveen.lisieux2011 at gmail.com (Praveen Muthusamy) Date: Sat, 22 Feb 2020 22:49:32 +0530 Subject: [OE-core] [PATCH V3] alsa-utils: upgrade 1.2.1 -> 1.2.2 Message-ID: <20200222171932.11494-1-praveen.lisieux2011@gmail.com> From: Praveen Muthusamy Signed-off-by: Praveen Muthusamy --- ...lsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} | 0 .../alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} (100%) rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} (97%) diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb similarity index 100% rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb index 9144af628a..8bbc5d3ef3 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb @@ -21,8 +21,8 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" -SRC_URI[md5sum] = "c4628bae7632937eac2de4cf2a3de82e" -SRC_URI[sha256sum] = "0b110ba71ef41d3009db1bc4dcae0cf79efb99cb5426fa19d0312470560a2c0d" +SRC_URI[md5sum] = "00612234ff4722c8f7f8f7a83ff9bc63" +SRC_URI[sha256sum] = "44807bd578c5f6df6e91a11b8d37e546424a5a1ea8d8e659ee359fe01730e4f3" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with -- 2.17.1 From martin.jansa at gmail.com Sat Feb 22 17:48:42 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Sat, 22 Feb 2020 18:48:42 +0100 Subject: [OE-core] [oe-commits] [openembedded-core] 06/26: webkitgtk: unbreak wayland build In-Reply-To: <20200221093921.880D82328BD@git.openembedded.org> References: <158227796073.14405.8091912688817468758@git.openembedded.org> <20200221093921.880D82328BD@git.openembedded.org> Message-ID: <20200222174842.3q75aclj43asd45k@jama> On Fri, Feb 21, 2020 at 09:39:26AM +0000, git at git.openembedded.org wrote: > This is an automated email from the git hooks/post-receive script. > > rpurdie pushed a commit to branch master > in repository openembedded-core. > > commit 85431fe5c16ce1aa0916e57e820ff69c5aa0612a > Author: Alexander Kanavin > AuthorDate: Wed Feb 19 20:47:42 2020 +0100 > > webkitgtk: unbreak wayland build > > webkit nowadays requires a couple of supplementary libraries for this, > so bring them in (courtesy of meta-webkit[1], which will hopefully > adjust without a lot of trouble). > > [1] https://github.com/Igalia/meta-webkit/ > > [RP: Add missing maintainers entries] > Signed-off-by: Alexander Kanavin > Signed-off-by: Richard Purdie > --- > meta/conf/distro/include/maintainers.inc | 2 ++ > meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++ > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- > meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++ These need opengl in DISTRO_FEATURES, will send a fix for that. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From martin.jansa at gmail.com Sat Feb 22 17:49:01 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Sat, 22 Feb 2020 18:49:01 +0100 Subject: [OE-core] [PATCH] libwpe, wpebackend-fdo: add opengl to required DISTRO_FEATURES Message-ID: <20200222174901.20638-1-Martin.Jansa@gmail.com> * requires virtual/egl which isn't available without opengl in DISTRO_FEATURES as shown in world builds without it: ERROR: Nothing PROVIDES 'virtual/egl' (but openembedded-core/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb, openembedded-core/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb DEPENDS on or otherwise requires it) $ bitbake libwpe NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'virtual/egl' (but /OE/build/oe-core/openembedded-core/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb DEPENDS on or otherwise requires it). Close matches: virtual/kernel virtual/make virtual/perf ERROR: Required build target 'libwpe' has no buildable providers. Missing or unbuildable dependency chain was: ['libwpe', 'virtual/egl'] $ bitbake wpebackend-fdo NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'virtual/egl' (but /OE/build/oe-core/openembedded-core/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb DEPENDS on or otherwise requires it). Close matches: virtual/kernel virtual/make virtual/perf ERROR: Required build target 'wpebackend-fdo' has no buildable providers. Missing or unbuildable dependency chain was: ['wpebackend-fdo', 'virtual/egl'] $ bitbake webkitgtk ERROR: Nothing PROVIDES 'webkitgtk' webkitgtk was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES) Signed-off-by: Martin Jansa --- meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 4 +++- meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb index 346ca9b1d8..12499ff281 100644 --- a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb @@ -9,7 +9,9 @@ DEPENDS = "virtual/egl libxkbcommon" # Workaround build issue with RPi userland EGL libraries. CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" -inherit cmake +inherit cmake features_check + +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb index 7db5806d9d..cd2f7fabda 100644 --- a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb @@ -8,7 +8,9 @@ DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" DEPENDS_append_class-target = " wayland-native" -inherit cmake +inherit cmake features_check + +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" -- 2.20.1 From akuster808 at gmail.com Sat Feb 22 18:34:42 2020 From: akuster808 at gmail.com (akuster808) Date: Sat, 22 Feb 2020 10:34:42 -0800 Subject: [OE-core] [zeus][PATCH] sqlite: fix numerous CVEs In-Reply-To: <20200221205942.27168-1-bunk@stusta.de> References: <20200221205942.27168-1-bunk@stusta.de> Message-ID: Adrian, On 2/21/20 12:59 PM, Adrian Bunk wrote: > From: Ross Burton > > Fix the following CVEs: > > - CVE-2019-19244 > - CVE-2019-19880 > - CVE-2019-19923 > - CVE-2019-19924 > - CVE-2019-19925 > - CVE-2019-19926 > - CVE-2019-19959 > - CVE-2019-20218 > > Signed-off-by: Ross Burton > Signed-off-by: Richard Purdie > Signed-off-by: Adrian Bunk Thanks for backporting these changes. One question. The master commit f3ebf3f8dd0b4d144db451a8fcb352762f7fbd75 has merge conflicts and there is no mention in the commit message that you made any changes to get them to apply. Did you have to fixup any of the patches? Master and Zeus have different versions of sqlite. - armin > --- > .../sqlite/sqlite3/CVE-2019-19244.patch | 33 ++++++++++ > .../sqlite/sqlite3/CVE-2019-19880.patch | 33 ++++++++++ > .../sqlite/sqlite3/CVE-2019-19923.patch | 50 ++++++++++++++ > .../sqlite/sqlite3/CVE-2019-19924.patch | 65 +++++++++++++++++++ > .../sqlite/sqlite3/CVE-2019-19925.patch | 33 ++++++++++ > .../sqlite/sqlite3/CVE-2019-19926.patch | 31 +++++++++ > .../sqlite/sqlite3/CVE-2019-19959.patch | 46 +++++++++++++ > .../sqlite/sqlite3/CVE-2019-20218.patch | 31 +++++++++ > meta/recipes-support/sqlite/sqlite3_3.29.0.bb | 11 +++- > 9 files changed, 332 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch > > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch > new file mode 100644 > index 0000000000..3f70979acc > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch > @@ -0,0 +1,33 @@ > +CVE: CVE-2019-19244 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 0f690d4ae5ffe656762fdbb7f36cc4c2dcbb2d9d Mon Sep 17 00:00:00 2001 > +From: dan > +Date: Fri, 22 Nov 2019 10:14:01 +0000 > +Subject: [PATCH] Fix a crash that could occur if a sub-select that uses both > + DISTINCT and window functions also used an ORDER BY that is the same as its > + select list. > + > +Amalgamation version of the patch: > +FossilOrigin-Name: bcdd66c1691955c697f3d756c2b035acfe98f6aad72e90b0021bab6e9023b3ba > +--- > + sqlite3.c | 5 +++-- > + sqlite3.h | 2 +- > + 2 files changed, 4 insertions(+), 3 deletions(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index 8fd740b..db1c649 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( > + */ > + if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct > + && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 > ++ && p->pWin==0 > + ){ > + p->selFlags &= ~SF_Distinct; > + pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch > new file mode 100644 > index 0000000000..ca5c31c57b > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch > @@ -0,0 +1,33 @@ > +CVE: CVE-2019-19880 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 3622d20ad10dfac9586d4423547ed960cbc66fcf Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Wed, 18 Dec 2019 00:05:50 +0000 > +Subject: [PATCH] When processing constant integer values in ORDER BY clauses > + of window definitions (see check-in [7e4 --- > + > +--- > + sqlite3.c | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index db1c649..a83b3d2 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -147584,9 +147584,11 @@ static ExprList *exprListAppendList( > + int nInit = pList ? pList->nExpr : 0; > + for(i=0; inExpr; i++){ > + Expr *pDup = sqlite3ExprDup(pParse->db, pAppend->a[i].pExpr, 0); > ++ assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) ); > + if( bIntToNull && pDup && pDup->op==TK_INTEGER ){ > + pDup->op = TK_NULL; > + pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse); > ++ pDup->u.zToken = 0; > + } > + pList = sqlite3ExprListAppend(pParse, pList, pDup); > + if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags; > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch > new file mode 100644 > index 0000000000..b1b866b250 > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch > @@ -0,0 +1,50 @@ > +CVE: CVE-2019-19923 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From b64463719dc53bde98b0ce3930b10a32560c3a02 Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Wed, 18 Dec 2019 20:51:58 +0000 > +Subject: [PATCH] Continue to back away from the LEFT JOIN optimization of > + check-in [41c27bc0ff1d3135] by disallowing query flattening if the outer > + query is DISTINCT. Without this fix, if an index scan is run on the table > + within the view on the right-hand side of the LEFT JOIN, stale result > + registers might be accessed yielding incorrect results, and/or an > + OP_IfNullRow opcode might be invoked on the un-opened table, resulting in a > + NULL-pointer dereference. This problem was found by the Yongheng and Rui > + fuzzer. > + > +FossilOrigin-Name: 862974312edf00e9d1068115d1a39b7235b7db68b6d86b81d38a12f025a4748e > +--- > + sqlite3.c | 10 +++++++--- > + 1 file changed, 7 insertions(+), 3 deletions(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index d29da07..5bc06c8 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -129216,6 +129216,7 @@ static void substSelect( > + ** (3b) the FROM clause of the subquery may not contain a virtual > + ** table and > + ** (3c) the outer query may not be an aggregate. > ++** (3d) the outer query may not be DISTINCT. > + ** > + ** (4) The subquery can not be DISTINCT. > + ** > +@@ -129412,8 +129413,11 @@ static int flattenSubquery( > + */ > + if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){ > + isLeftJoin = 1; > +- if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){ > +- /* (3a) (3c) (3b) */ > ++ if( pSubSrc->nSrc>1 /* (3a) */ > ++ || isAgg /* (3b) */ > ++ || IsVirtual(pSubSrc->a[0].pTab) /* (3c) */ > ++ || (p->selFlags & SF_Distinct)!=0 /* (3d) */ > ++ ){ > + return 0; > + } > + } > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch > new file mode 100644 > index 0000000000..80d5edbb0c > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch > @@ -0,0 +1,65 @@ > +CVE: CVE-2019-19924 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 854fe21e8a987f84da81f6bb9e90abc5355c6621 Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Thu, 19 Dec 2019 20:37:32 +0000 > +Subject: [PATCH] When an error occurs while rewriting the parser tree for > + window functions in the sqlite3WindowRewrite() routine, make sure that > + pParse->nErr is set, and make sure that this shuts down any subsequent code > + generation that might depend on the transformations that were implemented. > + This fixes a problem discovered by the Yongheng and Rui fuzzer. > + > +Amalgamation format of backported patch > +FossilOrigin-Name: e2bddcd4c55ba3cbe0130332679ff4b048630d0ced9a8899982edb5a3569ba7f > +--- > + sqlite3.c | 16 +++++++++++----- > + sqlite3.h | 2 +- > + 2 files changed, 12 insertions(+), 6 deletions(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index 408ec4c..857c28e 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -77798,7 +77798,8 @@ SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse *pParse, Index *pIdx){ > + */ > + static void vdbeVComment(Vdbe *p, const char *zFormat, va_list ap){ > + assert( p->nOp>0 || p->aOp==0 ); > +- assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed ); > ++ assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed > ++ || p->pParse->nErr>0 ); > + if( p->nOp ){ > + assert( p->aOp ); > + sqlite3DbFree(p->db, p->aOp[p->nOp-1].zComment); > +@@ -97872,6 +97873,7 @@ static int codeCompare( > + int addr; > + CollSeq *p4; > + > ++ if( pParse->nErr ) return 0; > + p4 = sqlite3BinaryCompareCollSeq(pParse, pLeft, pRight); > + p5 = binaryCompareP5(pLeft, pRight, jumpIfNull); > + addr = sqlite3VdbeAddOp4(pParse->pVdbe, opcode, in2, dest, in1, > +@@ -147627,7 +147629,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ > + > + pTab = sqlite3DbMallocZero(db, sizeof(Table)); > + if( pTab==0 ){ > +- return SQLITE_NOMEM; > ++ return sqlite3ErrorToParser(db, SQLITE_NOMEM); > + } > + > + p->pSrc = 0; > +@@ -147731,6 +147733,10 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ > + sqlite3DbFree(db, pTab); > + } > + > ++ if( rc && pParse->nErr==0 ){ > ++ assert( pParse->db->mallocFailed ); > ++ return sqlite3ErrorToParser(pParse->db, SQLITE_NOMEM); > ++ } > + return rc; > + } > + > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch > new file mode 100644 > index 0000000000..ffc2c6afff > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch > @@ -0,0 +1,33 @@ > +CVE: CVE-2019-19925 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From e92580434d2cdca228649d32f76167492de4f512 Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Thu, 19 Dec 2019 15:15:40 +0000 > +Subject: [PATCH] Fix the zipfile extension so that INSERT works even if the > + pathname of the file being inserted is a NULL. Bug discovered by the > + Yongheng and Rui fuzzer. > + > +FossilOrigin-Name: a80f84b511231204658304226de3e075a55afc2e3f39ac063716f7a57f585c06 > +--- > + shell.c | 1 + > + sqlite3.c | 4 ++-- > + sqlite3.h | 2 +- > + 3 files changed, 4 insertions(+), 3 deletions(-) > + > +diff --git a/shell.c b/shell.c > +index 053180c..404a8d4 100644 > +--- a/shell.c > ++++ b/shell.c > +@@ -5827,6 +5827,7 @@ static int zipfileUpdate( > + > + if( rc==SQLITE_OK ){ > + zPath = (const char*)sqlite3_value_text(apVal[2]); > ++ if( zPath==0 ) zPath = ""; > + nPath = (int)strlen(zPath); > + mTime = zipfileGetTime(apVal[4]); > + } > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch > new file mode 100644 > index 0000000000..92bc7908bc > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch > @@ -0,0 +1,31 @@ > +CVE: CVE-2019-19926 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 4165b1e1e0001165ace9051a70f938099505eadc Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Thu, 19 Dec 2019 22:08:19 +0000 > +Subject: [PATCH] Continuation of [e2bddcd4c55ba3cb]: Add another spot where it > + is necessary to abort early due to prior errors in sqlite3WindowRewrite(). > + > +FossilOrigin-Name: cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2 > +--- > + sqlite3.c | 7 ++++--- > + sqlite3.h | 2 +- > + 2 files changed, 5 insertions(+), 4 deletions(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index 857c28e..19a474d 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -128427,6 +128427,7 @@ static int multiSelect( > + } > + #endif > + } > ++ if( pParse->nErr ) goto multi_select_end; > + > + /* Compute collating sequences used by > + ** temporary tables needed to implement the compound select. > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch > new file mode 100644 > index 0000000000..cba8ec9d30 > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch > @@ -0,0 +1,46 @@ > +CVE: CVE-2019-19959 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From f83f7e8141ee7cbbf7f2dc8985279a7372b259b6 Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Mon, 23 Dec 2019 21:04:33 +0000 > +Subject: [PATCH] Fix the zipfile() function in the zipfile extension so that > + it is able to deal with goofy filenames that contain embedded zeros. > + > +FossilOrigin-Name: cc0fb00a128fd0773db5ff7891f7aa577a3671d570166d2cbb30df922344adcf > +--- > + shell.c | 4 ++-- > + sqlite3.c | 4 ++-- > + sqlite3.h | 2 +- > + 3 files changed, 5 insertions(+), 5 deletions(-) > + > +diff --git a/shell.c b/shell.c > +index 404a8d4..48065e9 100644 > +--- a/shell.c > ++++ b/shell.c > +@@ -5841,7 +5841,7 @@ static int zipfileUpdate( > + zFree = sqlite3_mprintf("%s/", zPath); > + if( zFree==0 ){ rc = SQLITE_NOMEM; } > + zPath = (const char*)zFree; > +- nPath++; > ++ nPath = (int)strlen(zPath); > + } > + } > + > +@@ -6242,11 +6242,11 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){ > + }else{ > + if( zName[nName-1]!='/' ){ > + zName = zFree = sqlite3_mprintf("%s/", zName); > +- nName++; > + if( zName==0 ){ > + rc = SQLITE_NOMEM; > + goto zipfile_step_out; > + } > ++ nName = (int)strlen(zName); > + }else{ > + while( nName>1 && zName[nName-2]=='/' ) nName--; > + } > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch > new file mode 100644 > index 0000000000..fb6cd6df2d > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch > @@ -0,0 +1,31 @@ > +CVE: CVE-2019-20218 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 6bbd76d34f29f61483791231f2ce579dcadab8a5 Mon Sep 17 00:00:00 2001 > +From: Dan Kennedy > +Date: Fri, 27 Dec 2019 20:54:42 +0000 > +Subject: [PATCH] Do not attempt to unwind the WITH stack in the Parse object > + following an error. This fixes a separate case to [de6e6d68]. > + > +FossilOrigin-Name: d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92 > +--- > + sqlite3.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index 5bc06c8..408ec4c 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -130570,7 +130570,7 @@ static int selectExpander(Walker *pWalker, Select *p){ > + > + /* Process NATURAL keywords, and ON and USING clauses of joins. > + */ > +- if( db->mallocFailed || sqliteProcessJoin(pParse, p) ){ > ++ if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){ > + return WRC_Abort; > + } > + > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3_3.29.0.bb b/meta/recipes-support/sqlite/sqlite3_3.29.0.bb > index 34066fbe89..61145851be 100644 > --- a/meta/recipes-support/sqlite/sqlite3_3.29.0.bb > +++ b/meta/recipes-support/sqlite/sqlite3_3.29.0.bb > @@ -4,6 +4,15 @@ LICENSE = "PD" > LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" > > SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \ > - file://0001-Fix-CVE-2019-16168.patch" > + file://0001-Fix-CVE-2019-16168.patch \ > + file://CVE-2019-19244.patch \ > + file://CVE-2019-19880.patch \ > + file://CVE-2019-19923.patch \ > + file://CVE-2019-19924.patch \ > + file://CVE-2019-19925.patch \ > + file://CVE-2019-19926.patch \ > + file://CVE-2019-19959.patch \ > + file://CVE-2019-20218.patch \ > +" > SRC_URI[md5sum] = "8f3dfe83387e62ecb91c7c5c09c688dc" > SRC_URI[sha256sum] = "8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b" -------------- next part -------------- An HTML attachment was scrubbed... URL: From akuster808 at gmail.com Sat Feb 22 18:50:13 2020 From: akuster808 at gmail.com (akuster808) Date: Sat, 22 Feb 2020 10:50:13 -0800 Subject: [OE-core] [zeus][PATCH 1/2] libxml2: fix CVE-2020-7595 In-Reply-To: <20200221210032.3414-1-bunk@stusta.de> References: <20200221210032.3414-1-bunk@stusta.de> Message-ID: <3a180667-45cb-a15a-8f6b-20d49802ee71@gmail.com> On 2/21/20 1:00 PM, Adrian Bunk wrote: > From: Anuj Mittal > > Signed-off-by: Anuj Mittal > Signed-off-by: Richard Purdie > Signed-off-by: Adrian Bunk Is this a backport from Master? please include masters commit id. Since Master and Zeus are at different versions, was there anything you had to do to make this apply to Zeus? I have adopted the kernel stable note of [Fixup for XXX context] so the folks know things had to be tweaked from the original commit. - Armin > --- > .../libxml/libxml2/CVE-2020-7595.patch | 36 +++++++++++++++++++ > meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + > 2 files changed, 37 insertions(+) > create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch > > diff --git a/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch > new file mode 100644 > index 0000000000..facfefd362 > --- /dev/null > +++ b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch > @@ -0,0 +1,36 @@ > +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 > +From: Zhipeng Xie > +Date: Thu, 12 Dec 2019 17:30:55 +0800 > +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities > + > +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef > +return NULL which cause a infinite loop in xmlStringLenDecodeEntities > + > +Found with libFuzzer. > + > +Signed-off-by: Zhipeng Xie > + > +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076] > +CVE: CVE-2020-7595 > +Signed-off-by: Anuj Mittal > +--- > + parser.c | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/parser.c b/parser.c > +index d1c31963..a34bb6cd 100644 > +--- a/parser.c > ++++ b/parser.c > +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, > + else > + c = 0; > + while ((c != 0) && (c != end) && /* non input consuming loop */ > +- (c != end2) && (c != end3)) { > ++ (c != end2) && (c != end3) && > ++ (ctxt->instate != XML_PARSER_EOF)) { > + > + if (c == 0) break; > + if ((c == '&') && (str[1] == '#')) { > +-- > +2.24.1 > + > diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb > index c44a90b1c2..5797dd6bee 100644 > --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb > +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb > @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ > file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ > file://fix-execution-of-ptests.patch \ > file://Fix-CVE-2019-19956.patch \ > + file://CVE-2020-7595.patch \ > " > > SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6" From jpuhlman at mvista.com Sat Feb 22 18:54:00 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Sat, 22 Feb 2020 10:54:00 -0800 Subject: [OE-core] [PATCH] readline/ediline: Fix conflicting manpages. Message-ID: <20200222185400.32136-1-jpuhlman@mvista.com> From: Jeremy Puhlman file /usr/share/man/man3/history.3 conflicts between attempted installs of libedit-doc-20191231+3.1-r0.corei7_64 and readline-doc-8.0-r0.corei7_64 Signed-off-by: Jeremy A. Puhlman --- meta/recipes-core/readline/readline.inc | 8 +++++++- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 07f54a76f1..4babcbd69a 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk" CONFFILES_${PN} += "${sysconfdir}/inputrc" +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" + # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. SRC_URI_append_class-native = " file://rl-native.map" -LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" \ No newline at end of file +LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 7116c9ddbc..267fdcc54a 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -17,3 +17,9 @@ SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416" SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071" BBCLASSEXTEND = "native nativesdk" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- 2.20.1 From bunk at stusta.de Sat Feb 22 20:58:20 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sat, 22 Feb 2020 22:58:20 +0200 Subject: [OE-core] [zeus][PATCH] sqlite: fix numerous CVEs In-Reply-To: References: <20200221205942.27168-1-bunk@stusta.de> Message-ID: <20200222205820.GA9628@localhost> On Sat, Feb 22, 2020 at 10:34:42AM -0800, akuster808 wrote: > Adrian, > > On 2/21/20 12:59 PM, Adrian Bunk wrote: > > From: Ross Burton > > > > Fix the following CVEs: > > > > - CVE-2019-19244 > > - CVE-2019-19880 > > - CVE-2019-19923 > > - CVE-2019-19924 > > - CVE-2019-19925 > > - CVE-2019-19926 > > - CVE-2019-19959 > > - CVE-2019-20218 > > > > Signed-off-by: Ross Burton > > Signed-off-by: Richard Purdie > > Signed-off-by: Adrian Bunk > > Thanks for backporting these changes. One question. The master commit > f3ebf3f8dd0b4d144db451a8fcb352762f7fbd75 > > has merge conflicts The patches are new files, so merge conflicts are impossbile on them (they might not apply, but git does not even know that they are patches). > and there is no mention in the commit message that > you made any changes to get them to apply. > > Did you have to fixup any of the patches? No. > Master and Zeus have different versions of sqlite. Yes, changing SRC_URI in the correct file was the trivial change needed. > - armin cu Adrian From rpjday at crashcourse.ca Sat Feb 22 20:59:07 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sat, 22 Feb 2020 15:59:07 -0500 (EST) Subject: [OE-core] can i totally ignore recipes not related to the current build? Message-ID: i have a layer (from elsewhere) that needs massive migration, and generates numerous parse errors, almost all related to a specialized image. my normal workflow is to try to build for an absolutely stock core-image-minimal, so i don't care about any recipes or .bbappends that don't contribute to that. regardless (AIUI), all recipes in all included layers will at least be *parsed* for syntactic correctness, even if they don't contribute to the final image, so i'd like a way to somehow totally ignore all processing of recipes that don't do that. i'm aware of PNBLACKLIST, but i'm sure i verified that that simply won't *build* that recipe, but it will still be parsed. is there a way to utterly ignore recipes that don't contribute to a given target? i'm sure there must be, i've just never had need for that until now. rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== From alex.kanavin at gmail.com Sat Feb 22 21:00:01 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 22 Feb 2020 22:00:01 +0100 Subject: [OE-core] can i totally ignore recipes not related to the current build? In-Reply-To: References: Message-ID: BBMASK? Alex On Sat, 22 Feb 2020 at 21:59, Robert P. J. Day wrote: > > i have a layer (from elsewhere) that needs massive migration, and > generates numerous parse errors, almost all related to a specialized > image. my normal workflow is to try to build for an absolutely stock > core-image-minimal, so i don't care about any recipes or .bbappends > that don't contribute to that. > > regardless (AIUI), all recipes in all included layers will at least > be *parsed* for syntactic correctness, even if they don't contribute > to the final image, so i'd like a way to somehow totally ignore all > processing of recipes that don't do that. > > i'm aware of PNBLACKLIST, but i'm sure i verified that that simply > won't *build* that recipe, but it will still be parsed. is there a way > to utterly ignore recipes that don't contribute to a given target? i'm > sure there must be, i've just never had need for that until now. > > rday > > -- > > ======================================================================== > Robert P. J. Day Ottawa, Ontario, CANADA > http://crashcourse.ca > > Twitter: http://twitter.com/rpjday > LinkedIn: http://ca.linkedin.com/in/rpjday > ======================================================================== > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From rpjday at crashcourse.ca Sat Feb 22 21:03:23 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sat, 22 Feb 2020 16:03:23 -0500 (EST) Subject: [OE-core] can i totally ignore recipes not related to the current build? In-Reply-To: References: Message-ID: On Sat, 22 Feb 2020, Alexander Kanavin wrote: > BBMASK? thank you. i knew there was something, i was just drawing a blank and i can't remember the last time i needed to do that. rday From rpjday at crashcourse.ca Sat Feb 22 21:07:56 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sat, 22 Feb 2020 16:07:56 -0500 (EST) Subject: [OE-core] can i totally ignore recipes not related to the current build? In-Reply-To: References: Message-ID: On Sat, 22 Feb 2020, Alexander Kanavin wrote: > BBMASK? BTW, that will work for me in this situation but is there a way to not have to enumerate all the recipes to ignore, and just say, "don't look at anything that is not related to building core-image-minimal?" *that* would be seriously useful, because there's going to be a *ton* of recipes i need to ignore. rday From bunk at stusta.de Sat Feb 22 21:12:34 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sat, 22 Feb 2020 23:12:34 +0200 Subject: [OE-core] [zeus][PATCH 1/2] libxml2: fix CVE-2020-7595 In-Reply-To: <3a180667-45cb-a15a-8f6b-20d49802ee71@gmail.com> References: <20200221210032.3414-1-bunk@stusta.de> <3a180667-45cb-a15a-8f6b-20d49802ee71@gmail.com> Message-ID: <20200222211234.GB9628@localhost> On Sat, Feb 22, 2020 at 10:50:13AM -0800, akuster808 wrote: > On 2/21/20 1:00 PM, Adrian Bunk wrote: > > From: Anuj Mittal > > > > Signed-off-by: Anuj Mittal > > Signed-off-by: Richard Purdie > > Signed-off-by: Adrian Bunk > > Is this a backport from Master? Yes. > please include masters commit id. openembedded-core commit id or poky commit id? They are always different, and I am working on top of poky. > Since Master and Zeus are at different versions, was there anything you > had to do to make this apply to Zeus? There is always the trivial change to the bb file. > I have adopted the kernel stable note of [Fixup for XXX context] so the > folks know things had to be tweaked from the original commit. I am already doing the same for non-trivial changes, e.g. http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293312.html > - Armin cu Adrian From bunk at stusta.de Sat Feb 22 21:17:24 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sat, 22 Feb 2020 23:17:24 +0200 Subject: [OE-core] can i totally ignore recipes not related to the current build? In-Reply-To: References: Message-ID: <20200222211724.GC9628@localhost> On Sat, Feb 22, 2020 at 04:07:56PM -0500, Robert P. J. Day wrote: > On Sat, 22 Feb 2020, Alexander Kanavin wrote: > > > BBMASK? > > BTW, that will work for me in this situation but is there a way to > not have to enumerate all the recipes to ignore, and just say, "don't > look at anything that is not related to building core-image-minimal?" >... How do you know without parsing that a recipe is not related? Information like names of packages built or RPROVIDES are in the recipes. > rday cu Adrian From rpjday at crashcourse.ca Sat Feb 22 21:20:13 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Sat, 22 Feb 2020 16:20:13 -0500 (EST) Subject: [OE-core] can i totally ignore recipes not related to the current build? In-Reply-To: <20200222211724.GC9628@localhost> References: <20200222211724.GC9628@localhost> Message-ID: On Sat, 22 Feb 2020, Adrian Bunk wrote: > On Sat, Feb 22, 2020 at 04:07:56PM -0500, Robert P. J. Day wrote: > > On Sat, 22 Feb 2020, Alexander Kanavin wrote: > > > > > BBMASK? > > > > BTW, that will work for me in this situation but is there a way to > > not have to enumerate all the recipes to ignore, and just say, "don't > > look at anything that is not related to building core-image-minimal?" > >... > > How do you know without parsing that a recipe is not related? > Information like names of packages built or RPROVIDES are in > the recipes. ah, good point ... i am not really thinking this through. duh. rday From alex.kanavin at gmail.com Sat Feb 22 22:09:06 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 22 Feb 2020 23:09:06 +0100 Subject: [OE-core] [PATCH 1/4] valgrind: replace a submitted patch with one that was merged Message-ID: <20200222220909.12019-1-alex.kanavin@gmail.com> This addresses a ptest failure in particular that the submitted patch caused. Signed-off-by: Alexander Kanavin --- ...ad_detatch-call-portable-across-plat.patch | 65 +++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch index 44d707a235..f407d8191b 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch @@ -1,25 +1,31 @@ -From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001 +From 92fcf75d6d3903e45492b041bf4ad07787d2e58a Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Mon, 27 Jan 2020 17:17:19 -0800 -Subject: [PATCH] tests: Make pthread_detatch call portable across platforms +Date: Mon, 27 Jan 2020 19:50:04 -0800 +Subject: [PATCH] drd/tests/pth_detached3: Make pthread_detach() call portable + across platforms -pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type -this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable -across glibc and musl +pthread_t is opaque type therefore we can not apply simple arithmetic to +variables of pthread_t type this test needs to pass a invalid pthread_t +handle, typcasting to uintptr_t works too and is portable across glibc and +musl Fixes | pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread' | 24 | pthread_detach(thread + 8); | | ^ -Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/] +[ bvanassche: reformatted patch description and fixed up line numbers ] + +Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=92fcf75d6d3903e45492b041bf4ad07787d2e58a] Signed-off-by: Khem Raj --- - drd/tests/pth_detached3.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + drd/tests/pth_detached3.c | 3 ++- + drd/tests/pth_detached3.stderr.exp1 | 4 ++-- + drd/tests/pth_detached3.stderr.exp2 | 4 ++-- + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c -index c02eef11a..efeb15b72 100644 +index c02eef1..efeb15b 100644 --- a/drd/tests/pth_detached3.c +++ b/drd/tests/pth_detached3.c @@ -4,6 +4,7 @@ @@ -39,6 +45,43 @@ index c02eef11a..efeb15b72 100644 fprintf(stderr, "Finished.\n"); +diff --git a/drd/tests/pth_detached3.stderr.exp1 b/drd/tests/pth_detached3.stderr.exp1 +index 58412ec..8dd58ba 100644 +--- a/drd/tests/pth_detached3.stderr.exp1 ++++ b/drd/tests/pth_detached3.stderr.exp1 +@@ -1,11 +1,11 @@ + + pthread_detach(): invalid thread ID 0x........ + at 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:21) ++ by 0x........: main (pth_detached3.c:22) + + pthread_detach(): invalid thread ID 0x........ + at 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:24) ++ by 0x........: main (pth_detached3.c:25) + + Finished. + +diff --git a/drd/tests/pth_detached3.stderr.exp2 b/drd/tests/pth_detached3.stderr.exp2 +index bdc5cf8..e82dee1 100644 +--- a/drd/tests/pth_detached3.stderr.exp2 ++++ b/drd/tests/pth_detached3.stderr.exp2 +@@ -2,12 +2,12 @@ + pthread_detach(): invalid thread ID 0x........ + at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?) + by 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:21) ++ by 0x........: main (pth_detached3.c:22) + + pthread_detach(): invalid thread ID 0x........ + at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?) + by 0x........: pthread_detach (drd_pthread_intercepts.c:?) +- by 0x........: main (pth_detached3.c:24) ++ by 0x........: main (pth_detached3.c:25) + + Finished. + -- -2.25.0 +2.9.3 -- 2.25.0 From alex.kanavin at gmail.com Sat Feb 22 22:09:07 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 22 Feb 2020 23:09:07 +0100 Subject: [OE-core] [PATCH 2/4] valgrind: exclude one more failing test for arm64 In-Reply-To: <20200222220909.12019-1-alex.kanavin@gmail.com> References: <20200222220909.12019-1-alex.kanavin@gmail.com> Message-ID: <20200222220909.12019-2-alex.kanavin@gmail.com> valgrind's test suite isn't generally run by upstream on arm64, so let's simply disable the failing test and establish a set that works. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index acf4fd1bc1..a3a0c6e50f 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -1,3 +1,4 @@ +gdbserver_tests/hgtls cachegrind/tests/ann1 callgrind/tests/simwork1 callgrind/tests/simwork2 -- 2.25.0 From alex.kanavin at gmail.com Sat Feb 22 22:09:08 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 22 Feb 2020 23:09:08 +0100 Subject: [OE-core] [PATCH 3/4] mdadm: fix more ptests In-Reply-To: <20200222220909.12019-1-alex.kanavin@gmail.com> References: <20200222220909.12019-1-alex.kanavin@gmail.com> Message-ID: <20200222220909.12019-3-alex.kanavin@gmail.com> Particularly: 1. set $dir, so supplementary utilities can be found 2. disable integrity checks as they take more time than any other test Signed-off-by: Alexander Kanavin --- meta/recipes-extended/mdadm/files/run-ptest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/mdadm/files/run-ptest b/meta/recipes-extended/mdadm/files/run-ptest index 7959c055ad..fae8071d43 100644 --- a/meta/recipes-extended/mdadm/files/run-ptest +++ b/meta/recipes-extended/mdadm/files/run-ptest @@ -2,6 +2,6 @@ mkdir -p /mdadm-testing-dir # make the test continue to execute even one fail -./test --keep-going +dir=. ./test --keep-going --disable-integrity rm -rf /mdadm-testing-dir/* -- 2.25.0 From alex.kanavin at gmail.com Sat Feb 22 22:09:09 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 22 Feb 2020 23:09:09 +0100 Subject: [OE-core] [PATCH 4/4] mdadm: drop from PTESTS_SLOW In-Reply-To: <20200222220909.12019-1-alex.kanavin@gmail.com> References: <20200222220909.12019-1-alex.kanavin@gmail.com> Message-ID: <20200222220909.12019-4-alex.kanavin@gmail.com> There are two primary reasons for this: 1. mdadm test suite tends to work like this do_action sleep arbitrary_amount check_result This is unreliable, and arbitrary_amount may or may not be enough. I have confirmed this by increasing the amount, and seeing more tests pass than before. 2. The test suite aborts half way through because one of the mdadm binaries segfaults. This indicates that upstream isn't actually running the suite anymore, and in this situation we shouldn't be relying on it either. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/ptest-packagelists.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 752a0882dc..6e770853b8 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -58,6 +58,7 @@ PTESTS_FAST = "\ # rt-tests-ptest \ # Needs to be checked whether it runs at all # bash-ptest \ # Test outcomes are non-deterministic by design # ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py +# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts #" PTESTS_SLOW = "\ @@ -69,7 +70,6 @@ PTESTS_SLOW = "\ gstreamer1.0-ptest \ libevent-ptest \ lttng-tools-ptest \ - mdadm-ptest \ openssh-ptest \ openssl-ptest \ perl-ptest \ -- 2.25.0 From richard.purdie at linuxfoundation.org Sun Feb 23 10:55:12 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sun, 23 Feb 2020 10:55:12 +0000 Subject: [OE-core] [PATCH 1/2] package: Correct variable dependecies Message-ID: <20200223105513.285315-1-richard.purdie@linuxfoundation.org> Ensure that the plain variable X is also added to the dependencies as well as X_. Allow the funciton to be called with a different variable list too. Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1efc396ac64..d4c6a90e846 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -2171,10 +2171,12 @@ python package_depchains() { # iteration, we need to list them here: PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm pkg_postinst_ontarget INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME ALTERNATIVE PKGE PKGV PKGR USERADD_PARAM GROUPADD_PARAM CONFFILES SYSTEMD_SERVICE LICENSE SECTION pkg_preinst pkg_prerm RREPLACES GROUPMEMS_PARAM SYSTEMD_AUTO_ENABLE SKIP_FILEDEPS PRIVATE_LIBS" -def gen_packagevar(d): +def gen_packagevar(d, pkgvars="PACKAGEVARS"): ret = [] pkgs = (d.getVar("PACKAGES") or "").split() - vars = (d.getVar("PACKAGEVARS") or "").split() + vars = (d.getVar(pkgvars) or "").split() + for v in vars: + ret.append(v) for p in pkgs: for v in vars: ret.append(v + "_" + p) -- 2.25.0 From richard.purdie at linuxfoundation.org Sun Feb 23 10:55:13 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sun, 23 Feb 2020 10:55:13 +0000 Subject: [OE-core] [PATCH 2/2] package_ipk: Add missing variables to the task hash In-Reply-To: <20200223105513.285315-1-richard.purdie@linuxfoundation.org> References: <20200223105513.285315-1-richard.purdie@linuxfoundation.org> Message-ID: <20200223105513.285315-2-richard.purdie@linuxfoundation.org> Several variables used by the task are not included in the hash, as highlighted by recent changes to MAINTAINERS not causing rebuilds. Fix this. Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 25d1ab725ad..c008559e4ab 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -237,6 +237,10 @@ def ipk_write_pkg(pkg, d): cleanupcontrol(root) bb.utils.unlockfile(lf) +# Have to list any variables referenced as X_ that aren't in pkgdata here +IPKEXTRAVARS = "PRIORITY MAINTAINER PACKAGE_ARCH HOMEPAGE" +ipk_write_pkg[vardeps] += "${@gen_packagevar(d, 'IPKEXTRAVARS')}" + # Otherwise allarch packages may change depending on override configuration ipk_write_pkg[vardepsexclude] = "OVERRIDES" -- 2.25.0 From bunk at stusta.de Sun Feb 23 12:19:32 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 14:19:32 +0200 Subject: [OE-core] [PATCH] libcap: Upgrade 2.31 -> 2.32 Message-ID: <20200223121932.9327-1-bunk@stusta.de> Signed-off-by: Adrian Bunk --- .../recipes-support/libcap/{libcap_2.31.bb => libcap_2.32.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libcap/{libcap_2.31.bb => libcap_2.32.bb} (93%) diff --git a/meta/recipes-support/libcap/libcap_2.31.bb b/meta/recipes-support/libcap/libcap_2.32.bb similarity index 93% rename from meta/recipes-support/libcap/libcap_2.31.bb rename to meta/recipes-support/libcap/libcap_2.32.bb index 97959c1025..d78a58f7d2 100644 --- a/meta/recipes-support/libcap/libcap_2.31.bb +++ b/meta/recipes-support/libcap/libcap_2.32.bb @@ -12,8 +12,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[md5sum] = "52120c05dc797b01f5a7ae70f4335e96" -SRC_URI[sha256sum] = "c6088de41e1c97fa8047e2e7de0e4ee0cd13e6cc16538022230ae76727a87c46" +SRC_URI[md5sum] = "7416119c9fdcfd0e8dd190a432c668e9" +SRC_URI[sha256sum] = "1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" -- 2.17.1 From praveen.lisieux2011 at gmail.com Sun Feb 23 12:56:20 2020 From: praveen.lisieux2011 at gmail.com (Praveen Muthusamy) Date: Sun, 23 Feb 2020 18:26:20 +0530 Subject: [OE-core] [PATCH V3] alsa-utils: upgrade 1.2.1 -> 1.2.2 Message-ID: <20200223125620.6117-1-praveen.lisieux2011@gmail.com> From: Praveen Muthusamy Changelog: https://alsa-project.org/wiki/Changes_v1.2.1.2_v1.2.2 Signed-off-by: Praveen Muthusamy --- ...lsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} | 0 .../alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} (100%) rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} (97%) diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb similarity index 100% rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb index 9144af628a..8bbc5d3ef3 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb @@ -21,8 +21,8 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" -SRC_URI[md5sum] = "c4628bae7632937eac2de4cf2a3de82e" -SRC_URI[sha256sum] = "0b110ba71ef41d3009db1bc4dcae0cf79efb99cb5426fa19d0312470560a2c0d" +SRC_URI[md5sum] = "00612234ff4722c8f7f8f7a83ff9bc63" +SRC_URI[sha256sum] = "44807bd578c5f6df6e91a11b8d37e546424a5a1ea8d8e659ee359fe01730e4f3" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with -- 2.17.1 From bunk at stusta.de Sun Feb 23 13:02:06 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 15:02:06 +0200 Subject: [OE-core] [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <20200219194752.7967-2-alex.kanavin@gmail.com> References: <20200219194752.7967-1-alex.kanavin@gmail.com> <20200219194752.7967-2-alex.kanavin@gmail.com> Message-ID: <20200223130206.GE9628@localhost> On Wed, Feb 19, 2020 at 08:47:41PM +0100, Alexander Kanavin wrote: > Also enabling wayland if x11 is not enabled is not necessarily > the correct decision. >... > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ >... Not a new issue, but I guess something should change regarding the REQUIRED_DISTRO_FEATURES = "x11 opengl" cu Adrian From alex.kanavin at gmail.com Sun Feb 23 13:05:54 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 23 Feb 2020 14:05:54 +0100 Subject: [OE-core] [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: <20200223130206.GE9628@localhost> References: <20200219194752.7967-1-alex.kanavin@gmail.com> <20200219194752.7967-2-alex.kanavin@gmail.com> <20200223130206.GE9628@localhost> Message-ID: Right, I think this line can be simply dropped. Care to make a patch? Alex On Sun, 23 Feb 2020 at 14:02, Adrian Bunk wrote: > On Wed, Feb 19, 2020 at 08:47:41PM +0100, Alexander Kanavin wrote: > > Also enabling wayland if x11 is not enabled is not necessarily > > the correct decision. > >... > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', > 'x11', 'wayland' ,d)} \ > > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', > d)} \ > > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'webgl opengl', '' ,d)} \ > >... > > Not a new issue, but I guess something should change regarding the > REQUIRED_DISTRO_FEATURES = "x11 opengl" > > cu > Adrian > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Sun Feb 23 13:11:19 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sun, 23 Feb 2020 13:11:19 +0000 Subject: [OE-core] [PATCH V3] alsa-utils: upgrade 1.2.1 -> 1.2.2 In-Reply-To: <20200223125620.6117-1-praveen.lisieux2011@gmail.com> References: <20200223125620.6117-1-praveen.lisieux2011@gmail.com> Message-ID: <1c4e397e80d53d8ef779cf84b57dc4d051ef3238.camel@linuxfoundation.org> On Sun, 2020-02-23 at 18:26 +0530, Praveen Muthusamy wrote: > From: Praveen Muthusamy > > Changelog: https://alsa-project.org/wiki/Changes_v1.2.1.2_v1.2.2 > > Signed-off-by: Praveen Muthusamy > --- > ...lsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} | 0 > .../alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} | 4 ++-- > 2 files changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.1.bb => alsa-utils-scripts_1.2.2.bb} (100%) > rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.1.bb => alsa-utils_1.2.2.bb} (97%) Thanks, does this address the previous testing failure though? Cheers, Richard From gzatko at gmail.com Sun Feb 23 13:22:57 2020 From: gzatko at gmail.com (gzatko at gmail.com) Date: Sun, 23 Feb 2020 14:22:57 +0100 Subject: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream Message-ID: <20200223132257.4867-1-gzatko@gmail.com> From: Gregor Zatko Until now a Debian package has been used as a source. This change just switches it to project's upstream. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 Signed-off-by: Gregor Zatko --- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index 6452c8d99f..dbea697edd 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb @@ -1,52 +1,50 @@ SUMMARY = "Document type definitions for verification of XML data files" DESCRIPTION = "Document type definitions for verification of XML data \ -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ -XML DTD, as well as a selected set of legacy DTDs for use with older \ -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set. It ships with the latest DocBook 4.5 \ +XML DTD." +HOMEPAGE = "https://www.docbook.org/xml/" + +PR = "r1" LICENSE = "OASIS" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" +ARCHIVE_NAME = "docbook-xml-${PV}.zip" + # Note: the upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When # upgrading this recipe, please verify whether this is still needed. -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ - file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ +SRC_URI = "\ + https://docbook.org/xml/${PV}/${ARCHIVE_NAME} \ + file://LICENSE-OASIS \ " +SRC_URI[md5sum] = "03083e288e87a7e829e437358da7ef9e" +SRC_URI[sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" - -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" - -S = "${WORKDIR}/docbook-xml-4.5.c31424" +UPSTREAM_CHECK_URI = "https://docbook.org/xml/${PV}/" -inherit allarch +inherit allarch xmlcatalog BBCLASSEXTEND = "native" -do_configure (){ - : -} +# the XMLCATALOGS variable is used in xmlcatalog BB class +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -do_compile (){ - : -} +S = "${WORKDIR}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" do_install () { + install -d ${D}${sysconfdir}/xml/ xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml - - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do - DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION - install -d -m 755 ${D}$DEST - cp -v -R docbook-$DTDVERSION/* ${D}$DEST - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml - done + DEST=${datadir}/xml/docbook/schema/dtd/${PV} + install -d -m 755 ${D}$DEST + cp -v catalog.xml ${D}$DEST + xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml } -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -inherit xmlcatalog - -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" +FILES_${PN} = "\ + ${datadir}/* \ + ${XMLCATALOGS} \ +" -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 23 13:52:29 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 23 Feb 2020 14:52:29 +0100 Subject: [OE-core] [PATCH 1/3] lttng-tools: exclude one more test that sporadically fails Message-ID: <20200223135231.22138-1-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...-regression-disable-the-tools-live-tests.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch index a558a0993f..f2c14ecc94 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch @@ -1,4 +1,4 @@ -From 5f0ef3e007ed83c1ce7ae817308e5942decc1230 Mon Sep 17 00:00:00 2001 +From c69b68e5c03f1d260025fb1dd9ab7345e31e15ef Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 24 Jan 2020 18:03:25 +0100 Subject: [PATCH] tests/regression: disable the tools/live tests @@ -10,14 +10,14 @@ https://bugs.lttng.org/issues/1217 Upstream-Status: Inappropriate [upstream is working on a real fix] Signed-off-by: Alexander Kanavin --- - tests/regression/Makefile.am | 3 --- - 1 file changed, 3 deletions(-) + tests/regression/Makefile.am | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am -index 73eb9f7..92fc18f 100644 +index 73eb9f7..b92bdbd 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am -@@ -9,9 +9,6 @@ TESTS = tools/filtering/test_invalid_filter \ +@@ -9,14 +9,10 @@ TESTS = tools/filtering/test_invalid_filter \ tools/filtering/test_valid_filter \ tools/streaming/test_ust \ tools/health/test_thread_ok \ @@ -27,3 +27,8 @@ index 73eb9f7..92fc18f 100644 tools/tracefile-limits/test_tracefile_count \ tools/tracefile-limits/test_tracefile_size \ tools/exclusion/test_exclusion \ + tools/snapshots/test_ust_fast \ +- tools/snapshots/test_ust_streaming \ + tools/save-load/test_save \ + tools/save-load/test_load \ + tools/save-load/test_autoload \ -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 23 13:52:30 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 23 Feb 2020 14:52:30 +0100 Subject: [OE-core] [PATCH 2/3] libinput: update 1.14.3 -> 1.15.2 In-Reply-To: <20200223135231.22138-1-alex.kanavin@gmail.com> References: <20200223135231.22138-1-alex.kanavin@gmail.com> Message-ID: <20200223135231.22138-2-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...64bit-time_t-for-32bit-architectures.patch | 386 ------------------ ...{libinput_1.14.3.bb => libinput_1.15.2.bb} | 8 +- 2 files changed, 4 insertions(+), 390 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch rename meta/recipes-graphics/wayland/{libinput_1.14.3.bb => libinput_1.15.2.bb} (86%) diff --git a/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch deleted file mode 100644 index 344e6aaf8f..0000000000 --- a/meta/recipes-graphics/wayland/libinput/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch +++ /dev/null @@ -1,386 +0,0 @@ -From ab6ce09bfb669177c90cc5c10155eec44e9fc34b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Sat, 23 Nov 2019 17:23:56 -0800 -Subject: [PATCH] Adjust for 64bit time_t for 32bit architectures - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/libinput/libinput/merge_requests/346] -Signed-off-by: Peter Hutterer ---- - meson.build | 1 + - src/evdev-mt-touchpad-buttons.c | 15 ++++--- - src/evdev.c | 5 ++- - src/util-input-event.h | 69 +++++++++++++++++++++++++++++++++ - tools/libinput-record.c | 16 +++++--- - 5 files changed, 90 insertions(+), 16 deletions(-) - create mode 100644 src/util-input-event.h - ---- a/meson.build -+++ b/meson.build -@@ -220,7 +220,8 @@ endif - ############ libinput-util.a ############ - src_libinput_util = [ - 'src/libinput-util.c', -- 'src/libinput-util.h' -+ 'src/libinput-util.h', -+ 'src/util-input-event.h' - ] - libinput_util = static_library('libinput-util', - src_libinput_util, ---- a/src/evdev-mt-touchpad-buttons.c -+++ b/src/evdev-mt-touchpad-buttons.c -@@ -30,6 +30,7 @@ - #include - #include "linux/input.h" - -+#include "util-input-event.h" - #include "evdev-mt-touchpad.h" - - #define DEFAULT_BUTTON_ENTER_TIMEOUT ms2us(100) -@@ -1145,14 +1146,12 @@ tp_notify_clickpadbutton(struct tp_dispa - if (tp->buttons.trackpoint) { - if (is_topbutton) { - struct evdev_dispatch *dispatch = tp->buttons.trackpoint->dispatch; -- struct input_event event; -- struct input_event syn_report = {{ 0, 0 }, EV_SYN, SYN_REPORT, 0 }; -+ struct input_event event, syn_report; -+ int value; - -- event.time = us2tv(time); -- event.type = EV_KEY; -- event.code = button; -- event.value = (state == LIBINPUT_BUTTON_STATE_PRESSED) ? 1 : 0; -- syn_report.time = event.time; -+ value = (state == LIBINPUT_BUTTON_STATE_PRESSED) ? 1 : 0; -+ event = input_event_init(time, EV_KEY, button, value); -+ syn_report = input_event_init(time, EV_SYN, SYN_REPORT, 0); - dispatch->interface->process(dispatch, - tp->buttons.trackpoint, - &event, ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -44,6 +44,7 @@ - #include "filter.h" - #include "libinput-private.h" - #include "quirks.h" -+#include "util-input-event.h" - - #if HAVE_LIBWACOM - #include -@@ -859,7 +860,7 @@ evdev_print_event(struct evdev_device *d - { - static uint32_t offset = 0; - static uint32_t last_time = 0; -- uint32_t time = us2ms(tv2us(&e->time)); -+ uint32_t time = us2ms(input_event_time(e)); - - if (offset == 0) { - offset = time; -@@ -891,7 +892,7 @@ static inline void - evdev_process_event(struct evdev_device *device, struct input_event *e) - { - struct evdev_dispatch *dispatch = device->dispatch; -- uint64_t time = tv2us(&e->time); -+ uint64_t time = input_event_time(e); - - #if 0 - evdev_print_event(device, e); ---- /dev/null -+++ b/src/util-input-event.h -@@ -0,0 +1,69 @@ -+/* -+ * Copyright ? 2019 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#pragma once -+ -+#include "config.h" -+ -+#include "util-time.h" -+#include -+ -+static inline struct input_event -+input_event_init(uint64_t time, -+ unsigned int code, -+ unsigned int type, -+ int value) -+{ -+ struct input_event ev; -+ struct timeval tval = us2tv(time); -+ -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; -+ ev.type = type; -+ ev.code = code; -+ ev.value = value; -+ -+ return ev; -+} -+ -+static inline uint64_t -+input_event_time(const struct input_event *e) -+{ -+ struct timeval tval; -+ -+ tval.tv_sec = e->input_event_sec; -+ tval.tv_usec = e->input_event_usec; -+ -+ return tv2us(&tval); -+} -+ -+ -+static inline void -+input_event_set_time(struct input_event *e, -+ uint64_t time) -+{ -+ struct timeval tval = us2tv(time); -+ -+ e->input_event_sec = tval.tv_sec; -+ e->input_event_usec = tval.tv_usec; -+} ---- a/tools/libinput-record.c -+++ b/tools/libinput-record.c -@@ -41,6 +41,7 @@ - #include - - #include "libinput-versionsort.h" -+#include "util-input-event.h" - #include "libinput-util.h" - #include "libinput-version.h" - #include "libinput-git-version.h" -@@ -196,8 +197,9 @@ print_evdev_event(struct record_context - const char *cname; - bool was_modified = false; - char desc[1024]; -+ uint64_t time = input_event_time(ev) - ctx->offset; - -- ev->time = us2tv(tv2us(&ev->time) - ctx->offset); -+ input_event_set_time(ev, time); - - /* Don't leak passwords unless the user wants to */ - if (!ctx->show_keycodes) -@@ -215,7 +217,7 @@ print_evdev_event(struct record_context - static unsigned long last_ms = 0; - unsigned long time, dt; - -- time = us2ms(tv2us(&ev->time)); -+ time = us2ms(input_event_time(ev)); - dt = time - last_ms; - last_ms = time; - -@@ -239,8 +241,8 @@ print_evdev_event(struct record_context - - iprintf(ctx, - "- [%3lu, %6u, %3d, %3d, %6d] # %s\n", -- ev->time.tv_sec, -- (unsigned int)ev->time.tv_usec, -+ ev->input_event_sec, -+ (unsigned int)ev->input_event_usec, - ev->type, - ev->code, - ev->value, -@@ -268,16 +270,18 @@ handle_evdev_frame(struct record_context - while (libevdev_next_event(evdev, - LIBEVDEV_READ_FLAG_NORMAL, - &e) == LIBEVDEV_READ_STATUS_SUCCESS) { -+ uint64_t time; - - if (ctx->offset == 0) -- ctx->offset = tv2us(&e.time); -+ ctx->offset = input_event_time(&e); - - if (d->nevents == d->events_sz) - resize(d->events, d->events_sz); - - event = &d->events[d->nevents++]; - event->type = EVDEV; -- event->time = tv2us(&e.time) - ctx->offset; -+ time = input_event_time(&e); -+ input_event_set_time(&e, time - ctx->offset); - event->u.evdev = e; - count++; - ---- a/src/libinput-private.h -+++ b/src/libinput-private.h -@@ -39,6 +39,7 @@ - - #include "libinput.h" - #include "libinput-util.h" -+#include "util-time.h" - #include "libinput-version.h" - - #if LIBINPUT_VERSION_MICRO >= 90 ---- a/src/libinput-util.h -+++ b/src/libinput-util.h -@@ -206,12 +206,6 @@ clear_bit(unsigned char *array, int bit) - array[bit / 8] &= ~(1 << (bit % 8)); - } - --static inline void --msleep(unsigned int ms) --{ -- usleep(ms * 1000); --} -- - static inline bool - long_bit_is_set(const unsigned long *array, int bit) - { -@@ -453,53 +447,6 @@ bool - parse_switch_reliability_property(const char *prop, - enum switch_reliability *reliability); - --static inline uint64_t --us(uint64_t us) --{ -- return us; --} -- --static inline uint64_t --ns2us(uint64_t ns) --{ -- return us(ns / 1000); --} -- --static inline uint64_t --ms2us(uint64_t ms) --{ -- return us(ms * 1000); --} -- --static inline uint64_t --s2us(uint64_t s) --{ -- return ms2us(s * 1000); --} -- --static inline uint32_t --us2ms(uint64_t us) --{ -- return (uint32_t)(us / 1000); --} -- --static inline uint64_t --tv2us(const struct timeval *tv) --{ -- return s2us(tv->tv_sec) + tv->tv_usec; --} -- --static inline struct timeval --us2tv(uint64_t time) --{ -- struct timeval tv; -- -- tv.tv_sec = time / ms2us(1000); -- tv.tv_usec = time % ms2us(1000); -- -- return tv; --} -- - static inline bool - safe_atoi_base(const char *str, int *val, int base) - { ---- /dev/null -+++ b/src/util-time.h -@@ -0,0 +1,84 @@ -+/* -+ * Copyright ? 2013-2019 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#pragma once -+ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+ -+static inline void -+msleep(unsigned int ms) -+{ -+ usleep(ms * 1000); -+} -+ -+static inline uint64_t -+us(uint64_t us) -+{ -+ return us; -+} -+ -+static inline uint64_t -+ns2us(uint64_t ns) -+{ -+ return us(ns / 1000); -+} -+ -+static inline uint64_t -+ms2us(uint64_t ms) -+{ -+ return us(ms * 1000); -+} -+ -+static inline uint64_t -+s2us(uint64_t s) -+{ -+ return ms2us(s * 1000); -+} -+ -+static inline uint32_t -+us2ms(uint64_t us) -+{ -+ return (uint32_t)(us / 1000); -+} -+ -+static inline uint64_t -+tv2us(const struct timeval *tv) -+{ -+ return s2us(tv->tv_sec) + tv->tv_usec; -+} -+ -+static inline struct timeval -+us2tv(uint64_t time) -+{ -+ struct timeval tv; -+ -+ tv.tv_sec = time / ms2us(1000); -+ tv.tv_usec = time % ms2us(1000); -+ -+ return tv; -+} diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.15.2.bb similarity index 86% rename from meta/recipes-graphics/wayland/libinput_1.14.3.bb rename to meta/recipes-graphics/wayland/libinput_1.15.2.bb index bc5a76dc9a..810532774e 100644 --- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb +++ b/meta/recipes-graphics/wayland/libinput_1.15.2.bb @@ -13,11 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63" DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ file://determinism.patch \ -" -SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32" -SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7" + " +SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643" +SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747" UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" @@ -38,3 +37,4 @@ EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ RPROVIDES_${PN} = "libinput" RREPLACES_${PN} = "libinput" RCONFLICTS_${PN} = "libinput" + -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 23 13:52:31 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 23 Feb 2020 14:52:31 +0100 Subject: [OE-core] [PATCH 3/3] ptest: add an option to enforce a failure (e.g. ptests are required to pass) In-Reply-To: <20200223135231.22138-1-alex.kanavin@gmail.com> References: <20200223135231.22138-1-alex.kanavin@gmail.com> Message-ID: <20200223135231.22138-3-alex.kanavin@gmail.com> This can be useful with a more specific, targeted and robust set of ptest packages; the benefit is that ptest regressions are caught as they happen and can be more easily traced to changes that caused them. The existing AB ptest image continues to be expected to fail, my observation of the AB runs is that the full set of ptests is not robust enough (particularly around socket/network related tests) and sporadically fails in random places. This can probably be addressed by making ptests exclusive to a worker (e.g. there is no other workload happening at the same time as ptests). Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/runtime/cases/ptest.py | 15 ++++++++++++++- .../images/core-image-sato-sdk-ptest.bb | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/ptest.py b/meta/lib/oeqa/runtime/cases/ptest.py index eb284df439..5626f707b9 100644 --- a/meta/lib/oeqa/runtime/cases/ptest.py +++ b/meta/lib/oeqa/runtime/cases/ptest.py @@ -18,7 +18,20 @@ class PtestRunnerTest(OERuntimeTestCase): @OETestDepends(['ssh.SSHTest.test_ssh']) @OEHasPackage(['ptest-runner']) @unittest.expectedFailure - def test_ptestrunner(self): + def test_ptestrunner_expectfail(self): + if not self.td.get('PTEST_EXPECT_FAILURE'): + self.skipTest('Cannot run ptests with @expectedFailure as ptests are required to pass') + self.do_ptestrunner() + + @skipIfNotFeature('ptest', 'Test requires ptest to be in DISTRO_FEATURES') + @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['ptest-runner']) + def test_ptestrunner_expectsuccess(self): + if self.td.get('PTEST_EXPECT_FAILURE'): + self.skipTest('Cannot run ptests without @expectedFailure as ptests are expected to fail') + self.do_ptestrunner() + + def do_ptestrunner(self): status, output = self.target.run('which ptest-runner', 0) if status != 0: self.skipTest("No -ptest packages are installed in the image") diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 58c257c49f..bf749acd79 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -18,3 +18,6 @@ IMAGE_ROOTFS_EXTRA_SPACE = "1124288" # ptests need more memory than standard to avoid the OOM killer # also lttng-tools needs /tmp that has at least 1G QB_MEM = "-m 2048" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" -- 2.25.0 From jpewhacker at gmail.com Sun Feb 23 14:33:49 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Sun, 23 Feb 2020 08:33:49 -0600 Subject: [OE-core] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-8-alex.kanavin@gmail.com> Message-ID: On Sun, Feb 16, 2020 at 2:52 PM Alexander Kanavin wrote: > > On Sun, 16 Feb 2020 at 21:15, Khem Raj wrote: >> >> On Sun, Feb 16, 2020 at 7:52 AM Alexander Kanavin >> wrote: >> > >> > webkit nowadays requires a couple of supplementary libraries for this, >> > so bring them in (courtesy of meta-browser, which will hopefully >> > adjust without a lot of trouble). >> >> its not meta-browser, I guess you should credit meta-wpe here [1] >> and perhaps Cc the meta-wpe maintainer as a courtesy. > > > Actually, it's copied from meta-webkit > https://github.com/Igalia/meta-webkit/ > which does not say in the readme who the maintainer is, so I am not sure whom to CC. > I can adjust the commit msg though. I've CC'd the WPE mailing list. OE-core now has libwpe and wpebackend-fdo recipes. They should possibly be removed from meta-webkit to prevent duplication. > > Alex > > >> >> >> [1] https://github.com/WebPlatformForEmbedded/meta-wpe/tree/master/recipes-wpe/libwpe >> > >> > Signed-off-by: Alexander Kanavin >> > --- >> > meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 19 +++++++++++++++++++ >> > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- >> > .../webkit/wpebackend-fdo_1.4.1.bb | 19 +++++++++++++++++++ >> > 3 files changed, 39 insertions(+), 1 deletion(-) >> > create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb >> > create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb >> > >> > diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb >> > new file mode 100644 >> > index 0000000000..b9c71f9dc5 >> > --- /dev/null >> > +++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb >> > @@ -0,0 +1,19 @@ >> > +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." >> > +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" >> > +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" >> > + >> > +LICENSE = "BSD" >> > +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" >> > +DEPENDS = "virtual/egl libxkbcommon" >> > + >> > +# Workaround build issue with RPi userland EGL libraries. >> > +CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" >> > + >> > +inherit cmake >> > + >> > +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" >> > +SRC_URI[md5sum] = "1d4d38413ee0d0043f74d0445cab906f" >> > +SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b" >> > +SRC_URI[sha1sum] = "a41480a0a85cfa11b3f87f801b7c37bc3410e060" >> > +SRC_URI[sha384sum] = "30488e375d956809a84b0d8af7b386a332541c77dcbd53496a896f894dbf39ac34534e935d6bc7a75c1b536f04f7f0a0" >> > +SRC_URI[sha512sum] = "cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670" >> > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> > index 4aa8533b42..8d87ad49a3 100644 >> > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb >> > @@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ >> > libsecret \ >> > " >> > >> > -PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland" >> > +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" >> > PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" >> > PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" >> > PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" >> > diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb >> > new file mode 100644 >> > index 0000000000..84df0c2535 >> > --- /dev/null >> > +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb >> > @@ -0,0 +1,19 @@ >> > +SUMMARY = "WPE's backend based on a freedesktop.org stack." >> > +HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo" >> > +BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues" >> > + >> > +LICENSE = "BSD" >> > +LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" >> > +DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe" >> > + >> > +DEPENDS_append_class-target = " wayland-native" >> > + >> > +inherit cmake >> > + >> > +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" >> > +SRC_URI[md5sum] = "c6362491a4a38ddac42b66f140e1cff2" >> > +SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d" >> > +SRC_URI[sha1sum] = "9217c8a5511bc53544b42cb23390256580ac4b0c" >> > +SRC_URI[sha384sum] = "79f3a28bc8e0a8240dc9962a6a245276d39dd8112a753d5ada39e98332d857eb9fc9c2879a702060807a10ea60be796d" >> > +SRC_URI[sha512sum] = "8fdd13843c77b95b96b3feffea463bce565620997680e209a0cdcc09314a1469f2f1cb4744dceb2cf6c8d6ce5cb2bbdb4c7fbaf0451a687640c3f63bbdbfc4d4" >> > + >> > -- >> > 2.25.0 >> > >> > -- >> > _______________________________________________ >> > Openembedded-core mailing list >> > Openembedded-core at lists.openembedded.org >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From bunk at stusta.de Sun Feb 23 14:35:58 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 16:35:58 +0200 Subject: [OE-core] [PATCH] apt: Inherit upstream-version-is-even Message-ID: <20200223143600.2282-1-bunk@stusta.de> Even versions are shipped in Ubuntu LTS and Debian releases. Signed-off-by: Adrian Bunk --- meta/recipes-devtools/apt/apt.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 50c4d8484a..13f5969f86 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" -inherit autotools gettext useradd +inherit autotools gettext useradd upstream-version-is-even EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" -- 2.17.1 From bunk at stusta.de Sun Feb 23 14:36:00 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 16:36:00 +0200 Subject: [OE-core] [PATCH] linux-firmware: Upgrade 20200117 -> 20200122 Message-ID: <20200223143600.2282-3-bunk@stusta.de> Switch to using the tarballs of tagged releases. WHENCE changed due to firmware filename changes. Signed-off-by: Adrian Bunk --- ...irmware_20200117.bb => linux-firmware_20200122.bb} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200117.bb => linux-firmware_20200122.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 8111c41016..0d1422cfca 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -125,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=cdcd9f664a404c681bb745bcac6253a3 \ + file://WHENCE;md5=c27d0c06cd5d376d8ab55860e65ba4e4 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -194,13 +194,10 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "9c340bd1bdabf53808a9178a7be98c5f2ad599a7" +SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" - -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "ac291b21f366ae2a37193ec8f14c39d2" +SRC_URI[sha256sum] = "a30e811b3736a72b874ac27e10662f5e5409b1cadf8aab7ba88e8f8bc8083986" inherit allarch -- 2.17.1 From bunk at stusta.de Sun Feb 23 14:35:59 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 16:35:59 +0200 Subject: [OE-core] [PATCH] bison: Upgrade 3.5.1 -> 3.5.2 Message-ID: <20200223143600.2282-2-bunk@stusta.de> Signed-off-by: Adrian Bunk --- .../recipes-devtools/bison/{bison_3.5.1.bb => bison_3.5.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/bison/{bison_3.5.1.bb => bison_3.5.2.bb} (90%) diff --git a/meta/recipes-devtools/bison/bison_3.5.1.bb b/meta/recipes-devtools/bison/bison_3.5.2.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.1.bb rename to meta/recipes-devtools/bison/bison_3.5.2.bb index e70252d974..b5b4a8ef76 100644 --- a/meta/recipes-devtools/bison/bison_3.5.1.bb +++ b/meta/recipes-devtools/bison/bison_3.5.2.bb @@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "6fc5fa4488832a65db934b9e93bd5d4c" -SRC_URI[sha256sum] = "3e7e097bd9709a2d5e40e69446b74b149733b3de864fadb7a9b54eca7b2a4dd0" +SRC_URI[md5sum] = "49fc2cf23e31e697d5072835e1662a97" +SRC_URI[sha256sum] = "24e273db9eb6da8bbb6f0648284d0724a5cbd6268a163db402f961350a4e50dd" inherit autotools gettext texinfo -- 2.17.1 From bunk at stusta.de Sun Feb 23 14:38:47 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 16:38:47 +0200 Subject: [OE-core] [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive In-Reply-To: References: <20200219194752.7967-1-alex.kanavin@gmail.com> <20200219194752.7967-2-alex.kanavin@gmail.com> <20200223130206.GE9628@localhost> Message-ID: <20200223143847.GF9628@localhost> On Sun, Feb 23, 2020 at 02:05:54PM +0100, Alexander Kanavin wrote: > Right, I think this line can be simply dropped. Care to make a patch? Seems to need something like ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}", I'll send a patch later. > Alex cu Adrian From alex.kanavin at gmail.com Sun Feb 23 14:42:36 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 23 Feb 2020 15:42:36 +0100 Subject: [OE-core] [PATCH] apt: Inherit upstream-version-is-even In-Reply-To: <20200223143600.2282-1-bunk@stusta.de> References: <20200223143600.2282-1-bunk@stusta.de> Message-ID: Is there a link to this policy, or some other document stating the rule? I am seeing that Ubuntu 19.10 ships 1.9: https://packages.ubuntu.com/search?suite=all&searchon=names&keywords=apt Alex On Sun, 23 Feb 2020 at 15:36, Adrian Bunk wrote: > Even versions are shipped in Ubuntu LTS and Debian releases. > > Signed-off-by: Adrian Bunk > --- > meta/recipes-devtools/apt/apt.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/apt/apt.inc > b/meta/recipes-devtools/apt/apt.inc > index 50c4d8484a..13f5969f86 100644 > --- a/meta/recipes-devtools/apt/apt.inc > +++ b/meta/recipes-devtools/apt/apt.inc > @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = > "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" > # so we check the latest upstream from a directory that does get updated > UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" > > -inherit autotools gettext useradd > +inherit autotools gettext useradd upstream-version-is-even > > EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" > > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sun Feb 23 14:44:34 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 23 Feb 2020 15:44:34 +0100 Subject: [OE-core] [PATCH] apt: Inherit upstream-version-is-even In-Reply-To: References: <20200223143600.2282-1-bunk@stusta.de> Message-ID: Ah right, 19.10 is not LTS. Nevermind. Alex On Sun, 23 Feb 2020 at 15:42, Alexander Kanavin wrote: > Is there a link to this policy, or some other document stating the rule? > > I am seeing that Ubuntu 19.10 ships 1.9: > https://packages.ubuntu.com/search?suite=all&searchon=names&keywords=apt > > Alex > > On Sun, 23 Feb 2020 at 15:36, Adrian Bunk wrote: > >> Even versions are shipped in Ubuntu LTS and Debian releases. >> >> Signed-off-by: Adrian Bunk >> --- >> meta/recipes-devtools/apt/apt.inc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/recipes-devtools/apt/apt.inc >> b/meta/recipes-devtools/apt/apt.inc >> index 50c4d8484a..13f5969f86 100644 >> --- a/meta/recipes-devtools/apt/apt.inc >> +++ b/meta/recipes-devtools/apt/apt.inc >> @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = >> "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" >> # so we check the latest upstream from a directory that does get updated >> UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" >> >> -inherit autotools gettext useradd >> +inherit autotools gettext useradd upstream-version-is-even >> >> EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" >> >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From akuster808 at gmail.com Sun Feb 23 16:33:04 2020 From: akuster808 at gmail.com (akuster808) Date: Sun, 23 Feb 2020 08:33:04 -0800 Subject: [OE-core] [zeus][PATCH 1/2] libxml2: fix CVE-2020-7595 In-Reply-To: <20200222211234.GB9628@localhost> References: <20200221210032.3414-1-bunk@stusta.de> <3a180667-45cb-a15a-8f6b-20d49802ee71@gmail.com> <20200222211234.GB9628@localhost> Message-ID: <01e510d4-e97d-109c-f12b-322ca68d5ca9@gmail.com> On 2/22/20 1:12 PM, Adrian Bunk wrote: > On Sat, Feb 22, 2020 at 10:50:13AM -0800, akuster808 wrote: >> On 2/21/20 1:00 PM, Adrian Bunk wrote: >>> From: Anuj Mittal >>> >>> Signed-off-by: Anuj Mittal >>> Signed-off-by: Richard Purdie >>> Signed-off-by: Adrian Bunk >> Is this a backport from Master? > Yes. > >> please include masters commit id. > openembedded-core commit id or poky commit id? Openembedded-core? ID - armin > They are always different, and I am working on top of poky. > >> Since Master and Zeus are at different versions, was there anything you >> had to do to make this apply to Zeus? > There is always the trivial change to the bb file. > >> I have adopted the kernel stable note of [Fixup for XXX context] so the >> folks know things had to be tweaked from the original commit. > I am already doing the same for non-trivial changes, e.g. > http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293312.html > >> - Armin > cu > Adrian From bunk at stusta.de Sun Feb 23 17:32:10 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 19:32:10 +0200 Subject: [OE-core] [PATCH 2/6] webkitgtk: Remove unused DEPENDS on pulseaudio In-Reply-To: <20200223173214.9487-1-bunk@stusta.de> References: <20200223173214.9487-1-bunk@stusta.de> Message-ID: <20200223173214.9487-2-bunk@stusta.de> Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 51fba94964..80ed427352 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -33,7 +33,7 @@ CVE_PRODUCT = "webkitgtk webkitgtk\+" DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -- 2.17.1 From bunk at stusta.de Sun Feb 23 17:32:13 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 19:32:13 +0200 Subject: [OE-core] [PATCH 5/6] systemd: Add a PACKAGECONFIG for libidn2 In-Reply-To: <20200223173214.9487-1-bunk@stusta.de> References: <20200223173214.9487-1-bunk@stusta.de> Message-ID: <20200223173214.9487-5-bunk@stusta.de> Signed-off-by: Adrian Bunk --- meta/recipes-core/systemd/systemd_244.3.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index b686519482..5d863410b8 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -138,6 +138,7 @@ PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl" PACKAGECONFIG[kmod] = "-Dkmod=true,-Dkmod=false,kmod" PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig" PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn" +PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2" PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false" PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false" PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4" -- 2.17.1 From bunk at stusta.de Sun Feb 23 17:32:09 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 19:32:09 +0200 Subject: [OE-core] [PATCH 1/6] webkitgtk: Correct from REQUIRED_DISTRO_FEATURES to ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" Message-ID: <20200223173214.9487-1-bunk@stusta.de> opengl is optional. x11 can be replaced with wayland. Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a48a976f94..51fba94964 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" CVE_PRODUCT = "webkitgtk webkitgtk\+" -- 2.17.1 From bunk at stusta.de Sun Feb 23 17:32:12 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 19:32:12 +0200 Subject: [OE-core] [PATCH 4/6] webkitgtk: Remove the unused DEPENDS on libidn In-Reply-To: <20200223173214.9487-1-bunk@stusta.de> References: <20200223173214.9487-1-bunk@stusta.de> Message-ID: <20200223173214.9487-4-bunk@stusta.de> Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a9c00862c3..7b3d16d8cb 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,7 +30,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ -- 2.17.1 From bunk at stusta.de Sun Feb 23 17:32:11 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 19:32:11 +0200 Subject: [OE-core] [PATCH 3/6] webkitgtk: Remove obsolete gtk2 packageconfig In-Reply-To: <20200223173214.9487-1-bunk@stusta.de> References: <20200223173214.9487-1-bunk@stusta.de> Message-ID: <20200223173214.9487-3-bunk@stusta.de> Upstream no longer supports GTK2 plugins. Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 80ed427352..a9c00862c3 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -48,7 +48,6 @@ PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" -PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" -- 2.17.1 From bunk at stusta.de Sun Feb 23 17:32:14 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 19:32:14 +0200 Subject: [OE-core] [PATCH 6/6] libidn: Move to meta-oe In-Reply-To: <20200223173214.9487-1-bunk@stusta.de> References: <20200223173214.9487-1-bunk@stusta.de> Message-ID: <20200223173214.9487-6-bunk@stusta.de> There are no users left in OE-core. Signed-off-by: Adrian Bunk --- meta/conf/distro/include/maintainers.inc | 1 - .../0001-idn-format-security-warnings.patch | 181 ------------------ ...R_P_warning_error_with_automake_1.12.patch | 34 ---- .../libidn/dont-depend-on-help2man.patch | 23 --- .../libidn/libidn_fix_for_automake-1.12.patch | 35 ---- meta/recipes-extended/libidn/libidn_1.35.bb | 42 ---- 6 files changed, 316 deletions(-) delete mode 100644 meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch delete mode 100644 meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch delete mode 100644 meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch delete mode 100644 meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch delete mode 100644 meta/recipes-extended/libidn/libidn_1.35.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 5f1dae9a34..8f612ace39 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -340,7 +340,6 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton " RECIPE_MAINTAINER_pn-libical = "Ross Burton " RECIPE_MAINTAINER_pn-libice = "Armin Kuster " RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen " -RECIPE_MAINTAINER_pn-libidn = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton " RECIPE_MAINTAINER_pn-libinput = "Ross Burton " RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton " diff --git a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch deleted file mode 100644 index 5adc7d9fd9..0000000000 --- a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Tue, 28 Jun 2016 12:43:31 +0100 -Subject: [PATCH] idn: fix printf() format security warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../../libidn-1.32/src/idn.c: In function 'main': -| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no format arguments [-Werror=format-security] -| error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no format arguments [-Werror=format-security] -| fprintf (stderr, _("Type each input string on a line by itself, " -| ^~~~~~~ -| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, errno, _("input error")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ - -Signed-off-by: Andr? Draszik ---- -Upstream-Status: Pending - - src/idn.c | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/src/idn.c b/src/idn.c -index be1c7d1..68e4291 100644 ---- a/src/idn.c -+++ b/src/idn.c -@@ -170,7 +170,7 @@ main (int argc, char *argv[]) - (args_info.idna_to_unicode_given ? 1 : 0) + - (args_info.nfkc_given ? 1 : 0) != 1) - { -- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -+ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified")); - usage (EXIT_FAILURE); - } - -@@ -185,7 +185,7 @@ main (int argc, char *argv[]) - if (!args_info.quiet_given - && args_info.inputs_num == 0 - && isatty (fileno (stdin))) -- fprintf (stderr, _("Type each input string on a line by itself, " -+ fprintf (stderr, "%s", _("Type each input string on a line by itself, " - "terminated by a newline character.\n")); - - do -@@ -197,7 +197,7 @@ main (int argc, char *argv[]) - if (feof (stdin)) - break; - -- error (EXIT_FAILURE, errno, _("input error")); -+ error (EXIT_FAILURE, errno, "%s", _("input error")); - } - - if (strlen (line) > 0) -@@ -215,7 +215,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -240,7 +240,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -277,7 +277,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, &len); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - if (args_info.debug_given) -@@ -336,7 +336,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - p = stringprep_utf8_to_locale (r); -@@ -360,7 +360,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, NULL); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - if (args_info.debug_given) -@@ -438,7 +438,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - } - -@@ -494,7 +494,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - p = stringprep_utf8_to_locale (r); -@@ -523,7 +523,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -537,7 +537,8 @@ main (int argc, char *argv[]) - r = stringprep_utf8_nfkc_normalize (p, -1); - free (p); - if (!r) -- error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -+ error (EXIT_FAILURE, 0, "%s", -+ _("could not do NFKC normalization")); - - if (args_info.debug_given) - { -@@ -547,7 +548,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - --- -2.8.1 - diff --git a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch deleted file mode 100644 index 43bd232944..0000000000 --- a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Tue, 10 Jul 2012 02:44:30 -0700 -Subject: [PATCH] libidn: fix build with automake 1.12 - -Upstream-Status: Inappropriate - -automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that, -and the warnings are treated as errors because of the -Werror parameter. - -These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not -eliminated these deprecated macros yet. So disable the treatment of warnings -as errors until gettext is updated to remove the deprecated macros. - -Signed-off-by: Nitin A Kamble -2012/07/10 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 261dad2..c4f935e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn at gnu.org]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - # Library code modified: REVISION++ diff --git a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch deleted file mode 100644 index 0863530f29..0000000000 --- a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist -diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am ---- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300 -+++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200 -@@ -49,15 +49,9 @@ - - # Man pages. - --dist_man_MANS = idn.1 $(gdoc_MANS) -+dist_man_MANS = $(gdoc_MANS) - MAINTAINERCLEANFILES = $(dist_man_MANS) - --idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \ -- $(top_srcdir)/configure.ac -- $(HELP2MAN) \ -- --name="Internationalized Domain Names command line tool" \ -- --output=$@ $(top_builddir)/src/idn$(EXEEXT) -- - # GDOC - - GDOC_BIN = $(srcdir)/gdoc diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch deleted file mode 100644 index 3c0559e34f..0000000000 --- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Wed, 2 May 2012 18:05:19 -0700 -Subject: [PATCH] libtasn1: fix build with automake 1.12 - -Upstream-Status: Pending - -This patch fixes following issue with automake 1.12 - -| automake: warnings are treated as errors -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-off-by: Nitin A Kamble -2012/05/03 - ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8297649..7b9626e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) - AC_SUBST(LT_REVISION, 0) - AC_SUBST(LT_AGE, 6) - -+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it -+m4_pattern_allow([AM_PROG_AR]) -+AM_PROG_AR -+ - AC_PROG_CC - gl_EARLY - lgl_EARLY diff --git a/meta/recipes-extended/libidn/libidn_1.35.bb b/meta/recipes-extended/libidn/libidn_1.35.bb deleted file mode 100644 index d5ce5b46bd..0000000000 --- a/meta/recipes-extended/libidn/libidn_1.35.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Internationalized Domain Name support library" -DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." -HOMEPAGE = "http://www.gnu.org/software/libidn/" -SECTION = "libs" -LICENSE = "(LGPLv2.1+ | LGPLv3) & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \ - file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ - file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" -DEPENDS = "virtual/libiconv autoconf-archive" - -inherit pkgconfig autotools gettext texinfo gtk-doc - -SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ - file://libidn_fix_for_automake-1.12.patch \ - file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ - file://dont-depend-on-help2man.patch \ - file://0001-idn-format-security-warnings.patch \ - " - -SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead" -SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e" - -# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 -# so package command into a separate package -PACKAGES =+ "idn" -FILES_idn = "${bindir}/*" - -LICENSE_${PN} = "LGPLv2.1+ | LGPLv3" -LICENSE_idn = "GPLv3+" - -EXTRA_OECONF = "--disable-csharp" - -do_install_append() { - rm -rf ${D}${datadir}/emacs -} - -BBCLASSEXTEND = "native nativesdk" - -- 2.17.1 From patchwork at patchwork.openembedded.org Sun Feb 23 18:02:22 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sun, 23 Feb 2020 18:02:22 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_=22webkitg?= =?utf-8?q?tk=3A_Correct_from_REQUIR=2E=2E=2E=22_and_5_more?= In-Reply-To: <20200223173214.9487-1-bunk@stusta.de> References: <20200223173214.9487-1-bunk@stusta.de> Message-ID: <20200223180222.2276.77082@do> == Series Details == Series: "webkitgtk: Correct from REQUIR..." and 5 more Revision: 1 URL : https://patchwork.openembedded.org/series/22885/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [1/6] webkitgtk: Correct from REQUIRED_DISTRO_FEATURES to ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" Issue Commit shortlog is too long [test_shortlog_length] Suggested fix Edit shortlog so that it is 90 characters or less (currently 100 characters) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From bunk at stusta.de Sun Feb 23 18:29:30 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 20:29:30 +0200 Subject: [OE-core] [PATCH v2 3/6] webkitgtk: Remove obsolete gtk2 packageconfig In-Reply-To: <20200223182933.6168-1-bunk@stusta.de> References: <20200223182933.6168-1-bunk@stusta.de> Message-ID: <20200223182933.6168-3-bunk@stusta.de> Upstream no longer supports GTK2 plugins. Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 80ed427352..a9c00862c3 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -48,7 +48,6 @@ PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" -PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" -- 2.17.1 From bunk at stusta.de Sun Feb 23 18:29:29 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 20:29:29 +0200 Subject: [OE-core] [PATCH v2 2/6] webkitgtk: Remove unused DEPENDS on pulseaudio In-Reply-To: <20200223182933.6168-1-bunk@stusta.de> References: <20200223182933.6168-1-bunk@stusta.de> Message-ID: <20200223182933.6168-2-bunk@stusta.de> Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 51fba94964..80ed427352 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -33,7 +33,7 @@ CVE_PRODUCT = "webkitgtk webkitgtk\+" DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -- 2.17.1 From bunk at stusta.de Sun Feb 23 18:29:31 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 20:29:31 +0200 Subject: [OE-core] [PATCH v2 4/6] webkitgtk: Remove the unused DEPENDS on libidn In-Reply-To: <20200223182933.6168-1-bunk@stusta.de> References: <20200223182933.6168-1-bunk@stusta.de> Message-ID: <20200223182933.6168-4-bunk@stusta.de> Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a9c00862c3..7b3d16d8cb 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,7 +30,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ -- 2.17.1 From bunk at stusta.de Sun Feb 23 18:29:28 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 20:29:28 +0200 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements Message-ID: <20200223182933.6168-1-bunk@stusta.de> opengl is optional. x11 can be replaced with wayland. Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index a48a976f94..51fba94964 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" CVE_PRODUCT = "webkitgtk webkitgtk\+" -- 2.17.1 From bunk at stusta.de Sun Feb 23 18:29:32 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 20:29:32 +0200 Subject: [OE-core] [PATCH v2 5/6] systemd: Add a PACKAGECONFIG for libidn2 In-Reply-To: <20200223182933.6168-1-bunk@stusta.de> References: <20200223182933.6168-1-bunk@stusta.de> Message-ID: <20200223182933.6168-5-bunk@stusta.de> Signed-off-by: Adrian Bunk --- meta/recipes-core/systemd/systemd_244.3.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index b686519482..5d863410b8 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -138,6 +138,7 @@ PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl" PACKAGECONFIG[kmod] = "-Dkmod=true,-Dkmod=false,kmod" PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig" PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn" +PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2" PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false" PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false" PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4" -- 2.17.1 From bunk at stusta.de Sun Feb 23 18:29:33 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 20:29:33 +0200 Subject: [OE-core] [PATCH v2 6/6] libidn: Move to meta-oe In-Reply-To: <20200223182933.6168-1-bunk@stusta.de> References: <20200223182933.6168-1-bunk@stusta.de> Message-ID: <20200223182933.6168-6-bunk@stusta.de> There are no users left in OE-core. Signed-off-by: Adrian Bunk --- meta/conf/distro/include/maintainers.inc | 1 - .../0001-idn-format-security-warnings.patch | 181 ------------------ ...R_P_warning_error_with_automake_1.12.patch | 34 ---- .../libidn/dont-depend-on-help2man.patch | 23 --- .../libidn/libidn_fix_for_automake-1.12.patch | 35 ---- meta/recipes-extended/libidn/libidn_1.35.bb | 42 ---- 6 files changed, 316 deletions(-) delete mode 100644 meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch delete mode 100644 meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch delete mode 100644 meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch delete mode 100644 meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch delete mode 100644 meta/recipes-extended/libidn/libidn_1.35.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 5f1dae9a34..8f612ace39 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -340,7 +340,6 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton " RECIPE_MAINTAINER_pn-libical = "Ross Burton " RECIPE_MAINTAINER_pn-libice = "Armin Kuster " RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen " -RECIPE_MAINTAINER_pn-libidn = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton " RECIPE_MAINTAINER_pn-libinput = "Ross Burton " RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton " diff --git a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch deleted file mode 100644 index 5adc7d9fd9..0000000000 --- a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Tue, 28 Jun 2016 12:43:31 +0100 -Subject: [PATCH] idn: fix printf() format security warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../../libidn-1.32/src/idn.c: In function 'main': -| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no format arguments [-Werror=format-security] -| error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no format arguments [-Werror=format-security] -| fprintf (stderr, _("Type each input string on a line by itself, " -| ^~~~~~~ -| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, errno, _("input error")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UCS-4 to UTF-8")); -| ^ -| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ -| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no format arguments [-Werror=format-security] -| error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -| ^~~~~ -| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no format arguments [-Werror=format-security] -| _("could not convert from UTF-8 to UCS-4")); -| ^ - -Signed-off-by: Andr? Draszik ---- -Upstream-Status: Pending - - src/idn.c | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/src/idn.c b/src/idn.c -index be1c7d1..68e4291 100644 ---- a/src/idn.c -+++ b/src/idn.c -@@ -170,7 +170,7 @@ main (int argc, char *argv[]) - (args_info.idna_to_unicode_given ? 1 : 0) + - (args_info.nfkc_given ? 1 : 0) != 1) - { -- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); -+ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified")); - usage (EXIT_FAILURE); - } - -@@ -185,7 +185,7 @@ main (int argc, char *argv[]) - if (!args_info.quiet_given - && args_info.inputs_num == 0 - && isatty (fileno (stdin))) -- fprintf (stderr, _("Type each input string on a line by itself, " -+ fprintf (stderr, "%s", _("Type each input string on a line by itself, " - "terminated by a newline character.\n")); - - do -@@ -197,7 +197,7 @@ main (int argc, char *argv[]) - if (feof (stdin)) - break; - -- error (EXIT_FAILURE, errno, _("input error")); -+ error (EXIT_FAILURE, errno, "%s", _("input error")); - } - - if (strlen (line) > 0) -@@ -215,7 +215,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -240,7 +240,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -277,7 +277,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, &len); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - if (args_info.debug_given) -@@ -336,7 +336,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - p = stringprep_utf8_to_locale (r); -@@ -360,7 +360,7 @@ main (int argc, char *argv[]) - q = stringprep_utf8_to_ucs4 (p, -1, NULL); - free (p); - if (!q) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - - if (args_info.debug_given) -@@ -438,7 +438,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UCS-4 to UTF-8")); - } - -@@ -494,7 +494,7 @@ main (int argc, char *argv[]) - r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); - free (q); - if (!r) -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - - p = stringprep_utf8_to_locale (r); -@@ -523,7 +523,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (p); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - -@@ -537,7 +537,8 @@ main (int argc, char *argv[]) - r = stringprep_utf8_nfkc_normalize (p, -1); - free (p); - if (!r) -- error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); -+ error (EXIT_FAILURE, 0, "%s", -+ _("could not do NFKC normalization")); - - if (args_info.debug_given) - { -@@ -547,7 +548,7 @@ main (int argc, char *argv[]) - if (!q) - { - free (r); -- error (EXIT_FAILURE, 0, -+ error (EXIT_FAILURE, 0, "%s", - _("could not convert from UTF-8 to UCS-4")); - } - --- -2.8.1 - diff --git a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch deleted file mode 100644 index 43bd232944..0000000000 --- a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Tue, 10 Jul 2012 02:44:30 -0700 -Subject: [PATCH] libidn: fix build with automake 1.12 - -Upstream-Status: Inappropriate - -automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that, -and the warnings are treated as errors because of the -Werror parameter. - -These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not -eliminated these deprecated macros yet. So disable the treatment of warnings -as errors until gettext is updated to remove the deprecated macros. - -Signed-off-by: Nitin A Kamble -2012/07/10 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 261dad2..c4f935e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn at gnu.org]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - # Library code modified: REVISION++ diff --git a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch deleted file mode 100644 index 0863530f29..0000000000 --- a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist -diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am ---- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300 -+++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200 -@@ -49,15 +49,9 @@ - - # Man pages. - --dist_man_MANS = idn.1 $(gdoc_MANS) -+dist_man_MANS = $(gdoc_MANS) - MAINTAINERCLEANFILES = $(dist_man_MANS) - --idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \ -- $(top_srcdir)/configure.ac -- $(HELP2MAN) \ -- --name="Internationalized Domain Names command line tool" \ -- --output=$@ $(top_builddir)/src/idn$(EXEEXT) -- - # GDOC - - GDOC_BIN = $(srcdir)/gdoc diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch deleted file mode 100644 index 3c0559e34f..0000000000 --- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Wed, 2 May 2012 18:05:19 -0700 -Subject: [PATCH] libtasn1: fix build with automake 1.12 - -Upstream-Status: Pending - -This patch fixes following issue with automake 1.12 - -| automake: warnings are treated as errors -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-off-by: Nitin A Kamble -2012/05/03 - ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8297649..7b9626e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) - AC_SUBST(LT_REVISION, 0) - AC_SUBST(LT_AGE, 6) - -+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it -+m4_pattern_allow([AM_PROG_AR]) -+AM_PROG_AR -+ - AC_PROG_CC - gl_EARLY - lgl_EARLY diff --git a/meta/recipes-extended/libidn/libidn_1.35.bb b/meta/recipes-extended/libidn/libidn_1.35.bb deleted file mode 100644 index d5ce5b46bd..0000000000 --- a/meta/recipes-extended/libidn/libidn_1.35.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Internationalized Domain Name support library" -DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." -HOMEPAGE = "http://www.gnu.org/software/libidn/" -SECTION = "libs" -LICENSE = "(LGPLv2.1+ | LGPLv3) & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \ - file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ - file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" -DEPENDS = "virtual/libiconv autoconf-archive" - -inherit pkgconfig autotools gettext texinfo gtk-doc - -SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ - file://libidn_fix_for_automake-1.12.patch \ - file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ - file://dont-depend-on-help2man.patch \ - file://0001-idn-format-security-warnings.patch \ - " - -SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead" -SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e" - -# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 -# so package command into a separate package -PACKAGES =+ "idn" -FILES_idn = "${bindir}/*" - -LICENSE_${PN} = "LGPLv2.1+ | LGPLv3" -LICENSE_idn = "GPLv3+" - -EXTRA_OECONF = "--disable-csharp" - -do_install_append() { - rm -rf ${D}${datadir}/emacs -} - -BBCLASSEXTEND = "native nativesdk" - -- 2.17.1 From bunk at stusta.de Sun Feb 23 18:30:25 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 20:30:25 +0200 Subject: [OE-core] [PATCH] Revert "psmisc: Fix dependency for USE_NLS=no" Message-ID: <20200223183025.6310-1-bunk@stusta.de> This reverts commit 52971eeaaf0adcf859ab04853e9ab2e551e4998f. The original problem was later fix by psmisc: revert to default autopoint exclusion Signed-off-by: Adrian Bunk --- meta/recipes-extended/psmisc/psmisc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index a75b04702c..6ab1288152 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -7,7 +7,7 @@ command sends a specified signal (SIGTERM if nothing is specified) to \ processes identified by name. The fuser command identifies the PIDs \ of processes that are using specified files or filesystems." SECTION = "base" -DEPENDS = "ncurses virtual/libintl gettext-native" +DEPENDS = "ncurses virtual/libintl" LICENSE = "GPLv2" SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" -- 2.17.1 From bunk at stusta.de Sun Feb 23 19:34:07 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 21:34:07 +0200 Subject: [OE-core] [RFC][PATCH 1/2] nss: Move to meta-oe Message-ID: <20200223193408.5602-1-bunk@stusta.de> rpm was the last user in OE-core. Signed-off-by: Adrian Bunk --- meta/conf/distro/include/maintainers.inc | 1 - ...figure-option-to-disable-ARM-HW-cryp.patch | 52 ---- ...0001-nss-fix-support-cross-compiling.patch | 48 --- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss-fix-incorrect-shebang-of-perl.patch | 110 ------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- .../recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 ------------------ 14 files changed, 638 deletions(-) delete mode 100644 meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch delete mode 100644 meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch delete mode 100644 meta/recipes-support/nss/nss/blank-cert9.db delete mode 100644 meta/recipes-support/nss/nss/blank-key4.db delete mode 100644 meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch delete mode 100644 meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch delete mode 100644 meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch delete mode 100644 meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch delete mode 100644 meta/recipes-support/nss/nss/nss.pc.in delete mode 100644 meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch delete mode 100644 meta/recipes-support/nss/nss/signlibs.sh delete mode 100644 meta/recipes-support/nss/nss/system-pkcs11.txt delete mode 100644 meta/recipes-support/nss/nss_3.50.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 8f612ace39..e4b710d640 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch deleted file mode 100644 index c380c14491..0000000000 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ - /* We don't test on big endian platform, so disable this on big endian. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d5403397e7..0000000000 --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia -Signed-off-by: Alexander Kanavin ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db deleted file mode 100644 index 7d4bcf2582d510f7b51d4306706746178c41fbbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 zcmeH~OK;Oa6ou_RTxhB2E*&F{wuccN{o(-@&vF*Mi2=rvIMnr}O+nF`U&7>vtSn_P&Rbs?}Ky8c(Wy zjHlCiaZ{VD-7zVX_dOET`quV08qKEvy)(=5Nl};AV#WCkI{QcIZ4Tp+IO%uabo%Gw zb$Tw&dfn5rlx8?M?!7wd9t=ch|F}PRE;4CfWnXPyLz+9NM^RTo&4ii>H)%)`Qiv$T z6m}^j6xtLr3b_q!wvuIJM at b$^mh+H{l4PSK`6x+7N|KY3WThl|DM at BZ4k^0jmFr_? zU21mL?5x>Yv$JMr&CZ&g4ObbiGF)Z2%5YW8*_g92XJgLBWtKf-_T1%>%ttXG%{$eS zYBldv^J+tBAFZg{N%A#3+VE(@qivFhlmlr@$fQC^bB9bSWKto|8uF|mf0u}BBX*0} zE#lf?5t-0LWa%XNI!POIl4fv{w&*17(@6s8BvC9SLveCZ#&}%sqAae;;>B{Ttd?VC zwHzy}THeW0!r{#>I zOpbCUp3t|IjGe}YCgyXi+by*cG}5N;l|Le%C-z2vk2!H?xfB*=900 at 8p2!H?xfB*HU&&_aBAa~B at 8(POer3jZPkcWy z`P|6mo5q3cmM!kM!TvAiVe%S-c% z3-wjeY^*HS>WyPU|Gc`cqBpzpe$Fb^OQzAi(h0xnU+wA6R-dC=2)>@Ht*E=lBEG at m5HOG%a-ncl?zv!TW+o%6M at t(ecb|EzZ|N02klX` zt4bfM^s&kxX-L(j#-qlk<~TJ~YG$bksA=nFmZN0Ua-yURC8Og|ijowgB;_bcK}u4R zk`$#RWhqHvO0H2GFE3gjC)-iY$u=k3oNRNl&B-<=+nnt1EQe<~Jj>x(4$tzr*XLfJ zdwuTpqh8MRIrBJ=WFN&qHlL|2X|By at YV&GcsW)5E?zp5}heta++Tqc3%$tZD|PGg>UZ#vCSrupe|beSwim&tN;nJh<_Nv)fW)#XdMbkER%^-c=%+OriWV--Ir z at Ap?=`e(JJ(t1RHN6FE5l?iI5sKEvS2tWV=5P$##AOHafKmY;|fWWW{c#d009U<00Izz00bZa0SG_<0uUH}0X+W?|24)L zLI45~fB*y_009U<00Izz00ij&|2HRpH1roX2tWV=5P$##AOHafKmY;|fB*zuk3h>D zExFsdFN1#n`o?DG at A=!mz4-R0mFHhS{`aGMCw_gf{mystq at 1=2M|VElc{X7l7&S-a z;q0N#(b>ECcfWb-&&$6&y8G8Z_h0;R>*tJVW~XMJ>|DC|(5t=u;D?(BCuVNYzyF() mPYwNr4FV8=00bZa0SG_<0uX=z1Rwx`ArdHzl*W_aDEtSkqPYeD diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d27ba..0000000000 --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d5b6..0000000000 --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 43c09d13ea..0000000000 --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+# CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc93a0..0000000000 --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ecb33..0000000000 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817faaa6..0000000000 --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499f8c..0000000000 --- a/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9cc4..0000000000 --- a/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb deleted file mode 100644 index e9855d7a7e..0000000000 --- a/meta/recipes-support/nss/nss_3.50.bb +++ /dev/null @@ -1,273 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " - -SRC_URI[md5sum] = "e0366615e12b147cebc136c915baea37" -SRC_URI[sha256sum] = "185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7" - -UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" -UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - 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 - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - 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 - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "perl" - -BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From bunk at stusta.de Sun Feb 23 19:34:08 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sun, 23 Feb 2020 21:34:08 +0200 Subject: [OE-core] [RFC][PATCH 2/2] nspr: Move to meta-oe In-Reply-To: <20200223193408.5602-1-bunk@stusta.de> References: <20200223193408.5602-1-bunk@stusta.de> Message-ID: <20200223193408.5602-2-bunk@stusta.de> It was used only by nss. Signed-off-by: Adrian Bunk --- meta/conf/distro/include/maintainers.inc | 1 - .../nspr/0001-md-Fix-build-with-musl.patch | 31 --- .../nspr/nspr/0002-Add-nios2-support.patch | 102 --------- ...remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 --------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ----- meta/recipes-support/nspr/nspr/nspr.pc.in | 11 - .../nspr/nspr/remove-rpath-from-tests.patch | 26 --- .../remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 ------------------ 9 files changed, 542 deletions(-) delete mode 100644 meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch delete mode 100644 meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch delete mode 100644 meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch delete mode 100644 meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch delete mode 100644 meta/recipes-support/nspr/nspr/nspr.pc.in delete mode 100644 meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch delete mode 100644 meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch delete mode 100644 meta/recipes-support/nspr/nspr_4.25.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index e4b710d640..874c595f0d 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -525,7 +525,6 @@ RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang " RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd670026..0000000000 --- a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header is not provided by musl -linux kernel headers provide which has same definitions - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 3a04d426a8..0000000000 --- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg -@@ -975,6 +975,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ diff --git a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f34d..0000000000 --- a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc8548..0000000000 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index 1f15d19cfa..0000000000 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: -I${includedir}/nspr diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index 7ba59ed644..0000000000 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c5dc..0000000000 --- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr_4.25.bb b/meta/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1eed..0000000000 --- a/meta/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From alistair at alistair23.me Sun Feb 23 20:24:53 2020 From: alistair at alistair23.me (Alistair Francis) Date: Sun, 23 Feb 2020 12:24:53 -0800 Subject: [OE-core] [PATCH] clutter: Build cluter with the GDK backend Message-ID: <20200223202453.22249-1-alistair@alistair23.me> ClutterActors can crash with strange segfaults when built without the GDK backend but run ontop of GDK. To fix this let's add a PACKAGECONFIG to enable/disable GDK backend support and enable it by default. Signed-off-by: Alistair Francis --- meta/recipes-graphics/clutter/clutter-1.0.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 5dc45ebf21..e0ac819e4c 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -24,11 +24,11 @@ ERDEPENDS_EVDEV = "xkeyboard-config" # Disable pretty much everything, override in platform specific set up EXTRA_OECONF += "--disable-quartz-backend \ --disable-win32-backend \ - --disable-gdk-backend \ --disable-cex100-backend \ --disable-tslib-input \ " +PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" # Default configuration, distros might want to override -PACKAGECONFIG ??= "egl \ +PACKAGECONFIG ??= "egl gdk \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" -- 2.25.0 From alex.kanavin at gmail.com Sun Feb 23 22:11:11 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sun, 23 Feb 2020 23:11:11 +0100 Subject: [OE-core] [PATCH] wayland: add ptest Message-ID: <20200223221111.12560-1-alex.kanavin@gmail.com> Sadly, meson makes it very difficult to install tests: the test configuration is written into host-specific binary files, which can't be transferred to the target. (unlike autotools where at least everything happens via Makefiles which can be patched and tweaked via sed and env vars) So the configuration has to be entirely recreated in shell. I managed this for wayland, but weston proved too difficult. I had filed bugs asking upstream to make the tests installable: https://gitlab.freedesktop.org/wayland/wayland/issues/146 https://gitlab.freedesktop.org/wayland/weston/issues/368 Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/recipes-graphics/wayland/wayland/run-ptest | 17 +++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.18.0.bb | 14 +++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/wayland/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 6e770853b8..4afac58e3a 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -47,6 +47,7 @@ PTESTS_FAST = "\ quilt-ptest \ sed-ptest \ slang-ptest \ + wayland-ptest \ zlib-ptest \ " diff --git a/meta/recipes-graphics/wayland/wayland/run-ptest b/meta/recipes-graphics/wayland/wayland/run-ptest new file mode 100644 index 0000000000..7e8d9de046 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +export WAYLAND_SCANNER=wayland-scanner +export TEST_DATA_DIR=tests/data +export TEST_OUTPUT_DIR=tests/output +export SED=sed +export WAYLAND_EGL_LIB=/usr/lib/libwayland-egl.so.1 +export NM=nm + +for i in `ls tests/*-test tests/wayland-egl-symbols-check tests/scanner-test.sh`; do + $i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb index 5dc31163da..00be3aac27 100644 --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://run-ptest \ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ @@ -23,7 +24,7 @@ SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -inherit meson pkgconfig +inherit meson pkgconfig ptest PACKAGECONFIG ??= "dtd-validation" PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," @@ -39,6 +40,15 @@ do_install_append_class-native() { -i ${D}/${datadir}/aclocal/wayland-scanner.m4 } +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/tests/data + cp -rf ${B}/tests/*-test ${B}/tests/*-checker ${D}${PTEST_PATH}/tests + cp -rf ${B}/tests/*-checker ${D}${PTEST_PATH} + cp -rf ${S}/tests/scanner-test.sh ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/data/* ${D}${PTEST_PATH}/tests/data/ + cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ +} + sysroot_stage_all_append_class-target () { rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ @@ -48,3 +58,5 @@ FILES_${PN} = "${libdir}/*${SOLIBS}" FILES_${PN}-dev += "${bindir} ${datadir}/wayland" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN}-ptest += "binutils sed" -- 2.25.0 From anuj.mittal at intel.com Sun Feb 23 23:30:06 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Sun, 23 Feb 2020 23:30:06 +0000 Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: This is causing error when building linux-yocto-rt 5.2: | In file included from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/spinlock.h:51, | from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/mmzone.h:8, | from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/gfp.h:6, | from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/slab.h:15, | from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/crypto.h:19, | from /build/tmp/work-shared/intel-core2-32/kernel-source/arch/x86/kernel/asm-offsets.c:9: | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/spinlock_api_smp.h: In function '__raw_spin_trylock': | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/preempt.h:190:3: error: implicit declaration of function '__preempt_schedule' [-Werror=implicit-function-declaration] | 190 | __preempt_schedule(); \ | | ^~~~~~~~~~~~~~~~~~ | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/spinlock_api_smp.h:93:2: note: in expansion of macro 'preempt_enable' | 93 | preempt_enable(); | | ^~~~~~~~~~~~~~ | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/rcupdate.h: In function 'rcu_read_unlock_sched_notrace': | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/preempt.h:197:3: error: implicit declaration of function '__preempt_schedule_notrace'; did you mean 'preempt_enable_notrace'? [-Werror=implicit-function-declaration] | 197 | __preempt_schedule_notrace(); \ | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/rcupdate.h:731:2: note: in expansion of macro 'preempt_enable_notrace' | 731 | preempt_enable_notrace(); | | ^~~~~~~~~~~~~~~~~~~~~~ Thanks, Anuj > -----Original Message----- > From: openembedded-core-bounces at lists.openembedded.org bounces at lists.openembedded.org> On Behalf Of bruce.ashfield at gmail.com > Sent: Saturday, February 22, 2020 01:46 AM > To: richard.purdie at linuxfoundation.org > Cc: openembedded-core at lists.openembedded.org > Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 > > From: Bruce Ashfield > > Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following > commits: > > 928ea9c56927 Linux 5.2.29 > 4e41907620bc slip: Fix use-after-free Read in slip_open > d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open > 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB > devices > 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected > 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error > d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE > modules > c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support > 4ac031b15d86 USB: serial: mos7840: fix remote wakeup > 4d44a218aea6 USB: serial: mos7720: fix remote wakeup > 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 > 13a33fb9debe appledisplay: fix error handling in the scheduled work > 0cd437d7c16b USB: chaoskey: fix error case of a timeout > 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge > 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status > 726510907c68 USBIP: add config dependency for SGL_ALLOC > 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer > 1e4921f684ca media: imon: invalid dereference in imon_touch_event > d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query > ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking > e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure > 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of > cpufreq > 767facdefa23 media: usbvision: Fix races among open, close, and disconnect > ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect > 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true > 57f2b5c44f02 nfc: port100: handle command failure cleanly > 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD > c938307a439a futex: Prevent robust futex exit race > 8b0f13ee2b7b nbd: prevent memory leak > 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the > lowmem/highmem boundary > a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset > 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt > workqueues" > 53eaf5993eea ath9k_hw: fix uninitialized variable data > 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in > ath10k_usb_alloc_urb_from_pipe > 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility > ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection > 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() > c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around > set_page_dirty() > 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles > c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on > unsupported ASICs > 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven > ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface > 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in > remove_stable_node() > 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in > shrink_zone_span() > 01d151b7e74e virtio_balloon: fix shrinker count > caae62219805 virtio_ring: fix return code on DMA mapping fails > 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed > abce58c3af15 nbd:fix memory leak in nbd_get_socket() > 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils > 3608aa07bac2 gpio: max77620: Fixup debounce delays > c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers > 95a617d1f70c net/mlx5: Update the list of the PCI supported devices > febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode > f8bddf0e192a net/mlx5e: Fix error flow cleanup in > mlx5e_tc_tun_create_header_ipv4/6 > e049e3c43308 taprio: don't reject same mqprio settings > 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family > 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress > 27845a1dd06b net/mlx5: Fix auto group size calculation > ec6d299939c3 net/mlx5e: Fix set vf link state error flow > bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array > size > 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists > a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in > act_tunnel_key > 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path > 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() > 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings > ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion > 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel > da957117e731 fbdev: Ditch fb_edid_add_monspecs > 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess > fault > 0063e9b69796 mm/memory_hotplug: fix updating the node span > d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in > shrink_pgdat_span() > 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any > process > 045a481acd16 slcan: Fix memory leak in error path > 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite > 8505966cdc7e mm/page_io.c: do not free shared swap slots > 349d5ccf8971 mm: hugetlb: switch to css_tryget() in > hugetlb_cgroup_charge_cgroup() > cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() > eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak > of mbind > c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and > QI_DEV_EIOTLB_PFSID macros > 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path > 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation > f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable > either > 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable > 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms > a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is > present > ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets > b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system > 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return > IB_WC_RNR_RETRY_EXC_ERR > 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA > d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK > packet > e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved > 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when > removing > 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 > f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have > (F11, F12) > 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 > driver > 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size > 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption > disabled in ptrace_stop() > a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation > 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint > c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test > ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer > 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb > 364436976763 slip: Fix memory leak in slip_open error path > b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE > modules > c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() > b392b2d28e58 net: gemini: add missed free_netdev > 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). > 5fa89b3526c5 ax88172a: fix information leak on short answers > 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero > efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 > a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, > make the CPU_ENTRY_AREA_PAGES assert precise > 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the > kernel > 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test > 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX > 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry > 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in > SAVE_ALL > 0593a806b430 x86/entry/32: Use %ss segment where required > 26ce03ac3327 x86/entry/32: Fix IRET exception > f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit > 41cb303e1436 x86/pti/32: Size initial_page_table correctly > 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler > 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() > 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame > layout > ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV > 37880a369c68 x86/speculation: Fix redundant MDS mitigation message > 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status > c77d64c158c6 x86/insn: Fix awk regexp warnings > 41bbdde13b43 x86: Use CONFIG_PREEMPTION > 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() > 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value > 8ccce28352fe x86/mm, tracing: Fix CR2 corruption > 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap > 7801660649a0 x86/entry/64: Simplify idtentry a little > 5d305a697f40 x86/entry/32: Simplify common_exception > 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE > bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line > 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant > 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption > e4a8155be9bd x86/ldt: Initialize the context lock for init_mm > f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest > 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() > 22334402db00 x86/stackframe/32: Provide consistent pt_regs > ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations > 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations > ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to > asm/frame.h > c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path > ce394d5e28c6 x86/asm: Pin sensitive CR0 bits > b3327106585c x86/asm: Pin sensitive CR4 bits > e3534ce1de0c Documentation/x86: Fix path to entry_32.S > 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c > 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is > enabled > > Signed-off-by: Bruce Ashfield > --- > .../linux/linux-yocto-rt_5.2.bb | 6 ++--- > .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- > meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++---------- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes- > kernel/linux/linux-yocto-rt_5.2.bb > index 5391e052c5..79da8c14b3 100644 > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > @@ -11,13 +11,13 @@ python () { > raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to > linux-yocto-rt to enable it") } > > -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > SRC_URI = "git://git.yoctoproject.org/linux- > yocto.git;branch=${KBRANCH};name=machine \ > git://git.yoctoproject.org/yocto-kernel- > cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > -LINUX_VERSION ?= "5.2.28" > +LINUX_VERSION ?= "5.2.29" > > LIC_FILES_CHKSUM = > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes- > kernel/linux/linux-yocto-tiny_5.2.bb > index 986dd6e351..d88cb5d742 100644 > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" > > require recipes-kernel/linux/linux-yocto.inc > > -LINUX_VERSION ?= "5.2.28" > +LINUX_VERSION ?= "5.2.29" > LIC_FILES_CHKSUM = > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" > KMETA = "kernel-meta" > KCONF_BSP_AUDIT_LEVEL = "2" > > -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > PV = "${LINUX_VERSION}+git${SRCPV}" > > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes- > kernel/linux/linux-yocto_5.2.bb > index 358c0ad80a..59cc08e9a3 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" > KBRANCH_qemux86-64 ?= "v5.2/standard/base" > KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" > > -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" > -SRCREV_machine_qemuarm64 ?= > "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" > -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemuriscv64 ?= > "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemux86-64 ?= > "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_machine_qemumips64 ?= > "894ee953d9c4036003f41e0800315efe3bab8492" > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" > +SRCREV_machine_qemuarm64 ?= > "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemumips ?= > "078d960b86b2b6539e6823f1da884e85b07e50f3" > +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemuriscv64 ?= > "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemux86-64 ?= > "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_machine_qemumips64 ?= > "ad3efcb4a297394ceb0ab2357737bd8be9846fec" > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= > "qemuarma15" > @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux- > yocto.git;name=machine;branch=${KBRA > git://git.yoctoproject.org/yocto-kernel- > cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > LIC_FILES_CHKSUM = > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > -LINUX_VERSION ?= "5.2.28" > +LINUX_VERSION ?= "5.2.29" > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > DEPENDS += "openssl-native util-linux-native" > -- > 2.19.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Mon Feb 24 00:25:18 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sun, 23 Feb 2020 16:25:18 -0800 Subject: [OE-core] [RFC][PATCH 1/2] nss: Move to meta-oe In-Reply-To: <20200223193408.5602-1-bunk@stusta.de> References: <20200223193408.5602-1-bunk@stusta.de> Message-ID: On Sun, Feb 23, 2020 at 11:34 AM Adrian Bunk wrote: > > rpm was the last user in OE-core. > we should also assess external dependencies especially on libraries, there might be layers which do not depend on meta-oe but use nss or enable nss packageconfigs in core components like curl. > Signed-off-by: Adrian Bunk > --- > meta/conf/distro/include/maintainers.inc | 1 - > ...figure-option-to-disable-ARM-HW-cryp.patch | 52 ---- > ...0001-nss-fix-support-cross-compiling.patch | 48 --- > meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes > meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes > .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- > .../nss-fix-incorrect-shebang-of-perl.patch | 110 ------- > .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- > .../nss-no-rpath-for-cross-compiling.patch | 26 -- > meta/recipes-support/nss/nss/nss.pc.in | 11 - > .../nss/nss/pqg.c-ULL_addend.patch | 23 -- > meta/recipes-support/nss/nss/signlibs.sh | 20 -- > .../recipes-support/nss/nss/system-pkcs11.txt | 5 - > meta/recipes-support/nss/nss_3.50.bb | 273 ------------------ > 14 files changed, 638 deletions(-) > delete mode 100644 meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch > delete mode 100644 meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch > delete mode 100644 meta/recipes-support/nss/nss/blank-cert9.db > delete mode 100644 meta/recipes-support/nss/nss/blank-key4.db > delete mode 100644 meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch > delete mode 100644 meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch > delete mode 100644 meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch > delete mode 100644 meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch > delete mode 100644 meta/recipes-support/nss/nss/nss.pc.in > delete mode 100644 meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch > delete mode 100644 meta/recipes-support/nss/nss/signlibs.sh > delete mode 100644 meta/recipes-support/nss/nss/system-pkcs11.txt > delete mode 100644 meta/recipes-support/nss/nss_3.50.bb > > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc > index 8f612ace39..e4b710d640 100644 > --- a/meta/conf/distro/include/maintainers.inc > +++ b/meta/conf/distro/include/maintainers.inc > @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " > RECIPE_MAINTAINER_pn-ninja = "Khem Raj " > RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " > RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " > -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " > RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " > RECIPE_MAINTAINER_pn-ofono = "Ross Burton " > RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " > diff --git a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch > deleted file mode 100644 > index c380c14491..0000000000 > --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin > -Date: Wed, 18 Dec 2019 12:29:50 +0100 > -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto > - > -Not all current hardware supports it, particularly anything > -prior to armv8 does not. > - > -Upstream-Status: Pending > -Signed-off-by: Alexander Kanavin > ---- > - nss/lib/freebl/Makefile | 3 +++ > - 1 file changed, 3 insertions(+) > - > ---- a/nss/lib/freebl/Makefile > -+++ b/nss/lib/freebl/Makefile > -@@ -125,6 +125,9 @@ else > - DEFINES += -DNSS_X86 > - endif > - endif > -+ > -+ifdef NSS_USE_ARM_HW_CRYPTO > -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO > - ifeq ($(CPU_ARCH),aarch64) > - DEFINES += -DUSE_HW_AES > - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c > -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) > - endif > - endif > - endif > -+endif > - > - ifeq ($(OS_TARGET),OSF1) > - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD > ---- a/nss/lib/freebl/gcm.c > -+++ b/nss/lib/freebl/gcm.c > -@@ -17,6 +17,7 @@ > - > - #include > - > -+#ifdef NSS_USE_ARM_HW_CRYPTO > - /* old gcc doesn't support some poly64x2_t intrinsic */ > - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ > - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) > -@@ -25,6 +26,7 @@ > - /* We don't test on big endian platform, so disable this on big endian. */ > - #define USE_ARM_GCM > - #endif > -+#endif > - > - /* Forward declarations */ > - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); > diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch > deleted file mode 100644 > index d5403397e7..0000000000 > --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin > -Date: Wed, 22 Feb 2017 11:36:11 +0200 > -Subject: [PATCH] nss: fix support cross compiling > - > -Let some make variables be assigned from outside makefile. > - > -Upstream-Status: Inappropriate [configuration] > -Signed-off-by: Hongxu Jia > -Signed-off-by: Alexander Kanavin > ---- > - nss/coreconf/arch.mk | 2 +- > - nss/lib/freebl/Makefile | 6 ++++++ > - 2 files changed, 7 insertions(+), 1 deletion(-) > - > -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk > -index 06c276f..9c1eb51 100644 > ---- a/nss/coreconf/arch.mk > -+++ b/nss/coreconf/arch.mk > -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) > - ifeq ($(OS_TEST),i86pc) > - OS_RELEASE := $(shell uname -r)_$(OS_TEST) > - else > -- OS_RELEASE := $(shell uname -r) > -+ OS_RELEASE ?= $(shell uname -r) > - endif > - > - # > -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile > -index 0ce1425..ebeb411 100644 > ---- a/nss/lib/freebl/Makefile > -+++ b/nss/lib/freebl/Makefile > -@@ -36,6 +36,12 @@ ifdef USE_64 > - DEFINES += -DNSS_USE_64 > - endif > - > -+ifeq ($(OS_TEST),mips) > -+ifndef USE_64 > -+ DEFINES += -DNS_PTR_LE_32 > -+endif > -+endif > -+ > - ifdef USE_ABI32_FPU > - DEFINES += -DNSS_USE_ABI32_FPU > - endif > --- > -2.11.0 > - > diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db > deleted file mode 100644 > index 7d4bcf2582d510f7b51d4306706746178c41fbbc..0000000000000000000000000000000000000000 > GIT binary patch > literal 0 > HcmV?d00001 > > literal 28672 > zcmeH~OK;Oa6ou_RTxhB2E zo*x9ii4|h*_1I~ zZrHba)~#5p8ul;c|MmFZ3-M$7 at oz8K{Np`(`1t46udT0Jd$xfG1V8`;KmY_l00ck) > z1pYgLy&z~bn*RCtYE*m~e$2+BtLgM)o=?WZje~yL8Kk1yJ51jR&WYomsPp1krlfAY > zTxW+fc9>*&F{wuccN{o(-@&vF*Mi2=rvIMnr}O+nF`U&7>vtSn_P&Rbs?}Ky8c(Wy > zjHlCiaZ{VD-7zVX_dOET`quV08qKEvy)(=5Nl};AV#WCkI{QcIZ4Tp+IO%uabo%Gw > zb$Tw&dfn5rlx8?M?!7wd9t=ch|F}PRE;4CfWnXPyLz+9NM^RTo&4ii>H)%)`Qiv$T > z6m}^j6xtLr3b_q!wvuIJM at b$^mh+H{l4PSK`6x+7N|KY3WThl|DM at BZ4k^0jmFr_? > zU21mL?5x>Yv$JMr&CZ&g4ObbiGF)Z2%5YW8*_g92XJgLBWtKf-_T1%>%ttXG%{$eS > zYBldv^J+tBAFZg{N%A#3+VE(@qivFhlmlr@$fQC^bB9bSWKto|8uF|mf0u}BBX*0} > zE#lf?5t-0LWa%XNI!POIl4fv{w&*17(@6s8BvC9SLveCZ#&}%sqAae;;>B{Ttd?VC > zwHzy}THeW0!r{#>I > zOpbCUp3t|IjGe}YCgyXi+by*cG}5N;l|Le%C-z2vk zrm#Z+4+ww&2!H?xfB*=900 at 8p2!H?xfWWd6*rbi&{=clB7yAMM5C8!X009sH0T2KI > z5C8!X00Aa|`#%l>2!H?xfB*=900 at 8p2!H?xfB* z0w4eaAOHd&fcrnr00 at 8p2!H?xfB*=900 at 8p2!H?xEI$F<|Cj$8V}~FB0w4eaAOHd& > O00JNY0w4eaAn+IM > diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db > deleted file mode 100644 > index d47f08d04fe82197bc6a39ef9bf216b61c3dc77a..0000000000000000000000000000000000000000 > GIT binary patch > literal 0 > HcmV?d00001 > > literal 36864 > zcmeI)Pj3 at P7zXfN$JsbGQBr~AB4lZNXcZIG&g?%N!~w at RZQ3*mZcvLjSnGHJQ-_q; > zfnEyAB}g2&RFzt!s;9Q+svn?82vt4w)Lub+1tcV(r_THCZkH&E#0_CRt9bl+XXe at 2 > z-!3E at BtAW}*d2u8!p7!$Fc6M0WtgUMN(jR+GWs>HU&&_aBAa~B at 8(POer3jZPkcWy > z`P|6mo5q3c z4+p{NU=Sqlxq7ovTWyHd+T3D8BzwhlwmM!kM!TvAiVe%S-c% > z3-wjeY^*HS>WyPU|Gc`cqBpzpe$Fb^OQzAi(h0xnU+wA6R z#j<&x2dsS&bURo2{gut`wO|mA#fw{5I^FnOa3?Jx9U!IyCGE zT^ZcDC&Q`CXRYFqve}B3z16-Pt_{+R(Ont+sC!R}lB!Z4v5JS2v+4HxTj6FJlid{) > z_3lZjs>-dC=2)>@Ht*E=lBEG at m5HOG%a-ncl?zv!TW+o%6M at t(ecb|EzZ|N02klX` > zt4bfM^s&kxX-L(j#-qlk<~TJ~YG$bksA=nFmZN0Ua-yURC8Og|ijowgB;_bcK}u4R > zk`$#RWhqHvO0H2GFE3gjC)-iY$u=k3oNRNl&B-<=+nnt1EQe<~Jj>x(4$tzr*XLfJ > zdwuTpqh8MRIrBJ=WFN&qHlL|2X|By at YV&GcsW)5E?zp5}heta++Tqc zuB2nTEakG4%SUzjs4ia at kLP-v=5d zaY>3%$tZD|PGg>UZ#vCSrupe|beSwim&tN;nJh<_Nv)fW)#XdMbkER%^ z;*##3xTISsE<0%%rsakIOTH1JvF&s at ZCXyp3uLFw;#In~lG$mj>-c=%+OriWV--Ir > z at Ap?=`e(JJ(t1RHN6FE5l?iI5sKEvS2tWV=5P$##AOHafKmY;|fWWW{ z7v}{52tWV=5P$##AOHafKmY;|U;#Y;<3 at l01Rwwb2tWV=5P$##AOHaf48H)L|A+q? > z;|w7H0SG_<0uX=z1Rwwb2tWV=c>c#d009U<00Izz00bZa0SG_<0uUH}0X+W?|24)L > zLI45~fB*y_009U<00Izz00ij&|2HRpH1roX2tWV=5P$##AOHafKmY;|fB*zuk3h>D > zExFsdFN1#n`o?DG at A=!mz4-R0mFHhS{`aGMCw_gf{mystq at 1=2M|VElc{X7l7&S-a > z;q0N#(b>ECcfWb-&&$6&y8G8Z_h0;R>*tJVW~XMJ>|DC|(5t=u;D?(BCuVNYzyF() > mPYwNr4FV8=00bZa0SG_<0uX=z1Rwx`ArdHzl*W_aDEtSkqPYeD > > diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch > deleted file mode 100644 > index de812d27ba..0000000000 > --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -clang 3.9 add this warning to rightly flag undefined > -behavior, we relegate this to be just a warning instead > -of error and keep the behavior as it was. Right fix would > -be to not pass enum to the function with variadic arguments > -as last named argument > - > -Fixes errors like > -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] > - va_start(ap, responseType0); > - ^ > -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here > - SECOidTag responseType0, ...) > - > -see > -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start > -for more details > - > -Signed-off-by: Khem Raj > -Upstream-Status: Pending > - > -Index: nss-3.37.1/nss/coreconf/Werror.mk > -=================================================================== > ---- nss-3.37.1.orig/nss/coreconf/Werror.mk > -+++ nss-3.37.1/nss/coreconf/Werror.mk > -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS > - ifdef CC_IS_CLANG > - # -Qunused-arguments : clang objects to arguments that it doesn't understand > - # and fixing this would require rearchitecture > -- WARNING_CFLAGS += -Qunused-arguments > -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs > - # -Wno-parentheses-equality : because clang warns about macro expansions > - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) > - ifdef BUILD_OPT > diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch > deleted file mode 100644 > index 547594d5b6..0000000000 > --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch > +++ /dev/null > @@ -1,110 +0,0 @@ > -nss: fix incorrect shebang of perl > - > -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. > - > -Signed-off-by: Hongxu Jia > -Upstream-Status: Pending > ---- > - nss/cmd/smimetools/smime | 2 +- > - nss/coreconf/cpdist.pl | 2 +- > - nss/coreconf/import.pl | 2 +- > - nss/coreconf/jniregen.pl | 2 +- > - nss/coreconf/outofdate.pl | 2 +- > - nss/coreconf/release.pl | 2 +- > - nss/coreconf/version.pl | 2 +- > - nss/tests/clean_tbx | 2 +- > - nss/tests/path_uniq | 2 +- > - 9 files changed, 9 insertions(+), 9 deletions(-) > - > -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime > ---- a/nss/cmd/smimetools/smime > -+++ b/nss/cmd/smimetools/smime > -@@ -1,4 +1,4 @@ > --#!/usr/local/bin/perl > -+#!/usr/bin/env perl > - > - # This Source Code Form is subject to the terms of the Mozilla Public > - # License, v. 2.0. If a copy of the MPL was not distributed with this > -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl > -index 800edfb..652187f 100755 > ---- a/nss/coreconf/cpdist.pl > -+++ b/nss/coreconf/cpdist.pl > -@@ -1,4 +1,4 @@ > --#! /usr/local/bin/perl > -+#!/usr/bin/env perl > - # > - # This Source Code Form is subject to the terms of the Mozilla Public > - # License, v. 2.0. If a copy of the MPL was not distributed with this > -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl > -index dd2d177..428eaa5 100755 > ---- a/nss/coreconf/import.pl > -+++ b/nss/coreconf/import.pl > -@@ -1,4 +1,4 @@ > --#! /usr/local/bin/perl > -+#!/usr/bin/env perl > - # > - # This Source Code Form is subject to the terms of the Mozilla Public > - # License, v. 2.0. If a copy of the MPL was not distributed with this > -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl > -index 2039180..5f4f69c 100755 > ---- a/nss/coreconf/jniregen.pl > -+++ b/nss/coreconf/jniregen.pl > -@@ -1,4 +1,4 @@ > --#!/usr/local/bin/perl > -+#!/usr/bin/env perl > - # > - # This Source Code Form is subject to the terms of the Mozilla Public > - # License, v. 2.0. If a copy of the MPL was not distributed with this > -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl > -index 33d80bb..01fc097 100755 > ---- a/nss/coreconf/outofdate.pl > -+++ b/nss/coreconf/outofdate.pl > -@@ -1,4 +1,4 @@ > --#!/usr/local/bin/perl > -+#!/usr/bin/env perl > - # > - # This Source Code Form is subject to the terms of the Mozilla Public > - # License, v. 2.0. If a copy of the MPL was not distributed with this > -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl > -index 7cde19d..b5df2f6 100755 > ---- a/nss/coreconf/release.pl > -+++ b/nss/coreconf/release.pl > -@@ -1,4 +1,4 @@ > --#! /usr/local/bin/perl > -+#!/usr/bin/env perl > - # > - # This Source Code Form is subject to the terms of the Mozilla Public > - # License, v. 2.0. If a copy of the MPL was not distributed with this > -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl > -index d2a4942..79359fe 100644 > ---- a/nss/coreconf/version.pl > -+++ b/nss/coreconf/version.pl > -@@ -1,4 +1,4 @@ > --#!/usr/sbin/perl > -+#!/usr/bin/env perl > - # > - # This Source Code Form is subject to the terms of the Mozilla Public > - # License, v. 2.0. If a copy of the MPL was not distributed with this > -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx > -index 4de9555..a7def9f 100755 > ---- a/nss/tests/clean_tbx > -+++ b/nss/tests/clean_tbx > -@@ -1,4 +1,4 @@ > --#! /bin/perl > -+#!/usr/bin/env perl > - > - ####################################################################### > - # > -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq > -index f29f60a..08fbffa 100755 > ---- a/nss/tests/path_uniq > -+++ b/nss/tests/path_uniq > -@@ -1,4 +1,4 @@ > --#! /bin/perl > -+#!/usr/bin/env perl > - > - ######################################################################## > - # > --- > -1.8.1.2 > - > diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch > deleted file mode 100644 > index 43c09d13ea..0000000000 > --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -Fix nss multilib build on openSUSE 11.x 32bit > - > -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will > -fail with error: > - > -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled > - > -It caused by the '-m64' option which passed to host gcc. > - > -The nsinstall was built first while nss starting to build, it only runs > -on host to install built files, it doesn't need any cross-compling or > -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this > -error. > - > -Upstream-Status: Pending > - > -Signed-off-by: Wenzong Fan > -=================================================== > -Index: nss-3.24/nss/coreconf/nsinstall/Makefile > -=================================================================== > ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile > -+++ nss-3.24/nss/coreconf/nsinstall/Makefile > -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 > - > - include $(DEPTH)/coreconf/config.mk > - > -+# nsinstall is unfit for cross-compiling/multilib-build since it was > -+# always run on local host to install built files. This change intends > -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. > -+ARCHFLAG = > -+LDFLAGS = > -+# CFLAGS = > -+ > - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) > - PROGRAM = > - else > diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch > deleted file mode 100644 > index 7661dc93a0..0000000000 > --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -nss:no rpath for cross compiling > - > -Signed-off-by: Hongxu Jia > -Upstream-Status: Inappropriate [configuration] > ---- > - nss/cmd/platlibs.mk | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk > ---- a/nss/cmd/platlibs.mk > -+++ b/nss/cmd/platlibs.mk > -@@ -18,9 +18,9 @@ endif > - > - ifeq ($(OS_ARCH), Linux) > - ifeq ($(USE_64), 1) > --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' > -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' > - else > --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' > -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' > - endif > - endif > - > --- > -1.8.1.2 > - > diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in > deleted file mode 100644 > index 402b4ecb33..0000000000 > --- a/meta/recipes-support/nss/nss/nss.pc.in > +++ /dev/null > @@ -1,11 +0,0 @@ > -prefix=OEPREFIX > -exec_prefix=OEEXECPREFIX > -libdir=OELIBDIR > -includedir=OEINCDIR > - > -Name: NSS > -Description: Network Security Services > -Version: %NSS_VERSION% > -Requires: nspr >= %NSPR_VERSION% > -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 > -Cflags: -IOEINCDIR > diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch > deleted file mode 100644 > index 3a817faaa6..0000000000 > --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -nss does not build on mips with clang because wrong types are used? > - > -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] > - if (addend < MP_DIGIT_MAX) { > - ~~~~~~ ^ ~~~~~~~~~~~~ > - > -Signed-off-by: Khem Raj > -Upstream-Status: Pending > -Index: nss-3.37.1/nss/lib/freebl/pqg.c > -=================================================================== > ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c > -+++ nss-3.37.1/nss/lib/freebl/pqg.c > -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in > - > - static SECStatus > - addToSeed(const SECItem *seed, > -- unsigned long addend, > -- int seedlen, /* g in 186-1 */ > -+ unsigned long long addend, > -+ int seedlen, /* g in 186-1 */ > - SECItem *seedout) > - { > - mp_int s, sum, modulus, tmp; > diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh > deleted file mode 100644 > index a74e499f8c..0000000000 > --- a/meta/recipes-support/nss/nss/signlibs.sh > +++ /dev/null > @@ -1,20 +0,0 @@ > -#!/bin/sh > - > -# signlibs.sh > -# > -# (c)2010 Wind River Systems, Inc. > -# > -# regenerates the .chk files for the NSS libraries that require it > -# since the ones that are built have incorrect checksums that were > -# calculated on the host where they really need to be done on the > -# target > - > -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` > -SIGN_BINARY=`which shlibsign` > -for I in $CHK_FILES > -do > - DN=`dirname $I` > - BN=`basename $I .chk` > - FN=$DN/$BN.so > - $SIGN_BINARY -i $FN > -done > diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt > deleted file mode 100644 > index 1a264e9cc4..0000000000 > --- a/meta/recipes-support/nss/nss/system-pkcs11.txt > +++ /dev/null > @@ -1,5 +0,0 @@ > -library= > -name=NSS Internal PKCS #11 Module > -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' > -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) > - > diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb > deleted file mode 100644 > index e9855d7a7e..0000000000 > --- a/meta/recipes-support/nss/nss_3.50.bb > +++ /dev/null > @@ -1,273 +0,0 @@ > -SUMMARY = "Mozilla's SSL and TLS implementation" > -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ > -designed to support cross-platform development of \ > -security-enabled client and server applications. \ > -Applications built with NSS can support SSL v2 and v3, \ > -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ > -v3 certificates, and other security standards." > -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" > -SECTION = "libs" > - > -DEPENDS = "sqlite3 nspr zlib nss-native" > -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" > - > -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" > - > -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ > - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ > - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" > - > -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" > - > -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ > - file://nss.pc.in \ > - file://signlibs.sh \ > - file://0001-nss-fix-support-cross-compiling.patch \ > - file://nss-no-rpath-for-cross-compiling.patch \ > - file://nss-fix-incorrect-shebang-of-perl.patch \ > - file://disable-Wvarargs-with-clang.patch \ > - file://pqg.c-ULL_addend.patch \ > - file://blank-cert9.db \ > - file://blank-key4.db \ > - file://system-pkcs11.txt \ > - file://nss-fix-nsinstall-build.patch \ > - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ > - " > - > -SRC_URI[md5sum] = "e0366615e12b147cebc136c915baea37" > -SRC_URI[sha256sum] = "185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7" > - > -UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" > -UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" > - > -inherit siteinfo > - > -TD = "${S}/tentative-dist" > -TDS = "${S}/tentative-dist-staging" > - > -TARGET_CC_ARCH += "${LDFLAGS}" > - > -do_configure_prepend_libc-musl () { > - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk > -} > - > -do_compile_prepend_class-native() { > - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr > - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} > - export NSS_ENABLE_WERROR=0 > -} > - > -do_compile_prepend_class-nativesdk() { > - export LDFLAGS="" > -} > - > -do_compile_prepend_class-native() { > - # Need to set RPATH so that chrpath will do its job correctly > - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" > -} > - > -do_compile() { > - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr > - > - export CROSS_COMPILE=1 > - export NATIVE_CC="${BUILD_CC}" > - # Additional defines needed on Centos 7 > - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" > - export BUILD_OPT=1 > - > - export FREEBL_NO_DEPEND=1 > - export FREEBL_LOWHASH=1 > - > - export LIBDIR=${libdir} > - export MOZILLA_CLIENT=1 > - export NS_USE_GCC=1 > - export NSS_USE_SYSTEM_SQLITE=1 > - export NSS_ENABLE_ECC=1 > - > - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} > - > - export OS_RELEASE=3.4 > - export OS_TARGET=Linux > - export OS_ARCH=Linux > - > - if [ "${TARGET_ARCH}" = "powerpc" ]; then > - OS_TEST=ppc > - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then > - 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 > - > - if [ "${SITEINFO_BITS}" = "64" ]; then > - export USE_64=1 > - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then > - export USE_X32=1 > - fi > - > - export NSS_DISABLE_GTESTS=1 > - > - # We can modify CC in the environment, but if we set it via an > - # argument to make, nsinstall, a host program, will also build with it! > - # > - # nss pretty much does its own thing with CFLAGS, so we put them into CC. > - # Optimization will get clobbered, but most of the stuff will survive. > - # The motivation for this is to point to the correct place for debug > - # source files and CFLAGS does that. Nothing uses CCC. > - # > - export CC="${CC} ${CFLAGS}" > - make -C ./nss CCC="${CXX} -g" \ > - OS_TEST=${OS_TEST} \ > - RPATH="${RPATH}" > -} > - > -do_compile[vardepsexclude] += "SITEINFO_BITS" > - > -do_install_prepend_class-nativesdk() { > - export LDFLAGS="" > -} > - > -do_install() { > - export CROSS_COMPILE=1 > - export NATIVE_CC="${BUILD_CC}" > - export BUILD_OPT=1 > - > - export FREEBL_NO_DEPEND=1 > - > - export LIBDIR=${libdir} > - export MOZILLA_CLIENT=1 > - export NS_USE_GCC=1 > - export NSS_USE_SYSTEM_SQLITE=1 > - export NSS_ENABLE_ECC=1 > - > - export OS_RELEASE=3.4 > - export OS_TARGET=Linux > - export OS_ARCH=Linux > - > - if [ "${TARGET_ARCH}" = "powerpc" ]; then > - OS_TEST=ppc > - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then > - 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 > - if [ "${SITEINFO_BITS}" = "64" ]; then > - export USE_64=1 > - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then > - export USE_X32=1 > - fi > - > - export NSS_DISABLE_GTESTS=1 > - > - make -C ./nss \ > - CCC="${CXX}" \ > - OS_TEST=${OS_TEST} \ > - SOURCE_LIB_DIR="${TD}/${libdir}" \ > - SOURCE_BIN_DIR="${TD}/${bindir}" \ > - install > - > - install -d ${D}/${libdir}/ > - for file in ${S}/dist/*.OBJ/lib/*.so; do > - echo "Installing `basename $file`..." > - cp $file ${D}/${libdir}/ > - done > - > - for shared_lib in ${TD}/${libdir}/*.so.*; do > - if [ -f $shared_lib ]; then > - cp $shared_lib ${D}/${libdir} > - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) > - fi > - done > - for shared_lib in ${TD}/${libdir}/*.so; do > - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then > - cp $shared_lib ${D}/${libdir} > - fi > - done > - > - install -d ${D}/${includedir}/nss3 > - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* > - > - install -d ${D}/${bindir} > - for binary in ${TD}/${bindir}/*; do > - install -m 755 -t ${D}/${bindir} $binary > - done > -} > - > -do_install[vardepsexclude] += "SITEINFO_BITS" > - > -do_install_append() { > - # Create empty .chk files for the NSS libraries at build time. They could > - # be regenerated at target's boot time. > - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do > - touch ${D}/${libdir}/$file > - chmod 755 ${D}/${libdir}/$file > - done > - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh > - > - install -d ${D}${libdir}/pkgconfig/ > - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc > - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc > - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc > - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc > - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc > -} > - > -do_install_append_class-target() { > - # It used to call certutil to create a blank certificate with empty password at > - # build time, but the checksum of key4.db changes every time when certutil is called. > - # It causes non-determinism issue, so provide databases with a blank certificate > - # which are originally from output of nss in qemux86-64 build. You can get these > - # databases by: > - # certutil -N -d sql:/database/path/ --empty-password > - install -d ${D}${sysconfdir}/pki/nssdb/ > - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db > - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db > - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt > -} > - > -PACKAGE_WRITE_DEPS += "nss-native" > -pkg_postinst_${PN} () { > - if [ -n "$D" ]; then > - for I in $D${libdir}/lib*.chk; do > - DN=`dirname $I` > - BN=`basename $I .chk` > - FN=$DN/$BN.so > - shlibsign -i $FN > - if [ $? -ne 0 ]; then > - exit 1 > - fi > - done > - else > - signlibs.sh > - fi > -} > - > -PACKAGES =+ "${PN}-smime" > -FILES_${PN}-smime = "\ > - ${bindir}/smime \ > -" > - > -FILES_${PN} = "\ > - ${sysconfdir} \ > - ${bindir} \ > - ${libdir}/lib*.chk \ > - ${libdir}/lib*.so \ > - " > - > -FILES_${PN}-dev = "\ > - ${libdir}/nss \ > - ${libdir}/pkgconfig/* \ > - ${includedir}/* \ > - " > - > -RDEPENDS_${PN}-smime = "perl" > - > -BBCLASSEXTEND = "native nativesdk" > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From akuster808 at gmail.com Mon Feb 24 03:12:26 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Sun, 23 Feb 2020 19:12:26 -0800 Subject: [OE-core] [PATCH] e2fsprogs: update to 1.45.5 Message-ID: <20200224031226.6965-1-akuster808@gmail.com> Dropping patch 0001-misc-create_inode.c-set-dir-s-mode-correctly.patch as upstream has not been accepted for over 2 years and we should not carry it if upstream has not taking it after all that time. Includes: CVE-2019-5188 see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5 for more information. Signed-off-by: Armin Kuster --- ...ate_inode.c-set-dir-s-mode-correctly.patch | 41 ------------------- ...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} | 3 +- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} (97%) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch deleted file mode 100644 index fc4a5409860..00000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 13 Sep 2017 19:55:35 -0700 -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly - -The dir's mode has been set by ext2fs_mkdir() with umask, so -reset it to the source's mode in set_inode_extra(). - -Fixed when source dir's mode is 521, but tarball would be 721, this was -incorrect. - -Upstream-Status: Submitted - -Signed-off-by: Robert Yang ---- - misc/create_inode.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 8ce3faf..50fbaa8 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsys fs, ext2_ino_t ino, - - inode.i_uid = st->st_uid; - inode.i_gid = st->st_gid; -- inode.i_mode |= st->st_mode; -+ /* -+ * The dir's mode has been set by ext2fs_mkdir() with umask, so -+ * reset it to the source's mode -+ */ -+ if S_ISDIR(st->st_mode) -+ inode.i_mode = LINUX_S_IFDIR | st->st_mode; -+ else -+ inode.i_mode |= st->st_mode; - inode.i_atime = st->st_atime; - inode.i_mtime = st->st_mtime; - inode.i_ctime = st->st_ctime; --- -2.10.2 - diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb similarity index 97% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb index 6e69eea21c3..7cd42b8137a 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb @@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ " @@ -13,7 +12,7 @@ SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permissio file://quiet-debugfs.patch \ " -SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" +SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ -- 2.17.1 From bruce.ashfield at gmail.com Mon Feb 24 04:06:35 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Sun, 23 Feb 2020 23:06:35 -0500 Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: On Sun, Feb 23, 2020 at 6:30 PM Mittal, Anuj wrote: > > This is causing error when building linux-yocto-rt 5.2: > It's already fixed in the tree (up to the .32 version), so I can send those bumps out shortly (although that will be followed quickly by the removal of 5.2 from master). Cheers, Bruce > | In file included from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/spinlock.h:51, > | from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/mmzone.h:8, > | from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/gfp.h:6, > | from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/slab.h:15, > | from /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/crypto.h:19, > | from /build/tmp/work-shared/intel-core2-32/kernel-source/arch/x86/kernel/asm-offsets.c:9: > | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/spinlock_api_smp.h: In function '__raw_spin_trylock': > | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/preempt.h:190:3: error: implicit declaration of function '__preempt_schedule' [-Werror=implicit-function-declaration] > | 190 | __preempt_schedule(); \ > | | ^~~~~~~~~~~~~~~~~~ > | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/spinlock_api_smp.h:93:2: note: in expansion of macro 'preempt_enable' > | 93 | preempt_enable(); > | | ^~~~~~~~~~~~~~ > | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/rcupdate.h: In function 'rcu_read_unlock_sched_notrace': > | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/preempt.h:197:3: error: implicit declaration of function '__preempt_schedule_notrace'; did you mean 'preempt_enable_notrace'? [-Werror=implicit-function-declaration] > | 197 | __preempt_schedule_notrace(); \ > | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > | /build/tmp/work-shared/intel-core2-32/kernel-source/include/linux/rcupdate.h:731:2: note: in expansion of macro 'preempt_enable_notrace' > | 731 | preempt_enable_notrace(); > | | ^~~~~~~~~~~~~~~~~~~~~~ > > Thanks, > > Anuj > > > -----Original Message----- > > From: openembedded-core-bounces at lists.openembedded.org > bounces at lists.openembedded.org> On Behalf Of bruce.ashfield at gmail.com > > Sent: Saturday, February 22, 2020 01:46 AM > > To: richard.purdie at linuxfoundation.org > > Cc: openembedded-core at lists.openembedded.org > > Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 > > > > From: Bruce Ashfield > > > > Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following > > commits: > > > > 928ea9c56927 Linux 5.2.29 > > 4e41907620bc slip: Fix use-after-free Read in slip_open > > d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open > > 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB > > devices > > 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected > > 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error > > d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE > > modules > > c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support > > 4ac031b15d86 USB: serial: mos7840: fix remote wakeup > > 4d44a218aea6 USB: serial: mos7720: fix remote wakeup > > 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 > > 13a33fb9debe appledisplay: fix error handling in the scheduled work > > 0cd437d7c16b USB: chaoskey: fix error case of a timeout > > 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge > > 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status > > 726510907c68 USBIP: add config dependency for SGL_ALLOC > > 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer > > 1e4921f684ca media: imon: invalid dereference in imon_touch_event > > d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query > > ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking > > e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure > > 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of > > cpufreq > > 767facdefa23 media: usbvision: Fix races among open, close, and disconnect > > ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect > > 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true > > 57f2b5c44f02 nfc: port100: handle command failure cleanly > > 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD > > c938307a439a futex: Prevent robust futex exit race > > 8b0f13ee2b7b nbd: prevent memory leak > > 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the > > lowmem/highmem boundary > > a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset > > 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt > > workqueues" > > 53eaf5993eea ath9k_hw: fix uninitialized variable data > > 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in > > ath10k_usb_alloc_urb_from_pipe > > 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility > > ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection > > 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() > > c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around > > set_page_dirty() > > 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles > > c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on > > unsupported ASICs > > 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven > > ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface > > 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in > > remove_stable_node() > > 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in > > shrink_zone_span() > > 01d151b7e74e virtio_balloon: fix shrinker count > > caae62219805 virtio_ring: fix return code on DMA mapping fails > > 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed > > abce58c3af15 nbd:fix memory leak in nbd_get_socket() > > 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils > > 3608aa07bac2 gpio: max77620: Fixup debounce delays > > c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers > > 95a617d1f70c net/mlx5: Update the list of the PCI supported devices > > febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode > > f8bddf0e192a net/mlx5e: Fix error flow cleanup in > > mlx5e_tc_tun_create_header_ipv4/6 > > e049e3c43308 taprio: don't reject same mqprio settings > > 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family > > 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress > > 27845a1dd06b net/mlx5: Fix auto group size calculation > > ec6d299939c3 net/mlx5e: Fix set vf link state error flow > > bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array > > size > > 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists > > a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in > > act_tunnel_key > > 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path > > 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() > > 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings > > ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion > > 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel > > da957117e731 fbdev: Ditch fb_edid_add_monspecs > > 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess > > fault > > 0063e9b69796 mm/memory_hotplug: fix updating the node span > > d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in > > shrink_pgdat_span() > > 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any > > process > > 045a481acd16 slcan: Fix memory leak in error path > > 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite > > 8505966cdc7e mm/page_io.c: do not free shared swap slots > > 349d5ccf8971 mm: hugetlb: switch to css_tryget() in > > hugetlb_cgroup_charge_cgroup() > > cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() > > eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak > > of mbind > > c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and > > QI_DEV_EIOTLB_PFSID macros > > 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path > > 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation > > f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable > > either > > 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable > > 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms > > a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is > > present > > ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets > > b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system > > 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return > > IB_WC_RNR_RETRY_EXC_ERR > > 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA > > d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK > > packet > > e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved > > 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when > > removing > > 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 > > f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have > > (F11, F12) > > 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 > > driver > > 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size > > 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption > > disabled in ptrace_stop() > > a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation > > 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint > > c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test > > ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer > > 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb > > 364436976763 slip: Fix memory leak in slip_open error path > > b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE > > modules > > c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() > > b392b2d28e58 net: gemini: add missed free_netdev > > 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). > > 5fa89b3526c5 ax88172a: fix information leak on short answers > > 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero > > efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 > > a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, > > make the CPU_ENTRY_AREA_PAGES assert precise > > 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the > > kernel > > 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test > > 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX > > 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry > > 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in > > SAVE_ALL > > 0593a806b430 x86/entry/32: Use %ss segment where required > > 26ce03ac3327 x86/entry/32: Fix IRET exception > > f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit > > 41cb303e1436 x86/pti/32: Size initial_page_table correctly > > 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler > > 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() > > 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame > > layout > > ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV > > 37880a369c68 x86/speculation: Fix redundant MDS mitigation message > > 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status > > c77d64c158c6 x86/insn: Fix awk regexp warnings > > 41bbdde13b43 x86: Use CONFIG_PREEMPTION > > 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() > > 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value > > 8ccce28352fe x86/mm, tracing: Fix CR2 corruption > > 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap > > 7801660649a0 x86/entry/64: Simplify idtentry a little > > 5d305a697f40 x86/entry/32: Simplify common_exception > > 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE > > bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line > > 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant > > 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption > > e4a8155be9bd x86/ldt: Initialize the context lock for init_mm > > f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest > > 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() > > 22334402db00 x86/stackframe/32: Provide consistent pt_regs > > ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations > > 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations > > ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to > > asm/frame.h > > c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path > > ce394d5e28c6 x86/asm: Pin sensitive CR0 bits > > b3327106585c x86/asm: Pin sensitive CR4 bits > > e3534ce1de0c Documentation/x86: Fix path to entry_32.S > > 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c > > 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is > > enabled > > > > Signed-off-by: Bruce Ashfield > > --- > > .../linux/linux-yocto-rt_5.2.bb | 6 ++--- > > .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- > > meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++---------- > > 3 files changed, 18 insertions(+), 18 deletions(-) > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes- > > kernel/linux/linux-yocto-rt_5.2.bb > > index 5391e052c5..79da8c14b3 100644 > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > @@ -11,13 +11,13 @@ python () { > > raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to > > linux-yocto-rt to enable it") } > > > > -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > SRC_URI = "git://git.yoctoproject.org/linux- > > yocto.git;branch=${KBRANCH};name=machine \ > > git://git.yoctoproject.org/yocto-kernel- > > cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > -LINUX_VERSION ?= "5.2.28" > > +LINUX_VERSION ?= "5.2.29" > > > > LIC_FILES_CHKSUM = > > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes- > > kernel/linux/linux-yocto-tiny_5.2.bb > > index 986dd6e351..d88cb5d742 100644 > > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" > > > > require recipes-kernel/linux/linux-yocto.inc > > > > -LINUX_VERSION ?= "5.2.28" > > +LINUX_VERSION ?= "5.2.29" > > LIC_FILES_CHKSUM = > > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" > > KMETA = "kernel-meta" > > KCONF_BSP_AUDIT_LEVEL = "2" > > > > -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > PV = "${LINUX_VERSION}+git${SRCPV}" > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes- > > kernel/linux/linux-yocto_5.2.bb > > index 358c0ad80a..59cc08e9a3 100644 > > --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" > > KBRANCH_qemux86-64 ?= "v5.2/standard/base" > > KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" > > > > -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" > > -SRCREV_machine_qemuarm64 ?= > > "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" > > -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemuriscv64 ?= > > "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemux86-64 ?= > > "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_machine_qemumips64 ?= > > "894ee953d9c4036003f41e0800315efe3bab8492" > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" > > +SRCREV_machine_qemuarm64 ?= > > "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemumips ?= > > "078d960b86b2b6539e6823f1da884e85b07e50f3" > > +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemuriscv64 ?= > > "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemux86-64 ?= > > "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_machine_qemumips64 ?= > > "ad3efcb4a297394ceb0ab2357737bd8be9846fec" > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= > > "qemuarma15" > > @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux- > > yocto.git;name=machine;branch=${KBRA > > git://git.yoctoproject.org/yocto-kernel- > > cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > LIC_FILES_CHKSUM = > > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > -LINUX_VERSION ?= "5.2.28" > > +LINUX_VERSION ?= "5.2.29" > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > DEPENDS += "openssl-native util-linux-native" > > -- > > 2.19.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From bunk at stusta.de Mon Feb 24 05:17:45 2020 From: bunk at stusta.de (Adrian Bunk) Date: Mon, 24 Feb 2020 07:17:45 +0200 Subject: [OE-core] [RFC][PATCH 1/2] nss: Move to meta-oe In-Reply-To: References: <20200223193408.5602-1-bunk@stusta.de> Message-ID: <20200224051745.GA6683@localhost> On Sun, Feb 23, 2020 at 04:25:18PM -0800, Khem Raj wrote: > On Sun, Feb 23, 2020 at 11:34 AM Adrian Bunk wrote: > > > > rpm was the last user in OE-core. > > we should also assess external dependencies especially on libraries, > there might be layers which do not depend on meta-oe but use nss > or enable nss packageconfigs in core components like curl. >... Is providing a crypto library in OE-core without providing security support better than not shipping it? nss in warrior seems to lack fixes for at least 5 CVEs. cu Adrian From anuj.mittal at intel.com Mon Feb 24 05:18:37 2020 From: anuj.mittal at intel.com (Mittal, Anuj) Date: Mon, 24 Feb 2020 05:18:37 +0000 Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: > -----Original Message----- > From: Bruce Ashfield > Sent: Monday, February 24, 2020 12:07 PM > To: Mittal, Anuj > Cc: richard.purdie at linuxfoundation.org; openembedded- > core at lists.openembedded.org > Subject: Re: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 > > On Sun, Feb 23, 2020 at 6:30 PM Mittal, Anuj wrote: > > > > This is causing error when building linux-yocto-rt 5.2: > > > > It's already fixed in the tree (up to the .32 version), so I can send those bumps out Thanks, it will help zeus which has 5.2 too. Thanks, Anuj > shortly (although that will be followed quickly by the removal of 5.2 from master). > > Cheers, > > Bruce > > > | In file included from /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/spinlock.h:51, > > | from /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/mmzone.h:8, > > | from /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/gfp.h:6, > > | from /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/slab.h:15, > > | from /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/crypto.h:19, > > | from /build/tmp/work-shared/intel-core2-32/kernel- > source/arch/x86/kernel/asm-offsets.c:9: > > | /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/spinlock_api_smp.h: In function '__raw_spin_trylock': > > | /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/preempt.h:190:3: error: implicit declaration of function > '__preempt_schedule' [-Werror=implicit-function-declaration] > > | 190 | __preempt_schedule(); \ > > | | ^~~~~~~~~~~~~~~~~~ > > | /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/spinlock_api_smp.h:93:2: note: in expansion of macro > 'preempt_enable' > > | 93 | preempt_enable(); > > | | ^~~~~~~~~~~~~~ > > | /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/rcupdate.h: In function 'rcu_read_unlock_sched_notrace': > > | /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/preempt.h:197:3: error: implicit declaration of function > '__preempt_schedule_notrace'; did you mean 'preempt_enable_notrace'? [- > Werror=implicit-function-declaration] > > | 197 | __preempt_schedule_notrace(); \ > > | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > | /build/tmp/work-shared/intel-core2-32/kernel- > source/include/linux/rcupdate.h:731:2: note: in expansion of macro > 'preempt_enable_notrace' > > | 731 | preempt_enable_notrace(); > > | | ^~~~~~~~~~~~~~~~~~~~~~ > > > > Thanks, > > > > Anuj > > > > > -----Original Message----- > > > From: openembedded-core-bounces at lists.openembedded.org > > > On Behalf Of > > > bruce.ashfield at gmail.com > > > Sent: Saturday, February 22, 2020 01:46 AM > > > To: richard.purdie at linuxfoundation.org > > > Cc: openembedded-core at lists.openembedded.org > > > Subject: [OE-core] [PATCH 03/10] linux-yocto/5.2: update to v5.2.29 > > > > > > From: Bruce Ashfield > > > > > > Updating linux-yocto/5.2 to the latest korg -stable release that > > > comprises the following > > > commits: > > > > > > 928ea9c56927 Linux 5.2.29 > > > 4e41907620bc slip: Fix use-after-free Read in slip_open > > > d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open > > > 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some > > > info-leaks to USB devices > > > 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected > > > 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding > error > > > d8b3d5fb8765 USB: serial: option: add support for Foxconn > > > T77W968 LTE modules > > > c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support > > > 4ac031b15d86 USB: serial: mos7840: fix remote wakeup > > > 4d44a218aea6 USB: serial: mos7720: fix remote wakeup > > > 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 > > > 13a33fb9debe appledisplay: fix error handling in the scheduled work > > > 0cd437d7c16b USB: chaoskey: fix error case of a timeout > > > 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge > > > 3a71173a4a45 usbip: tools: fix fd leakage in the function of > read_attr_usbip_status > > > 726510907c68 USBIP: add config dependency for SGL_ALLOC > > > 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer > > > 1e4921f684ca media: imon: invalid dereference in imon_touch_event > > > d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query > > > ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking > > > e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure > > > 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() > > > methods of cpufreq > > > 767facdefa23 media: usbvision: Fix races among open, close, and disconnect > > > ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect > > > 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to > true > > > 57f2b5c44f02 nfc: port100: handle command failure cleanly > > > 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD > > > c938307a439a futex: Prevent robust futex exit race > > > 8b0f13ee2b7b nbd: prevent memory leak > > > 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the > > > lowmem/highmem boundary > > > a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset > > > 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and > > > crypt workqueues" > > > 53eaf5993eea ath9k_hw: fix uninitialized variable data > > > 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in > > > ath10k_usb_alloc_urb_from_pipe > > > 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility > > > ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection > > > 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() > > > c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock > > > around > > > set_page_dirty() > > > 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles > > > c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr > > > on unsupported ASICs > > > 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven > > > ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface > > > 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in > > > remove_stable_node() > > > 79194b4a342c mm/memory_hotplug: don't access uninitialized > > > memmaps in > > > shrink_zone_span() > > > 01d151b7e74e virtio_balloon: fix shrinker count > > > caae62219805 virtio_ring: fix return code on DMA mapping fails > > > 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed > > > abce58c3af15 nbd:fix memory leak in nbd_get_socket() > > > 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils > > > 3608aa07bac2 gpio: max77620: Fixup debounce delays > > > c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers > > > 95a617d1f70c net/mlx5: Update the list of the PCI supported devices > > > febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode > > > f8bddf0e192a net/mlx5e: Fix error flow cleanup in > > > mlx5e_tc_tun_create_header_ipv4/6 > > > e049e3c43308 taprio: don't reject same mqprio settings > > > 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family > > > 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress > > > 27845a1dd06b net/mlx5: Fix auto group size calculation > > > ec6d299939c3 net/mlx5e: Fix set vf link state error flow > > > bab144f2a957 net/mlxfw: Verify FSM error code translation > > > doesn't exceed array size > > > 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists > > > a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX > > > in act_tunnel_key > > > 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path > > > 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() > > > 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings > > > ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion > > > 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE > tunnel > > > da957117e731 fbdev: Ditch fb_edid_add_monspecs > > > 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after > > > unhandled uaccess fault > > > 0063e9b69796 mm/memory_hotplug: fix updating the node span > > > d27074543286 mm/memory_hotplug: don't access uninitialized > > > memmaps in > > > shrink_pgdat_span() > > > 62ca688436d3 block, bfq: deschedule empty bfq_queues not > > > referred by any process > > > 045a481acd16 slcan: Fix memory leak in error path > > > 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite > > > 8505966cdc7e mm/page_io.c: do not free shared swap slots > > > 349d5ccf8971 mm: hugetlb: switch to css_tryget() in > > > hugetlb_cgroup_charge_cgroup() > > > cb4df7d810ac mm: memcg: switch to css_tryget() in > get_mem_cgroup_from_mm() > > > eec30082ea78 mm: mempolicy: fix the wrong return value and > > > potential pages leak of mbind > > > c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and > > > QI_DEV_EIOTLB_PFSID macros > > > 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path > > > 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation > > > f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent > > > is not stable either > > > 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not > stable > > > 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms > > > a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead > > > touchscreen is present > > > ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets > > > b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system > > > 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return > > > IB_WC_RNR_RETRY_EXC_ERR > > > 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID > RDMA > > > d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building > > > TID RDMA ACK packet > > > e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being > reserved > > > 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller > > > workqueue when removing > > > 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 > > > f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data > > > than we have (F11, F12) > > > 7e649c757a1a Input: synaptics-rmi4 - disable the relative > > > position IRQ in the F12 driver > > > 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size > > > 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with > > > preemption disabled in ptrace_stop() > > > a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange > operation > > > 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint > > > c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution > test > > > ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer > > > 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb > > > 364436976763 slip: Fix memory leak in slip_open error path > > > b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 > > > LTE modules > > > c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() > > > b392b2d28e58 net: gemini: add missed free_netdev > > > 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). > > > 5fa89b3526c5 ax88172a: fix information leak on short answers > > > 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero > > > efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 > > > a0f6ee27e686 x86/pti/32: Calculate the various PTI > > > cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert > precise > > > 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES > > > when abusing the kernel > > > 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test > > > 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX > > > 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception > entry > > > 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in > > > SAVE_ALL > > > 0593a806b430 x86/entry/32: Use %ss segment where required > > > 26ce03ac3327 x86/entry/32: Fix IRET exception > > > f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit > > > 41cb303e1436 x86/pti/32: Size initial_page_table correctly > > > 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault > handler > > > 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() > > > 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent > > > of frame layout > > > ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV > > > 37880a369c68 x86/speculation: Fix redundant MDS mitigation message > > > 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status > > > c77d64c158c6 x86/insn: Fix awk regexp warnings > > > 41bbdde13b43 x86: Use CONFIG_PREEMPTION > > > 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() > > > 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value > > > 8ccce28352fe x86/mm, tracing: Fix CR2 corruption > > > 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap > > > 7801660649a0 x86/entry/64: Simplify idtentry a little > > > 5d305a697f40 x86/entry/32: Simplify common_exception > > > 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE > > > bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line > > > 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant > > > 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption > > > e4a8155be9bd x86/ldt: Initialize the context lock for init_mm > > > f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest > > > 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() > > > 22334402db00 x86/stackframe/32: Provide consistent pt_regs > > > ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations > > > 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations > > > ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to > > > asm/frame.h > > > c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path > > > ce394d5e28c6 x86/asm: Pin sensitive CR0 bits > > > b3327106585c x86/asm: Pin sensitive CR4 bits > > > e3534ce1de0c Documentation/x86: Fix path to entry_32.S > > > 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c > > > 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit > > > emulation is enabled > > > > > > Signed-off-by: Bruce Ashfield > > > --- > > > .../linux/linux-yocto-rt_5.2.bb | 6 ++--- > > > .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- > > > meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 > > > +++++++++---------- > > > 3 files changed, 18 insertions(+), 18 deletions(-) > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > b/meta/recipes- kernel/linux/linux-yocto-rt_5.2.bb > > > index 5391e052c5..79da8c14b3 100644 > > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb > > > @@ -11,13 +11,13 @@ python () { > > > raise bb.parse.SkipRecipe("Set > > > PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") > > > } > > > > > > -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > SRC_URI = "git://git.yoctoproject.org/linux- > > > yocto.git;branch=${KBRANCH};name=machine \ > > > git://git.yoctoproject.org/yocto-kernel- > > > cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > > > -LINUX_VERSION ?= "5.2.28" > > > +LINUX_VERSION ?= "5.2.29" > > > > > > LIC_FILES_CHKSUM = > > > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > b/meta/recipes- kernel/linux/linux-yocto-tiny_5.2.bb > > > index 986dd6e351..d88cb5d742 100644 > > > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb > > > @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" > > > > > > require recipes-kernel/linux/linux-yocto.inc > > > > > > -LINUX_VERSION ?= "5.2.28" > > > +LINUX_VERSION ?= "5.2.29" > > > LIC_FILES_CHKSUM = > > > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" > > > KMETA = "kernel-meta" > > > KCONF_BSP_AUDIT_LEVEL = "2" > > > > > > -SRCREV_machine_qemuarm ?= > "d79fa780eef7c3b08fcff8a44070c211afa91214" > > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > +SRCREV_machine_qemuarm ?= > "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" > > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > PV = "${LINUX_VERSION}+git${SRCPV}" > > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > b/meta/recipes- kernel/linux/linux-yocto_5.2.bb index > > > 358c0ad80a..59cc08e9a3 100644 > > > --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb > > > @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" > > > KBRANCH_qemux86-64 ?= "v5.2/standard/base" > > > KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" > > > > > > -SRCREV_machine_qemuarm ?= > "ed43b791f2cca6e87928fa47556e540333385187" > > > -SRCREV_machine_qemuarm64 ?= > > > "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemumips ?= > "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" > > > -SRCREV_machine_qemuppc ?= > "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemuriscv64 ?= > > > "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemux86 ?= > "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemux86-64 ?= > > > "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_machine_qemumips64 ?= > > > "894ee953d9c4036003f41e0800315efe3bab8492" > > > -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" > > > -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" > > > +SRCREV_machine_qemuarm ?= > "6080c11f80fbba3ae018518af53564a226e7efcf" > > > +SRCREV_machine_qemuarm64 ?= > > > "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemumips ?= > > > "078d960b86b2b6539e6823f1da884e85b07e50f3" > > > +SRCREV_machine_qemuppc ?= > "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemuriscv64 ?= > > > "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemux86 ?= > "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemux86-64 ?= > > > "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_machine_qemumips64 ?= > > > "ad3efcb4a297394ceb0ab2357737bd8be9846fec" > > > +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" > > > +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" > > > > > > # remap qemuarm to qemuarma15 for the 5.2 kernel # > > > KMACHINE_qemuarm ?= "qemuarma15" > > > @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux- > > > yocto.git;name=machine;branch=${KBRA > > > git://git.yoctoproject.org/yocto-kernel- > > > cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" > > > > > > LIC_FILES_CHKSUM = > > > "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" > > > -LINUX_VERSION ?= "5.2.28" > > > +LINUX_VERSION ?= "5.2.29" > > > > > > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" > > > DEPENDS += "openssl-native util-linux-native" > > > -- > > > 2.19.1 > > > > > > -- > > > _______________________________________________ > > > Openembedded-core mailing list > > > Openembedded-core at lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end > - "Use the force Harry" - Gandalf, Star Trek II From chee.yang.lee at intel.com Mon Feb 24 05:46:53 2020 From: chee.yang.lee at intel.com (chee.yang.lee at intel.com) Date: Mon, 24 Feb 2020 13:46:53 +0800 Subject: [OE-core] [PATCH] qemu: Fix CVE-2020-1711 Message-ID: <1582523213-65026-1-git-send-email-chee.yang.lee@intel.com> From: Lee Chee Yang see https://git.qemu.org/?p=qemu.git;a=commit;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc Signed-off-by: Lee Chee Yang --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a557e74..f26e722 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch new file mode 100644 index 0000000..aa7bc82 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch @@ -0,0 +1,64 @@ +From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001 +From: Felipe Franciosi +Date: Thu, 23 Jan 2020 12:44:59 +0000 +Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711) + +When querying an iSCSI server for the provisioning status of blocks (via +GET LBA STATUS), Qemu only validates that the response descriptor zero's +LBA matches the one requested. Given the SCSI spec allows servers to +respond with the status of blocks beyond the end of the LUN, Qemu may +have its heap corrupted by clearing/setting too many bits at the end of +its allocmap for the LUN. + +A malicious guest in control of the iSCSI server could carefully program +Qemu's heap (by selectively setting the bitmap) and then smash it. + +This limits the number of bits that iscsi_co_block_status() will try to +update in the allocmap so it can't overflow the bitmap. + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc] +CVE: CVE-2020-1711 + +Fixes: CVE-2020-1711 +Cc: qemu-stable at nongnu.org +Signed-off-by: Felipe Franciosi +Signed-off-by: Peter Turschmid +Signed-off-by: Raphael Norwitz +Signed-off-by: Kevin Wolf +Signed-off-by: Lee Chee Yang +--- + block/iscsi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/block/iscsi.c b/block/iscsi.c +index 2aea7e3..cbd5729 100644 +--- a/block/iscsi.c ++++ b/block/iscsi.c +@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + struct scsi_get_lba_status *lbas = NULL; + struct scsi_lba_status_descriptor *lbasd = NULL; + struct IscsiTask iTask; +- uint64_t lba; ++ uint64_t lba, max_bytes; + int ret; + + iscsi_co_init_iscsitask(iscsilun, &iTask); +@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + } + + lba = offset / iscsilun->block_size; ++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size; + + qemu_mutex_lock(&iscsilun->mutex); + retry: +@@ -764,7 +765,7 @@ retry: + goto out_unlock; + } + +- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size; ++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes); + + if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED || + lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) { +-- +1.8.3.1 -- 2.7.4 From chee.yang.lee at intel.com Mon Feb 24 06:14:15 2020 From: chee.yang.lee at intel.com (chee.yang.lee at intel.com) Date: Mon, 24 Feb 2020 14:14:15 +0800 Subject: [OE-core] [PATCH][zeus] qemu: Fix CVE-2020-1711 Message-ID: <1582524855-32996-1-git-send-email-chee.yang.lee@intel.com> From: Lee Chee Yang see https://git.qemu.org/?p=qemu.git;a=commit;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc Signed-off-by: Lee Chee Yang --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index bb444b6..d394db8 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://CVE-2019-15890.patch \ file://CVE-2019-12068.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch new file mode 100644 index 0000000..aa7bc82 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch @@ -0,0 +1,64 @@ +From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001 +From: Felipe Franciosi +Date: Thu, 23 Jan 2020 12:44:59 +0000 +Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711) + +When querying an iSCSI server for the provisioning status of blocks (via +GET LBA STATUS), Qemu only validates that the response descriptor zero's +LBA matches the one requested. Given the SCSI spec allows servers to +respond with the status of blocks beyond the end of the LUN, Qemu may +have its heap corrupted by clearing/setting too many bits at the end of +its allocmap for the LUN. + +A malicious guest in control of the iSCSI server could carefully program +Qemu's heap (by selectively setting the bitmap) and then smash it. + +This limits the number of bits that iscsi_co_block_status() will try to +update in the allocmap so it can't overflow the bitmap. + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc] +CVE: CVE-2020-1711 + +Fixes: CVE-2020-1711 +Cc: qemu-stable at nongnu.org +Signed-off-by: Felipe Franciosi +Signed-off-by: Peter Turschmid +Signed-off-by: Raphael Norwitz +Signed-off-by: Kevin Wolf +Signed-off-by: Lee Chee Yang +--- + block/iscsi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/block/iscsi.c b/block/iscsi.c +index 2aea7e3..cbd5729 100644 +--- a/block/iscsi.c ++++ b/block/iscsi.c +@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + struct scsi_get_lba_status *lbas = NULL; + struct scsi_lba_status_descriptor *lbasd = NULL; + struct IscsiTask iTask; +- uint64_t lba; ++ uint64_t lba, max_bytes; + int ret; + + iscsi_co_init_iscsitask(iscsilun, &iTask); +@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + } + + lba = offset / iscsilun->block_size; ++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size; + + qemu_mutex_lock(&iscsilun->mutex); + retry: +@@ -764,7 +765,7 @@ retry: + goto out_unlock; + } + +- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size; ++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes); + + if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED || + lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) { +-- +1.8.3.1 -- 2.7.4 From jacob.kroon at gmail.com Mon Feb 24 07:25:01 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Mon, 24 Feb 2020 08:25:01 +0100 Subject: [OE-core] Overriding SDE_FILE Message-ID: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> Hi Douglas, You updated a comment in reproducible_build.bbclass, commit e7b891b76954c784f5a93bd0a1c91315673ce40d: > -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's ${SDE_FILE}. > +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. > +# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task > +# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE. > +# But I can't really get this to work. What did work for me was to replace "do_create_source_date_epoch_stamp()" in my recipe: do_create_source_date_epoch_stamp() { mkdir -p ${SDE_DIR} date -d "1981-03-03" "+%s" > ${SDE_FILE} } What is the intended way to achieve the thing I'm trying to do here ? Cheers, Jacob From liezhi.yang at windriver.com Mon Feb 24 08:57:05 2020 From: liezhi.yang at windriver.com (Robert Yang) Date: Mon, 24 Feb 2020 16:57:05 +0800 Subject: [OE-core] [PATCH 0/1] weston: PACKAGECONFIG clients requires wayland Message-ID: The following changes since commit 0bfb2e984062e2a00f8989d26aebb89b112d81d2: package_ipk: Add missing variables to the task hash (2020-02-23 23:33:43 +0000) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/weston http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/weston Robert Yang (1): weston: PACKAGECONFIG clients requires wayland meta/recipes-graphics/wayland/weston_8.0.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 From liezhi.yang at windriver.com Mon Feb 24 08:57:06 2020 From: liezhi.yang at windriver.com (Robert Yang) Date: Mon, 24 Feb 2020 16:57:06 +0800 Subject: [OE-core] [PATCH 1/1] weston: PACKAGECONFIG clients requires wayland In-Reply-To: References: Message-ID: Fixed: DISTRO_FEATURES_remove = "wayland" $ bitbake weston clients/meson.build:141:4: ERROR: Problem encountered: weston-simple-dmabuf-egl requires option renderer-gl which is not enabled. If you rather not build this, drop "dmabuf-egl" from simple-clients option. WARNING: exit code 1 from a shell command. Signed-off-by: Robert Yang --- meta/recipes-graphics/wayland/weston_8.0.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston_8.0.0.bb b/meta/recipes-graphics/wayland/weston_8.0.0.bb index 83aee87..f8e9e15 100644 --- a/meta/recipes-graphics/wayland/weston_8.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_8.0.0.bb @@ -27,11 +27,11 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - clients launch" + launch" # # Compositor choices # -- 2.7.4 From richard.purdie at linuxfoundation.org Mon Feb 24 09:17:56 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 24 Feb 2020 09:17:56 +0000 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <20200223182933.6168-1-bunk@stusta.de> References: <20200223182933.6168-1-bunk@stusta.de> Message-ID: On Sun, 2020-02-23 at 20:29 +0200, Adrian Bunk wrote: > opengl is optional. > x11 can be replaced with wayland. > > Signed-off-by: Adrian Bunk > --- > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > index a48a976f94..51fba94964 100644 > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 > > inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc > > -REQUIRED_DISTRO_FEATURES = "x11 opengl" > +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" > > CVE_PRODUCT = "webkitgtk webkitgtk\+" The autobuilder no-x11 build seems unhappy with this patch series unfortunately :( https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1616 Cheers, Richard From richard.purdie at linuxfoundation.org Mon Feb 24 10:23:49 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 24 Feb 2020 10:23:49 +0000 Subject: [OE-core] [PATCH] e2fsprogs: update to 1.45.5 In-Reply-To: <20200224031226.6965-1-akuster808@gmail.com> References: <20200224031226.6965-1-akuster808@gmail.com> Message-ID: <1f5759550013cdb49ebfb34194863af3d9dbcf6c.camel@linuxfoundation.org> On Sun, 2020-02-23 at 19:12 -0800, Armin Kuster wrote: > Dropping patch 0001-misc-create_inode.c-set-dir-s-mode- > correctly.patch as upstream has not been accepted for over 2 years > and we should not carry it if upstream has not taking it after all > that time. Looking at the patch, this worries me a lot. Why have upstream not taken it? Did they say it was incorrect? We wrote the original code to handle offline root here so its entirely possible this is a value issue and we'll break filesystems if we don't have that patch :( I can't take a change like this without more info, CVE or not. Cheers, Richard > Includes: CVE-2019-5188 > > see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5 > for more information. > > Signed-off-by: Armin Kuster > --- > ...ate_inode.c-set-dir-s-mode-correctly.patch | 41 --------------- > ---- > ...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} | 3 +- > 2 files changed, 1 insertion(+), 43 deletions(-) > delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001- > misc-create_inode.c-set-dir-s-mode-correctly.patch > rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb => > e2fsprogs_1.45.5.bb} (97%) > > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- > create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes- > devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode- > correctly.patch > deleted file mode 100644 > index fc4a5409860..00000000000 > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- > create_inode.c-set-dir-s-mode-correctly.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:00 > 2001 > -From: Robert Yang > -Date: Wed, 13 Sep 2017 19:55:35 -0700 > -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly > - > -The dir's mode has been set by ext2fs_mkdir() with umask, so > -reset it to the source's mode in set_inode_extra(). > - > -Fixed when source dir's mode is 521, but tarball would be 721, this > was > -incorrect. > - > -Upstream-Status: Submitted > - > -Signed-off-by: Robert Yang > ---- > - misc/create_inode.c | 9 ++++++++- > - 1 file changed, 8 insertions(+), 1 deletion(-) > - > -diff --git a/misc/create_inode.c b/misc/create_inode.c > -index 8ce3faf..50fbaa8 100644 > ---- a/misc/create_inode.c > -+++ b/misc/create_inode.c > -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsys > fs, ext2_ino_t ino, > - > - inode.i_uid = st->st_uid; > - inode.i_gid = st->st_gid; > -- inode.i_mode |= st->st_mode; > -+ /* > -+ * The dir's mode has been set by ext2fs_mkdir() with umask, so > -+ * reset it to the source's mode > -+ */ > -+ if S_ISDIR(st->st_mode) > -+ inode.i_mode = LINUX_S_IFDIR | st->st_mode; > -+ else > -+ inode.i_mode |= st->st_mode; > - inode.i_atime = st->st_atime; > - inode.i_mtime = st->st_mtime; > - inode.i_ctime = st->st_ctime; > --- > -2.10.2 > - > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb > b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb > similarity index 97% > rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb > rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb > index 6e69eea21c3..7cd42b8137a 100644 > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb > @@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ > file://run-ptest \ > file://ptest.patch \ > file://mkdir_p.patch \ > - file://0001-misc-create_inode.c-set-dir-s-mode- > correctly.patch \ > file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ > file://0001-intl-do-not-try-to-use-gettext-defines-that- > no-longe.patch \ > " > @@ -13,7 +12,7 @@ SRC_URI_append_class-native = " > file://e2fsprogs-fix-missing-check-for-permissio > file://quiet-debugfs.patch \ > " > > -SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" > +SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618" > UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+(\.\d+)*)$" > > EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ > -- > 2.17.1 > From bunk at stusta.de Mon Feb 24 10:46:35 2020 From: bunk at stusta.de (Adrian Bunk) Date: Mon, 24 Feb 2020 12:46:35 +0200 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: References: <20200223182933.6168-1-bunk@stusta.de> Message-ID: <20200224104635.GA27036@localhost> On Mon, Feb 24, 2020 at 09:17:56AM +0000, Richard Purdie wrote: > On Sun, 2020-02-23 at 20:29 +0200, Adrian Bunk wrote: > > opengl is optional. > > x11 can be replaced with wayland. > > > > Signed-off-by: Adrian Bunk > > --- > > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > index a48a976f94..51fba94964 100644 > > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 > > > > inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc > > > > -REQUIRED_DISTRO_FEATURES = "x11 opengl" > > +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" > > > > CVE_PRODUCT = "webkitgtk webkitgtk\+" > > The autobuilder no-x11 build seems unhappy with this patch series > unfortunately :( > > https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1616 Sorry for that, I did not test a wayland-only build of webkitgtk. I'll take care of that this evening, until then please drop either this first patch or the whole series. > Cheers, > > Richard cu Adrian From liezhi.yang at windriver.com Mon Feb 24 11:13:00 2020 From: liezhi.yang at windriver.com (Robert Yang) Date: Mon, 24 Feb 2020 19:13:00 +0800 Subject: [OE-core] [PATCH] e2fsprogs: update to 1.45.5 In-Reply-To: <1f5759550013cdb49ebfb34194863af3d9dbcf6c.camel@linuxfoundation.org> References: <20200224031226.6965-1-akuster808@gmail.com> <1f5759550013cdb49ebfb34194863af3d9dbcf6c.camel@linuxfoundation.org> Message-ID: <89e6bbf2-51ca-4dcf-46b3-e484d228f579@windriver.com> On 2/24/20 6:23 PM, Richard Purdie wrote: > On Sun, 2020-02-23 at 19:12 -0800, Armin Kuster wrote: >> Dropping patch 0001-misc-create_inode.c-set-dir-s-mode- >> correctly.patch as upstream has not been accepted for over 2 years >> and we should not carry it if upstream has not taking it after all >> that time. > > Looking at the patch, this worries me a lot. Why have upstream not > taken it? Did they say it was incorrect? I can't find any records about it, maybe I didn't send it because of some reason. We still need it. I refreshed the patch and sent to upstream. @Armin, The refreshed patch is in the attachment. // Robert > > We wrote the original code to handle offline root here so its entirely > possible this is a value issue and we'll break filesystems if we don't > have that patch :( > > I can't take a change like this without more info, CVE or not. > > Cheers, > > Richard > > >> Includes: CVE-2019-5188 >> >> see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5 >> for more information. >> >> Signed-off-by: Armin Kuster >> --- >> ...ate_inode.c-set-dir-s-mode-correctly.patch | 41 --------------- >> ---- >> ...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} | 3 +- >> 2 files changed, 1 insertion(+), 43 deletions(-) >> delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001- >> misc-create_inode.c-set-dir-s-mode-correctly.patch >> rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb => >> e2fsprogs_1.45.5.bb} (97%) >> >> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- >> create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes- >> devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode- >> correctly.patch >> deleted file mode 100644 >> index fc4a5409860..00000000000 >> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- >> create_inode.c-set-dir-s-mode-correctly.patch >> +++ /dev/null >> @@ -1,41 +0,0 @@ >> -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:00 >> 2001 >> -From: Robert Yang >> -Date: Wed, 13 Sep 2017 19:55:35 -0700 >> -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly >> - >> -The dir's mode has been set by ext2fs_mkdir() with umask, so >> -reset it to the source's mode in set_inode_extra(). >> - >> -Fixed when source dir's mode is 521, but tarball would be 721, this >> was >> -incorrect. >> - >> -Upstream-Status: Submitted >> - >> -Signed-off-by: Robert Yang >> ---- >> - misc/create_inode.c | 9 ++++++++- >> - 1 file changed, 8 insertions(+), 1 deletion(-) >> - >> -diff --git a/misc/create_inode.c b/misc/create_inode.c >> -index 8ce3faf..50fbaa8 100644 >> ---- a/misc/create_inode.c >> -+++ b/misc/create_inode.c >> -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsys >> fs, ext2_ino_t ino, >> - >> - inode.i_uid = st->st_uid; >> - inode.i_gid = st->st_gid; >> -- inode.i_mode |= st->st_mode; >> -+ /* >> -+ * The dir's mode has been set by ext2fs_mkdir() with umask, so >> -+ * reset it to the source's mode >> -+ */ >> -+ if S_ISDIR(st->st_mode) >> -+ inode.i_mode = LINUX_S_IFDIR | st->st_mode; >> -+ else >> -+ inode.i_mode |= st->st_mode; >> - inode.i_atime = st->st_atime; >> - inode.i_mtime = st->st_mtime; >> - inode.i_ctime = st->st_ctime; >> --- >> -2.10.2 >> - >> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb >> b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb >> similarity index 97% >> rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb >> rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb >> index 6e69eea21c3..7cd42b8137a 100644 >> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb >> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb >> @@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ >> file://run-ptest \ >> file://ptest.patch \ >> file://mkdir_p.patch \ >> - file://0001-misc-create_inode.c-set-dir-s-mode- >> correctly.patch \ >> file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ >> file://0001-intl-do-not-try-to-use-gettext-defines-that- >> no-longe.patch \ >> " >> @@ -13,7 +12,7 @@ SRC_URI_append_class-native = " >> file://e2fsprogs-fix-missing-check-for-permissio >> file://quiet-debugfs.patch \ >> " >> >> -SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" >> +SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618" >> UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+(\.\d+)*)$" >> >> EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ >> -- >> 2.17.1 >> > > -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-misc-create_inode.c-set-dir-s-mode-correctly.patch Type: text/x-patch Size: 1343 bytes Desc: not available URL: From git at andred.net Mon Feb 24 12:35:19 2020 From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=) Date: Mon, 24 Feb 2020 12:35:19 +0000 Subject: [OE-core] [PATCH] bitbake.conf: omit XZ threads and RAM from sstate signatures Message-ID: <20200224123519.26348-1-git@andred.net> The number of threads used, and the amount of memory allowed to be used, should not affect sstate signatures, as they don't affect the result. Otherwise, it becomes impossible to re-use sstate from automated builders on developer's machines (as the former might execute bitbake with certain constraints different compared to developer's machines). This is in particular a problem with the opkg package writing backend, as the OPKGBUILDCMD depends on XZ_DEFAULTS. Without the vardepexclude, there is no re-use possible of the package_write_ipk sstate. The reason XZ_DEFAULTS as a whole isn't being whitelisted as such here is that some arguments can affect the outcome of the xz operation, so the approach taken is to only whitelist the safe flags memlimit and # of threads. Change-Id: I20d6ee5485d59a6a0d45fb679c503b035cbe1c40 Signed-off-by: Andr? Draszik --- meta/conf/bitbake.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 954c06b313..d5a1a2471d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -794,7 +794,10 @@ BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" # Default parallelism and resource usage for xz -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" +XZ_MEMLIMIT ?= "50%" +XZ_THREADS ?= "${@oe.utils.cpu_count()}" +XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" +XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" ################################################################## # Magic Cookie for SANITY CHECK -- 2.23.0.rc1 From git at andred.net Mon Feb 24 12:59:55 2020 From: git at andred.net (=?UTF-8?q?Andr=C3=A9=20Draszik?=) Date: Mon, 24 Feb 2020 12:59:55 +0000 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures Message-ID: <20200224125955.26771-1-git@andred.net> The number of threads used, and the amount of memory allowed to be used, should not affect sstate signatures, as they don't affect the result. Otherwise, it becomes impossible to re-use sstate from automated builders on developer's machines (as the former might execute bitbake with certain constraints different compared to developer's machines). This is in particular a problem with the opkg package writing backend, as the OPKGBUILDCMD depends on XZ_DEFAULTS. Without the vardepexclude, there is no re-use possible of the package_write_ipk sstate. The reason XZ_DEFAULTS as a whole isn't being whitelisted as such here is that some arguments can affect the outcome of the xz operation, so the approach taken is to only whitelist the safe flags memlimit and # of threads. Signed-off-by: Andr? Draszik --- v2: remove Gerrit Change-Id line --- meta/conf/bitbake.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 954c06b313..d5a1a2471d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -794,7 +794,10 @@ BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" # Default parallelism and resource usage for xz -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" +XZ_MEMLIMIT ?= "50%" +XZ_THREADS ?= "${@oe.utils.cpu_count()}" +XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" +XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" ################################################################## # Magic Cookie for SANITY CHECK -- 2.23.0.rc1 From bunk at stusta.de Mon Feb 24 13:40:22 2020 From: bunk at stusta.de (Adrian Bunk) Date: Mon, 24 Feb 2020 15:40:22 +0200 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <20200224125955.26771-1-git@andred.net> References: <20200224125955.26771-1-git@andred.net> Message-ID: <20200224134022.GB27036@localhost> On Mon, Feb 24, 2020 at 12:59:55PM +0000, Andr? Draszik wrote: > The number of threads used, and the amount of memory allowed > to be used, should not affect sstate signatures, as they > don't affect the result. Unfortunately they can affect the result. > Otherwise, it becomes impossible to re-use sstate from > automated builders on developer's machines (as the former > might execute bitbake with certain constraints different > compared to developer's machines). >... > -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" >... Threaded compression can result in slightly worse compression than single-threaded compression. With memlimit the problem is actually the opposite way, and worse than what you were trying to fix: When a developer hits memlimit during compression, the documented behavour of xz is to scale down the compression level. I assume 50% wrongly gives the same sstate signature no matter how much RAM is installed on the local machine? cu Adrian From bunk at stusta.de Mon Feb 24 14:08:01 2020 From: bunk at stusta.de (Adrian Bunk) Date: Mon, 24 Feb 2020 16:08:01 +0200 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <20200224104635.GA27036@localhost> References: <20200223182933.6168-1-bunk@stusta.de> <20200224104635.GA27036@localhost> Message-ID: <20200224140801.GC27036@localhost> On Mon, Feb 24, 2020 at 12:46:35PM +0200, Adrian Bunk wrote: > On Mon, Feb 24, 2020 at 09:17:56AM +0000, Richard Purdie wrote: > > On Sun, 2020-02-23 at 20:29 +0200, Adrian Bunk wrote: > > > opengl is optional. > > > x11 can be replaced with wayland. > > > > > > Signed-off-by: Adrian Bunk > > > --- > > > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > > index a48a976f94..51fba94964 100644 > > > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > > > @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 > > > > > > inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc > > > > > > -REQUIRED_DISTRO_FEATURES = "x11 opengl" > > > +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" > > > > > > CVE_PRODUCT = "webkitgtk webkitgtk\+" > > > > The autobuilder no-x11 build seems unhappy with this patch series > > unfortunately :( > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1616 > > Sorry for that, I did not test a wayland-only build of webkitgtk. > > I'll take care of that this evening, until then please drop either this > first patch or the whole series. OK, the short-term solution is to drop the first patch. The original failure is easy to fix (I'll send a patch that moves the X libraries from DEPENDS to the x11 config), but the next one is not: Alexander, wayland support in webkitgtk requires mesa built with x11 support (otherwise gl.pc is not available). cu Adrian From alex.kanavin at gmail.com Mon Feb 24 14:12:26 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 24 Feb 2020 15:12:26 +0100 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <20200224140801.GC27036@localhost> References: <20200223182933.6168-1-bunk@stusta.de> <20200224104635.GA27036@localhost> <20200224140801.GC27036@localhost> Message-ID: On Mon, 24 Feb 2020 at 15:08, Adrian Bunk wrote: > Alexander, wayland support in webkitgtk requires mesa built with x11 > support (otherwise gl.pc is not available). Can you provide links where this happens please? Specifically, where mesa makes that decision, and where webkit asks for that file? So it's easier for me to look into it. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From brgl at bgdev.pl Mon Feb 24 14:14:57 2020 From: brgl at bgdev.pl (Bartosz Golaszewski) Date: Mon, 24 Feb 2020 15:14:57 +0100 Subject: [OE-core] [PATCH] image_types: fix checksum conversion dependencies Message-ID: <20200224141457.10825-1-brgl@bgdev.pl> From: Bartosz Golaszewski Only md5sum and sha256sum tools are provided by HOSTTOOLS. For other checksum utils, the conversions need to depend on coreutils-native. Signed-off-by: Bartosz Golaszewski --- meta/classes/image_types.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index f82f1d8862..63ffbac7e6 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -315,6 +315,10 @@ CONVERSION_DEPENDS_lzo = "lzop-native" CONVERSION_DEPENDS_zip = "zip-native" CONVERSION_DEPENDS_zst = "zstd-native" CONVERSION_DEPENDS_sum = "mtd-utils-native" +CONVERSION_DEPENDS_sha1sum = "coreutils-native" +CONVERSION_DEPENDS_sha224sum = "coreutils-native" +CONVERSION_DEPENDS_sha384sum = "coreutils-native" +CONVERSION_DEPENDS_sha512sum = "coreutils-native" CONVERSION_DEPENDS_bmap = "bmap-tools-native" CONVERSION_DEPENDS_u-boot = "u-boot-tools-native" CONVERSION_DEPENDS_vmdk = "qemu-system-native" -- 2.19.1 From git at andred.net Mon Feb 24 14:21:57 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Mon, 24 Feb 2020 14:21:57 +0000 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <20200224134022.GB27036@localhost> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> Message-ID: <6c0d874e887dc5a2355d236d77e8ec771ea729f9.camel@andred.net> On Mon, 2020-02-24 at 15:40 +0200, Adrian Bunk wrote: > On Mon, Feb 24, 2020 at 12:59:55PM +0000, Andr? Draszik wrote: > > The number of threads used, and the amount of memory allowed > > to be used, should not affect sstate signatures, as they > > don't affect the result. > > Unfortunately they can affect the result. I'm actually aware of that, and was contemplating on expanding on that topic ... I guess I should have > > > Otherwise, it becomes impossible to re-use sstate from > > automated builders on developer's machines (as the former > > might execute bitbake with certain constraints different > > compared to developer's machines). > > ... > > -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" > > ... > > Threaded compression can result in slightly worse compression > than single-threaded compression. > > With memlimit the problem is actually the opposite way, > and worse than what you were trying to fix: > > When a developer hits memlimit during compression, the documented > behavour of xz is to scale down the compression level. I believe none of the above is relevant in the context here, though. The whole point is to avoid running xz again (within a different environment) if artefacts are available already. threads and memlimit in particular are meant to enable compressing on resource constrained systems. Allowing sstate re-use no matter what threading and memory limit was set seems sensible, even if a build- machine has more ram than a deverloper's machine (or vice versa), as the point here is to allow sstate re-use to speed up builds. The point is not to change the compression, or to invalidate upon slight variations due to different amount of RAM. It's good in particular to re-use the sstate artefacts, rather than creating new ones, just because the build happens to run on a different machine. Once the artefact has been created, it doesn't matter anymore how it was created, as long as the high-level options aren't being changed (like an explicit compression level, checksum method, etc.) > I assume 50% wrongly gives the same sstate signature no matter how > much RAM is installed on the local machine? Likely, but a different problem... Even before this patch, you will get differing results, but this patch doesn't prevent you from being more strict and specifying --no-adjust and it doesn't prevent you from changing the compression level as a whole either. Cheers, Andre' From bunk at stusta.de Mon Feb 24 14:31:55 2020 From: bunk at stusta.de (Adrian Bunk) Date: Mon, 24 Feb 2020 16:31:55 +0200 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <6c0d874e887dc5a2355d236d77e8ec771ea729f9.camel@andred.net> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <6c0d874e887dc5a2355d236d77e8ec771ea729f9.camel@andred.net> Message-ID: <20200224143155.GD27036@localhost> On Mon, Feb 24, 2020 at 02:21:57PM +0000, Andr? Draszik wrote: >... > Once the artefact has been created, it doesn't matter anymore how it > was created, as long as the high-level options aren't being changed (like > an explicit compression level, checksum method, etc.) >... meta-poky/conf/distro/poky.conf:INHERIT += "reproducible_build" > Cheers, > Andre' cu Adrian From sno at netbsd.org Mon Feb 24 14:39:20 2020 From: sno at netbsd.org (Jens Rehsack) Date: Mon, 24 Feb 2020 15:39:20 +0100 Subject: [OE-core] [PATCH v3] make: 4.2.1 -> 4.3 Message-ID: <20200224143920.19383-1-sno@netbsd.org> Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch and 0002-glob-Do-not-assume-glibc-glob-internals.patch. 2) License has been changed to GPLv3 only 3) Important bug-fix is * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html 4) Backward-incompatibilities: * Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes * Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space. Fix incompatibility issues between gnulib bundled with updated make fix issues in w32 compat sources. Signed-off-by: Jens Rehsack --- meta/recipes-devtools/make/make.inc | 4 +- ...b-Do-not-assume-glibc-glob-internals.patch | 70 ---------------- ...m4-restrict-AIX-specific-test-on-AIX.patch | 38 +++++++++ ...rc-dir.c-fix-buffer-overflow-warning.patch | 41 ++++++++++ ...b-Do-not-assume-glibc-glob-internals.patch | 38 --------- ...low-being-detected-by-importing-proj.patch | 33 ++++++++ ...02-w32-compat-dirent.c-follow-header.patch | 36 +++++++++ ...-posixfcn-fcntl-gnulib-make-emulated.patch | 79 +++++++++++++++++++ meta/recipes-devtools/make/make_4.2.1.bb | 12 --- meta/recipes-devtools/make/make_4.3.bb | 18 +++++ 10 files changed, 246 insertions(+), 123 deletions(-) delete mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch create mode 100644 meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch delete mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch create mode 100644 meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch create mode 100644 meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb create mode 100644 meta/recipes-devtools/make/make_4.3.bb diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index b8905bc6d3..4142cf23d3 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 2b6e4d40c3..0000000000 --- a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj - - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index f34bbf5..12eef30 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch new file mode 100644 index 0000000000..096bcfdf78 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch @@ -0,0 +1,38 @@ +From 8309601775d9442416329a77f7dcfd8aa799e9a6 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 17:39:56 +0100 +Subject: [PATCH 1/2] m4/getloadavg.m4: restrict AIX specific test on AIX + +When cross compiling for a system without getloadavg, do not try add +additional linker paths unless it's absolutely necessary. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + m4/getloadavg.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 +index 3bd2a14..696c5de 100644 +--- a/m4/getloadavg.m4 ++++ b/m4/getloadavg.m4 +@@ -42,6 +42,8 @@ AC_CHECK_FUNC([getloadavg], [], + fi + + if test $gl_func_getloadavg_done = no; then ++ AS_CASE([$host_os], ++ [aix*], [ + # There is a commonly available library for RS/6000 AIX. + # Since it is not a standard part of AIX, it might be installed locally. + gl_getloadavg_LIBS=$LIBS +@@ -49,6 +51,7 @@ AC_CHECK_FUNC([getloadavg], [], + AC_CHECK_LIB([getloadavg], [getloadavg], + [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], + [LIBS=$gl_getloadavg_LIBS]) ++ ], [:]) + fi + + # Set up the replacement function if necessary. +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch new file mode 100644 index 0000000000..57970824f6 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch @@ -0,0 +1,41 @@ +From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 10:52:21 +0100 +Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning + +Fix compiler warning: + src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the + length of the source argument [-Wstringop-overflow=] + +The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the +size of the buffer is increased by 1 to hold a path with the length of +`MAXPATHLEN` and trailing `0`. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/dir.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dir.c b/src/dir.c +index 862a18e..cad4c4a 100644 +--- a/src/dir.c ++++ b/src/dir.c +@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) + if (plen > 1 && path[plen - 1] == '.' + && (path[plen - 2] == '/' || path[plen - 2] == '\\')) + { +- char parent[MAXPATHLEN]; ++ char parent[MAXPATHLEN+1]; + +- strncpy (parent, path, plen - 2); +- parent[plen - 2] = '\0'; ++ strncpy (parent, path, MAXPATHLEN); ++ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; + if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) + return -1; + } +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index d49acd9f6e..0000000000 --- a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- -Upstream-Status: Backport - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64ec870..e87901c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.16.1 - diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch new file mode 100644 index 0000000000..b3d97f9a3a --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch @@ -0,0 +1,33 @@ +From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 12:10:06 +0100 +Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing + projects + +GNU project `make` relies on gnulib but provides some own compatibility +functions - including an `fcntl`, which fails on mingw. +The intension of gnulib is providing these functions and being wider tested, +but silently injecting a function opens battle of compatibility layers. + +So adding a hint into target `config.h` to allow deciding whether using +an own compatibility implementation or not. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending + + m4/gnulib-comp.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 +index 3ee0811..cf75541 100644 +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -147,6 +147,7 @@ + gl_FUNC_FCNTL + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) ++ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) + fi + gl_FCNTL_MODULE_INDICATOR([fcntl]) + gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch new file mode 100644 index 0000000000..9ecc44543e --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch @@ -0,0 +1,36 @@ +From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Mon, 24 Feb 2020 11:12:43 +0100 +Subject: [PATCH 2/3] w32: compat: dirent.c: follow header + +src/w32/include/dirent.h completely delegates to mingw dirent implementation, +gnulib detects it as fine and completely usable - trust in that. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/w32/compat/dirent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c +index b8ec615..de80f72 100644 +--- a/src/w32/compat/dirent.c ++++ b/src/w32/compat/dirent.c +@@ -23,7 +23,7 @@ this program. If not, see . */ + #include + #include "dirent.h" + +- ++#ifndef __MINGW32__ + DIR* + opendir(const char* pDirName) + { +@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) + + return; + } ++#endif /* !__MINGW32__ */ +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch new file mode 100644 index 0000000000..70414c51f4 --- /dev/null +++ b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch @@ -0,0 +1,79 @@ +From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Fri, 21 Feb 2020 19:29:49 +0100 +Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated + +Rate the fcntl emulation from gnulib higher than the own one. + +Signed-off-by: Jens Rehsack +--- +Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) + + src/output.h | 19 ++++++++++++++----- + src/w32/compat/posixfcn.c | 2 ++ + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/output.h b/src/output.h +index a506505..d3ce6b7 100644 +--- a/src/output.h ++++ b/src/output.h +@@ -67,14 +67,21 @@ void output_dump (struct output *out); + + # ifdef WINDOWS32 + /* For emulations in w32/compat/posixfcn.c. */ +-# define F_GETFD 1 +-# define F_SETLKW 2 ++# ifndef F_GETFD ++# define F_GETFD 1 ++# endif ++# ifndef F_SETLKW ++# define F_SETLKW 2 ++# endif + /* Implementation note: None of the values of l_type below can be zero + -- they are compared with a static instance of the struct, so zero + means unknown/invalid, see w32/compat/posixfcn.c. */ +-# define F_WRLCK 1 +-# define F_UNLCK 2 +- ++# ifndef F_WRLCK ++# define F_WRLCK 1 ++# endif ++# ifndef F_UNLCK ++# define F_UNLCK 2 ++# endif + struct flock + { + short l_type; +@@ -89,7 +96,9 @@ struct flock + typedef intptr_t sync_handle_t; + + /* Public functions emulated/provided in posixfcn.c. */ ++# ifndef HAVE_GNULIB_FCNTL + int fcntl (intptr_t fd, int cmd, ...); ++# endif + intptr_t create_mutex (void); + int same_stream (FILE *f1, FILE *f2); + +diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c +index 975dfb7..d337b9c 100644 +--- a/src/w32/compat/posixfcn.c ++++ b/src/w32/compat/posixfcn.c +@@ -29,6 +29,7 @@ this program. If not, see . */ + #ifndef NO_OUTPUT_SYNC + /* Support for OUTPUT_SYNC and related functionality. */ + ++#ifndef HAVE_GNULIB_FCNTL + /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ + int + fcntl (intptr_t fd, int cmd, ...) +@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) + return -1; + } + } ++#endif /* GNULIB_TEST_FCNTL */ + + static intptr_t mutex_handle = -1; + +-- +2.17.1 + diff --git a/meta/recipes-devtools/make/make_4.2.1.bb b/meta/recipes-devtools/make/make_4.2.1.bb deleted file mode 100644 index c6e6a0cd58..0000000000 --- a/meta/recipes-devtools/make/make_4.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require make.inc - -EXTRA_OECONF += "--without-guile" - -SRC_URI[md5sum] = "15b012617e7c44c0ed482721629577ac" -SRC_URI[sha256sum] = "d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb new file mode 100644 index 0000000000..70caf0ae16 --- /dev/null +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -0,0 +1,18 @@ +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +require make.inc + +SRC_URI += "\ + file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ + file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ + file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ + file://0002-w32-compat-dirent.c-follow-header.patch \ + file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ +" + +EXTRA_OECONF += "--without-guile" + +SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" +SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" + +BBCLASSEXTEND = "native nativesdk" -- 2.17.1 From git at andred.net Mon Feb 24 14:58:21 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Mon, 24 Feb 2020 14:58:21 +0000 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <20200224143155.GD27036@localhost> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <6c0d874e887dc5a2355d236d77e8ec771ea729f9.camel@andred.net> <20200224143155.GD27036@localhost> Message-ID: <5639b75022c28419467aefb8de62c6ab24f9eae6.camel@andred.net> On Mon, 2020-02-24 at 16:31 +0200, Adrian Bunk wrote: > On Mon, Feb 24, 2020 at 02:21:57PM +0000, Andr? Draszik wrote: > > ... > > Once the artefact has been created, it doesn't matter anymore how it > > was created, as long as the high-level options aren't being changed (like > > an explicit compression level, checksum method, etc.) > > ... > > meta-poky/conf/distro/poky.conf:INHERIT += "reproducible_build" I still maintain these are two different problems. I am not trying to fix reproducible builds. Cheers, A. From bunk at stusta.de Mon Feb 24 15:10:41 2020 From: bunk at stusta.de (Adrian Bunk) Date: Mon, 24 Feb 2020 17:10:41 +0200 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <5639b75022c28419467aefb8de62c6ab24f9eae6.camel@andred.net> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <6c0d874e887dc5a2355d236d77e8ec771ea729f9.camel@andred.net> <20200224143155.GD27036@localhost> <5639b75022c28419467aefb8de62c6ab24f9eae6.camel@andred.net> Message-ID: <20200224151041.GE27036@localhost> On Mon, Feb 24, 2020 at 02:58:21PM +0000, Andr? Draszik wrote: > On Mon, 2020-02-24 at 16:31 +0200, Adrian Bunk wrote: > > On Mon, Feb 24, 2020 at 02:21:57PM +0000, Andr? Draszik wrote: > > > ... > > > Once the artefact has been created, it doesn't matter anymore how it > > > was created, as long as the high-level options aren't being changed (like > > > an explicit compression level, checksum method, etc.) > > > ... > > > > meta-poky/conf/distro/poky.conf:INHERIT += "reproducible_build" > > I still maintain these are two different problems. I am not trying to fix > reproducible builds. But won't fixing reproducible builds require reverting the patch you suggest for fixing your problem? > Cheers, > A. cu Adrian From akuster808 at gmail.com Mon Feb 24 15:19:25 2020 From: akuster808 at gmail.com (akuster808) Date: Mon, 24 Feb 2020 07:19:25 -0800 Subject: [OE-core] [PATCH] e2fsprogs: update to 1.45.5 In-Reply-To: <89e6bbf2-51ca-4dcf-46b3-e484d228f579@windriver.com> References: <20200224031226.6965-1-akuster808@gmail.com> <1f5759550013cdb49ebfb34194863af3d9dbcf6c.camel@linuxfoundation.org> <89e6bbf2-51ca-4dcf-46b3-e484d228f579@windriver.com> Message-ID: On 2/24/20 3:13 AM, Robert Yang wrote: > > On 2/24/20 6:23 PM, Richard Purdie wrote: >> On Sun, 2020-02-23 at 19:12 -0800, Armin Kuster wrote: >>> Dropping patch 0001-misc-create_inode.c-set-dir-s-mode- >>> correctly.patch as upstream has not been accepted for over 2 years >>> and we should not carry it if upstream has not taking it after all >>> that time. >> >> Looking at the patch, this worries me a lot. Why have upstream not >> taken it? Did they say it was incorrect? > > I can't find any records about it, maybe I didn't send it because of > some reason. > > We still need it. I refreshed the patch and sent to upstream. > > @Armin, The refreshed patch is in the attachment. Will do. thanks for the feedback. - armin > > // Robert > >> >> We wrote the original code to handle offline root here so its entirely >> possible this is a value issue and we'll break filesystems if we don't >> have that patch :( >> >> I can't take a change like this without more info, CVE or not. > >> >> Cheers, >> >> Richard >> >> >>> Includes: CVE-2019-5188 >>> >>> see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.5 >>> for more information. >>> >>> Signed-off-by: Armin Kuster >>> --- >>> ? ...ate_inode.c-set-dir-s-mode-correctly.patch | 41 --------------- >>> ---- >>> ? ...2fsprogs_1.45.4.bb => e2fsprogs_1.45.5.bb} |? 3 +- >>> ? 2 files changed, 1 insertion(+), 43 deletions(-) >>> ? delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001- >>> misc-create_inode.c-set-dir-s-mode-correctly.patch >>> ? rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb => >>> e2fsprogs_1.45.5.bb} (97%) >>> >>> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- >>> create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes- >>> devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode- >>> correctly.patch >>> deleted file mode 100644 >>> index fc4a5409860..00000000000 >>> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc- >>> create_inode.c-set-dir-s-mode-correctly.patch >>> +++ /dev/null >>> @@ -1,41 +0,0 @@ >>> -From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:00 >>> 2001 >>> -From: Robert Yang >>> -Date: Wed, 13 Sep 2017 19:55:35 -0700 >>> -Subject: [PATCH] misc/create_inode.c: set dir's mode correctly >>> - >>> -The dir's mode has been set by ext2fs_mkdir() with umask, so >>> -reset it to the source's mode in set_inode_extra(). >>> - >>> -Fixed when source dir's mode is 521, but tarball would be 721, this >>> was >>> -incorrect. >>> - >>> -Upstream-Status: Submitted >>> - >>> -Signed-off-by: Robert Yang >>> ---- >>> - misc/create_inode.c | 9 ++++++++- >>> - 1 file changed, 8 insertions(+), 1 deletion(-) >>> - >>> -diff --git a/misc/create_inode.c b/misc/create_inode.c >>> -index 8ce3faf..50fbaa8 100644 >>> ---- a/misc/create_inode.c >>> -+++ b/misc/create_inode.c >>> -@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsys >>> fs, ext2_ino_t ino, >>> - >>> -???? inode.i_uid = st->st_uid; >>> -???? inode.i_gid = st->st_gid; >>> --??? inode.i_mode |= st->st_mode; >>> -+??? /* >>> -+???? * The dir's mode has been set by ext2fs_mkdir() with umask, so >>> -+???? * reset it to the source's mode >>> -+???? */ >>> -+??? if S_ISDIR(st->st_mode) >>> -+??????? inode.i_mode = LINUX_S_IFDIR | st->st_mode; >>> -+??? else >>> -+??????? inode.i_mode |= st->st_mode; >>> -???? inode.i_atime = st->st_atime; >>> -???? inode.i_mtime = st->st_mtime; >>> -???? inode.i_ctime = st->st_ctime; >>> --- >>> -2.10.2 >>> - >>> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb >>> b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb >>> similarity index 97% >>> rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb >>> rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb >>> index 6e69eea21c3..7cd42b8137a 100644 >>> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb >>> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.5.bb >>> @@ -4,7 +4,6 @@ SRC_URI += "file://remove.ldconfig.call.patch \ >>> ???????????? file://run-ptest \ >>> ???????????? file://ptest.patch \ >>> ???????????? file://mkdir_p.patch \ >>> -?????????? file://0001-misc-create_inode.c-set-dir-s-mode- >>> correctly.patch \ >>> ???????????? file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ >>> ???????????? file://0001-intl-do-not-try-to-use-gettext-defines-that- >>> no-longe.patch \ >>> ???????????? " >>> @@ -13,7 +12,7 @@ SRC_URI_append_class-native = " >>> file://e2fsprogs-fix-missing-check-for-permissio >>> ????????????????????????????????? file://quiet-debugfs.patch \ >>> ? " >>> ? -SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac" >>> +SRCREV = "c2b1ec5fbc99ab8a2b71dae45d486b3ea004f618" >>> ? UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+(\.\d+)*)$" >>> ? ? EXTRA_OECONF += "--libdir=${base_libdir} >>> --sbindir=${base_sbindir} \ >>> --? >>> 2.17.1 >>> >> >> From brgl at bgdev.pl Mon Feb 24 15:45:49 2020 From: brgl at bgdev.pl (Bartosz Golaszewski) Date: Mon, 24 Feb 2020 16:45:49 +0100 Subject: [OE-core] [meta-security][PATCH] linux: drop the bbappend for linux v4.x series Message-ID: <20200224154549.17866-1-brgl@bgdev.pl> From: Bartosz Golaszewski v4.19 LTS has been dropped in poky in favor of v5.4. Drop the bbappend from meta-security as right now the build fails. Signed-off-by: Bartosz Golaszewski --- recipes-kernel/linux/linux-yocto_4.%.bbappend | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 recipes-kernel/linux/linux-yocto_4.%.bbappend diff --git a/recipes-kernel/linux/linux-yocto_4.%.bbappend b/recipes-kernel/linux/linux-yocto_4.%.bbappend deleted file mode 100644 index 39d4e6f..0000000 --- a/recipes-kernel/linux/linux-yocto_4.%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" -- 2.19.1 From patchwork at patchwork.openembedded.org Mon Feb 24 16:02:29 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 24 Feb 2020 16:02:29 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_linux=3A_d?= =?utf-8?q?rop_the_bbappend_for_linux_v4=2Ex_series?= In-Reply-To: <20200224154549.17866-1-brgl@bgdev.pl> References: <20200224154549.17866-1-brgl@bgdev.pl> Message-ID: <20200224160229.2273.8445@do> == Series Details == Series: linux: drop the bbappend for linux v4.x series Revision: 1 URL : https://patchwork.openembedded.org/series/22909/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [meta-security] linux: drop the bbappend for linux v4.x series Issue Series sent to the wrong mailing list [test_target_mailing_list] Suggested fix Check the project's README (meta-security) and send the patch to the indicated list * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 0bfb2e9840) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From raj.khem at gmail.com Mon Feb 24 16:07:47 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 24 Feb 2020 08:07:47 -0800 Subject: [OE-core] [PATCH] image_types: fix checksum conversion dependencies In-Reply-To: <20200224141457.10825-1-brgl@bgdev.pl> References: <20200224141457.10825-1-brgl@bgdev.pl> Message-ID: On Mon, Feb 24, 2020 at 6:15 AM Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > Only md5sum and sha256sum tools are provided by HOSTTOOLS. For other > checksum utils, the conversions need to depend on coreutils-native. > > Signed-off-by: Bartosz Golaszewski > --- > meta/classes/image_types.bbclass | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/meta/classes/image_types.bbclass > b/meta/classes/image_types.bbclass > index f82f1d8862..63ffbac7e6 100644 > --- a/meta/classes/image_types.bbclass > +++ b/meta/classes/image_types.bbclass > @@ -315,6 +315,10 @@ CONVERSION_DEPENDS_lzo = "lzop-native" > CONVERSION_DEPENDS_zip = "zip-native" > CONVERSION_DEPENDS_zst = "zstd-native" > CONVERSION_DEPENDS_sum = "mtd-utils-native" > +CONVERSION_DEPENDS_sha1sum = "coreutils-native" > +CONVERSION_DEPENDS_sha224sum = "coreutils-native" > +CONVERSION_DEPENDS_sha384sum = "coreutils-native" > +CONVERSION_DEPENDS_sha512sum = "coreutils-native" If they are common enough on host distros then perhaps add them to HOSTTOOLS might be better > CONVERSION_DEPENDS_bmap = "bmap-tools-native" > CONVERSION_DEPENDS_u-boot = "u-boot-tools-native" > CONVERSION_DEPENDS_vmdk = "qemu-system-native" > -- > 2.19.1 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From akuster808 at gmail.com Mon Feb 24 16:16:56 2020 From: akuster808 at gmail.com (akuster808) Date: Mon, 24 Feb 2020 08:16:56 -0800 Subject: [OE-core] [meta-security][PATCH] linux: drop the bbappend for linux v4.x series In-Reply-To: <20200224154549.17866-1-brgl@bgdev.pl> References: <20200224154549.17866-1-brgl@bgdev.pl> Message-ID: <8bf10a8d-3ea2-8f97-9d47-a3d37176c888@gmail.com> wrong ml. should be yocto at list.yoctoproject.org On 2/24/20 7:45 AM, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > v4.19 LTS has been dropped in poky in favor of v5.4. Drop the bbappend > from meta-security as right now the build fails. Thanks for the patch.? I saw this issue yesterday and you beat me to fixing it. - armin > > Signed-off-by: Bartosz Golaszewski > --- > recipes-kernel/linux/linux-yocto_4.%.bbappend | 2 -- > 1 file changed, 2 deletions(-) > delete mode 100644 recipes-kernel/linux/linux-yocto_4.%.bbappend > > diff --git a/recipes-kernel/linux/linux-yocto_4.%.bbappend b/recipes-kernel/linux/linux-yocto_4.%.bbappend > deleted file mode 100644 > index 39d4e6f..0000000 > --- a/recipes-kernel/linux/linux-yocto_4.%.bbappend > +++ /dev/null > @@ -1,2 +0,0 @@ > -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" > -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" From akuster808 at gmail.com Mon Feb 24 16:32:24 2020 From: akuster808 at gmail.com (akuster808) Date: Mon, 24 Feb 2020 08:32:24 -0800 Subject: [OE-core] [RFC][PATCH 1/2] nss: Move to meta-oe In-Reply-To: <20200224051745.GA6683@localhost> References: <20200223193408.5602-1-bunk@stusta.de> <20200224051745.GA6683@localhost> Message-ID: Adrian, On 2/23/20 9:17 PM, Adrian Bunk wrote: > On Sun, Feb 23, 2020 at 04:25:18PM -0800, Khem Raj wrote: >> On Sun, Feb 23, 2020 at 11:34 AM Adrian Bunk wrote: >>> rpm was the last user in OE-core. >> we should also assess external dependencies especially on libraries, >> there might be layers which do not depend on meta-oe but use nss >> or enable nss packageconfigs in core components like curl. >> ... > Is providing a crypto library in OE-core without providing security > support better than not shipping it? > > nss in warrior seems to lack fixes for at least 5 CVEs. I don't see how that is relevant to the RFC? nss package is not moving out for warrior nor zeus. - armin > > cu > Adrian From matthew.zeng at windriver.com Mon Feb 24 16:35:32 2020 From: matthew.zeng at windriver.com (Mingde (Matthew) Zeng) Date: Mon, 24 Feb 2020 11:35:32 -0500 Subject: [OE-core] [PATCH] perl: fix lib/warnings test on core-image-sato Message-ID: <87zhd8x7sb.fsf@windriver.com> Fixes [YOCTO #13296] The lib/warnings test fails on certain images such as core-image-sato. The upstream has already fixed this issue, thus submitting the relevent backport patch. Signed-off-by: Matthew Zeng -- Mingde (Matthew) Zeng --- ...rl-134117-Close-DATA-in-loc_tools.pl.patch | 30 +++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch diff --git a/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch new file mode 100644 index 0000000000..2ca9f35f4a --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch @@ -0,0 +1,30 @@ +From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001 +From: Richard Leach +Date: Sun, 19 May 2019 20:16:41 +0000 +Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl + +This prevents unexpected text and fixes test lib/warnings.t + +Upstream Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] + +Signed-off-By: Matthew Zeng + +--- + t/loc_tools.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/loc_tools.pl b/t/loc_tools.pl +index c76e29388a..beebd98d88 100644 +--- a/t/loc_tools.pl ++++ b/t/loc_tools.pl +@@ -421,7 +421,7 @@ sub find_locales ($;$) { + } + + # The rest of the locales are in this file. +- push @Data, ; ++ push @Data, ; close DATA; + + foreach my $line (@Data) { + my ($locale_name, $language_codes, $country_codes, $encodings) = +-- +2.25.0 diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 4869012b1a..9d747aa5b4 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ file://racefix.patch \ " @@ -388,4 +389,3 @@ EOF chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl cat ${SYSROOT_DESTDIR}${bindir}/nativeperl } - -- 2.24.0 From matthew.zeng at windriver.com Mon Feb 24 16:34:55 2020 From: matthew.zeng at windriver.com (Mingde (Matthew) Zeng) Date: Mon, 24 Feb 2020 11:34:55 -0500 Subject: [OE-core] [PATCH] perl: fix lib/warnings test on core-image-sato Message-ID: <8736b0ymds.fsf@windriver.com> Fixes [YOCTO #13296] The lib/warnings test fails on certain images such as core-image-sato. The upstream has already fixed this issue, thus submitting the relevent backport patch. Signed-off-by: Matthew Zeng -- Mingde (Matthew) Zeng --- ...rl-134117-Close-DATA-in-loc_tools.pl.patch | 30 +++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch diff --git a/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch new file mode 100644 index 0000000000..2ca9f35f4a --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch @@ -0,0 +1,30 @@ +From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001 +From: Richard Leach +Date: Sun, 19 May 2019 20:16:41 +0000 +Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl + +This prevents unexpected text and fixes test lib/warnings.t + +Upstream Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] + +Signed-off-By: Matthew Zeng + +--- + t/loc_tools.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/loc_tools.pl b/t/loc_tools.pl +index c76e29388a..beebd98d88 100644 +--- a/t/loc_tools.pl ++++ b/t/loc_tools.pl +@@ -421,7 +421,7 @@ sub find_locales ($;$) { + } + + # The rest of the locales are in this file. +- push @Data, ; ++ push @Data, ; close DATA; + + foreach my $line (@Data) { + my ($locale_name, $language_codes, $country_codes, $encodings) = +-- +2.25.0 diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 4869012b1a..9d747aa5b4 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ file://racefix.patch \ " @@ -388,4 +389,3 @@ EOF chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl cat ${SYSROOT_DESTDIR}${bindir}/nativeperl } - -- 2.24.0 From richard.purdie at linuxfoundation.org Mon Feb 24 16:44:28 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 24 Feb 2020 16:44:28 +0000 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <20200224134022.GB27036@localhost> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> Message-ID: <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> On Mon, 2020-02-24 at 15:40 +0200, Adrian Bunk wrote: > On Mon, Feb 24, 2020 at 12:59:55PM +0000, Andr? Draszik wrote: > > The number of threads used, and the amount of memory allowed > > to be used, should not affect sstate signatures, as they > > don't affect the result. > > Unfortunately they can affect the result. I looked into this a bit and its complicated. The threads are used to compress chunks and their compression should be deterministic whether done serially or in parallel. I did some tests and: xz gave equivalent output to: xz --threads=1 and xz --threads=2 xz --threads=5 xz --threads=50 all give different identical output. So if we force --threads >=2 we should have determinism? > > Otherwise, it becomes impossible to re-use sstate from > > automated builders on developer's machines (as the former > > might execute bitbake with certain constraints different > > compared to developer's machines). > > ... > > -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" > > ... > > Threaded compression can result in slightly worse compression > than single-threaded compression. > > With memlimit the problem is actually the opposite way, > and worse than what you were trying to fix: > > When a developer hits memlimit during compression, the documented > behavour of xz is to scale down the compression level. > > I assume 50% wrongly gives the same sstate signature no matter how > much RAM is installed on the local machine? I did some tests locally and I could see different output checksums depending on how much memory I gave xz. Perhaps we should specify a specific high amount like 1GB? Does anyone know more about the internals and how to have this behave "nicely" for our needs? FWIW we haven't seen variation on the autobuilder due to this as far as I know. Cheers, Richard From patchwork at patchwork.openembedded.org Mon Feb 24 17:03:11 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 24 Feb 2020 17:03:11 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_perl=3A_fi?= =?utf-8?q?x_lib/warnings_test_on_core-image-sato?= In-Reply-To: <87zhd8x7sb.fsf@windriver.com> References: <87zhd8x7sb.fsf@windriver.com> Message-ID: <20200224170311.2276.58282@do> == Series Details == Series: perl: fix lib/warnings test on core-image-sato Revision: 1 URL : https://patchwork.openembedded.org/series/22910/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fix Sign off the added patch file (meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch) * Issue Upstream-Status is in incorrect format [test_upstream_status_presence_format] Suggested fix Fix Upstream-Status format in 0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch Current Upstream Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From patchwork at patchwork.openembedded.org Mon Feb 24 17:03:12 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 24 Feb 2020 17:03:12 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_perl=3A_fi?= =?utf-8?q?x_lib/warnings_test_on_core-image-sato_=28rev2=29?= In-Reply-To: <8736b0ymds.fsf@windriver.com> References: <8736b0ymds.fsf@windriver.com> Message-ID: <20200224170312.2276.11468@do> == Series Details == Series: perl: fix lib/warnings test on core-image-sato (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22910/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fix Sign off the added patch file (meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch) * Issue Upstream-Status is in incorrect format [test_upstream_status_presence_format] Suggested fix Fix Upstream-Status format in 0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch Current Upstream Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From bunk at stusta.de Mon Feb 24 17:12:26 2020 From: bunk at stusta.de (Adrian Bunk) Date: Mon, 24 Feb 2020 19:12:26 +0200 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> Message-ID: <20200224171226.GF27036@localhost> On Mon, Feb 24, 2020 at 04:44:28PM +0000, Richard Purdie wrote: > On Mon, 2020-02-24 at 15:40 +0200, Adrian Bunk wrote: > > On Mon, Feb 24, 2020 at 12:59:55PM +0000, Andr? Draszik wrote: > > > The number of threads used, and the amount of memory allowed > > > to be used, should not affect sstate signatures, as they > > > don't affect the result. > > > > Unfortunately they can affect the result. > > I looked into this a bit and its complicated. The threads are used to > compress chunks and their compression should be deterministic whether > done serially or in parallel. > > I did some tests and: > > xz > gave equivalent output to: > xz --threads=1 > > and > > xz --threads=2 > xz --threads=5 > xz --threads=50 > > all give different identical output. > > So if we force --threads >=2 we should have determinism? This was also my guess after reading the manpage, but no definite answer from me. > > > Otherwise, it becomes impossible to re-use sstate from > > > automated builders on developer's machines (as the former > > > might execute bitbake with certain constraints different > > > compared to developer's machines). > > > ... > > > -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" > > > ... > > > > Threaded compression can result in slightly worse compression > > than single-threaded compression. > > > > With memlimit the problem is actually the opposite way, > > and worse than what you were trying to fix: > > > > When a developer hits memlimit during compression, the documented > > behavour of xz is to scale down the compression level. > > > > I assume 50% wrongly gives the same sstate signature no matter how > > much RAM is installed on the local machine? > > I did some tests locally and I could see different output checksums > depending on how much memory I gave xz. > > Perhaps we should specify a specific high amount like 1GB? xz -9 needs 1.25 GB per thread. And since xz decompression speed is linear to compressed size, -9 is often wanted since it gives the fastest xz decompression. > Does anyone know more about the internals and how to have this behave > "nicely" for our needs? > > FWIW we haven't seen variation on the autobuilder due to this as far as > I know. I assume the autobuilders have plenty of RAM per core? For any reasonably sizes machine that doesn't OOM on larger C++ projects the memlimit is a nop and can be dropped. More problematic might be developers with oldish desktops/laptops with many cores and few RAM. > Cheers, > > Richard cu Adrian From git at andred.net Mon Feb 24 17:14:18 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Mon, 24 Feb 2020 17:14:18 +0000 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> Message-ID: <23c396de32bb98414dcb2aaec178e73079e000d3.camel@andred.net> On Mon, 2020-02-24 at 16:44 +0000, Richard Purdie wrote: > On Mon, 2020-02-24 at 15:40 +0200, Adrian Bunk wrote: > > On Mon, Feb 24, 2020 at 12:59:55PM +0000, Andr? Draszik wrote: > > > The number of threads used, and the amount of memory allowed > > > to be used, should not affect sstate signatures, as they > > > don't affect the result. > > > > Unfortunately they can affect the result. > > I looked into this a bit and its complicated. The threads are used to > compress chunks and their compression should be deterministic whether > done serially or in parallel. > > I did some tests and: > > xz > gave equivalent output to: > xz --threads=1 > > and > > xz --threads=2 > xz --threads=5 > xz --threads=50 > > all give different identical output. > > So if we force --threads >=2 we should have determinism? How large were your files? Given threaded operation works by operating in 'blocks', you should have a different number of blocks in your output. They're all compressed independently, so I don't see how the result could be identical, unless the block size is large enough for xz to not create as many blocks as you allowed via setting the upper limit on the # of threads. > > > Otherwise, it becomes impossible to re-use sstate from > > > automated builders on developer's machines (as the former > > > might execute bitbake with certain constraints different > > > compared to developer's machines). > > > ... > > > -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" > > > ... > > > > Threaded compression can result in slightly worse compression > > than single-threaded compression. > > > > With memlimit the problem is actually the opposite way, > > and worse than what you were trying to fix: > > > > When a developer hits memlimit during compression, the documented > > behavour of xz is to scale down the compression level. > > > > I assume 50% wrongly gives the same sstate signature no matter how > > much RAM is installed on the local machine? > > I did some tests locally and I could see different output checksums > depending on how much memory I gave xz. > > Perhaps we should specify a specific high amount like 1GB? If I understand the man page right, at compression level 9 (default in OE), each thread / block will use up to 674MiB of RAM, so a limit of 1GiB effectively reduces parallelism to 1. > Does anyone know more about the internals and how to have this behave > "nicely" for our needs? What are the needs specifically? In my case, I have some defined builds that run on their own, so they are allowed to use all memory and a certain (lowish) number of threads. I also have other builds where several can run in parallel, and xz would just be killed if all of them were allowed to use all RAM, so I have to reduce threads and memory consumption. This of course means slower builds... I don't want to penalise myself or anybody else by generally forcing a low number of threads either. > FWIW we haven't seen variation on the autobuilder due to this as far as > I know. BTW, pigz and pbzip should have a similar thread related problem, according to the man pages, if you read between the lines. Files are split into chunks, and chunks are compressed individually in the pbzip2 case. pigz terminates each chunk with an empty block in the final .gz file. Cheers, Andre' From richard.purdie at linuxfoundation.org Mon Feb 24 17:32:29 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Mon, 24 Feb 2020 17:32:29 +0000 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <23c396de32bb98414dcb2aaec178e73079e000d3.camel@andred.net> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> <23c396de32bb98414dcb2aaec178e73079e000d3.camel@andred.net> Message-ID: On Mon, 2020-02-24 at 17:14 +0000, Andr? Draszik wrote: > On Mon, 2020-02-24 at 16:44 +0000, Richard Purdie wrote: > > On Mon, 2020-02-24 at 15:40 +0200, Adrian Bunk wrote: > > > On Mon, Feb 24, 2020 at 12:59:55PM +0000, Andr? Draszik wrote: > > > > The number of threads used, and the amount of memory allowed > > > > to be used, should not affect sstate signatures, as they > > > > don't affect the result. > > > > > > Unfortunately they can affect the result. > > > > I looked into this a bit and its complicated. The threads are used > > to > > compress chunks and their compression should be deterministic > > whether > > done serially or in parallel. > > > > I did some tests and: > > > > xz > > gave equivalent output to: > > xz --threads=1 > > > > and > > > > xz --threads=2 > > xz --threads=5 > > xz --threads=50 > > > > all give different identical output. > > > > So if we force --threads >=2 we should have determinism? > > How large were your files? 105MB total which should be enough as the largest xz block size is 32MB? > Given threaded operation works by operating in 'blocks', you should > have a different number of blocks in your output. > They're all compressed independently, so I don't see how the result > could be identical, unless the block size is large enough for xz to > not create as many blocks as you allowed via setting the upper limit > on the # of threads. I don't follow. The algorithm xz uses appears to be designed to give consistent results regardless of numbers of threads. It gets split into the same number of chunks. Each chunk is compressed independently, but deterministically and then they're assembled in order. It doesn't matter if the chunk is compressed in parallel or serially. > > > > Otherwise, it becomes impossible to re-use sstate from > > > > automated builders on developer's machines (as the former > > > > might execute bitbake with certain constraints different > > > > compared to developer's machines). > > > > ... > > > > -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count > > > > ()}" > > > > > Files are split into chunks, and chunks are compressed > > > > individually > > > > > in the > > > > > pbzip2 case. > > > > > pigz terminates each chunk with an empty block in the final > > > > .gz file. > > > > > > > > > > > > > > > Cheers, > > > > > Andre' > > > > > > > > > > > > > > ... > > > > > > Threaded compression can result in slightly worse compression > > > than single-threaded compression. > > > > > > With memlimit the problem is actually the opposite way, > > > and worse than what you were trying to fix: > > > > > > When a developer hits memlimit during compression, the documented > > > behavour of xz is to scale down the compression level. > > > > > > I assume 50% wrongly gives the same sstate signature no matter > > > how > > > much RAM is installed on the local machine? > > > > I did some tests locally and I could see different output checksums > > depending on how much memory I gave xz. > > > > Perhaps we should specify a specific high amount like 1GB? > > If I understand the man page right, at compression level 9 (default > in OE), > each thread / block will use up to 674MiB of RAM, so a limit of 1GiB > effectively reduces parallelism to 1. Right, I agree that isn't feasible. > > Does anyone know more about the internals and how to have this > > behave "nicely" for our needs? > > What are the needs specifically? The project is aiming to have deterministic builds, our output for given input metadata is binary identical. > In my case, I have some defined builds that run on their own, so they > are allowed to use all memory and a certain (lowish) number of > threads. > > I also have other builds where several can run in parallel, and xz > would just be killed if all of them were allowed to use all RAM, so I > have to reduce threads and memory consumption. > > This of course means slower builds... > > I don't want to penalise myself or anybody else by generally forcing > a low number of threads either. We didn't have resource issues on the autobuilder with xz but others did report it and its why the memlimit was set. It would be better to remove the memlimit for determinism really as far as I can tell and if necessary throttle the threads count. Maybe setting an upper limit of say 10 threads and a minimum of 2 might given us what we need. Perhaps we just allow the number of xz threads to be set independently? > > FWIW we haven't seen variation on the autobuilder due to this as > > far as > > I know. > > BTW, pigz and pbzip should have a similar thread related problem, > according to the man pages, if you read between the lines. Agreed. We have less of an issue with these as their use is much less frequent. xz is used by deb and ipk for packaging. Cheers, Richard From matthew.zeng at windriver.com Mon Feb 24 18:10:08 2020 From: matthew.zeng at windriver.com (Mingde (Matthew) Zeng) Date: Mon, 24 Feb 2020 13:10:08 -0500 Subject: [OE-core] [PATCH] perl: fix lib/warnings test on core-image-sato Message-ID: <87v9nvyhz3.fsf@windriver.com> Fixes [YOCTO #13296] The lib/warnings test fails on certain images such as core-image-sato. The upstream has already fixed this issue, thus submitting the relevent backport patch. Signed-off-by: Matthew Zeng -- Mingde (Matthew) Zeng --- ...rl-134117-Close-DATA-in-loc_tools.pl.patch | 30 +++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch diff --git a/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch new file mode 100644 index 0000000000..79cae0d6fa --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch @@ -0,0 +1,30 @@ +From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001 +From: Richard Leach +Date: Sun, 19 May 2019 20:16:41 +0000 +Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl + +This prevents unexpected text and fixes test lib/warnings.t + +Upstream-Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] + +Signed-off-by: Matthew Zeng + +--- + t/loc_tools.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/loc_tools.pl b/t/loc_tools.pl +index c76e29388a..beebd98d88 100644 +--- a/t/loc_tools.pl ++++ b/t/loc_tools.pl +@@ -421,7 +421,7 @@ sub find_locales ($;$) { + } + + # The rest of the locales are in this file. +- push @Data, ; ++ push @Data, ; close DATA; + + foreach my $line (@Data) { + my ($locale_name, $language_codes, $country_codes, $encodings) = +-- +2.25.0 diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 4869012b1a..9d747aa5b4 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ + file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ file://racefix.patch \ " @@ -388,4 +389,3 @@ EOF chmod 0755 ${SYSROOT_DESTDIR}${bindir}/nativeperl cat ${SYSROOT_DESTDIR}${bindir}/nativeperl } - -- 2.24.0 From alistair.francis at wdc.com Mon Feb 24 18:35:43 2020 From: alistair.francis at wdc.com (Alistair Francis) Date: Mon, 24 Feb 2020 10:35:43 -0800 Subject: [OE-core] [PATCH] opensbi: Update to v0.6 Message-ID: <20200224183543.9198-1-alistair.francis@wdc.com> Signed-off-by: Alistair Francis --- ...Makefile-Don-t-specify-mabi-or-march.patch | 13 +++++---- .../files/0001-build-Use-ffreestanding.patch | 28 ------------------- .../{opensbi_0.5.bb => opensbi_0.6.bb} | 6 +--- 3 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch rename meta/recipes-bsp/opensbi/{opensbi_0.5.bb => opensbi_0.6.bb} (88%) diff --git a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch index 74d93618b2..d2a8048e87 100644 --- a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch @@ -1,4 +1,4 @@ -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 +From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 15 Feb 2019 14:57:41 -0800 Subject: [PATCH] Makefile: Don't specify mabi or march @@ -7,23 +7,26 @@ To avoid can't link double-float modules with soft-float modules errors when building 32-bit openSBI don't specify mabi or march. -Upstream-Status: Inappropriate [Fixes a 32-bit Yocto flow bug] +Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] Signed-off-by: Alistair Francis + --- Makefile | 2 -- 1 file changed, 2 deletions(-) +diff --git a/Makefile b/Makefile +index ccf8ea3..69e5b38 100644 --- a/Makefile +++ b/Makefile -@@ -162,7 +162,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 +@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) + CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls CFLAGS += -mno-save-restore -mstrict-align -CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) CFLAGS += $(GENFLAGS) CFLAGS += $(platform-cflags-y) -@@ -176,7 +175,6 @@ CPPFLAGS += $(firmware-cppflags-y) +@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls ASFLAGS += -mno-save-restore -mstrict-align diff --git a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch b/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch deleted file mode 100644 index 4899fad6aa..0000000000 --- a/meta/recipes-bsp/opensbi/files/0001-build-Use-ffreestanding.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efa39afecedf75a1f3154c39507bdde2810bc140 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 6 Jan 2020 18:21:02 -0800 -Subject: [PATCH] build: Use -ffreestanding - -this is a stand-alone/baremetal application, therefore demanding --ffreestanding would help it compile with hosted toolchains e.g. ( linux -toolchains ), it also ensures that it won't be using platform -optimizations like inlining mem* str* functions which gcc might decide -especially with wrapper string functions in opensbi code - -Upstream-Status: Accepted [https://github.com/riscv/opensbi/commit/049ad0b3877352527ab470eba33bc767e9b54961] -Signed-off-by: Khem Raj ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Makefile -+++ b/Makefile -@@ -159,7 +159,7 @@ GENFLAGS += $(libsbiutils-genflags-y) - GENFLAGS += $(platform-genflags-y) - GENFLAGS += $(firmware-genflags-y) - --CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 -+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - CFLAGS += -mno-save-restore -mstrict-align - CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) diff --git a/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/meta/recipes-bsp/opensbi/opensbi_0.6.bb similarity index 88% rename from meta/recipes-bsp/opensbi/opensbi_0.5.bb rename to meta/recipes-bsp/opensbi/opensbi_0.6.bb index 71d64fa324..56f2d4b915 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.6.bb @@ -7,17 +7,13 @@ require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09" +SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" SRC_URI = "git://github.com/riscv/opensbi.git \ file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ - file://0001-build-Use-ffreestanding.patch \ " S = "${WORKDIR}/git" -SRC_URI[md5sum] = "621f38d8205ef5fb185e4055025e73df" -SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300" - EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" -- 2.25.0 From rpjday at crashcourse.ca Mon Feb 24 19:05:53 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Mon, 24 Feb 2020 14:05:53 -0500 (EST) Subject: [OE-core] why would systemd-systemctl-native need underlying sysvinit? Message-ID: in midst of migrating old YP layer to newer one and running across all sorts of oddities. in this case, in current master branch of oe-core, we have: recipes-bsp/keymaps/keymaps_1.0.bb:PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" recipes-core/psplash/psplash_git.bb:PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" recipes-core/dbus/dbus_1.12.16.bb:PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" recipes-core/initscripts/initscripts_1.0.bb:PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" recipes-kernel/modutils-initscripts/modutils-initscripts.bb:PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" i'm curious as to why, in some cases, systemd-systemctl-native requires *both* systemd and sysvinit to be contained in DISTRO_FEATURES, but not in other cases. the migration section to YP 2.3 talks only about systemd. thoughts? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== From rpjday at crashcourse.ca Mon Feb 24 19:10:18 2020 From: rpjday at crashcourse.ca (Robert P. J. Day) Date: Mon, 24 Feb 2020 14:10:18 -0500 (EST) Subject: [OE-core] does "deprecated" SSTATEPOSTINSTFUNCS still have value? Message-ID: YP 2.3 migration section describes that variable as deprecated and likely to be removed in the future, but it still lives on: classes/sstate.bbclass:SSTATEPOSTINSTFUNCS = "" classes/sstate.bbclass: for postinst in (d.getVar('SSTATEPOSTINSTFUNCS') or '').split(): classes/sstate.bbclass:sstate_install[vardeps] += "${SSTATEPOSTINSTFUNCS}" classes/buildhistory.bbclass:# then the value added to SSTATEPOSTINSTFUNCS: classes/buildhistory.bbclass:SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory" is it still meant to be used? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== From alex.kiernan at gmail.com Mon Feb 24 19:14:15 2020 From: alex.kiernan at gmail.com (Alex Kiernan) Date: Mon, 24 Feb 2020 19:14:15 +0000 Subject: [OE-core] why would systemd-systemctl-native need underlying sysvinit? In-Reply-To: References: Message-ID: On Mon, Feb 24, 2020 at 7:06 PM Robert P. J. Day wrote: > > > in midst of migrating old YP layer to newer one and running across > all sorts of oddities. in this case, in current master branch of > oe-core, we have: > > recipes-bsp/keymaps/keymaps_1.0.bb:PACKAGE_WRITE_DEPS_append = " > ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" > commit ee3ac7c64ed4c96062e7d21eed1355d4b60b78c4 Author: Jonas Bonn Date: Tue Jan 29 08:24:42 2019 +0100 keymaps: tighten package write dependency The dependency on systemd-systemctl-native is only needed if _both_ systemd and sysvinit are in play. (From OE-Core rev: 3ea08f4b24f8a49c3d5039b62b39d6419cfe234c) Signed-off-by: Jonas Bonn Signed-off-by: Richard Purdie which is then obvious once you read the source: pkg_postinst_${PN} () { if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then if [ -n "$D" ]; then OPTS="--root=$D" fi systemctl $OPTS mask keymap.service fi } And then the commit which added that makes it even clearer: commit c57427b4a7991e33b806d4fd0956b6010ed52f62 Author: Chen Qi Date: Wed Sep 3 15:09:17 2014 +0800 keymaps: mask keymap when necessary When 'sysvinit' and 'systemd' are both in DISTRO_FEATURES, we need to prevent the init script from running via systemd. This is because that the functionality of the init script has implemented in systemd internally. (From OE-Core rev: 8cfba07e24dae3d1837ccb5cb04e11f362519b0a) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie I'd guess the others are similar. -- Alex Kiernan From bruce.ashfield at gmail.com Mon Feb 24 20:02:02 2020 From: bruce.ashfield at gmail.com (bruce.ashfield at gmail.com) Date: Mon, 24 Feb 2020 15:02:02 -0500 Subject: [OE-core] [PATCH] linux-yocto/5.2: update to v5.2.32 Message-ID: <20200224200202.61426-1-bruce.ashfield@gmail.com> From: Bruce Ashfield Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: ef3886a722c8 Linux 5.2.32 ce5a5accc87e dm thin: fix use-after-free in metadata_pre_commit_callback 9aafc6574336 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() e177f6d8471e drm/amd/display: add default clocks if not able to fetch them dba8b53f1ef4 drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() bd427585578d drm/radeon: fix r1xx/r2xx register checker for POT textures b56603ead990 drm/i915/fbc: Disable fbc by default on all glk+ 5ce9d8bdf796 drm/nouveau/kms/nv50-: Limit MST BPC to 8 86bdcc48feb0 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom b039a9b6d8f4 drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN 03e122dbc136 scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd 8bf5409573de scsi: qla2xxx: Correctly retrieve and interpret active flash region 7af719a2ca84 scsi: qla2xxx: Change discovery state before PLOGI 1fea09aa4b42 scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX 30205f999d12 scsi: qla2xxx: Initialize free_work before flushing it 39ec6bc75116 scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd 1f08dd5fa5c5 scsi: iscsi: Fix a potential deadlock in the timeout handler 42a2fbbc708f dm thin: Flush data device before committing metadata 56d35c21552b dm thin metadata: Add support for a pre-commit callback d658f6349a2f dm btree: increase rebalance threshold in __rebalance2() 3aca6fce0d4e dm mpath: remove harmful bio-based optimization 2363f92cde9c drm: meson: venc: cvbs: fix CVBS mode matching 2878bba5052a dma-buf: Fix memory leak in sync_file_merge() b10d7f86b5ca vfio/pci: call irq_bypass_unregister_producer() before freeing irq 099085c85deb ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() 674f30df2798 ARM: dts: s3c64xx: Fix init order of clock providers 7fe7993bd757 cifs: Fix retrieval of DFS referrals in cifs_mount() 6fef05311f57 CIFS: Fix NULL pointer dereference in mid callback 42d37a87a332 CIFS: Do not miss cancelled OPEN responses ca8deb792b01 CIFS: Close open handle after interrupted close df192003fb6b CIFS: Respect O_SYNC and O_DIRECT flags during reconnect 40ae22555ce3 cifs: Don't display RDMA transport on reconnect 969925ff652b cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state 82fe0b779a89 cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE d88fc76297a7 cifs: smbd: Add messages on RDMA session destroy and reconnection f1bede222a44 cifs: smbd: Only queue work for error recovery on memory registration 118c2599caf3 cifs: smbd: Return -EAGAIN when transport is reconnecting 2c3c6e2691ff rpmsg: glink: Free pending deferred work on remove 7286d52aa88c rpmsg: glink: Don't send pending rx_done during remove eed61c8c6667 rpmsg: glink: Fix rpmsg_register_device err handling 00b748a63488 rpmsg: glink: Put an extra reference during cleanup ebb78ad8b431 rpmsg: glink: Fix use after free in open_ack TIMEOUT case b3f09043fc81 rpmsg: glink: Fix reuse intents memory leak issue 5bfb2ef7a181 rpmsg: glink: Set tail pointer to 0 at end of FIFO 63045fa07fba xtensa: fix syscall_set_return_value 9247f95643ef xtensa: fix TLB sanity checker c848ea0969ce gfs2: fix glock reference problem in gfs2_trans_remove_revoke eb30a9e18f47 xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map adff286a3be5 PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 f28f30c5255c PCI: rcar: Fix missing MACCTLR register setting in initialization sequence cb5cb799bf0b PCI: Do not use bus number zero from EA capability d291c94f8e57 PCI/MSI: Fix incorrect MSI-X masking on resume eb24be2871ad PCI: Fix Intel ACS quirk UPDCR register address 06ad330304d2 PCI: pciehp: Avoid returning prematurely from sysfs requests 5d558c8b1439 PCI/PM: Always return devices to D0 when thawing 84dfe86a3851 PCI/switchtec: Read all 64 bits of part_event_bitmap 0db244d3995f mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response 845b2cbece34 mmc: block: Make card_busy_detect() a bit more generic 5db0e71cbee1 libertas: make lbs_ibss_join_existing() return error code on rates overflow 36e460a8c861 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 2aabb3fcd7fe libertas: Fix two buffer overflows at parsing bss descriptor 8866a53c5e7a Linux 5.2.31 33a9ecf23bdb hsr: fix a NULL pointer dereference in hsr_dev_xmit() c5eba532e308 gre: refetch erspan header from skb->data after pskb_may_pull() 8477c46262fa tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() d46e87f84fd4 tcp: tighten acceptance of ACKs not matching a child socket 06b27e9e4496 tcp: fix rejected syncookies due to stale timestamps d3ce127be5c7 net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup 31ecfe259fba net: ipv6: add net argument to ip6_dst_lookup_flow 1a45655b78c5 net/mlx5e: Query global pause state before setting prio2buffer 10ac0045c8a7 tipc: fix ordering of tipc module init and exit routine f8089e38f286 tcp: md5: fix potential overestimation of TCP option space c9b8428b8b42 openvswitch: support asymmetric conntrack ab45bc5d7c6f net/tls: Fix return values to avoid ENOTSUPP aaa20d4352a1 net: thunderx: start phy before starting autonegotiation aebf8e234674 net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 876e02c6b8de net: ethernet: ti: cpsw: fix extra rx interrupt 75b099157e3b net: dsa: fix flow dissection on Tx path b8c2a07d7fc9 net: bridge: deny dev_set_mac_address() when unregistering ef141fca118c mqprio: Fix out-of-bounds access in mqprio_dump a0484dba9932 inet: protect against too small mtu values. 7d923144ef6e net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add() c0f777b6c28d SUNRPC: Fix another issue with MIC buffer space cce35a47eb7c raid5: need to set STRIPE_HANDLE for batch head 2b15565d1a62 workqueue: Fix missing kfree(rescuer) in destroy_workqueue() 2fb67c1da0c0 blk-mq: make sure that line break can be printed 588d5a85b106 ext4: fix a bug in ext4_wait_for_tail_page_commit 87b234005394 splice: only read in as much information as there is pipe buffer space de86c841c81b rtc: disable uie before setting time and enable after d4e7102cc326 mm/shmem.c: cast the type of unmap_start to u64 922a48c3e94d s390/kaslr: store KASLR offset for early dumps 3b7d69248f06 s390/smp,vdso: fix ASCE handling 546e9a689d3e firmware: qcom: scm: Ensure 'a0' status code is treated as signed a9b6310e93a4 ext4: work around deleting a file with i_nlink == 0 safely 609a4e56145d mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction 3d5c91034234 mfd: rk808: Fix RK818 ID template fbac2f7aa1c3 mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings 118197756683 powerpc: Fix vDSO clock_getres() 9ba5c6dcb3b7 powerpc: Avoid clang warnings around setjmp and longjmp 7c36247732a2 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 1eff30510478 omap: pdata-quirks: revert pandora specific gpiod additions 5dbe853560e4 iio: ad7949: fix channels mixups 7df6007288fd iio: ad7949: kill pointless "readback"-handling code 109dbc91c5a8 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw 6305866e630c iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings 9073b0be6589 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling 13f83b3a2688 reiserfs: fix extended attributes on the root directory e026fc523a75 ext4: Fix credit estimate for final inode freeing b09b4d152aa2 quota: fix livelock in dquot_writeback_dquots 513bcf5ee8e0 seccomp: avoid overflow in implicit constant conversion ae57738ec38a ext2: check err when partial != NULL b7c24d8c06b8 quota: Check that quota is not dirty before release 42e495b46f80 video/hdmi: Fix AVI bar unpack 6739872abdfd powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts 7d55c5e73263 powerpc: Allow flush_icache_range to work across ranges >4GB be0cd7e9b258 powerpc/xive: Prevent page fault issues in the machine crash handler 99d2164e4865 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB f0f08beb3fa0 stm class: Lose the protocol driver when dropping its reference c0919315b735 ppdev: fix PPGETTIME/PPSETTIME ioctls 86de25118e9c RDMA/core: Fix ib_dma_max_seg_size() f5aae41d4eac ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity 5cc72ba36683 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card f15fa36b9c6b pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init da352a4b5493 pinctrl: samsung: Fix device node refcount leaks in init code 738e8de6b8d2 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init 53149343fc98 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init 43cb61f4878b pinctrl: samsung: Add of_node_put() before return in error path 72f6c3180468 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type() e264e3ae1165 pinctrl: rza2: Fix gpio name typos 61a4f44dc075 ACPI: PM: Avoid attaching ACPI PM domain to certain devices 0a041ba2564a ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() b56eca6bf2e4 ACPI: OSL: only free map once in osl.c 2ba38c34447d ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge 0a4cab60dde2 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links 487afadea2fd ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links 9af85668040a ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links e055c1890429 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI 5eac1d4c2450 ALSA: oxfw: fix return value in error path of isochronous resources reservation 33e6efad9334 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs 7240e6e25891 PM / devfreq: Lock devfreq in trans_stat_show 92741be9a736 intel_th: pci: Add Tiger Lake CPU support 69d1163cd0f4 intel_th: pci: Add Ice Lake CPU support 5ac267cabcd9 intel_th: Fix a double put_device() in error path a3784ad079c6 powerpc/perf: Disable trace_imc pmu 08ded9339d52 cpuidle: teo: Fix "early hits" handling for disabled idle states 30b23caa5deb cpuidle: teo: Consider hits and misses metrics of disabled states 0df48241b6ab cpuidle: teo: Rename local variable in teo_select() db302e3bb162 cpuidle: teo: Ignore disabled idle states that are too deep ade564919a0c cpuidle: Do not unset the driver if it is there already f2a7f16026f9 media: cec.h: CEC_OP_REC_FLAG_ values were swapped 342c964a9895 media: radio: wl1273: fix interrupt masking on release 780fe9f19c38 media: bdisp: fix memleak on release 348cecf72f8e s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported 9ec8636ef00a ar5523: check NULL before memcpy() in ar5523_cmd() 6fc971f1d831 wil6210: check len before memcpy() calls ba29035eb4bc cgroup: pids: use atomic64_t for pids->limit 873f0623fcbe blk-mq: avoid sysfs buffer overflow with too many CPU cores 758af427f60f md: improve handling of bio with REQ_PREFLUSH in md_flush_request() 3882ad8fadb0 ASoC: fsl_audmix: Add spin lock to protect tdms 141bba39e422 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report a99f0045c434 ASoC: rt5645: Fixed typo for buddy jack support. 1ecdb55a6de6 ASoC: rt5645: Fixed buddy jack support. d78e1588f356 workqueue: Fix pwq ref leak in rescuer_thread() 86226c42d8f7 workqueue: Fix spurious sanity check failures in destroy_workqueue() 7b79872cb160 dm zoned: reduce overhead of backing device checks b7c4feffa872 dm writecache: handle REQ_FUA fa700de0abd2 hwrng: omap - Fix RNG wait loop timeout 903867fe506a ovl: relax WARN_ON() on rename to self 8b2e7fec9f26 ovl: fix corner case of non-unique st_dev;st_ino c73fe5396edf ovl: fix lookup failure on multi lower squashfs 15fe8b7f7962 lib: raid6: fix awk build warnings b8f32a0e26fb rtlwifi: rtl8192de: Fix missing enable interrupt flag 0917a96e2d3a rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 32c6c1de1c05 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address f1da748f078d btrfs: record all roots for rename exchange on a subvol 017f00a09704 Btrfs: send, skip backreference walking for extents with many references f08e9d661548 btrfs: Remove btrfs_bio::flags member f01ca4344ffe btrfs: Avoid getting stuck during cyclic writebacks 07383f0fced7 Btrfs: fix negative subv_writers counter and data space leak after buffered write 69608bab8b1b Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc 6bab2f18b421 btrfs: use refcount_inc_not_zero in kill_all_nodes b703482bc2ec btrfs: check page->mapping when loading free space cache 11b102bc593e iwlwifi: pcie: fix support for transmitting SKBs with fraglist 7a569d85c92b usb: typec: fix use after free in typec_register_port() 254d37011ab2 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" 26593100f6a1 usb: dwc3: ep0: Clear started flag on completion d2e949f9d6c5 usb: dwc3: gadget: Clear started flag for non-IOC 077399428186 usb: dwc3: gadget: Fix logical condition 545da1614800 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant 393edc8f15ca virtio-balloon: fix managed page counts when migrating pages between zones 15c579c3d104 virt_wifi: fix use-after-free in virt_wifi_newlink() 3891c22e7b74 mtd: rawnand: Change calculating of position page containing BBM 175a15f4c288 mtd: spear_smi: Fix Write Burst mode 5738119a60ed brcmfmac: disable PCIe interrupts before bus reset ab35b8b9a235 EDAC/altera: Use fast register IO for S10 IRQs deda3f6b06dc tpm: add check after commands attribs tab allocation ebb7dae402e3 usb: mon: Fix a deadlock in usbmon between mmap and read 650d955bc548 usb: core: urb: fix URB structure initialization function d54daa869ed5 USB: adutux: fix interface sanity check 3e4a4cb54c04 usb: roles: fix a potential use after free 14fa9bcb6a07 USB: serial: io_edgeport: fix epic endpoint lookup 174f3783b4f0 USB: idmouse: fix interface sanity checks 6facde75d1c8 USB: atm: ueagle-atm: add missing endpoint check b4972eba6831 iio: adc: ad7124: Enable internal reference b609ee0b3024 iio: adc: ad7606: fix reading unnecessary data from device bc27d17532dd iio: imu: inv_mpu6050: fix temperature reporting using bad unit edfeae1a5a70 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting 76a78a37799d iio: adis16480: Fix scales factors a8f0c5837cca iio: adis16480: Add debugfs_reg_access entry a02348d262b3 ARM: dts: pandora-common: define wl1251 as child node of mmc3 43a05d85e421 interconnect: qcom: sdm845: Walk the list safely on node removal 3ea35e60e8c8 xhci: make sure interrupts are restored to correct state 0df691c29da9 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour. d10974513d17 xhci: Increase STS_HALT timeout in xhci_suspend() 40ccc7fb3125 xhci: fix USB3 device initiated resume race with roothub autosuspend 8f015d20b7d5 xhci: Fix memory leak in xhci_add_in_port() de53955ea0d3 usb: xhci: only set D3hot for pci device 13d723a6c22c staging: gigaset: add endpoint-type sanity check ed9145e7d4a4 staging: gigaset: fix illegal free on probe errors a193faef6209 staging: gigaset: fix general protection fault on probe a48994561cab staging: vchiq: call unregister_chrdev_region() when driver registration fails 38beaaec130c staging: rtl8712: fix interface sanity check 238af85b081b staging: rtl8188eu: fix interface sanity check 9517a9f133fd binder: fix incorrect calculation for num_valid a65c5b1d8762 usb: host: xhci-tegra: Correct phy enable sequence 0da1ca92c578 usb: Allow USB device to be warm reset in suspended state fa74b02fa20f USB: documentation: flags on usb-storage versus UAS 46f840a92233 USB: uas: heed CAPACITY_HEURISTICS 9cc58d6fb42e USB: uas: honor flag to avoid CAPACITY16 19ccc7083566 media: venus: remove invalid compat_ioctl32 handler 6f4b7b312148 scsi: zfcp: trace channel log even for FCP command responses 6975c6beb5f0 usb: gadget: pch_udc: fix use after free 6f10fa4a113c rpmsg: char: release allocated memory f01eedaf4e09 mac80211: Do not send Layer 2 Update frame before authorization 38b2d9bb7b57 libertas: fix a potential NULL pointer dereference 2789290efc0b mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() fd820abb0696 Linux 5.2.30 10f017c26642 spi: dw: Correct handling of native chipselect 9e79f5ae512f spi: cadence: Correct handling of native chipselect db91ee312ada drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model 9eeb986b4809 clk: samsung: exynos5420: Keep top G3D clocks enabled 99232a68c619 block: fix "check bi_size overflow before merge" f54449c00a10 EDAC/ghes: Do not warn when incrementing refcount on 0 4f18ed319605 ALSA: hda: Fix regression by strip mask fix a550c8d05657 io_uring: ensure req->submit is copied when req is deferred 7b57a96cf3b7 Input: Fix memory leak in psxpad_spi_probe a006a5ae6b91 ALSA: hda: hdmi - fix pin setup on Tigerlake 85435506e9e0 EDAC/ghes: Fix locking and memory barrier issues 81a005d25b01 watchdog: aspeed: Fix clock behaviour for ast2600 c3f6c163ac89 md/raid0: Fix an error message in raid0_make_request() e90488c1856c ALSA: hda - Fix pending unsol events at shutdown ac5a40962daf KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) 949540e93943 binder: Handle start==NULL in binder_update_page_range() 75a11437a803 binder: Prevent repeated use of ->mmap() via NULL mapping e0a0299acecb binder: Fix race between mmap() and binder_alloc_print_pages() ba5d71130445 thermal: Fix deadlock in thermal thermal_zone_device_check cf162b1f1d6f iomap: Fix pipe page leakage during splicing 1ede48d1d47e RDMA/qib: Validate ->show()/store() callbacks before calling them 6df074625c15 can: ucan: fix non-atomic allocation in completion handler 1233eadb99a9 spi: Fix NULL pointer when setting SPI_CS_HIGH for GPIO CS cad0ca361138 spi: Fix SPI_CS_HIGH setting when using native and GPIO CS 25ac2d29646a spi: atmel: Fix CS high support efd56e6b1fbd spi: stm32-qspi: Fix kernel oops when unbinding driver dfbd2a22d8b1 spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register d7e9115f21e0 spi: spi-fsl-qspi: change i.MX7D RX FIFO size 76cde0d7ff39 crypto: ecdh - fix big endian bug in ECC library 36759ce37925 crypto: ccp - fix uninitialized list head 8ba8fa9fc2db crypto: geode-aes - switch to skcipher for cbc(aes) fallback 86a44e8938be crypto: af_alg - cast ki_complete ternary op to int 9ff009403999 crypto: atmel-aes - Fix IV handling when req->nbytes < ivsize 2cbf74169383 crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr f6981b364dae KVM: x86: Grab KVM's srcu lock when setting nested state c08ddad72e7b KVM: x86: Remove a spurious export of a static function 317fd0a0c93d KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES 7f70f6380882 KVM: x86: do not modify masked bits of shared MSRs 6384ad0ab29b KVM: arm/arm64: vgic: Don't rely on the wrong pending table bdcecb6dd8e8 KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter 3600a4189d12 KVM: PPC: Book3S HV: XIVE: Set kvm->arch.xive when VPs are allocated 34e8d4a0ef05 KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path 4ebdbf4ff503 KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one cc73381579f9 arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 1d19cc75f715 drm/i810: Prevent underflow in ioctl 16f54bf33fce drm: damage_helper: Fix race checking plane->state->fb 20a0047cdca4 drm/msm: fix memleak on release 6c34f27046e3 jbd2: Fix possible overflow in jbd2_log_space_left() 5b1ab9f1a2c0 kernfs: fix ino wrap-around detection 910116ce4349 nfsd: restore NFSv3 ACL support 6589961e5ec7 nfsd: Ensure CLONE persists data and metadata changes to the target file 574498a02845 tty: vt: keyboard: reject invalid keycodes c75342d33dd5 CIFS: Fix SMB2 oplock break processing c8c867906145 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks 2199093ff906 x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect 4d34c238f6ee x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all() 64a582385b92 media: rc: mark input device as pointing stick 70fd4e1972e8 coresight: etm4x: Fix input validation for sysfs. 55c0be64071e Input: goodix - add upside-down quirk for Teclast X89 tablet 2405495a00f8 Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers 868c29a7efd0 Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash 0e606e3626e6 Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus 94adc53b2c47 ALSA: hda: Modify stream stripe mask only when needed a527c3df9f54 ALSA: hda - Add mute led support for HP ProBook 645 G4 accc2add3da3 ALSA: pcm: oss: Avoid potential buffer overflows 55f6418b7ae3 ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236 bbad17075fe3 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop fcfb4bce22aa ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC 83753976cfae fuse: verify attributes a6f6439eb10f fuse: verify nlink 31aa652b9a69 i2c: core: fix use after free in of_i2c_notify 92084c0b356d net: ep93xx_eth: fix mismatch of request_mem_region in remove f75cb980f0ab afs: Fix race in commit bulk status fetch 26167b5cf5df net: hns3: fix ETS bandwidth validation bug 037e0cbe8863 net: hns3: reallocate SSU' buffer size when pfc_en changes 423f97775629 ravb: implement MTU change while device is up ba49aa6bccbb rsxx: add missed destroy_workqueue calls in remove 6dbf3b9cc169 selftests: kvm: fix build with glibc >= 2.30 334204bdbd89 drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. d2001cf2e8d3 x86/resctrl: Fix potential lockdep warning 7bf14c3c120b ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() 57dbe72b9638 perf/core: Consistently fail fork on allocation failures 24a8ce6100ab sched/pelt: Fix update of blocked PELT ordering cadf46055b6f sched/core: Avoid spurious lock dependencies b8a654dde72b Input: cyttsp4_core - fix use after free bug 9bcb8316e536 block: check bi_size overflow before merge f05d37196a77 xfrm: release device reference for invalid state e630f0eab8b3 NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 14f8f24bfcbc ALSA: hda: Add Cometlake-S PCI ID 85deda956139 ecryptfs: fix unlink and rmdir in face of underlying fs modifications 7a7b13483234 audit_get_nd(): don't unlock parent too early 6f26d186c431 exportfs_decode_fh(): negative pinned may become positive without the parent locked d5a9bd7dc9c2 cgroup: don't put ERR_PTR() into fc->root 5490ae827b29 iwlwifi: pcie: don't consider IV len in A-MSDU 5bc1282dfb21 RDMA/hns: Correct the value of srq_desc_size 9b0df7c7e42c RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN bf7d03571100 MIPS: SGI-IP27: fix exception handler replication b578c711e5e7 autofs: fix a leak in autofs_expire_indirect() 81559b396efa aio: Fix io_pgetevents() struct __compat_aio_sigset layout 03bd68a92f82 signal: simplify set_user_sigmask/restore_user_sigmask 88300b370dbc serial: ifx6x60: add missed pm_runtime_disable 06eb5d963912 serial: serial_core: Perform NULL checks for break_ctl ops c811b133b3e7 serial: pl011: Fix DMA ->flush_buffer() d451358ffe85 tty: serial: msm_serial: Fix flow control 5b10978724e0 tty: serial: fsl_lpuart: use the sg count from dma_map_sg c38c3a52315f usb: gadget: u_serial: add missing port entry locking b30c295d649b time: Zero the upper 32-bits in __kernel_timespec on 32-bit 9f06fb5da07e lp: fix sparc64 LPSETTIMEOUT ioctl 068341cb7952 sparc64: implement ioremap_uc 932b771c65b6 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator edc3ff235784 net: fec: fix clock count mis-match ed9b79600a5d platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size 952328f5193b platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer da62cf911005 HID: core: check whether Usage Page item is after Usage ID items fb85a234fc39 tipc: fix link name length check 0867e153690e selftests: bpf: test_sockmap: handle file creation failures gracefully cd73a77a2288 net/tls: use sg_next() to walk sg entries 55c1ea6758d8 net/tls: remove the dead inplace_crypto code c824b8c9957b net: skmsg: fix TLS 1.3 crash with full sk_msg 45c795cbee84 net: sockmap: use bitmap for copy info c1c89460bda2 net/tls: free the record on encryption error 1468022cc8f2 net/tls: take into account that bpf_exec_tx_verdict() may free the record a3157970686f openvswitch: remove another BUG_ON() bacb11535532 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() 744916544dba sctp: cache netns in sctp_ep_common f4312b9ba27c sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook 8d442143ccd4 openvswitch: fix flow command message size b834278b4d0a net: sched: fix `tc -s class show` no bstats on class with nolock subqueues 2f47935914f8 net: psample: fix skb_over_panic 8fc3ccb35fba net: macb: add missed tasklet_kill 9243823cd73a net: dsa: sja1105: fix sja1105_parse_rgmii_delays() 1e7ff496e195 mdio_bus: don't use managed reset-controller f458119c914d macvlan: schedule bc_work even if error 442b4bac7514 xfrm: Fix memleak on xfrm state destroy d06561a292bf thunderbolt: Power cycle the router if NVM authentication fails 97a4d0528c98 mei: me: add comet point V device id aa6a4bfabb1a mei: bus: prefix device names on bus with the bus name fb94cd58ee14 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P 33c6adbab912 staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids 34820fb849a8 staging: rtl8723bs: Drop ACPI device ids 18ff3bb126fe staging: rtl8192e: fix potential use after free 955068eb7918 staging: wilc1000: fix illegal memory access in wilc_parse_join_bss_param() afe6f4526509 usb: dwc2: use a longer core rest timeout in dwc2_core_reset() 4b15bd43d8ed clk: at91: fix update bit maps on CFG_MOR write 6ed6cd2d7f8a i40e: Fix for ethtool -m issue on X722 NIC ddcdd3cc96f1 i40e: Fix for missing "link modes" info in ethtool ae4d08f3a69b iavf: initialize ITRN registers with correct values 12c0db2518f8 ice: fix potential infinite loop because loop counter being too small c105a4b2019d pwm: bcm-iproc: Prevent unloading the driver module while in use 66f3f3c4da1e block: drbd: remove a stray unlock in __drbd_send_protocol() 11748bed1eeb mac80211: fix station inactive_time shortly after boot 2df48b15a9ca net/fq_impl: Switch to kvmalloc() for memory allocation 1332a34432a5 ceph: return -EINVAL if given fsc mount option on kernel w/o support 218333cf3e5b net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV e8fec331b7e3 net: stmmac: xgmac: Fix TSA selection f7e0994188b2 net: stmmac: gmac4: bitrev32 returns u32 d99d2e2d5c7d drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 3db9d787fbbe net: mscc: ocelot: fix __ocelot_rmw_ix prototype 23d1a942d638 net/mlx5e: Fix eswitch debug print of max fdb flow c26064b7eda5 drm/amdgpu: dont schedule jobs while in reset d61b5d11db4b net: bcmgenet: reapply manual settings to the PHY 303f8e7b7d18 net: bcmgenet: use RGMII loopback for MAC reset 82077751014a scripts/gdb: fix debugging modules compiled with hot/cold partitioning 7b20840690f5 mm/gup_benchmark: fix MAP_HUGETLB case c7816d20058f ASoC: SOF: topology: Fix bytes control size checks 1b3afeddab4a ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c 4de26c8cbe50 ALSA: hda: hdmi - add Tigerlake support f43786eb3acb ASoC: stm32: sai: add restriction on mmap support 36fa7d5299c2 watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading f023dd202f6b watchdog: meson: Fix the wrong value of left time 9054f01030f8 watchdog: pm8916_wdt: fix pretimeout registration flow 2c25aa88640f nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths 6fdb636145b0 nvme-rdma: fix a segmentation fault during module unload 43bd0bf71860 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition 7091bcbccb6b perf scripting engines: Iterate on tep event arrays directly 7371326920db x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early 8efe12d76d7e can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 4a3333ea25b1 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error a26a27d53b40 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error 39b89fc6625f can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors f6b5da01db2f can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM acb9095493be can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max 189c1239632b can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak 7ac97e4ef4d9 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open 1ac0d4885a34 can: peak_usb: report bus recovery as well b542266496fa stacktrace: Don't skip first entry on noncurrent tasks afe7ff5be406 bridge: ebtables: don't crash when using dnat target in output chains a19d86990335 netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT 17db97a8e7d5 netfilter: ipset: Fix the last missing check of nla_parse_deprecated() 5f4ada6390b6 net: fec: add missed clk_disable_unprepare in remove 0b283b59a62f clk: ti: clkctrl: Fix failed to enable error with double udelay timeout b70eae1c4480 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call aab6b68e53eb ASoC: hdac_hda: fix race in device removal b23f8d6ca25f fbdev: c2p: Fix link failure on non-inlining 51c019bf2c42 arm64: dts: zii-ultra: fix ARM regulator GPIO handle 819ee4651182 x86/resctrl: Prevent NULL pointer dereference when reading mondata 4d71464d5830 idr: Fix idr_alloc_u32 on 32-bit systems 9956dbb774e4 idr: Fix integer overflow in idr_for_each_entry a530ec599a8a idr: Fix idr_get_next_ul race with idr_remove 6909ddf4276c powerpc/bpf: Fix tail call implementation 957928006316 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero d3a556320b11 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 4fd976da64d7 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend 1d6d86b21245 clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 440f439c1041 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup b4c8fc7dcab9 clk: at91: avoid sleeping early c42ce4122e86 ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names 32ea5f2ae3b6 arm64: dts: imx8mm: fix compatible string for sdma 4071d8976ac5 reset: fix reset_control_ops kerneldoc comment b178a6e8f8f3 soc: imx: gpc: fix initialiser format 0a751a005ded ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts 946654641741 pinctrl: cherryview: Allocate IRQ chip dynamic 66c7b484cae0 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume 30c758e0a731 arm64: dts: ls1028a: fix a compatible issue ba3e13683df7 ASoC: kirkwood: fix device remove ordering d7ee3bbc1085 ASoC: kirkwood: fix external clock probe defer 7a754f5e5751 clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU 2361cffc9775 clk: samsung: exynos5433: Fix error paths e1fc074e8178 reset: Fix memory leak in reset_control_array_put() b01838b0ca64 ASoC: compress: fix unsigned integer overflow check 41360b33fec2 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX e7fc8cc79377 soundwire: intel: fix intel_register_dai PDI offsets and numbers 82b111a092b1 clocksource/drivers/mediatek: Fix error handling 85c26d3b879d thunderbolt: Fix lockdep circular locking depedency warning a41faef2aef6 thunderbolt: Read DP IN adapter first two dwords in one go 0b4d76ea32e5 clk: at91: sam9x60: fix programmable clock 3ac5085a98ba clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate 922eddf892e2 XArray: Fix xas_next() with a single entry at 0 Signed-off-by: Bruce Ashfield --- Although 5.2 will be dropped soon, this update is worth sending for backport to the -stable branches and to fix a couple of lingering build issues with the last 5.2 SRCREV bump I sent. Bruce .../linux/linux-yocto-rt_5.2.bb | 6 ++--- .../linux/linux-yocto-tiny_5.2.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 79da8c14b3..441545f55e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index d88cb5d742..6d49e00e21 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 59cc08e9a3..44516dcacb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" -SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" -SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "1ed2236e622e5b79d910fc1db37ec6eec5a94fdc" +SRCREV_machine_qemuarm64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips ?= "e669e4307d07072458904ac0fda56f7192e2880d" +SRCREV_machine_qemuppc ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuriscv64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86-64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips64 ?= "217cada95bbe7eb4c3a6d40ee141ea4cea3bc1b6" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.19.1 From pbarker at konsulko.com Mon Feb 24 20:14:01 2020 From: pbarker at konsulko.com (Paul Barker) Date: Mon, 24 Feb 2020 20:14:01 +0000 Subject: [OE-core] [PATCH] fetch2/gitsm: Unpack shallow mirror tarballs Message-ID: <20200224201401.13720-1-pbarker@konsulko.com> When a shallow mirror tarball is used to satisfy a gitsm URI it needs to be unpacked so that the .gitmodules file can be examined. Signed-off-by: Paul Barker --- lib/bb/fetch2/gitsm.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index aa121cbe..98f5dae5 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -169,6 +169,12 @@ class GitSM(Git): raise Git.download(self, ud, d) + + # If we're using a shallow mirror tarball it needs to be unpacked so + # that we can examine the .gitmodules file + if ud.shallow and os.path.exists(ud.fullshallow) and Git.need_update(self, ud, d): + bb.utils.mkdirhier(ud.clonedir) + runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=ud.clonedir) self.process_submodules(ud, ud.clonedir, download_submodule, d) def unpack(self, ud, destdir, d): -- 2.20.1 From pbarker at konsulko.com Mon Feb 24 20:15:17 2020 From: pbarker at konsulko.com (Paul Barker) Date: Mon, 24 Feb 2020 20:15:17 +0000 Subject: [OE-core] [PATCH] fetch2/gitsm: Unpack shallow mirror tarballs In-Reply-To: <20200224201401.13720-1-pbarker@konsulko.com> References: <20200224201401.13720-1-pbarker@konsulko.com> Message-ID: On Mon, 24 Feb 2020 at 20:14, Paul Barker wrote: > > When a shallow mirror tarball is used to satisfy a gitsm URI it needs to > be unpacked so that the .gitmodules file can be examined. > > Signed-off-by: Paul Barker > --- > lib/bb/fetch2/gitsm.py | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py > index aa121cbe..98f5dae5 100644 > --- a/lib/bb/fetch2/gitsm.py > +++ b/lib/bb/fetch2/gitsm.py > @@ -169,6 +169,12 @@ class GitSM(Git): > raise > > Git.download(self, ud, d) > + > + # If we're using a shallow mirror tarball it needs to be unpacked so > + # that we can examine the .gitmodules file > + if ud.shallow and os.path.exists(ud.fullshallow) and Git.need_update(self, ud, d): > + bb.utils.mkdirhier(ud.clonedir) > + runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=ud.clonedir) > self.process_submodules(ud, ud.clonedir, download_submodule, d) > > def unpack(self, ud, destdir, d): > -- > 2.20.1 > I realised the moment I hit send that I got the wrong mailing list... From pbarker at konsulko.com Mon Feb 24 20:32:10 2020 From: pbarker at konsulko.com (Paul Barker) Date: Mon, 24 Feb 2020 20:32:10 +0000 Subject: [OE-core] [PATCH] archiver.bbclass: Handle gitsm URLs in the mirror archiver Message-ID: <20200224203210.14297-1-pbarker@konsulko.com> To fully archive a `gitsm://` entry in SRC_URI we need to also capture the submodules recursively. Signed-off-by: Paul Barker --- meta/classes/archiver.bbclass | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 013195df7d..a823708771 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -337,12 +337,10 @@ python do_ar_mirror() { bb.utils.mkdirhier(destdir) - fetcher = bb.fetch2.Fetch(src_uri, d) - - for url in fetcher.urls: + def archive_url(fetcher, url): if is_excluded(url): bb.note('Skipping excluded url: %s' % (url)) - continue + return bb.note('Archiving url: %s' % (url)) ud = fetcher.ud[url] @@ -376,6 +374,21 @@ python do_ar_mirror() { bb.note('Copying source mirror') cmd = 'cp -fpPRH %s %s' % (localpath, destdir) subprocess.check_call(cmd, shell=True) + + if url.startswith('gitsm://'): + def archive_submodule(ud, url, module, modpath, d): + url += ";bareclone=1;nobranch=1" + newfetch = bb.fetch2.Fetch([url], d, cache=False) + + for url in newfetch.urls: + archive_url(newfetch, url) + + ud.method.process_submodules(ud, ud.clonedir, archive_submodule, d) + + fetcher = bb.fetch2.Fetch(src_uri, d, cache=False) + + for url in fetcher.urls: + archive_url(fetcher, url) } def exclude_useless_paths(tarinfo): -- 2.20.1 From patchwork at patchwork.openembedded.org Mon Feb 24 20:32:28 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Mon, 24 Feb 2020 20:32:28 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_fetch2/git?= =?utf-8?q?sm=3A_Unpack_shallow_mirror_tarballs?= In-Reply-To: <20200224201401.13720-1-pbarker@konsulko.com> References: <20200224201401.13720-1-pbarker@konsulko.com> Message-ID: <20200224203228.2276.31555@do> == Series Details == Series: fetch2/gitsm: Unpack shallow mirror tarballs Revision: 1 URL : https://patchwork.openembedded.org/series/22916/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 0bfb2e9840) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From armccurdy at gmail.com Mon Feb 24 21:40:45 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Mon, 24 Feb 2020 13:40:45 -0800 Subject: [OE-core] [OE-Core][PATCH] libxcrypt: Enable static builds In-Reply-To: References: <20200122071934.60789-1-alex.kiernan@gmail.com> <15178a56a7fff6877d13b52312ffc8b898a60f3f.camel@linuxfoundation.org> Message-ID: On Fri, Feb 21, 2020 at 8:35 AM Alex Kiernan wrote: > > On Tue, Jan 28, 2020 at 8:07 PM Andre McCurdy wrote: > > > > On Tue, Jan 28, 2020 at 4:48 AM Alex Kiernan wrote: > > > > > > Let me have a look at that - what got me here was trying to get a > > > static busybox so I could OSTree's tests to pass, which all turned out > > > to be way harder than I expected; this was just one of the things I > > > tripped over. > > > > Busybox shouldn't need to link with libxcrypt if USE_BB_CRYPT is > > enabled (which it is in OE's default Busybox defconfig). > > > > There's a long standing bug in Busybox whereby crypt.h gets included > > unconditionally (instead of being guarded by #if ENABLE_USE_BB_CRYPT > > etc) so the Busybox recipe still needs to depend on virtual/crypt but > > it's only a compile time dependency. > > It looks like that might've been fixed: > > 4767a5375e66 libbb: include only if necessary Yes, looks like a fix in the Busybox master branch (not in any release yet though). > If I drop virtual/crypt, I still get the same link time failure to > find crypt, which I think we're getting because this test > https://git.busybox.net/busybox/tree/Makefile.flags#n149 passes: > > CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' > >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c > >/dev/null 2>&1 && echo "y"; rm crypttest.c) > > Not quite sure how that can pass tbh... It looks like that test should just be skipped completely if Busybox is configured to use its own internal libcrypt? Probably something to raise on the Busybox mailing list rather than here. > This ugly hack avoids needing a static crypt:> > diff --git a/meta/recipes-core/busybox/busybox.inc > b/meta/recipes-core/busybox/busybox.inc > index 1a82f23b0f3a..7335a846038f 100644 > --- a/meta/recipes-core/busybox/busybox.inc > +++ b/meta/recipes-core/busybox/busybox.inc > @@ -18,7 +18,7 @@ BUSYBOX_SPLIT_SUID ?= "1" > export EXTRA_CFLAGS = "${CFLAGS}" > export EXTRA_LDFLAGS = "${LDFLAGS}" > > -EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} > CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y HOSTCC='${BUILD_CC}' > HOSTCPP='${BUILD_CPP}'" > +EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} > CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y HOSTCC='${BUILD_CC}' > HOSTCPP='${BUILD_CPP}' CRYPT_AVAILABLE=n" That's going to break for anyone who has their own busybox config with CONFIG_USE_BB_CRYPT disabled. > PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog > ${PN}-mdev ${PN}-hwclock" > > Not sure how to get that integrated nicely... > > -- > Alex Kiernan From alex.kanavin at gmail.com Mon Feb 24 21:45:33 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Mon, 24 Feb 2020 22:45:33 +0100 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <20200224140801.GC27036@localhost> References: <20200223182933.6168-1-bunk@stusta.de> <20200224104635.GA27036@localhost> <20200224140801.GC27036@localhost> Message-ID: On Mon, 24 Feb 2020 at 15:08, Adrian Bunk wrote: > > Alexander, wayland support in webkitgtk requires mesa built with x11 > support (otherwise gl.pc is not available). > I had a look; I'm not sure I understood the options correctly, but the issue is due to this: ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ The above works if both opengl and x11 are enabled as DISTRO_FEATURES, but if x11 is not enabled, then it should be "webgl gles2". Can you try that? Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Mon Feb 24 21:55:24 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 24 Feb 2020 13:55:24 -0800 Subject: [OE-core] [PATCH] image_types: fix checksum conversion dependencies In-Reply-To: References: <20200224141457.10825-1-brgl@bgdev.pl> Message-ID: On Mon, Feb 24, 2020 at 10:39 AM Bartosz Golaszewski < bgolaszewski at baylibre.com> wrote: > pon., 24 lut 2020 o 17:07 Khem Raj napisa?(a): > > > > > > > > On Mon, Feb 24, 2020 at 6:15 AM Bartosz Golaszewski > wrote: > >> > >> From: Bartosz Golaszewski > >> > >> Only md5sum and sha256sum tools are provided by HOSTTOOLS. For other > >> checksum utils, the conversions need to depend on coreutils-native. > >> > >> Signed-off-by: Bartosz Golaszewski > >> --- > >> meta/classes/image_types.bbclass | 4 ++++ > >> 1 file changed, 4 insertions(+) > >> > >> diff --git a/meta/classes/image_types.bbclass > b/meta/classes/image_types.bbclass > >> index f82f1d8862..63ffbac7e6 100644 > >> --- a/meta/classes/image_types.bbclass > >> +++ b/meta/classes/image_types.bbclass > >> @@ -315,6 +315,10 @@ CONVERSION_DEPENDS_lzo = "lzop-native" > >> CONVERSION_DEPENDS_zip = "zip-native" > >> CONVERSION_DEPENDS_zst = "zstd-native" > >> CONVERSION_DEPENDS_sum = "mtd-utils-native" > >> +CONVERSION_DEPENDS_sha1sum = "coreutils-native" > >> +CONVERSION_DEPENDS_sha224sum = "coreutils-native" > >> +CONVERSION_DEPENDS_sha384sum = "coreutils-native" > >> +CONVERSION_DEPENDS_sha512sum = "coreutils-native" > > > > > > If they are common enough on host distros then perhaps add them to > HOSTTOOLS might be better > > > > They are part of coreutils although I'm not sure how common they are > in distros. They're not commonly used in poky recipes so I'd say it's > fine for them to use coreutils-native. > If they are in centos7 baseinstall then we should be fine to add it to hosttools > > Bart > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bunk at stusta.de Mon Feb 24 22:00:13 2020 From: bunk at stusta.de (Adrian Bunk) Date: Tue, 25 Feb 2020 00:00:13 +0200 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> <23c396de32bb98414dcb2aaec178e73079e000d3.camel@andred.net> Message-ID: <20200224220013.GA11259@localhost> On Mon, Feb 24, 2020 at 05:32:29PM +0000, Richard Purdie wrote: > On Mon, 2020-02-24 at 17:14 +0000, Andr? Draszik wrote: >... > > I don't want to penalise myself or anybody else by generally forcing > > a low number of threads either. > > We didn't have resource issues on the autobuilder with xz but others > did report it and its why the memlimit was set. It would be better to > remove the memlimit for determinism really as far as I can tell and if > necessary throttle the threads count. > > Maybe setting an upper limit of say 10 threads and a minimum of 2 might > given us what we need. On a Threadripper with 128 cores and 256 GB RAM it would not be a problem to use all cores. A laptop with 8 cores and 8 GB RAM is problematic. > Perhaps we just allow the number of xz threads > to be set independently? dpkg manually reduces the number of threads until less than half of the RAM is used: https://sources.debian.org/src/dpkg/1.19.7/lib/dpkg/compress.c/#L566-L574 In a script it would be possible to use --no-adjust to achieve the same: $ xz -9 --memlimit=50% --no-adjust -T32 /dev/null xz: Memory usage limit is too low for the given filter setup. xz: 39,972 MiB of memory is required. The limit is 32,051 MiB. $ > > > FWIW we haven't seen variation on the autobuilder due to this as > > > far as > > > I know. > > > > BTW, pigz and pbzip should have a similar thread related problem, > > according to the man pages, if you read between the lines. > > Agreed. We have less of an issue with these as their use is much less > frequent. xz is used by deb and ipk for packaging. Good point, dpkg does parallel xz compression and I am not aware of any reproducibility problems this causes. > Cheers, > > Richard cu Adrian From sjolley.yp.pm at gmail.com Mon Feb 24 22:06:03 2020 From: sjolley.yp.pm at gmail.com (sjolley.yp.pm at gmail.com) Date: Mon, 24 Feb 2020 14:06:03 -0800 Subject: [OE-core] Yocto Project Newcomer & Unassigned Bugs - Help Needed Message-ID: <026101d5eb5e$9b1140b0$d133c210$@gmail.com> All, The triage team is starting to try and collect up and classify bugs which a newcomer to the project would be able to work on in a way which means people can find them. They're being listed on the triage page under the appropriate heading: https://wiki.yoctoproject.org/wiki/Bug_Triage#Newcomer_Bugs The idea is these bugs should be straight forward for a person to help work on who doesn't have deep experience with the project. If anyone can help, please take ownership of the bug and send patches! If anyone needs help/advice there are people on irc who can likely do so, or some of the more experienced contributors will likely be happy to help too. Also, the triage team meets weekly and does its best to handle the bugs reported into the Bugzilla. The number of people attending that meeting has fallen, as have the number of people available to help fix bugs. One of the things we hear users report is they don't know how to help. We (the triage team) are therefore going to start reporting out the currently 292 unassigned or newcomer bugs. We're hoping people may be able to spare some time now and again to help out with these. Bugs are split into two types, "true bugs" where things don't work as they should and "enhancements" which are features we'd want to add to the system. There are also roughly four different "priority" classes right now, "3.1", "3.2, "3.99" and "Future", the more pressing/urgent issues being in "3.1" and then "3.2". Please review this link and if a bug is something you would be able to help with either take ownership of the bug, or send me (sjolley.yp.pm at gmail.com ) an e-mail with the bug number you would like and I will assign it to you (please make sure you have a Bugzilla account). The list is at: https://wiki.yoctoproject.org/wiki/Bug_Triage_Archive#Unassigned_or_Newcomer _Bugs Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From scott.branden at broadcom.com Tue Feb 25 00:11:14 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Mon, 24 Feb 2020 16:11:14 -0800 Subject: [OE-core] [PATCH 1/2] common-license: add fdk-aac license file Message-ID: <20200225001115.18188-1-scott.branden@broadcom.com> From: Mircea Carausu Add Fraunhofer FDK AAC Codec Library license. Signed-offby: Mircea Carausu Signed-off-by: Scott Branden --- ...aunhofer_FDK_AAC_Codec_Library_for_Android | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 meta/files/common-licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android diff --git a/meta/files/common-licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android b/meta/files/common-licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android new file mode 100644 index 0000000000..05b32bdeaf --- /dev/null +++ b/meta/files/common-licenses/Fraunhofer_FDK_AAC_Codec_Library_for_Android @@ -0,0 +1,92 @@ +Software License for The Fraunhofer FDK AAC Codec Library for Android + +? Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur F?rderung der angewandten +Forschung e.V. All rights reserved. + + 1. INTRODUCTION +The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software +that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding +scheme for digital audio. This FDK AAC Codec software is intended to be used on +a wide variety of Android devices. + +AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient +general perceptual audio codecs. AAC-ELD is considered the best-performing +full-bandwidth communications codec by independent studies and is widely +deployed. AAC has been standardized by ISO and IEC as part of the MPEG +specifications. + +Patent licenses for necessary patent claims for the FDK AAC Codec (including +those of Fraunhofer) may be obtained through Via Licensing +(www.vialicensing.com) or through the respective patent owners individually for +the purpose of encoding or decoding bit streams in products that are compliant +with the ISO/IEC MPEG audio standards. Please note that most manufacturers of +Android devices already license these patent claims through Via Licensing or +directly from the patent owners, and therefore FDK AAC Codec software may +already be covered under those patent licenses when it is used for those +licensed purposes only. + +Commercially-licensed AAC software libraries, including floating-point versions +with enhanced sound quality, are also available from Fraunhofer. Users are +encouraged to check the Fraunhofer website for additional applications +information and documentation. + +2. COPYRIGHT LICENSE + +Redistribution and use in source and binary forms, with or without modification, +are permitted without payment of copyright license fees provided that you +satisfy the following conditions: + +You must retain the complete text of this software license in redistributions of +the FDK AAC Codec or your modifications thereto in source code form. + +You must retain the complete text of this software license in the documentation +and/or other materials provided with redistributions of the FDK AAC Codec or +your modifications thereto in binary form. You must make available free of +charge copies of the complete source code of the FDK AAC Codec and your +modifications thereto to recipients of copies in binary form. + +The name of Fraunhofer may not be used to endorse or promote products derived +from this library without prior written permission. + +You may not charge copyright license fees for anyone to use, copy or distribute +the FDK AAC Codec software or your modifications thereto. + +Your modified versions of the FDK AAC Codec must carry prominent notices stating +that you changed the software and the date of any change. For modified versions +of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android" +must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK +AAC Codec Library for Android." + +3. NO PATENT LICENSE + +NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without +limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE. +Fraunhofer provides no warranty of patent non-infringement with respect to this +software. + +You may use this FDK AAC Codec software or modifications thereto only for +purposes that are authorized by appropriate patent licenses. + +4. DISCLAIMER + +This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright +holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +including but not limited to the implied warranties of merchantability and +fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, +or consequential damages, including but not limited to procurement of substitute +goods or services; loss of use, data, or profits, or business interruption, +however caused and on any theory of liability, whether in contract, strict +liability, or tort (including negligence), arising in any way out of the use of +this software, even if advised of the possibility of such damage. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info at iis.fraunhofer.de + -- 2.17.1 From scott.branden at broadcom.com Tue Feb 25 00:11:15 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Mon, 24 Feb 2020 16:11:15 -0800 Subject: [OE-core] [PATCH 2/2] ffmpeg: add PACKAGECONFIG support for fdk-aac In-Reply-To: <20200225001115.18188-1-scott.branden@broadcom.com> References: <20200225001115.18188-1-scott.branden@broadcom.com> Message-ID: <20200225001115.18188-2-scott.branden@broadcom.com> Add PACKAGECONFIG support for fdk-aac in ffmpeg. Signed-off-by: Scott Branden --- meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index 20a8249b02..d7b0641054 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb @@ -59,6 +59,7 @@ PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" # features to support PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" +PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" -- 2.17.1 From timothy.t.orling at linux.intel.com Tue Feb 25 04:21:42 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Mon, 24 Feb 2020 20:21:42 -0800 Subject: [OE-core] [PATCH] python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 Message-ID: <20200225042142.39745-1-timothy.t.orling@linux.intel.com> THis release is a mix of improvements and fixes: https://github.com/SCons/scons/blob/3.1.2/src/RELEASE.txt * Changed to inherit pypi rather than relying on SOURCEFORGE_MIRROR. * Add SRC_URI for LICENSE file (not included in pypi tarball). * Make it more obvious that RDEPENDS are for class-target and drop empty RDEPENDS from -native * python3-scons-native now DEPENDS on python3-setuptools-native * Tested with core-image-base + packagegroup-core-buildessential with "scons" oe-selftest via testimage. * Tested build of "serf" (which uses python3-scons-native via the scons.bbclass). License-Update: Added "MIT License" text, updated copyright years Signed-off-by: Tim Orling --- ...3.1.1.bb => python3-scons-native_3.1.2.bb} | 3 +- .../python/python3-scons_3.1.1.bb | 29 ---------------- .../python/python3-scons_3.1.2.bb | 33 +++++++++++++++++++ 3 files changed, 34 insertions(+), 31 deletions(-) rename meta/recipes-devtools/python/{python3-scons-native_3.1.1.bb => python3-scons-native_3.1.2.bb} (79%) delete mode 100644 meta/recipes-devtools/python/python3-scons_3.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-scons_3.1.2.bb diff --git a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb similarity index 79% rename from meta/recipes-devtools/python/python3-scons-native_3.1.1.bb rename to meta/recipes-devtools/python/python3-scons-native_3.1.2.bb index 5cd5956625..9e127304d6 100644 --- a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb +++ b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb @@ -1,7 +1,6 @@ require python3-scons_${PV}.bb inherit native python3native -DEPENDS = "python3-native" -RDEPENDS_${PN} = "" +DEPENDS = "python3-native python3-setuptools-native" do_install_append() { create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' diff --git a/meta/recipes-devtools/python/python3-scons_3.1.1.bb b/meta/recipes-devtools/python/python3-scons_3.1.1.bb deleted file mode 100644 index 0c7aaeaeee..0000000000 --- a/meta/recipes-devtools/python/python3-scons_3.1.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Software Construction tool (make/autotools replacement)" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=37bb53a08e6beaea0c90e7821d731284" - -SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" -SRC_URI[md5sum] = "35b2a3993313bbedd221d4d5758fd2fd" -SRC_URI[sha256sum] = "4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5" - -S = "${WORKDIR}/scons-${PV}" - -UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" - -inherit setuptools3 - -do_install_prepend() { - sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* -} - -RDEPENDS_${PN} = "\ - python3-core \ - python3-fcntl \ - python3-io \ - python3-json \ - python3-shell \ - python3-pickle \ - python3-pprint \ - " diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb new file mode 100644 index 0000000000..aa7a2a8300 --- /dev/null +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Software Construction tool (make/autotools replacement)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" + +# pypi package does not have a valid license file +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" + +SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" +SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" +SRC_URI[license.md5sum] = "e14e1b33428df24a40a782ae142785d0" +SRC_URI[license.sha256sum] = "72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6" + +S = "${WORKDIR}/scons-${PV}" + +UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" + +inherit pypi setuptools3 + +do_install_prepend() { + sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* +} + +RDEPENDS_${PN}_class-target = "\ + python3-core \ + python3-fcntl \ + python3-io \ + python3-json \ + python3-shell \ + python3-pickle \ + python3-pprint \ + " -- 2.24.0 From raj.khem at gmail.com Tue Feb 25 05:44:06 2020 From: raj.khem at gmail.com (Khem Raj) Date: Mon, 24 Feb 2020 21:44:06 -0800 Subject: [OE-core] [PATCH] mime,mime-xdg: Conflict with allarch Message-ID: <20200225054406.867243-1-raj.khem@gmail.com> mime and mime-xdb classes add dependencies ( both runtime and buildtime ) on target packages, therefore recipes using allarch should not inherit mime/mime-xdg or vice-versa, this fixes subtle sstate mismatches [YOCTO #13805] Signed-off-by: Khem Raj Cc: Andreas M?ller --- meta/classes/mime-xdg.bbclass | 5 +++++ meta/classes/mime.bbclass | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/meta/classes/mime-xdg.bbclass b/meta/classes/mime-xdg.bbclass index 63169e990d..c175291814 100644 --- a/meta/classes/mime-xdg.bbclass +++ b/meta/classes/mime-xdg.bbclass @@ -14,6 +14,11 @@ DESKTOPDIR = "${datadir}/applications" # skipped for MIME_XDG_PACKAGES not empty MIME_XDG_PACKAGES ?= "" +python __anonymous() { + if bb.data.inherits_class('allarch', d): + bb.fatal("allarch and mime-xdg can not be inherited together") +} + mime_xdg_postinst() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_desktop_database ${PKG} \ diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass index c9072adf3b..f4ccac7bd4 100644 --- a/meta/classes/mime.bbclass +++ b/meta/classes/mime.bbclass @@ -6,6 +6,11 @@ DEPENDS += "${@bb.utils.contains('BPN', 'shared-mime-info', '', 'shared-mime-inf PACKAGE_WRITE_DEPS += "shared-mime-info-native" MIMEDIR = "${datadir}/mime" +python __anonymous() { + if bb.data.inherits_class('allarch', d): + bb.fatal("allarch and mime can not be inherited together") +} + mime_postinst() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_mime_database ${PKG} \ -- 2.25.1 From anuj.mittal at intel.com Tue Feb 25 06:45:26 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Tue, 25 Feb 2020 14:45:26 +0800 Subject: [OE-core] [PATCH] libevdev: fix upstream check Message-ID: <1582613126-37627-1-git-send-email-anuj.mittal@intel.com> Ignore the ones ending in .90x as they are -rc releases. Signed-off-by: Anuj Mittal --- meta/recipes-support/libevdev/libevdev_1.8.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.8.0.bb index 46ed5d7..3523dc0 100644 --- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb +++ b/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -12,3 +12,5 @@ SRC_URI[md5sum] = "879631080be18526737e33b63d848039" SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" inherit autotools pkgconfig + +UPSTREAM_CHECK_REGEX = "libevdev-(?P(\d+\.)+(?!90\d+)\d+)" -- 2.7.4 From li.zhou at windriver.com Tue Feb 25 08:17:42 2020 From: li.zhou at windriver.com (zhou li) Date: Tue, 25 Feb 2020 16:17:42 +0800 Subject: [OE-core] [PATCH] kernel-devsrc: fix missing generated files from the packet In-Reply-To: References: <1581991613-30949-1-git-send-email-li.zhou@windriver.com> <342f0a1b-aec2-932a-2a49-cd2b896d8822@windriver.com> Message-ID: On 2/18/20 9:36 PM, Bruce Ashfield wrote: > On Mon, Feb 17, 2020 at 10:58 PM zhou li wrote: >> >> On 2/18/20 10:12 AM, Bruce Ashfield wrote: >>> On Mon, Feb 17, 2020 at 9:07 PM Li Zhou wrote: >>>> The file arch/arm/include/generated/asm/unistd-nr.h is needed by some >>>> external kernel module. Error occurs when building the module with >>>> the SDK. >>>> >>>> Add arch/${ARCH}/include/generated dir and files under it to >>>> kernel-devsrc package to solve this issue. >>>> >>>> Signed-off-by: Li Zhou >>>> --- >>>> meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++++++ >>>> 1 file changed, 6 insertions(+) >>>> >>>> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb >>>> index b6f2dbc..8621fe1 100644 >>>> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb >>>> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb >>>> @@ -108,6 +108,12 @@ do_install() { >>>> fi >>>> >>>> cp -a include $kerneldir/build/include >>>> + >>>> + if [ -d arch/${ARCH}/include/generated ]; then >>>> + mkdir -p $kerneldir/build/arch/${ARCH}/include >>>> + cp -r arch/${ARCH}/include/generated $kerneldir/build/arch/${ARCH}/include >>>> + fi >>> This is just papering over the real problem. >>> >>> Anything that is generated, should be regenerated when the headers are >>> used/prepared. >>> >>> What is missing and/or why isn't that happening with this ? >>> >>> Bruce >> >> In some old version yocto, the file >> arch/arm/include/generated/asm/unistd-nr.h can be directly used from our >> sdk. So now it isn't permitted any more? And we should figure out how to > Anything in the generated subdirectories of the kernel build should be > regenerated when we do the make prepare/scripts/modules_prepare steps. > If it isn't being regenerated, then we are missing something in devsrc > that can regenerate them (either a step in the preparation, a > Makefile, a script ..). > > If we start pulling bits and pieces out of generated, we'll end up > constantly having to take more and more, when the right thing (by the > way our minimal devsrc is designed) is to have it regenerated. > > It's valid to use it, but we shouldn't need to copy it if it can be > generated. If it can't be generated, we should document why with a > comment in the code and in the commit message of the change. Hi, Bruce: ?????? Thank you for your reply. I try and find that can generate the header file mentioned. Then do you mean that the user should run to generate the header files needed first, and then make their own code using those header files? Thanks a lot. > > Bruce > > >> generate it again when developing the external kernel modules? Thank you. >> >> >>>> + >>>> ) >>>> >>>> # now grab the chunks from the source tree that we need >>>> -- >>>> 1.9.1 >>>> >>>> -- >>>> _______________________________________________ >>>> Openembedded-core mailing list >>>> Openembedded-core at lists.openembedded.org >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> >> -- >> Best Regards! >> Zhou Li >> Phone number: 86-10-84778511 >> > -- Best Regards! Zhou Li Phone number: 86-10-84778511 From brgl at bgdev.pl Tue Feb 25 08:18:52 2020 From: brgl at bgdev.pl (Bartosz Golaszewski) Date: Tue, 25 Feb 2020 09:18:52 +0100 Subject: [OE-core] [PATCH] hosttools: add utilities for all supported checksums Message-ID: <20200225081852.14328-1-brgl@bgdev.pl> From: Bartosz Golaszewski Only md5sum and sha256sum are currently provided by HOSTTOOLS. Trying to use any other checksum conversion will result in a build failure. Fix it by adding other supported checksum utilities to HOSTTOOLS. Signed-off-by: Bartosz Golaszewski --- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 954c06b313..e201b671bb 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -489,7 +489,8 @@ HOSTTOOLS += " \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ - python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ + python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ + sha1sum sha224sum sha256sum sha384sum sha512sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ " -- 2.25.0 From li.zhou at windriver.com Tue Feb 25 08:41:58 2020 From: li.zhou at windriver.com (zhou li) Date: Tue, 25 Feb 2020 16:41:58 +0800 Subject: [OE-core] [PATCH] lttng-modules: Check the pid_ns before using it because it may be NULL In-Reply-To: <1196510898.2098.1582210055795.JavaMail.zimbra@efficios.com> References: <1582165584-187223-1-git-send-email-li.zhou@windriver.com> <1196510898.2098.1582210055795.JavaMail.zimbra@efficios.com> Message-ID: <91eec671-f8e8-96ed-1520-d91860644d85@windriver.com> On 2/20/20 10:47 PM, Jonathan Rajotte-Julien wrote: > Hi, > > Can we get more info on the kernel version and config? > > Did you submit this on our mailing list?(lttng-dev). If not I would highly recommend that you do so in the future so we can eliminate *custom* patches and get to the bottom of the issue at hand so that the whole community benefit from it. Hi, Jonathan: ??????? Thank you for you help and suggestion on this. This issue is seen on linux 4.18 + lttng-modules 2.10. > > Cheers > > ----- Li Zhou wrote: >> Check the pid_ns before using it because it may be NULL to fix below >> issue: >> <1>[ 22.637196] Unable to handle kernel NULL pointer dereference at >> virtual address 0000000000000080 >> <1>[ 22.645982] Mem abort info: >> <1>[ 22.648769] ESR = 0x96000007 >> <1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits >> <1>[ 22.657730] SET = 0, FnV = 0 >> <1>[ 22.660777] EA = 0, S1PTW = 0 >> <1>[ 22.663910] Data abort info: >> <1>[ 22.666784] ISV = 0, ISS = 0x00000007 >> <1>[ 22.670611] CM = 0, WnR = 0 >> <1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = >> 0000000012378f78 >> <1>[ 22.680180] [0000000000000080] pgd=000000007f023003, >> pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 >> <0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP >> <4>[ 22.690797] Modules linked in: adkNetD ncp >> lttng_ring_buffer_client_overwrite(C) >> lttng_ring_buffer_metadata_client(C) lttng_ring_buffer_client_discard(C) >> lttng_ring_buffer_client_mmap_overwrite(C) >> lttng_ring_buffer_client_mmap_discard(C) >> lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) >> lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) >> lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) >> lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) lttng_clock(C) >> <0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = >> 0x000000005d27910f) >> <4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C >> 4.18.37-rt820-custom #1 >> <4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) >> <4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) >> <4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] >> <4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] >> <4>[ 22.690851] sp : ffffffc07fe57ad0 >> <4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 >> <4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 >> <4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 >> <4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 >> <4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 >> <4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe >> <4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 >> <4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f >> <4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 >> <4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f >> <4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 >> <4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 >> <4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 >> <4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 >> <4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 >> <4>[ 22.690896] Call trace: >> <4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] >> <4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] >> <4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] >> <4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] >> <4>[ 22.691026] compat_sys_ioctl+0x110/0x778 >> >> Signed-off-by: Li Zhou >> --- >> ...es-Check-the-pid_ns-before-using-it-becau.patch | 86 ++++++++++++++++++++++ >> meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb | 2 + >> 2 files changed, 88 insertions(+) >> create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >> >> diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >> new file mode 100644 >> index 0000000..5306c79 >> --- /dev/null >> +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >> @@ -0,0 +1,86 @@ >> +From 0c0072e005ce9d591518d1819a39264859132561 Mon Sep 17 00:00:00 2001 >> +From: Li Zhou >> +Date: Wed, 19 Feb 2020 11:14:38 +0800 >> +Subject: [PATCH] lttng-modules: Check the pid_ns before using it because it >> + may be NULL >> + >> +<1>[ 22.637196] Unable to handle kernel NULL pointer dereference at >> +virtual address 0000000000000080 >> +<1>[ 22.645982] Mem abort info: >> +<1>[ 22.648769] ESR = 0x96000007 >> +<1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits >> +<1>[ 22.657730] SET = 0, FnV = 0 >> +<1>[ 22.660777] EA = 0, S1PTW = 0 >> +<1>[ 22.663910] Data abort info: >> +<1>[ 22.666784] ISV = 0, ISS = 0x00000007 >> +<1>[ 22.670611] CM = 0, WnR = 0 >> +<1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = >> +0000000012378f78 >> +<1>[ 22.680180] [0000000000000080] pgd=000000007f023003, >> +pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 >> +<0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP >> +<4>[ 22.690797] Modules linked in: adkNetD ncp >> +lttng_ring_buffer_client_overwrite(C) >> +lttng_ring_buffer_metadata_client(C) lttng_ring_buffer_client_discard(C) >> +lttng_ring_buffer_client_mmap_overwrite(C) >> +lttng_ring_buffer_client_mmap_discard(C) >> +lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) >> +lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) >> +lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) >> +lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) lttng_clock(C) >> +<0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = >> +0x000000005d27910f) >> +<4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C >> +4.18.37-rt820-custom #1 >> +<4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) >> +<4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) >> +<4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] >> +<4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] >> +<4>[ 22.690851] sp : ffffffc07fe57ad0 >> +<4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 >> +<4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 >> +<4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 >> +<4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 >> +<4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 >> +<4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe >> +<4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 >> +<4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f >> +<4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 >> +<4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f >> +<4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 >> +<4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 >> +<4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 >> +<4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 >> +<4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 >> +<4>[ 22.690896] Call trace: >> +<4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] >> +<4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] >> +<4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] >> +<4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] >> +<4>[ 22.691026] compat_sys_ioctl+0x110/0x778 >> + >> +Signed-off-by: Liguang Li >> + >> +Upstream-Status: Pending >> + >> +Signed-off-by: Li Zhou >> +--- >> + lttng-statedump-impl.c | 2 +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c >> +index 1c09e51..fb609e3 100644 >> +--- a/lttng-statedump-impl.c >> ++++ b/lttng-statedump-impl.c >> +@@ -397,7 +397,7 @@ void lttng_statedump_process_ns(struct lttng_session *session, >> + do { >> + trace_lttng_statedump_process_state(session, >> + p, type, mode, submode, status, pid_ns); >> +- pid_ns = pid_ns->parent; >> ++ pid_ns = pid_ns ? pid_ns->parent : NULL; >> + } while (pid_ns); >> + } >> + >> +-- >> +1.9.1 >> + >> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >> index c833ff7..cbd43e3 100644 >> --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >> @@ -11,6 +11,7 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' >> SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ >> file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ >> file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ >> + file://0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch \ >> " >> >> SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" >> @@ -36,6 +37,7 @@ DEFAULT_PREFERENCE_class-devupstream = "-1" >> SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ >> file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ >> file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ >> + file://0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch \ >> " >> SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" >> PV_class-devupstream = "2.11.1+git${SRCPV}" >> -- >> 1.9.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- Best Regards! Zhou Li Phone number: 86-10-84778511 From kai.kang at windriver.com Tue Feb 25 09:06:19 2020 From: kai.kang at windriver.com (kai.kang at windriver.com) Date: Tue, 25 Feb 2020 17:06:19 +0800 Subject: [OE-core] [PATCH] ruby: install required files for ptest Message-ID: <20200225090619.25118-1-kai.kang@windriver.com> From: Kai Kang After update to 2.7.0, it fails to start ptest of ruby with errors: | ./test/runner.rb:11:in `require_relative': cannot load such file -- /usr/lib64/ruby/ptest/tool/test/runner (LoadError) and | test/rdoc/test_rdoc_attr.rb: cannot load such file -- rdoc/version | test/did_you_mean/spell_checking/test_key_name_check.rb: cannot load such file -- /usr/lib64/ruby/ptest/lib/did_you_mean Install the required files for the ptest. Signed-off-by: Kai Kang --- meta/recipes-devtools/ruby/ruby_2.7.0.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/ruby/ruby_2.7.0.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb index c796318717..268b4bebd9 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -45,6 +45,12 @@ do_install_append_class-target () { do_install_ptest () { cp -rf ${S}/test ${D}${PTEST_PATH}/ + + install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb + cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/ + mkdir -p ${D}${PTEST_PATH}/lib + cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib + # install test-binaries find $(find ./.ext -path '*/-test-') -name '*.so' -print0 \ | tar --no-recursion --null -T - --no-same-owner --preserve-permissions -cf - \ -- 2.17.1 From git at andred.net Tue Feb 25 09:16:20 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Tue, 25 Feb 2020 09:16:20 +0000 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <20200224220013.GA11259@localhost> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> <23c396de32bb98414dcb2aaec178e73079e000d3.camel@andred.net> <20200224220013.GA11259@localhost> Message-ID: <861ecc2be15dcbfcb8cb5a6dac481561d235ddd9.camel@andred.net> On Tue, 2020-02-25 at 00:00 +0200, Adrian Bunk wrote: > On Mon, Feb 24, 2020 at 05:32:29PM +0000, Richard Purdie wrote: > > On Mon, 2020-02-24 at 17:14 +0000, Andr? Draszik wrote: > > ... > > > I don't want to penalise myself or anybody else by generally forcing > > > a low number of threads either. > > > > We didn't have resource issues on the autobuilder with xz but others > > did report it and its why the memlimit was set. It would be better to > > remove the memlimit for determinism really as far as I can tell and if > > necessary throttle the threads count. > > > > Maybe setting an upper limit of say 10 threads and a minimum of 2 might > > given us what we need. > > On a Threadripper with 128 cores and 256 GB RAM it would not be a > problem to use all cores. > > A laptop with 8 cores and 8 GB RAM is problematic. > > > Perhaps we just allow the number of xz threads > > to be set independently? > > dpkg manually reduces the number of threads until less than half > of the RAM is used: > https://sources.debian.org/src/dpkg/1.19.7/lib/dpkg/compress.c/#L566-L574 > > In a script it would be possible to use --no-adjust to achieve the same: > $ xz -9 --memlimit=50% --no-adjust -T32 /dev/null > xz: Memory usage limit is too low for the given filter setup. > xz: 39,972 MiB of memory is required. The limit is 32,051 MiB. > $ > The problem with --no-adjust is that it also prevents xz from reducing the number of threads. It will do that in preference to changing compression parameters, so as long as you have more than 2499MiB of memory to support at least 2 threads (with default block size), compression will be identical. > > > > FWIW we haven't seen variation on the autobuilder due to this as > > > > far as > > > > I know. > > > > > > BTW, pigz and pbzip should have a similar thread related problem, > > > according to the man pages, if you read between the lines. > > > > Agreed. We have less of an issue with these as their use is much less > > frequent. xz is used by deb and ipk for packaging. They both actually don't. It's reproducible no matter how many threads. Interesting... > > Good point, dpkg does parallel xz compression and I am not aware of any > reproducibility problems this causes. Debian's dpkg tries to be clever by simply reducing the number of threads until compression uses at most half of physical ram. I guess this typically works out as at least two threads in most if not all environments. Cheers, Andre' From bunk at stusta.de Tue Feb 25 09:54:12 2020 From: bunk at stusta.de (Adrian Bunk) Date: Tue, 25 Feb 2020 11:54:12 +0200 Subject: [OE-core] [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <861ecc2be15dcbfcb8cb5a6dac481561d235ddd9.camel@andred.net> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> <23c396de32bb98414dcb2aaec178e73079e000d3.camel@andred.net> <20200224220013.GA11259@localhost> <861ecc2be15dcbfcb8cb5a6dac481561d235ddd9.camel@andred.net> Message-ID: <20200225095412.GA7740@localhost> On Tue, Feb 25, 2020 at 09:16:20AM +0000, Andr? Draszik wrote: > On Tue, 2020-02-25 at 00:00 +0200, Adrian Bunk wrote: >... > > > Perhaps we just allow the number of xz threads > > > to be set independently? > > > > dpkg manually reduces the number of threads until less than half > > of the RAM is used: > > https://sources.debian.org/src/dpkg/1.19.7/lib/dpkg/compress.c/#L566-L574 > > > > In a script it would be possible to use --no-adjust to achieve the same: > > $ xz -9 --memlimit=50% --no-adjust -T32 /dev/null > > xz: Memory usage limit is too low for the given filter setup. > > xz: 39,972 MiB of memory is required. The limit is 32,051 MiB. > > $ > > The problem with --no-adjust is that it also prevents xz from reducing the > number of threads. It will do that in preference to changing compression > parameters, so as long as you have more than 2499MiB of memory to support at > least 2 threads (with default block size), compression will be identical. >... 5 GB due to the 50%. But I had something different in mind: Similar to what dpkg is doing, you could once loop from @oe.utils.cpu_count() down to 2 until "--memlimit=50% --no-adjust -T$(i)" succeeds. Then run the actual compression without --memlimit. I would not consider anything with less than 4 GB RAM reasonable for building Yocto (g++ also likes to use more than 2 GB). > Cheers, > Andre' cu Adrian From richard.purdie at linuxfoundation.org Tue Feb 25 10:21:19 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 25 Feb 2020 10:21:19 +0000 Subject: [OE-core] [PATCH] mime,mime-xdg: Conflict with allarch In-Reply-To: <20200225054406.867243-1-raj.khem@gmail.com> References: <20200225054406.867243-1-raj.khem@gmail.com> Message-ID: <29622e48fc7ebf80aa002b2d1903f6d970af9d86.camel@linuxfoundation.org> On Mon, 2020-02-24 at 21:44 -0800, Khem Raj wrote: > mime and mime-xdb classes add dependencies ( both runtime and > buildtime > ) on target packages, therefore recipes using allarch should not > inherit > mime/mime-xdg or vice-versa, this fixes subtle sstate mismatches > > [YOCTO #13805] > > Signed-off-by: Khem Raj > Cc: Andreas M?ller > --- > meta/classes/mime-xdg.bbclass | 5 +++++ > meta/classes/mime.bbclass | 5 +++++ > 2 files changed, 10 insertions(+) Is this the right way to fix this? mime info probably is arch independent, so should we be whitelisting some of the dependencies? Cheers, Richard From richard.purdie at linuxfoundation.org Tue Feb 25 10:46:28 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 25 Feb 2020 10:46:28 +0000 Subject: [OE-core] [PATCH 1/2] common-license: add fdk-aac license file In-Reply-To: <20200225001115.18188-1-scott.branden@broadcom.com> References: <20200225001115.18188-1-scott.branden@broadcom.com> Message-ID: <628af1221089667f1377f419dd9375637ac1d028.camel@linuxfoundation.org> On Mon, 2020-02-24 at 16:11 -0800, Scott Branden via Openembedded-core wrote: > From: Mircea Carausu > > Add Fraunhofer FDK AAC Codec Library license. > > Signed-offby: Mircea Carausu > Signed-off-by: Scott Branden I'm not sure this belongs in Core? Is it a commonly used license? This recipe isn't in OE-Core? Does the license have an SPDX identifier (I couldn't see it on https://spdx.org/licenses/)? Cheers, Richard From git at andred.net Tue Feb 25 11:16:21 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Tue, 25 Feb 2020 11:16:21 +0000 Subject: [OE-core] reproducible builds involving xz (was: Re: [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures) In-Reply-To: <20200224151041.GE27036@localhost> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <6c0d874e887dc5a2355d236d77e8ec771ea729f9.camel@andred.net> <20200224143155.GD27036@localhost> <5639b75022c28419467aefb8de62c6ab24f9eae6.camel@andred.net> <20200224151041.GE27036@localhost> Message-ID: <0018e8670b37836cfae92fd7332e927ec49f19ca.camel@andred.net> On Mon, 2020-02-24 at 17:10 +0200, Adrian Bunk wrote: > On Mon, Feb 24, 2020 at 02:58:21PM +0000, Andr? Draszik wrote: > > On Mon, 2020-02-24 at 16:31 +0200, Adrian Bunk wrote: > > > On Mon, Feb 24, 2020 at 02:21:57PM +0000, Andr? Draszik wrote: > > > > ... > > > > Once the artefact has been created, it doesn't matter anymore how it > > > > was created, as long as the high-level options aren't being changed (like > > > > an explicit compression level, checksum method, etc.) > > > > ... > > > > > > meta-poky/conf/distro/poky.conf:INHERIT += "reproducible_build" > > > > I still maintain these are two different problems. I am not trying to fix > > reproducible builds. > > But won't fixing reproducible builds require reverting the patch you > suggest for fixing your problem? No, I don't think so. To fix reproducible, you need to either patch xz to always behave like in multi-threaded mode, even when --threads=1 was given in the arguments. Additionally, a patch to xz to allow it to scale down the number of threads, but not the compression level (--no-adjust prevents both), could be useful. Alternatively, you need to decide if you want to support it with --threads=1 or --threads >= 2, and issue at least a warning in reproducible_build.bbclass if somebody deviates. You should also calculate the memory requirements, reduce the number of threads to fit, and again give at least a warning if the compression can not be done without changing compression level after that. I still maintain that none of that is related to my original patch. Cheers, Andre' From bunk at stusta.de Tue Feb 25 11:19:55 2020 From: bunk at stusta.de (Adrian Bunk) Date: Tue, 25 Feb 2020 13:19:55 +0200 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: References: <20200223182933.6168-1-bunk@stusta.de> <20200224104635.GA27036@localhost> <20200224140801.GC27036@localhost> Message-ID: <20200225111955.GA13902@localhost> On Mon, Feb 24, 2020 at 10:45:33PM +0100, Alexander Kanavin wrote: > On Mon, 24 Feb 2020 at 15:08, Adrian Bunk wrote: > > > Alexander, wayland support in webkitgtk requires mesa built with x11 > > support (otherwise gl.pc is not available). > > I had a look; I'm not sure I understood the options correctly, but the > issue is due to this: > > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl > opengl', '' ,d)} \ > > The above works if both opengl and x11 are enabled as DISTRO_FEATURES, but > if x11 is not enabled, then it should be "webgl gles2". Can you try that? Thanks, that did the trick. Expressing everything might still be problematic, is there a way to set REQUIRED_DISTRO_FEATURES to x11 || (wayland && opengl) ? Using webkitgtk with x11 without opengl might not be common, but it is explicitly supported upstream. > Alex cu Adrian From richard.purdie at linuxfoundation.org Tue Feb 25 11:23:56 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 25 Feb 2020 11:23:56 +0000 Subject: [OE-core] reproducible builds involving xz (was: Re: [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures) In-Reply-To: <0018e8670b37836cfae92fd7332e927ec49f19ca.camel@andred.net> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <6c0d874e887dc5a2355d236d77e8ec771ea729f9.camel@andred.net> <20200224143155.GD27036@localhost> <5639b75022c28419467aefb8de62c6ab24f9eae6.camel@andred.net> <20200224151041.GE27036@localhost> <0018e8670b37836cfae92fd7332e927ec49f19ca.camel@andred.net> Message-ID: On Tue, 2020-02-25 at 11:16 +0000, Andr? Draszik wrote: > On Mon, 2020-02-24 at 17:10 +0200, Adrian Bunk wrote: > > On Mon, Feb 24, 2020 at 02:58:21PM +0000, Andr? Draszik wrote: > > > On Mon, 2020-02-24 at 16:31 +0200, Adrian Bunk wrote: > > > > On Mon, Feb 24, 2020 at 02:21:57PM +0000, Andr? Draszik wrote: > > > > > ... > > > > > Once the artefact has been created, it doesn't matter anymore > > > > > how it > > > > > was created, as long as the high-level options aren't being > > > > > changed (like > > > > > an explicit compression level, checksum method, etc.) > > > > > ... > > > > > > > > meta-poky/conf/distro/poky.conf:INHERIT += "reproducible_build" > > > > > > I still maintain these are two different problems. I am not > > > trying to fix > > > reproducible builds. > > > > But won't fixing reproducible builds require reverting the patch > > you > > suggest for fixing your problem? > > No, I don't think so. > > To fix reproducible, you need to either patch xz to always behave > like in > multi-threaded mode, even when --threads=1 was given in the > arguments. > Additionally, a patch to xz to allow it to scale down the number of > threads, but not the compression level (--no-adjust prevents both), > could be useful. > > Alternatively, you need to decide if you want to support it with > --threads=1 or --threads >= 2, and issue at least a warning in > reproducible_build.bbclass if somebody deviates. > > > You should also calculate the memory requirements, reduce the number > of threads to fit, and again give at least a warning if the > compression > can not be done without changing compression level after that. > > I still maintain that none of that is related to my original patch. If I merge your patch, what will happen is that builds on the autobuilder can potentially start failing as it will potentially detect reproduciblity issues which it wouldn't previously see. To address this, I'd ike to see a new parameter added to oe.utils.cpu_count() which allows us to have a minimum of 2. I'd also like to reparametise the memlimit so we can drop it entirely by default. This should get us some defaults which won't break things and give reproducibile builds. They may not work for everyone but its then something which we can build upon. I do want to take a patch as I agree there is a serious issue here but I'd prefer we get it right and try and stop it causing me headaches on the testing infrastructure. Cheers, Richard From alex.kanavin at gmail.com Tue Feb 25 11:32:55 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 12:32:55 +0100 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <20200225111955.GA13902@localhost> References: <20200223182933.6168-1-bunk@stusta.de> <20200224104635.GA27036@localhost> <20200224140801.GC27036@localhost> <20200225111955.GA13902@localhost> Message-ID: I would probably look into how REQUIRED_DISTRO_FEATURE/ANY_OF_DISTRO_FEATURS is actually implemented, and see if you can convince it to do the right thing, or maybe write a custom re-implementation. Alex On Tue, 25 Feb 2020 at 12:19, Adrian Bunk wrote: > On Mon, Feb 24, 2020 at 10:45:33PM +0100, Alexander Kanavin wrote: > > On Mon, 24 Feb 2020 at 15:08, Adrian Bunk wrote: > > > > > Alexander, wayland support in webkitgtk requires mesa built with x11 > > > support (otherwise gl.pc is not available). > > > > I had a look; I'm not sure I understood the options correctly, but the > > issue is due to this: > > > > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'webgl > > opengl', '' ,d)} \ > > > > The above works if both opengl and x11 are enabled as DISTRO_FEATURES, > but > > if x11 is not enabled, then it should be "webgl gles2". Can you try that? > > Thanks, that did the trick. > > Expressing everything might still be problematic, is there a way to set > REQUIRED_DISTRO_FEATURES to > x11 || (wayland && opengl) > ? > > Using webkitgtk with x11 without opengl might not be common, > but it is explicitly supported upstream. > > > Alex > > cu > Adrian > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Tue Feb 25 12:11:39 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 25 Feb 2020 12:11:39 +0000 Subject: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream In-Reply-To: <20200223132257.4867-1-gzatko@gmail.com> References: <20200223132257.4867-1-gzatko@gmail.com> Message-ID: <87c5cc0c50a7060f3a38c51103d1a3603bd21843.camel@linuxfoundation.org> On Sun, 2020-02-23 at 14:22 +0100, gzatko at gmail.com wrote: > From: Gregor Zatko > > Until now a Debian package has been used as a source. > This change just switches it to project's upstream. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > Signed-off-by: Gregor Zatko > --- > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 60 +++++++++---------- > 1 file changed, 29 insertions(+), 31 deletions(-) I know this was discussed in the bug and the older entries were removed as a test. Unfortunately this does break builds: https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/1851 (so far) We may need to rethink that. Cheers, Richard From schnitzeltony at gmail.com Tue Feb 25 12:24:36 2020 From: schnitzeltony at gmail.com (=?UTF-8?Q?Andreas_M=C3=BCller?=) Date: Tue, 25 Feb 2020 13:24:36 +0100 Subject: [OE-core] [PATCH] mime,mime-xdg: Conflict with allarch In-Reply-To: <29622e48fc7ebf80aa002b2d1903f6d970af9d86.camel@linuxfoundation.org> References: <20200225054406.867243-1-raj.khem@gmail.com> <29622e48fc7ebf80aa002b2d1903f6d970af9d86.camel@linuxfoundation.org> Message-ID: On Tue, Feb 25, 2020 at 11:21 AM Richard Purdie wrote: > > On Mon, 2020-02-24 at 21:44 -0800, Khem Raj wrote: > > mime and mime-xdb classes add dependencies ( both runtime and > > buildtime > > ) on target packages, therefore recipes using allarch should not > > inherit > > mime/mime-xdg or vice-versa, this fixes subtle sstate mismatches > > > > [YOCTO #13805] > > > > Signed-off-by: Khem Raj > > Cc: Andreas M?ller > > --- > > meta/classes/mime-xdg.bbclass | 5 +++++ > > meta/classes/mime.bbclass | 5 +++++ > > 2 files changed, 10 insertions(+) > > Is this the right way to fix this? mime info probably is arch > independent, so should we be whitelisting some of the dependencies? > > Cheers, > > Richard > Khem and I had a short discussion about this [1]. His first approach was to remove DEPENDS. As far as I remember the deps were added to avoid QA warning. Honestly I never understood why these are spawned. If there is a fix / workaround this could be reduced to rdeps which an be handled for allarch. [1] https://github.com/YoeDistro/openembedded-core/commit/5605a9cf78c3731e2cc055cd4f8cc88a0b3d7e26 Andreas From bunk at stusta.de Tue Feb 25 12:38:07 2020 From: bunk at stusta.de (Adrian Bunk) Date: Tue, 25 Feb 2020 14:38:07 +0200 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: References: <20200223182933.6168-1-bunk@stusta.de> <20200224104635.GA27036@localhost> <20200224140801.GC27036@localhost> <20200225111955.GA13902@localhost> Message-ID: <20200225123807.GB13902@localhost> On Tue, Feb 25, 2020 at 12:32:55PM +0100, Alexander Kanavin wrote: > I would probably look into how > REQUIRED_DISTRO_FEATURE/ANY_OF_DISTRO_FEATURS is actually implemented, and > see if you can convince it to do the right thing, or maybe write a custom > re-implementation. I did already check meta/classes/features_check.bbclass, there is no obvious simple way for expressing more complicated dependencies. The low-effort way forward will be to keep opengl required even for x11, with a comment why. > Alex cu Adrian From martin.jansa at gmail.com Tue Feb 25 12:46:27 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Tue, 25 Feb 2020 13:46:27 +0100 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <20200225123807.GB13902@localhost> References: <20200223182933.6168-1-bunk@stusta.de> <20200224104635.GA27036@localhost> <20200224140801.GC27036@localhost> <20200225111955.GA13902@localhost> <20200225123807.GB13902@localhost> Message-ID: <20200225124627.23tpu5eknidqxrg3@jama> On Tue, Feb 25, 2020 at 02:38:07PM +0200, Adrian Bunk wrote: > On Tue, Feb 25, 2020 at 12:32:55PM +0100, Alexander Kanavin wrote: > > I would probably look into how > > REQUIRED_DISTRO_FEATURE/ANY_OF_DISTRO_FEATURS is actually implemented, and > > see if you can convince it to do the right thing, or maybe write a custom > > re-implementation. > > I did already check meta/classes/features_check.bbclass, there is no > obvious simple way for expressing more complicated dependencies. Doesn't this do what you wanted? REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland opengl', 'x11', d)}" > > The low-effort way forward will be to keep opengl required even for x11, > with a comment why. > > > Alex > > cu > Adrian > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From jacob.kroon at gmail.com Tue Feb 25 13:08:52 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Tue, 25 Feb 2020 14:08:52 +0100 Subject: [OE-core] [PATCH] readline/ediline: Fix conflicting manpages. In-Reply-To: <20200222185400.32136-1-jpuhlman@mvista.com> References: <20200222185400.32136-1-jpuhlman@mvista.com> Message-ID: On 2/22/20 7:54 PM, Jeremy A. Puhlman wrote: > From: Jeremy Puhlman > > file /usr/share/man/man3/history.3 conflicts between attempted installs of libedit-doc-20191231+3.1-r0.corei7_64 and readline-doc-8.0-r0.corei7_64 > > Signed-off-by: Jeremy A. Puhlman > --- > meta/recipes-core/readline/readline.inc | 8 +++++++- > meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 6 ++++++ > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc > index 07f54a76f1..4babcbd69a 100644 > --- a/meta/recipes-core/readline/readline.inc > +++ b/meta/recipes-core/readline/readline.inc > @@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk" > > CONFFILES_${PN} += "${sysconfdir}/inputrc" > > +inherit update-alternatives > + > +ALTERNATIVE_PRIORITY = "100" > +ALTERNATIVE_${PN} = "history.3" > +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" > + > # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs > # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. > SRC_URI_append_class-native = " file://rl-native.map" > -LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" > \ No newline at end of file > +LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" > diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb > index 7116c9ddbc..267fdcc54a 100644 > --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb > +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb > @@ -17,3 +17,9 @@ SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416" > SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071" > > BBCLASSEXTEND = "native nativesdk" > + > +inherit update-alternatives > + > +ALTERNATIVE_PRIORITY = "90" > +ALTERNATIVE_${PN} = "history.3" > +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" > With this change (I think), I now get a file > +lrwxrwxrwx root root 38 ./usr/share/man/man3/history.3 -> /usr/share/man/man3/history.3.readline in my rootfs, which is wierd since I don't have any other man pages in my image.. /Jacob From richard.purdie at linuxfoundation.org Tue Feb 25 13:33:53 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 25 Feb 2020 13:33:53 +0000 Subject: [OE-core] [PATCH] readline/ediline: Fix conflicting manpages. In-Reply-To: References: <20200222185400.32136-1-jpuhlman@mvista.com> Message-ID: <42d690f3ae40a420179cb85453d2722c153c2d8c.camel@linuxfoundation.org> On Tue, 2020-02-25 at 14:08 +0100, Jacob Kroon wrote: > On 2/22/20 7:54 PM, Jeremy A. Puhlman wrote: > > BBCLASSEXTEND = "native nativesdk" > > + > > +inherit update-alternatives > > + > > +ALTERNATIVE_PRIORITY = "90" > > +ALTERNATIVE_${PN} = "history.3" > > +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" > > > > With this change (I think), I now get a file > > > +lrwxrwxrwx root root 38 > > ./usr/share/man/man3/history.3 -> > > /usr/share/man/man3/history.3.readline > > in my rootfs, which is wierd since I don't have any other man pages > in my image.. At a guess, ALTERNATIVE_${PN} should be ALTERNATIVE_${PN}-doc ? Cheers, Richard From bruce.ashfield at gmail.com Tue Feb 25 13:51:10 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Tue, 25 Feb 2020 08:51:10 -0500 Subject: [OE-core] [PATCH] kernel-devsrc: fix missing generated files from the packet In-Reply-To: References: <1581991613-30949-1-git-send-email-li.zhou@windriver.com> <342f0a1b-aec2-932a-2a49-cd2b896d8822@windriver.com> Message-ID: On Tue, Feb 25, 2020 at 3:18 AM zhou li wrote: > > > On 2/18/20 9:36 PM, Bruce Ashfield wrote: > > On Mon, Feb 17, 2020 at 10:58 PM zhou li wrote: > >> > >> On 2/18/20 10:12 AM, Bruce Ashfield wrote: > >>> On Mon, Feb 17, 2020 at 9:07 PM Li Zhou wrote: > >>>> The file arch/arm/include/generated/asm/unistd-nr.h is needed by some > >>>> external kernel module. Error occurs when building the module with > >>>> the SDK. > >>>> > >>>> Add arch/${ARCH}/include/generated dir and files under it to > >>>> kernel-devsrc package to solve this issue. > >>>> > >>>> Signed-off-by: Li Zhou > >>>> --- > >>>> meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++++++ > >>>> 1 file changed, 6 insertions(+) > >>>> > >>>> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb > >>>> index b6f2dbc..8621fe1 100644 > >>>> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb > >>>> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb > >>>> @@ -108,6 +108,12 @@ do_install() { > >>>> fi > >>>> > >>>> cp -a include $kerneldir/build/include > >>>> + > >>>> + if [ -d arch/${ARCH}/include/generated ]; then > >>>> + mkdir -p $kerneldir/build/arch/${ARCH}/include > >>>> + cp -r arch/${ARCH}/include/generated $kerneldir/build/arch/${ARCH}/include > >>>> + fi > >>> This is just papering over the real problem. > >>> > >>> Anything that is generated, should be regenerated when the headers are > >>> used/prepared. > >>> > >>> What is missing and/or why isn't that happening with this ? > >>> > >>> Bruce > >> > >> In some old version yocto, the file > >> arch/arm/include/generated/asm/unistd-nr.h can be directly used from our > >> sdk. So now it isn't permitted any more? And we should figure out how to > > Anything in the generated subdirectories of the kernel build should be > > regenerated when we do the make prepare/scripts/modules_prepare steps. > > If it isn't being regenerated, then we are missing something in devsrc > > that can regenerate them (either a step in the preparation, a > > Makefile, a script ..). > > > > If we start pulling bits and pieces out of generated, we'll end up > > constantly having to take more and more, when the right thing (by the > > way our minimal devsrc is designed) is to have it regenerated. > > > > It's valid to use it, but we shouldn't need to copy it if it can be > > generated. If it can't be generated, we should document why with a > > comment in the code and in the commit message of the change. > > > Hi, Bruce: > > Thank you for your reply. I try and find that > can generate the header file mentioned. > > Then do you mean that the user should run to generate > the header files needed first, and then make their own code using those > header files? Yes. That's the model that we follow with devsrc, if it can be generated, it should be. It keeps the source as small as possible, prevents people from patching transient files and guarantees we'll never get the packaged and development environment files out of sync. If "make modules_prepare" or "make scripts prepare" isn't automatically triggering archprepare, then we should make sure it is documented. Cheers, Bruce > > Thanks a lot. > > > > > > Bruce > > > > > >> generate it again when developing the external kernel modules? Thank you. > >> > >> > >>>> + > >>>> ) > >>>> > >>>> # now grab the chunks from the source tree that we need > >>>> -- > >>>> 1.9.1 > >>>> > >>>> -- > >>>> _______________________________________________ > >>>> Openembedded-core mailing list > >>>> Openembedded-core at lists.openembedded.org > >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > >>> > >> -- > >> Best Regards! > >> Zhou Li > >> Phone number: 86-10-84778511 > >> > > > -- > Best Regards! > Zhou Li > Phone number: 86-10-84778511 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From richard.purdie at linuxfoundation.org Tue Feb 25 14:07:41 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Tue, 25 Feb 2020 14:07:41 +0000 Subject: [OE-core] [PATCH] mime,mime-xdg: Conflict with allarch In-Reply-To: References: <20200225054406.867243-1-raj.khem@gmail.com> <29622e48fc7ebf80aa002b2d1903f6d970af9d86.camel@linuxfoundation.org> Message-ID: <0a3ecc0796a2737d8396d39c38bb08b2331ef08b.camel@linuxfoundation.org> On Tue, 2020-02-25 at 13:24 +0100, Andreas M?ller wrote: > On Tue, Feb 25, 2020 at 11:21 AM Richard Purdie > wrote: > > On Mon, 2020-02-24 at 21:44 -0800, Khem Raj wrote: > > > mime and mime-xdb classes add dependencies ( both runtime and > > > buildtime > > > ) on target packages, therefore recipes using allarch should not > > > inherit > > > mime/mime-xdg or vice-versa, this fixes subtle sstate mismatches > > > > > > [YOCTO #13805] > > > > > > Signed-off-by: Khem Raj > > > Cc: Andreas M?ller > > > --- > > > meta/classes/mime-xdg.bbclass | 5 +++++ > > > meta/classes/mime.bbclass | 5 +++++ > > > 2 files changed, 10 insertions(+) > > > > Is this the right way to fix this? mime info probably is arch > > independent, so should we be whitelisting some of the dependencies? > > > > Cheers, > > > > Richard > > > Khem and I had a short discussion about this [1]. His first approach > was to remove DEPENDS. As far as I remember the deps were added to > avoid QA warning. > > Honestly I never understood why these are spawned. If there is a fix / > workaround this could be reduced to rdeps which an be handled for > allarch. > > [1] https://github.com/YoeDistro/openembedded-core/commit/5605a9cf78c3731e2cc055cd4f8cc88a0b3d7e26 I'd guess something like: SIGGEN_EXCLUDERECIPES_ABISAFE += "\ shared-mime-info \ desktop-file-utils \ " in layer.conf might be the correct fix. The other approach is just a workaround. Cheers, Richard From trevor.gamblin at windriver.com Tue Feb 25 14:11:15 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Tue, 25 Feb 2020 09:11:15 -0500 Subject: [OE-core] [PATCH v2] buildall-qemu: automate build testing for qemu MACHINEs Message-ID: <20200225141115.876047-1-trevor.gamblin@windriver.com> buildall-qemu simplifies the process of build testing an upgraded or patched recipe by cycling through the build steps for each available qemu target, with desired LIBC specified by the user as an option (defaulting to both glibc and musl if no option is provided). While building, a log file with the name "-buildall.log" is written, containing a PASS or FAIL line upon completion of the build for each architecture. For now, qemu targets are not selectable (i.e. the recipe is built for all qemu targets found in meta/conf/machine), but this functionality can be added in the future along with other useful options. The log file created by buildall-qemu also includes some basic system info (e.g. build start time, hostname, host OS, host kernel). Since it is not guaranteed that tools such as lsb_release will be available on the host (it isn't by default on my Fedora machine), this information is collected manually. Additionally, the previous run's log is retained for comparison by renaming it in the format -buildall.log.old once a new set of builds is triggered for the same recipe. We've seen multiple variations of this concept in use as one-liners and as bash functions in dotfiles, so it seemed appropriate to submit it in script form to oe-core for everyone to use. Sample log output: BUILDALL-QEMU LOG FOR aspell START TIME: 2020-02-11_19:50:02 HOSTNAME: yow-tgamblin-fedora2 HOST OS: Fedora 31 (Server Edition) HOST KERNEL: 5.4.10-200.fc31.x86_64 =============== BUILD RESULTS: [glibc] PASS: qemuarmv5 PASS: qemux86 PASS: qemuppc PASS: qemumips64 PASS: qemux86-64 PASS: qemumips PASS: qemuarm PASS: qemuarm64 PASS: qemuriscv64 [musl] PASS: qemuarmv5 PASS: qemux86 PASS: qemuppc PASS: qemumips64 PASS: qemux86-64 FAIL: qemumips FAIL: qemuarm FAIL: qemuarm64 FAIL: qemuriscv64 =============== PASSED: 14 FAILED: 4 Signed-off-by: Trevor Gamblin --- scripts/buildall-qemu | 120 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100755 scripts/buildall-qemu diff --git a/scripts/buildall-qemu b/scripts/buildall-qemu new file mode 100755 index 0000000000..ca9aafadf7 --- /dev/null +++ b/scripts/buildall-qemu @@ -0,0 +1,120 @@ +#!/bin/sh +# Copyright (c) 2020 Wind River Systems, Inc. +# +# SPDX-License-Identifier: GPL-2.0-only +# +# buildall-qemu: a tool for automating build testing of recipes +# TODO: Add support for selecting which qemu architectures to build +# TODO: Add support for queueing up multiple recipe builds +# TODO: Add more logging options (e.g. local.conf info, bitbake env info) + +usage () +{ + base=$(basename "$0") + echo "Usage: $base [options] [recipename/target]" + echo "Executes a build of a given target for selected LIBCs. With no options, default to both libc and musl." + echo "Options:" + echo "-l, --libc Specify one of \"glibc\" or \"musl\"" +} + + +buildall () +{ + # Get path to oe-core directory. Since oe-init-build-env prepends $PATH with + # the path to the scripts directory, get it from there + SCRIPTS_PATH="$(echo "$PATH" | cut -d ":" -f 1)" + OE_CORE_PATH=$(echo "$SCRIPTS_PATH" | sed 's|\(.*\)/.*|\1|') + + # Get target list and host machine information + TARGET_LIST=$(find "$OE_CORE_PATH"/meta/conf/machine -maxdepth 1 -type f | grep qemu | sed 's|.*/||' | sed -e 's/\.conf//') + + # Set LIBC value to use for the builds based on options provided by the user + if [ -n "$2" ] + then + LIBC_LIST="$2" + echo "$LIBC_LIST" + else + LIBC_LIST="glibc musl" + echo "$LIBC_LIST" + fi + + START_TIME=$(date "+%Y-%m-%d_%H:%M:%S") + LOG_FILE="$1-buildall.log" + OS_INFO=$(grep "PRETTY_NAME=" /etc/os-release | awk -F "=" '{print $2}' | sed -e 's/^"//' -e 's/"$//') + + # Append an existing log file for this build with .old if one exists + if [ -f "${LOG_FILE}" ] + then + mv "${LOG_FILE}" "${LOG_FILE}.old" + else + touch "${LOG_FILE}" + fi + + # Fill the log file with build and host info + echo "BUILDALL-QEMU LOG FOR $1" >> "${LOG_FILE}" + echo "START TIME: ${START_TIME}" >> "${LOG_FILE}" + echo "HOSTNAME: $(uname -n)" >> "${LOG_FILE}" + echo "HOST OS: ${OS_INFO}" >> "${LOG_FILE}" + echo "HOST KERNEL: $(uname -r)" >> "${LOG_FILE}" + echo "===============" >> "${LOG_FILE}" + echo "BUILD RESULTS:" >> "${LOG_FILE}" + + # start the builds for each MACHINE and TCLIBC + for j in ${LIBC_LIST} + do + echo "[$j]" >> "${LOG_FILE}" + for i in ${TARGET_LIST} + do + echo "$i" "$j"; \ + TCLIBC=$j MACHINE=$i bitbake "$1" && echo "PASS: $i" >> "${LOG_FILE}" || echo "FAIL: $i" >> "${LOG_FILE}" + done + done + + # Get pass/fail totals and add them to the end of the log + PASSED=$(grep "PASS:" "${LOG_FILE}" | wc -l) + FAILED=$(grep "FAIL:" "${LOG_FILE}" | wc -l) + + echo "===============" >> "${LOG_FILE}" + echo "PASSED: ${PASSED}" >> "${LOG_FILE}" + echo "FAILED: ${FAILED}" >> "${LOG_FILE}" +} + + +# fail entire script if any command fails +set -e + +# print usage and exit if not enough args given +[ $# -eq 0 ] && usage && exit 1 + +# handle arguments +RECIPE= +while [ $# -gt 0 ] +do + arg=$1 + case $arg in + -l|--libc) + if [ "$2" = "glibc" ] || [ "$2" = "musl" ] + then + LIBC_LIST="$2" + else + echo "Unrecognized libc option." + usage && exit 1 + fi + shift + shift + ;; + *) + RECIPE="$1" + shift + ;; + esac +done + +set -- "$RECIPE" + +# run buildall for the given recipe and LIBC +if [ -n "$1" ] +then + buildall "$1" "$LIBC_LIST" +fi + -- 2.24.1 From eugenyshcheglov at gmail.com Tue Feb 25 14:17:33 2020 From: eugenyshcheglov at gmail.com (Yevhenii Shchehlov) Date: Tue, 25 Feb 2020 16:17:33 +0200 Subject: [OE-core] [PATCH] utils.bbclass: Avoid recursive symlink in oe_soinstall Message-ID: <20200225141733.54584-1-eugenyshcheglov@gmail.com> This patch fixes an issue when oe_soinstall function creates non-functional recursive symlinks in case library soname is equal to library real (file) name. Signed-off-by: Yevhenii Shchehlov --- meta/classes/utils.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index cd3d05709e..dea824f54f 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -25,7 +25,7 @@ oe_soinstall() { libname=`basename $1` case "$libname" in *.so) - bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3)" + bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3 instead of libfoo.so)" ;; esac install -m 755 $1 $2/$libname @@ -33,8 +33,12 @@ oe_soinstall() { if [ -z $sonamelink ]; then bbfatal "oe_soinstall: $libname is missing ELF tag 'SONAME'." fi + if [ "$sonamelink" == "$libname" ]; then + bbwarn "oe_soinstall: $libname soname is equal to real (file) name. Minor version should be added to a real name (e.g. libfoo.so.1.2 instead of libfoo.so.1)" + else + ln -sf $libname $2/$sonamelink + fi solink=`echo $libname | sed -e 's/\.so\..*/.so/'` - ln -sf $libname $2/$sonamelink ln -sf $libname $2/$solink } -- 2.25.1 From jacob.kroon at gmail.com Tue Feb 25 14:34:11 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Tue, 25 Feb 2020 15:34:11 +0100 Subject: [OE-core] [PATCH] readline/ediline: Fix conflicting manpages. In-Reply-To: <42d690f3ae40a420179cb85453d2722c153c2d8c.camel@linuxfoundation.org> References: <20200222185400.32136-1-jpuhlman@mvista.com> <42d690f3ae40a420179cb85453d2722c153c2d8c.camel@linuxfoundation.org> Message-ID: On 2/25/20 2:33 PM, Richard Purdie wrote: > On Tue, 2020-02-25 at 14:08 +0100, Jacob Kroon wrote: >> On 2/22/20 7:54 PM, Jeremy A. Puhlman wrote: >>> BBCLASSEXTEND = "native nativesdk" >>> + >>> +inherit update-alternatives >>> + >>> +ALTERNATIVE_PRIORITY = "90" >>> +ALTERNATIVE_${PN} = "history.3" >>> +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" >>> >> >> With this change (I think), I now get a file >> >>> +lrwxrwxrwx root root 38 >>> ./usr/share/man/man3/history.3 -> >>> /usr/share/man/man3/history.3.readline >> >> in my rootfs, which is wierd since I don't have any other man pages >> in my image.. > > At a guess, ALTERNATIVE_${PN} should be ALTERNATIVE_${PN}-doc ? > I can confirm that changing the recipe according to RP's suggestion gets rid of that file in my image. Thanks, Jacob From raj.khem at gmail.com Tue Feb 25 14:54:39 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 25 Feb 2020 06:54:39 -0800 Subject: [OE-core] [PATCH 2/2][master-next] webkitgtk: enable gobject-introspection for armv7ve - it builds without issues In-Reply-To: <20200220234829.12306-2-schnitzeltony@gmail.com> References: <20200220234829.12306-1-schnitzeltony@gmail.com> <20200220234829.12306-2-schnitzeltony@gmail.com> Message-ID: On Thu, Feb 20, 2020 at 3:49 PM Andreas M?ller wrote: > > Maybe armv7a can be re-enabled either but due to limited resources there is no > chance for me to test. > > Signed-off-by: Andreas M?ller > --- > meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > index fa109446d1..a1dba73c51 100644 > --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb > @@ -127,7 +127,6 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb" > # qemu: uncaught target signal 11 (Segmentation fault) - core dumped > # Segmentation fault > GI_DATA_ENABLED_armv7a = "False" > -GI_DATA_ENABLED_armv7ve = "False" Introspection is now hanging forever in qemu-arm when building with musl. Perhaps just turn them into GI_DATA_ENABLED_armv7a_libc-musl = "False" please > > # Can't be built with ccache > CCACHE_DISABLE = "1" > -- > 2.21.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From schnitzeltony at gmail.com Tue Feb 25 15:11:26 2020 From: schnitzeltony at gmail.com (=?UTF-8?Q?Andreas_M=C3=BCller?=) Date: Tue, 25 Feb 2020 16:11:26 +0100 Subject: [OE-core] [PATCH] mime,mime-xdg: Conflict with allarch In-Reply-To: <0a3ecc0796a2737d8396d39c38bb08b2331ef08b.camel@linuxfoundation.org> References: <20200225054406.867243-1-raj.khem@gmail.com> <29622e48fc7ebf80aa002b2d1903f6d970af9d86.camel@linuxfoundation.org> <0a3ecc0796a2737d8396d39c38bb08b2331ef08b.camel@linuxfoundation.org> Message-ID: On Tue, Feb 25, 2020 at 3:07 PM Richard Purdie wrote: > > On Tue, 2020-02-25 at 13:24 +0100, Andreas M?ller wrote: > > On Tue, Feb 25, 2020 at 11:21 AM Richard Purdie > > wrote: > > > On Mon, 2020-02-24 at 21:44 -0800, Khem Raj wrote: > > > > mime and mime-xdb classes add dependencies ( both runtime and > > > > buildtime > > > > ) on target packages, therefore recipes using allarch should not > > > > inherit > > > > mime/mime-xdg or vice-versa, this fixes subtle sstate mismatches > > > > > > > > [YOCTO #13805] > > > > > > > > Signed-off-by: Khem Raj > > > > Cc: Andreas M?ller > > > > --- > > > > meta/classes/mime-xdg.bbclass | 5 +++++ > > > > meta/classes/mime.bbclass | 5 +++++ > > > > 2 files changed, 10 insertions(+) > > > > > > Is this the right way to fix this? mime info probably is arch > > > independent, so should we be whitelisting some of the dependencies? > > > > > > Cheers, > > > > > > Richard > > > > > Khem and I had a short discussion about this [1]. His first approach > > was to remove DEPENDS. As far as I remember the deps were added to > > avoid QA warning. > > > > Honestly I never understood why these are spawned. If there is a fix / > > workaround this could be reduced to rdeps which an be handled for > > allarch. > > > > [1] https://github.com/YoeDistro/openembedded-core/commit/5605a9cf78c3731e2cc055cd4f8cc88a0b3d7e26 > > I'd guess something like: > > SIGGEN_EXCLUDERECIPES_ABISAFE += "\ > shared-mime-info \ > desktop-file-utils \ > " > > in layer.conf might be the correct fix. The other approach is just a > workaround. That would fix rdeps allarch -> cross only - right?. How to get rid of the deps warning? @Khem: Do you have some logs showing what warning it was exactly? Andreas > > Cheers, > > Richard > > > From raj.khem at gmail.com Tue Feb 25 15:28:57 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 25 Feb 2020 07:28:57 -0800 Subject: [OE-core] [PATCH] webkitgtk: Disable GI data for musl/arm Message-ID: <20200225152857.3546150-1-raj.khem@gmail.com> qemu-arm hangs forever when running gobject introspection Signed-off-by: Khem Raj Cc: Andreas M?ller --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 7b3d16d8cb..e8fb8b1c64 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -123,5 +123,10 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED_libc-musl_armv7a = "False" +GI_DATA_ENABLED_libc-musl_armv7ve = "False" + # Can't be built with ccache CCACHE_DISABLE = "1" -- 2.25.1 From jacob.kroon at gmail.com Tue Feb 25 15:53:17 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Tue, 25 Feb 2020 16:53:17 +0100 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> Message-ID: On 2/24/20 8:25 AM, Jacob Kroon wrote: > Hi Douglas, > > You updated a comment in reproducible_build.bbclass, commit > e7b891b76954c784f5a93bd0a1c91315673ce40d: > >> -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in >> the recipe's ${SDE_FILE}. >> +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in >> the recipe's SDE_FILE. >> +# If none of these mechanisms are suitable, replace the >> do_deploy_source_date_epoch task >> +# with recipe-specific functionality to write the appropriate >> SOURCE_DATE_EPOCH into the SDE_FILE. >> +# > > But I can't really get this to work. What did work for me was to replace > "do_create_source_date_epoch_stamp()" in my recipe: > > do_create_source_date_epoch_stamp() { > ??? mkdir -p ${SDE_DIR} > ??? date -d "1981-03-03" "+%s" > ${SDE_FILE} > } > > What is the intended way to achieve the thing I'm trying to do here ? > FYI, JPEW has a proposed patch here http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce for allowing a recipe to just set SOURCE_DATE_EPOCH directly. But maybe that currently is at odds with SOURCE_DATE_EPOCH being in BB_HASHBASE_WHITELIST ? /Jacob From sjolley.yp.pm at gmail.com Tue Feb 25 15:54:59 2020 From: sjolley.yp.pm at gmail.com (sjolley.yp.pm at gmail.com) Date: Tue, 25 Feb 2020 07:54:59 -0800 Subject: [OE-core] Yocto Project Status WW08'20 Message-ID: <040e01d5ebf3$ef621320$ce263960$@gmail.com> Current Dev Position: YP 3.1 M3 - At Feature Freeze Next Deadline: YP 3.1 M3 build date 2/24/2020 Next Team Meetings: * Bug Triage meeting Thursday Feb. 27th at 7:30am PDT ( https://zoom.us/j/454367603) * Monthly Project Meeting Tuesday Mar. 3rd at 8am PDT ( https://zoom.us/j/990892712) * Weekly Engineering Sync Tuesday Feb. 25th at 8am PDT ( https://zoom.us/j/990892712) * Twitch - See http://www.twitch.tv/letoatreidesthe2nd Key Status/Updates: * YP 2.7.3 rc1 is in QA with the report due next week. * YP 3.0.2 rc2 was rebuilt to remove a broken bash CVE patch, rc3 had automated QA only and is now due for release. * We are now at the date for M3 which is feature freeze. We are not yet in a position where we can build M3 as there are a number of open high blocking bugs but patches will need to start tapering down to bug fix only. More invasive or unplanned features will no longer be accepted. * We have a serious issue with hashequiv but a patch in progress for that. There is also a usability issue raised with hashequiv and this can only realistically be fixed in M4, it means changing the UI message handling within bitbake. * We continue to see automated test failures with master, most are long standing issues which we're struggling to resolve. A minority now have had their causes narrowed down or are now reproducible at will which should help but there is concern about the others. * Some recent changes like psplash systemd support have introduced a race causing intermittent build failures. We had thought those resolved but they reappeared after merging. * Alex Kanavin has quietly but very effectively been fixing ptest failures and we now have only a very small number of non-toolchain tests failing, thanks Alex! * We're collecting a list of companies, products and projects which use the Yocto Project on the wiki: https://wiki.yoctoproject.org/wiki/Project_Users Please add any you know are missing (or email Richard/Stephen who can add). * The triage team is worried about attendance at triage meetings and the project is finding it hard to find people to help fix bugs. If anyone is willing to work on bugs, assistance would be greatly appreciated. YP 3.1 Milestone Dates: * YP 3.1 M3 build date 2/24/2020 * YP 3.1 M3 release date 3/6/2020 * YP 3.1 M4 build date 3/30/2020 * YP 3.1 M4 release date 4/24/2020 Planned upcoming dot releases: * YP 2.7.3 built and in QA * YP 2.7.3 release date 2/21/2020 * YP 3.0.2 release soon * YP 3.0.3 build date 5/4/2020 * YP 3.0.3 release date 5/15/2020 * YP 2.7.4 build date 5/18/2020 * YP 2.7.4 release date 5/29/2020 Tracking Metrics: * WDD 2665 (last week 2710) ( https://wiki.yoctoproject.org/charts/combo.html) * Poky Patch Metrics * Total patches found: 1356 (last week 1360) * Patches in the Pending State: 543 (40%) [last week 546 (40%)] The Yocto Project's technical governance is through its Technical Steering Committee, more information is available at: https://wiki.yoctoproject.org/wiki/TSC The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status [If anyone has suggestions for other information you'd like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Program Manager * Cell: (208) 244-4460 * Email: sjolley.yp.pm at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Tue Feb 25 16:33:32 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 25 Feb 2020 08:33:32 -0800 Subject: [OE-core] [PATCH] mime,mime-xdg: Conflict with allarch In-Reply-To: <0a3ecc0796a2737d8396d39c38bb08b2331ef08b.camel@linuxfoundation.org> References: <20200225054406.867243-1-raj.khem@gmail.com> <29622e48fc7ebf80aa002b2d1903f6d970af9d86.camel@linuxfoundation.org> <0a3ecc0796a2737d8396d39c38bb08b2331ef08b.camel@linuxfoundation.org> Message-ID: <52fc46e9-83f6-5f9e-a8ee-454a30cf03e8@gmail.com> On 2/25/20 6:07 AM, Richard Purdie wrote: > On Tue, 2020-02-25 at 13:24 +0100, Andreas M?ller wrote: >> On Tue, Feb 25, 2020 at 11:21 AM Richard Purdie >> wrote: >>> On Mon, 2020-02-24 at 21:44 -0800, Khem Raj wrote: >>>> mime and mime-xdb classes add dependencies ( both runtime and >>>> buildtime >>>> ) on target packages, therefore recipes using allarch should not >>>> inherit >>>> mime/mime-xdg or vice-versa, this fixes subtle sstate mismatches >>>> >>>> [YOCTO #13805] >>>> >>>> Signed-off-by: Khem Raj >>>> Cc: Andreas M?ller >>>> --- >>>> meta/classes/mime-xdg.bbclass | 5 +++++ >>>> meta/classes/mime.bbclass | 5 +++++ >>>> 2 files changed, 10 insertions(+) >>> >>> Is this the right way to fix this? mime info probably is arch >>> independent, so should we be whitelisting some of the dependencies? >>> >>> Cheers, >>> >>> Richard >>> >> Khem and I had a short discussion about this [1]. His first approach >> was to remove DEPENDS. As far as I remember the deps were added to >> avoid QA warning. >> >> Honestly I never understood why these are spawned. If there is a fix / >> workaround this could be reduced to rdeps which an be handled for >> allarch. >> >> [1] https://github.com/YoeDistro/openembedded-core/commit/5605a9cf78c3731e2cc055cd4f8cc88a0b3d7e26 > > I'd guess something like: > > SIGGEN_EXCLUDERECIPES_ABISAFE += "\ > shared-mime-info \ > desktop-file-utils \ > " > > in layer.conf might be the correct fix. The other approach is just a > workaround. yeah, I am testing something like this. > > Cheers, > > Richard > > > From mark.hatle at kernel.crashing.org Tue Feb 25 17:49:29 2020 From: mark.hatle at kernel.crashing.org (Mark Hatle) Date: Tue, 25 Feb 2020 11:49:29 -0600 Subject: [OE-core] [PATCH] sysvinit: Fix install order/dependency Message-ID: <20200225174929.112448-1-mark.hatle@kernel.crashing.org> It is possible for sysvinit to be installed before the passwd/group files are installed from base-passwd. This results in an warning that the shutdown group can't be found. Adding a dependeny on base-passwd will resolve this issue. This has similar symptoms to the problem that oe-core commit 0227e929021263c51d2e7db36224000fecb01f1c fixed. The fix is simular in that it ensures that base-passwd is installed first, just at runtime vs setscene time. Signed-off-by: Mark Hatle --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 21ef0e9cf3..63c10848b4 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -70,7 +70,7 @@ FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" -RDEPENDS_${PN} += "sysvinit-pidof initd-functions" +RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" CFLAGS_prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" -- 2.17.1 From raj.khem at gmail.com Tue Feb 25 17:51:26 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 25 Feb 2020 09:51:26 -0800 Subject: [OE-core] [PATCH V2] layer.conf: Consider shared-mime-info and desktop-file-utils siggen safe Message-ID: <20200225175126.3764629-1-raj.khem@gmail.com> These are added as dependencies by mime class, which could be inherited along with allarch and dependencies silently go into target specific recipes and which then can result in sstate hash signature mismatches when the allarch recipes are reused for another arch [YOCTO #13805] Signed-off-by: Khem Raj --- meta/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 07d9a9e32d..1d159c5fd0 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -44,6 +44,8 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ opkg-utils \ gstreamer1.0-meta-base \ ca-certificates \ + shared-mime-info \ + desktop-file-utils \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ -- 2.25.1 From alex.kanavin at gmail.com Tue Feb 25 18:53:24 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:24 +0100 Subject: [OE-core] [PATCH 01/12] libmodule-build-perl: upgrade 0.4229 -> 0.4231 Message-ID: <20200225185335.19326-1-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} (95%) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb similarity index 95% rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index e3ba40d96c..b3bc314ee7 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \ file://run-ptest \ - " -SRC_URI[md5sum] = "1447d9e02e63f7a1643986789a8f1ba9" -SRC_URI[sha256sum] = "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18" + " +SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001" +SRC_URI[sha256sum] = "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717" S = "${WORKDIR}/Module-Build-${PV}" -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:25 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:25 +0100 Subject: [OE-core] [PATCH 02/12] libarchive: upgrade 3.4.1 -> 3.4.2 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-2-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/libarchive/{libarchive_3.4.1.bb => libarchive_3.4.2.bb} (93%) diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb similarity index 93% rename from meta/recipes-extended/libarchive/libarchive_3.4.1.bb rename to meta/recipes-extended/libarchive/libarchive_3.4.2.bb index 2d33dd80ab..c3edb573e7 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -33,8 +33,8 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" -SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" +SRC_URI[md5sum] = "d953ed6b47694dadf0e6042f8f9ff451" +SRC_URI[sha256sum] = "b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176" inherit autotools update-alternatives pkgconfig -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:26 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:26 +0100 Subject: [OE-core] [PATCH 03/12] libpcre: upgrade 8.43 -> 8.44 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-3-alex.kanavin@gmail.com> License-Update: copyright years Signed-off-by: Alexander Kanavin --- .../libpcre/libpcre/out-of-tree.patch | 26 ------------------- .../{libpcre_8.43.bb => libpcre_8.44.bb} | 9 +++---- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-support/libpcre/libpcre/out-of-tree.patch rename meta/recipes-support/libpcre/{libpcre_8.43.bb => libpcre_8.44.bb} (91%) diff --git a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch deleted file mode 100644 index d56789615f..0000000000 --- a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch +++ /dev/null @@ -1,26 +0,0 @@ -In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is. - -Upstream-Status: Backport [r1750] -Signed-off-by: Ross Burton - -Index: configure.ac -=================================================================== ---- a/configure.ac (revision 1749) -+++ b/configure.ac (working copy) -@@ -159,6 +159,8 @@ - - if test "$enable_jit" = "auto"; then - AC_LANG(C) -+ SAVE_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$srcdir - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define SLJIT_CONFIG_AUTO 1 - #include "sljit/sljitConfigInternal.h" -@@ -165,6 +167,7 @@ - #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) - #error unsupported - #endif]])], enable_jit=yes, enable_jit=no) -+ CPPFLAGS=$SAVE_CPPFLAGS - fi - - # Handle --disable-pcregrep-jit (enabled by default) diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.44.bb similarity index 91% rename from meta/recipes-support/libpcre/libpcre_8.43.bb rename to meta/recipes-support/libpcre/libpcre_8.44.bb index f9a22fee9d..e5471e81da 100644 --- a/meta/recipes-support/libpcre/libpcre_8.43.bb +++ b/meta/recipes-support/libpcre/libpcre_8.44.bb @@ -6,16 +6,15 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ - file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ -" + " -SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" -SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" +SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" +SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" CVE_PRODUCT = "pcre" -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:27 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:27 +0100 Subject: [OE-core] [PATCH 04/12] ncurses: upgrade 6.1+20191019 -> 6.2 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-4-alex.kanavin@gmail.com> License-Update: copyright years and holders Signed-off-by: Alexander Kanavin --- meta/recipes-core/ncurses/ncurses.inc | 2 +- .../ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} (89%) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index b7bf4c0d81..4156bf4f7d 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" +LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb similarity index 89% rename from meta/recipes-core/ncurses/ncurses_6.1+20191019.bb rename to meta/recipes-core/ncurses/ncurses_6.2.bb index 187777f6ef..b6d899c878 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://config.cache \ " # commit id corresponds to the revision in package version -SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" +SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:28 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:28 +0100 Subject: [OE-core] [PATCH 05/12] python3-docutils: upgrade 0.15 -> 0.16 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-5-alex.kanavin@gmail.com> License-Update: formatting Signed-off-by: Alexander Kanavin --- .../{python3-docutils_0.15.bb => python3-docutils_0.16.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-docutils_0.15.bb => python3-docutils_0.16.bb} (60%) diff --git a/meta/recipes-devtools/python/python3-docutils_0.15.bb b/meta/recipes-devtools/python/python3-docutils_0.16.bb similarity index 60% rename from meta/recipes-devtools/python/python3-docutils_0.15.bb rename to meta/recipes-devtools/python/python3-docutils_0.16.bb index f5c3f5d707..50547a1b0c 100644 --- a/meta/recipes-devtools/python/python3-docutils_0.15.bb +++ b/meta/recipes-devtools/python/python3-docutils_0.16.bb @@ -2,13 +2,13 @@ SUMMARY = "Text processing system for documentation" HOMEPAGE = "http://docutils.sourceforge.net" SECTION = "devel/python" LICENSE = "PSF & BSD-2-Clause & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=35a23d42b615470583563132872c97d6" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" DEPENDS = "python3" SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" -SRC_URI[md5sum] = "f51729f19e70a9dc4837433193a5e798" -SRC_URI[sha256sum] = "c35e87e985f70106f6f97e050f3bed990641e0e104566134b9cd23849a460e96" +SRC_URI[md5sum] = "9ccb6f332e23360f964de72c8ea5f0ed" +SRC_URI[sha256sum] = "7d4e999cca74a52611773a42912088078363a30912e8822f7a3d38043b767573" S = "${WORKDIR}/docutils-${PV}" -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:29 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:29 +0100 Subject: [OE-core] [PATCH 06/12] python3-mako: upgrade 1.1.0 -> 1.1.1 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-6-alex.kanavin@gmail.com> License-Update: copyright years Signed-off-by: Alexander Kanavin --- .../python/{python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python3-mako_1.1.0.bb => python3-mako_1.1.1.bb} (63%) diff --git a/meta/recipes-devtools/python/python3-mako_1.1.0.bb b/meta/recipes-devtools/python/python3-mako_1.1.1.bb similarity index 63% rename from meta/recipes-devtools/python/python3-mako_1.1.0.bb rename to meta/recipes-devtools/python/python3-mako_1.1.1.bb index b139e5ab00..bc38009de4 100644 --- a/meta/recipes-devtools/python/python3-mako_1.1.0.bb +++ b/meta/recipes-devtools/python/python3-mako_1.1.1.bb @@ -2,14 +2,14 @@ SUMMARY = "Templating library for Python" HOMEPAGE = "http://www.makotemplates.org/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=df7e6c7c82990acf0228a55e00d29bc9" +LIC_FILES_CHKSUM = "file://LICENSE;md5=943eb67718222db21d44a4ef1836675f" PYPI_PACKAGE = "Mako" inherit pypi setuptools3 -SRC_URI[md5sum] = "6c3f2da0b74af529a4c4a537d0848bf2" -SRC_URI[sha256sum] = "a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b" +SRC_URI[md5sum] = "2660a4916f2f63456e6885c727b7cd2f" +SRC_URI[sha256sum] = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4" RDEPENDS_${PN} = "${PYTHON_PN}-html \ ${PYTHON_PN}-netclient \ -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:30 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:30 +0100 Subject: [OE-core] [PATCH 07/12] unifdef: upgrade 2.11 -> 2.12 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-7-alex.kanavin@gmail.com> License-Update: copyright years Signed-off-by: Alexander Kanavin --- .../unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename meta/recipes-devtools/unifdef/{unifdef_2.11.bb => unifdef_2.12.bb} (53%) diff --git a/meta/recipes-devtools/unifdef/unifdef_2.11.bb b/meta/recipes-devtools/unifdef/unifdef_2.12.bb similarity index 53% rename from meta/recipes-devtools/unifdef/unifdef_2.11.bb rename to meta/recipes-devtools/unifdef/unifdef_2.12.bb index 1ffc11e76b..22b10ba234 100644 --- a/meta/recipes-devtools/unifdef/unifdef_2.11.bb +++ b/meta/recipes-devtools/unifdef/unifdef_2.12.bb @@ -3,12 +3,13 @@ SECTION = "devel" LICENSE = "BSD-2-Clause" HOMEPAGE = "http://dotat.at/prog/unifdef/" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fc6c2c1dc4f18c891ed5b7a469fe32 \ - file://unifdef.c;endline=32;md5=aaec84d8b68d8b6dea71f45e9949ebfe" +LIC_FILES_CHKSUM = "file://COPYING;md5=3498caf346f6b77934882101749ada23 \ + file://unifdef.c;endline=32;md5=6f4ee8085d6e6ab0f7cb4390e1a9c497 \ + " SRC_URI = "http://dotat.at/prog/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "337053fd8a7d9ab3adf5e50f88af95b7" -SRC_URI[sha256sum] = "828ffc270ac262b88fe011136acef2780c05b0dc3c5435d005651740788d4537" +SRC_URI[md5sum] = "ae8c0b3b4c43c1f6bc5f32412a820818" +SRC_URI[sha256sum] = "43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400" UPSTREAM_CHECK_REGEX = "unifdef-(?P((\d+\.*)+)(?![a-f0-9]{6,})).tar" -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:31 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:31 +0100 Subject: [OE-core] [PATCH 08/12] gnutls: upgrade 3.6.11.1 -> 3.6.12 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-8-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/gnutls/{gnutls_3.6.11.1.bb => gnutls_3.6.12.bb} (93%) diff --git a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb b/meta/recipes-support/gnutls/gnutls_3.6.12.bb similarity index 93% rename from meta/recipes-support/gnutls/gnutls_3.6.11.1.bb rename to meta/recipes-support/gnutls/gnutls_3.6.12.bb index 5b05364c25..f1eeebc807 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb +++ b/meta/recipes-support/gnutls/gnutls_3.6.12.bb @@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7" -SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" +SRC_URI[md5sum] = "a23900f14980a467bdce3a0fd31dfa18" +SRC_URI[sha256sum] = "bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:32 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:32 +0100 Subject: [OE-core] [PATCH 09/12] python3-setuptools: upgrade 45.0.0 -> 45.2.0 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-9-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...0001-conditionally-do-not-fetch-code-by-easy_install.patch | 4 ++-- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- ...hon3-setuptools_45.0.0.bb => python3-setuptools_45.2.0.bb} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/python/{python3-setuptools_45.0.0.bb => python3-setuptools_45.2.0.bb} (100%) diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index b1a6813b2e..5f99cd2512 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 50e4ebce9f711391e2fa9f43906259e19ac00e63 Mon Sep 17 00:00:00 2001 +From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 09066f8..d3039a5 100644 +index 426301d..55c8062 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -649,6 +649,11 @@ class easy_install(Command): diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index c697937887..f7c3202fde 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "14898abd6f436eee58a5a2ba291fcbeb" -SRC_URI[sha256sum] = "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" +SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30" +SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools_45.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb similarity index 100% rename from meta/recipes-devtools/python/python3-setuptools_45.0.0.bb rename to meta/recipes-devtools/python/python3-setuptools_45.2.0.bb -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:33 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:33 +0100 Subject: [OE-core] [PATCH 10/12] libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-10-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../libgpg-error-1.36-gawk5-support.patch | 144 ------------------ ...gpg-error_1.36.bb => libgpg-error_1.37.bb} | 7 +- 2 files changed, 3 insertions(+), 148 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d1143b..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 92% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab0548d..0b691a5eb9 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,10 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ - " + " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:34 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:34 +0100 Subject: [OE-core] [PATCH 11/12] acpica: upgrade 20191213 -> 20200214 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-11-alex.kanavin@gmail.com> License-Update: copyright years Signed-off-by: Alexander Kanavin --- .../acpica/{acpica_20191213.bb => acpica_20200214.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-extended/acpica/{acpica_20191213.bb => acpica_20200214.bb} (88%) diff --git a/meta/recipes-extended/acpica/acpica_20191213.bb b/meta/recipes-extended/acpica/acpica_20200214.bb similarity index 88% rename from meta/recipes-extended/acpica/acpica_20191213.bb rename to meta/recipes-extended/acpica/acpica_20200214.bb index 6b1412eafb..cfa9fec4fb 100644 --- a/meta/recipes-extended/acpica/acpica_20191213.bb +++ b/meta/recipes-extended/acpica/acpica_20200214.bb @@ -10,15 +10,15 @@ HOMEPAGE = "http://www.acpica.org/" SECTION = "console/tools" LICENSE = "Intel | BSD | GPLv2" -LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=b5690d9ef8d54b2b1e1cc98aad64cd87" +LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=6adbcb81e9ee6ae50c569b94fe12f7c5" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[md5sum] = "0f0eb38e796fac24c2aa4d9b6adcd950" -SRC_URI[sha256sum] = "304930df9836d3d4cdbf67a3ae6bd96dbc65f62602d869f571f4b6a12341e6c6" +SRC_URI[md5sum] = "3505ba6170b77db1399eae0e2a959113" +SRC_URI[sha256sum] = "e77ab9f8557ca104f6e8f49efaa8eead29f78ca11cadfc8989012469ecc0738e" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" S = "${WORKDIR}/acpica-unix-${PV}" -- 2.25.0 From alex.kanavin at gmail.com Tue Feb 25 18:53:35 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 19:53:35 +0100 Subject: [OE-core] [PATCH 12/12] gst-validate: upgrade 1.16.1 -> 1.16.2 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: <20200225185335.19326-12-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- .../{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/gstreamer/{gst-validate_1.16.1.bb => gst-validate_1.16.2.bb} (87%) diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb similarity index 87% rename from meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb rename to meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb index 7d602eabc6..35492fe861 100644 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.16.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[md5sum] = "793e75f4717f718ad204c554d577b160" -SRC_URI[sha256sum] = "7f079b9b2a127604b98e297037dc8847ef50f4ce2b508aa2df0cac5b77562899" +SRC_URI[md5sum] = "688f42c52d62e8c5e506df911553fb2c" +SRC_URI[sha256sum] = "4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" -- 2.25.0 From scott.branden at broadcom.com Tue Feb 25 19:13:46 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 25 Feb 2020 11:13:46 -0800 Subject: [OE-core] [PATCH 1/2] common-license: add fdk-aac license file In-Reply-To: <628af1221089667f1377f419dd9375637ac1d028.camel@linuxfoundation.org> References: <20200225001115.18188-1-scott.branden@broadcom.com> <628af1221089667f1377f419dd9375637ac1d028.camel@linuxfoundation.org> Message-ID: Hi Richard, On 2020-02-25 2:46 a.m., Richard Purdie wrote: > On Mon, 2020-02-24 at 16:11 -0800, Scott Branden via Openembedded-core > wrote: >> From: Mircea Carausu >> >> Add Fraunhofer FDK AAC Codec Library license. >> >> Signed-offby: Mircea Carausu >> Signed-off-by: Scott Branden > I'm not sure this belongs in Core? Is it a commonly used license? This > recipe isn't in OE-Core? Does the license have an SPDX identifier (I > couldn't see it on https://spdx.org/licenses/)? If we do not add this license the following WARNING is emitted: WARNING: fdk-aac-2.0.1-r0 do_populate_lic: fdk-aac: No generic license file exists for: Fraunhofer_FDK_AAC_Codec_Library_for_Android in any provider We have submitted the fdk-aac recipe to meta-openembedded/meta-multimedia here: https://patchwork.openembedded.org/patch/170495/ Please suggest the appropriate place to submit this license. It is an open source license but does not have and SPDX indentifier and is only used for fdk-aac at this time. > Cheers, > > Richard > Thanks, ?Scott From jpuhlman at mvista.com Tue Feb 25 19:25:44 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Tue, 25 Feb 2020 11:25:44 -0800 Subject: [OE-core] [PATCH] libedit/readline: Correct package alternatives link for manpage Message-ID: <20200225192544.7521-1-jpuhlman@mvista.com> Signed-off-by: Jeremy A. Puhlman --- meta/recipes-core/readline/readline.inc | 2 +- meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 4babcbd69a..052e2d5f3d 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -47,7 +47,7 @@ CONFFILES_${PN} += "${sysconfdir}/inputrc" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb index 267fdcc54a..8d2d57a930 100644 --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb @@ -21,5 +21,5 @@ BBCLASSEXTEND = "native nativesdk" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "history.3" +ALTERNATIVE_${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" -- 2.13.3 From martin.jansa at gmail.com Tue Feb 25 19:28:59 2020 From: martin.jansa at gmail.com (Martin Jansa) Date: Tue, 25 Feb 2020 20:28:59 +0100 Subject: [OE-core] [PATCH 1/2] common-license: add fdk-aac license file In-Reply-To: References: <20200225001115.18188-1-scott.branden@broadcom.com> <628af1221089667f1377f419dd9375637ac1d028.camel@linuxfoundation.org> Message-ID: <20200225192859.j5j4shf72wxdvqgv@jama> On Tue, Feb 25, 2020 at 11:13:46AM -0800, Scott Branden via Openembedded-core wrote: > Hi Richard, > > On 2020-02-25 2:46 a.m., Richard Purdie wrote: > > On Mon, 2020-02-24 at 16:11 -0800, Scott Branden via Openembedded-core > > wrote: > > > From: Mircea Carausu > > > > > > Add Fraunhofer FDK AAC Codec Library license. > > > > > > Signed-offby: Mircea Carausu > > > Signed-off-by: Scott Branden > > I'm not sure this belongs in Core? Is it a commonly used license? This > > recipe isn't in OE-Core? Does the license have an SPDX identifier (I > > couldn't see it on https://spdx.org/licenses/)? > If we do not add this license the following WARNING is emitted: > > WARNING: fdk-aac-2.0.1-r0 do_populate_lic: fdk-aac: No generic license file > exists for: Fraunhofer_FDK_AAC_Codec_Library_for_Android in any provider > > We have submitted the fdk-aac recipe to meta-openembedded/meta-multimedia > here: > https://patchwork.openembedded.org/patch/170495/ > > Please suggest the appropriate place to submit this license. licenses directory in meta-multimedia > It is an open source license but does not have and SPDX indentifier and is > only used for fdk-aac at this time. > > > Cheers, > > > > Richard > > > Thanks, > ?Scott > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From raj.khem at gmail.com Tue Feb 25 19:30:26 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 25 Feb 2020 11:30:26 -0800 Subject: [OE-core] [PATCH 1/2] common-license: add fdk-aac license file In-Reply-To: References: <20200225001115.18188-1-scott.branden@broadcom.com> <628af1221089667f1377f419dd9375637ac1d028.camel@linuxfoundation.org> Message-ID: <90132247-53a6-3ae1-efc0-7aa2479fde86@gmail.com> On 2/25/20 11:13 AM, Scott Branden via Openembedded-core wrote: > Hi Richard, > > On 2020-02-25 2:46 a.m., Richard Purdie wrote: >> On Mon, 2020-02-24 at 16:11 -0800, Scott Branden via Openembedded-core >> wrote: >>> From: Mircea Carausu >>> >>> Add Fraunhofer FDK AAC Codec Library license. >>> >>> Signed-offby: Mircea Carausu >>> Signed-off-by: Scott Branden >> I'm not sure this belongs in Core? Is it a commonly used license? This >> recipe isn't in OE-Core? Does the license have an SPDX identifier (I >> couldn't see it on https://spdx.org/licenses/)? > If we do not add this license the following WARNING is emitted: > > WARNING: fdk-aac-2.0.1-r0 do_populate_lic: fdk-aac: No generic license > file exists for: Fraunhofer_FDK_AAC_Codec_Library_for_Android in any > provider > > We have submitted the fdk-aac recipe to > meta-openembedded/meta-multimedia here: > https://patchwork.openembedded.org/patch/170495/ > > Please suggest the appropriate place to submit this license. > It is an open source license but does not have and SPDX indentifier and > is only used for fdk-aac at this time. you can propose it for meta-multimedia > >> Cheers, >> >> Richard >> > Thanks, > ?Scott From scott.branden at broadcom.com Tue Feb 25 19:38:59 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 25 Feb 2020 11:38:59 -0800 Subject: [OE-core] [PATCH 1/2] common-license: add fdk-aac license file In-Reply-To: <90132247-53a6-3ae1-efc0-7aa2479fde86@gmail.com> References: <20200225001115.18188-1-scott.branden@broadcom.com> <628af1221089667f1377f419dd9375637ac1d028.camel@linuxfoundation.org> <90132247-53a6-3ae1-efc0-7aa2479fde86@gmail.com> Message-ID: <06e06e15-76a8-7c8e-578d-3ac10de79232@broadcom.com> On 2020-02-25 11:30 a.m., Khem Raj wrote: > > On 2/25/20 11:13 AM, Scott Branden via Openembedded-core wrote: >> Hi Richard, >> >> On 2020-02-25 2:46 a.m., Richard Purdie wrote: >>> On Mon, 2020-02-24 at 16:11 -0800, Scott Branden via Openembedded-core >>> wrote: >>>> From: Mircea Carausu >>>> >>>> Add Fraunhofer FDK AAC Codec Library license. >>>> >>>> Signed-offby: Mircea Carausu >>>> Signed-off-by: Scott Branden >>> I'm not sure this belongs in Core? Is it a commonly used license? This >>> recipe isn't in OE-Core? Does the license have an SPDX identifier (I >>> couldn't see it on https://spdx.org/licenses/)? >> If we do not add this license the following WARNING is emitted: >> >> WARNING: fdk-aac-2.0.1-r0 do_populate_lic: fdk-aac: No generic license >> file exists for: Fraunhofer_FDK_AAC_Codec_Library_for_Android in any >> provider >> >> We have submitted the fdk-aac recipe to >> meta-openembedded/meta-multimedia here: >> https://patchwork.openembedded.org/patch/170495/ >> >> Please suggest the appropriate place to submit this license. >> It is an open source license but does not have and SPDX indentifier and >> is only used for fdk-aac at this time. > you can propose it for meta-multimedia That makes more sense.? We missed seeing a licenses directory in meta-multimedia. >>> Cheers, >>> >>> Richard >>> >> Thanks, >> ?Scott From scott.branden at broadcom.com Tue Feb 25 19:43:37 2020 From: scott.branden at broadcom.com (Scott Branden) Date: Tue, 25 Feb 2020 11:43:37 -0800 Subject: [OE-core] [PATCH 1/2] common-license: add fdk-aac license file In-Reply-To: References: <20200225001115.18188-1-scott.branden@broadcom.com> <628af1221089667f1377f419dd9375637ac1d028.camel@linuxfoundation.org> Message-ID: <4e0450b0-e1b5-079c-8b83-56ceb7cfd551@broadcom.com> Richard, Please drop this patch.? fdk-aac license file submitted to meta-multimedia. On 2020-02-25 11:13 a.m., Scott Branden wrote: > Hi Richard, > > On 2020-02-25 2:46 a.m., Richard Purdie wrote: >> On Mon, 2020-02-24 at 16:11 -0800, Scott Branden via Openembedded-core >> wrote: >>> From: Mircea Carausu >>> >>> Add Fraunhofer FDK AAC Codec Library license. >>> >>> Signed-offby: Mircea Carausu >>> Signed-off-by: Scott Branden >> I'm not sure this belongs in Core? Is it a commonly used license? This >> recipe isn't in OE-Core? Does the license have an SPDX identifier (I >> couldn't see it on https://spdx.org/licenses/)? > If we do not add this license the following WARNING is emitted: > > WARNING: fdk-aac-2.0.1-r0 do_populate_lic: fdk-aac: No generic license > file exists for: Fraunhofer_FDK_AAC_Codec_Library_for_Android in any > provider > > We have submitted the fdk-aac recipe to > meta-openembedded/meta-multimedia here: > https://patchwork.openembedded.org/patch/170495/ > > Please suggest the appropriate place to submit this license. > It is an open source license but does not have and SPDX indentifier > and is only used for fdk-aac at this time. > >> Cheers, >> >> Richard >> > Thanks, > ?Scott From armccurdy at gmail.com Tue Feb 25 19:43:29 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 25 Feb 2020 11:43:29 -0800 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: <20200221224537.4052134-3-raj.khem@gmail.com> References: <20200221224537.4052134-1-raj.khem@gmail.com> <20200221224537.4052134-3-raj.khem@gmail.com> Message-ID: On Fri, Feb 21, 2020 at 2:46 PM Khem Raj wrote: > > From: Upgrade Helper Why does the author sometimes get set to "Upgrade Helper"? It doesn't seem to happen very often (4 times in the past 6 years in oe-core). What's special about those 4 cases? I think it would be clearer if the author was set to whoever ran the tool. > Signed-off-by: Khem Raj > --- > .../ninja/ninja/fix-musl.patch | 46 ------------------- > .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- > 2 files changed, 2 insertions(+), 50 deletions(-) > delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch > rename meta/recipes-devtools/ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} (87%) > > diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch > deleted file mode 100644 > index 7fd779110d..0000000000 > --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 > -From: makepost > -Date: Mon, 24 Dec 2018 03:13:16 +0200 > -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 > - > -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward > -compatibility macro. Should help avoid hardcoding platform detection. > - > -Signed-off-by: Oleksandr Kravchuk > - > -Upstream-Status: Pending > ---- > - src/disk_interface.cc | 14 ++++---------- > - 1 file changed, 4 insertions(+), 10 deletions(-) > - > -diff --git a/src/disk_interface.cc b/src/disk_interface.cc > -index d4c2fb0..dc297c4 100644 > ---- a/src/disk_interface.cc > -+++ b/src/disk_interface.cc > -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { > - // that it doesn't exist. > - if (st.st_mtime == 0) > - return 1; > --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) > -+#if defined(_AIX) > -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; > -+#elif defined(__APPLE__) > - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + > - st.st_mtimespec.tv_nsec); > --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ > -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) > -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html > -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. > -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar > -- // For bionic, C and POSIX API is always enabled. > -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. > -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. > - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; > --#elif defined(_AIX) > -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; > - #else > - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; > - #endif > --- > -2.17.1 > - > diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb > similarity index 87% > rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb > rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb > index f1236e8ac8..bdc6365052 100644 > --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb > +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb > @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" > > DEPENDS = "re2c-native ninja-native" > > -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" > +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" > > -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ > - file://fix-musl.patch \ > -" > +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" > UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" > > S = "${WORKDIR}/git" > -- > 2.25.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From alex.kanavin at gmail.com Tue Feb 25 19:46:48 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 20:46:48 +0100 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: References: <20200221224537.4052134-1-raj.khem@gmail.com> <20200221224537.4052134-3-raj.khem@gmail.com> Message-ID: These are the commits produced monthly by a tool called Automated Upgrade Helper and sent directly to recipe maintainers as listed in maintainers.inc. When maintainers receive the patches, they're supposed to reset the author to themselves, but sometimes it doesn't happen. Search for 'auh' in oe-core list for monthly summaries of AUH work. Alex On Tue, 25 Feb 2020 at 20:43, Andre McCurdy wrote: > On Fri, Feb 21, 2020 at 2:46 PM Khem Raj wrote: > > > > From: Upgrade Helper > > Why does the author sometimes get set to "Upgrade Helper"? It doesn't > seem to happen very often (4 times in the past 6 years in oe-core). > What's special about those 4 cases? > > I think it would be clearer if the author was set to whoever ran the tool. > > > Signed-off-by: Khem Raj > > --- > > .../ninja/ninja/fix-musl.patch | 46 ------------------- > > .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- > > 2 files changed, 2 insertions(+), 50 deletions(-) > > delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch > > rename meta/recipes-devtools/ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} > (87%) > > > > diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch > b/meta/recipes-devtools/ninja/ninja/fix-musl.patch > > deleted file mode 100644 > > index 7fd779110d..0000000000 > > --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch > > +++ /dev/null > > @@ -1,46 +0,0 @@ > > -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 > > -From: makepost > > -Date: Mon, 24 Dec 2018 03:13:16 +0200 > > -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 > > - > > -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward > > -compatibility macro. Should help avoid hardcoding platform detection. > > - > > -Signed-off-by: Oleksandr Kravchuk > > - > > -Upstream-Status: Pending > > ---- > > - src/disk_interface.cc | 14 ++++---------- > > - 1 file changed, 4 insertions(+), 10 deletions(-) > > - > > -diff --git a/src/disk_interface.cc b/src/disk_interface.cc > > -index d4c2fb0..dc297c4 100644 > > ---- a/src/disk_interface.cc > > -+++ b/src/disk_interface.cc > > -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& > path, string* err) const { > > - // that it doesn't exist. > > - if (st.st_mtime == 0) > > - return 1; > > --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) > > -+#if defined(_AIX) > > -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; > > -+#elif defined(__APPLE__) > > - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + > > - st.st_mtimespec.tv_nsec); > > --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || > defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ > > -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || > defined(__FreeBSD__)) > > -- // For glibc, see "Timestamp files" in the Notes of > http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html > > -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and > define the right macro values above. > > -- // For bsd, see > https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar > > -- // For bionic, C and POSIX API is always enabled. > > -- // For solaris, see > https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. > > -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. > > - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + > st.st_mtim.tv_nsec; > > --#elif defined(_AIX) > > -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; > > - #else > > - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; > > - #endif > > --- > > -2.17.1 > > - > > diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb > b/meta/recipes-devtools/ninja/ninja_1.10.0.bb > > similarity index 87% > > rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb > > rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb > > index f1236e8ac8..bdc6365052 100644 > > --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb > > +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb > > @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" > > > > DEPENDS = "re2c-native ninja-native" > > > > -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" > > +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" > > > > -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ > > - file://fix-musl.patch \ > > -" > > +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" > > UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" > > > > S = "${WORKDIR}/git" > > -- > > 2.25.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From armccurdy at gmail.com Tue Feb 25 19:56:58 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 25 Feb 2020 11:56:58 -0800 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: References: <20200221224537.4052134-1-raj.khem@gmail.com> <20200221224537.4052134-3-raj.khem@gmail.com> Message-ID: On Tue, Feb 25, 2020 at 11:47 AM Alexander Kanavin wrote: > > These are the commits produced monthly by a tool called Automated Upgrade Helper and sent directly to recipe maintainers as listed in maintainers.inc. When maintainers receive the patches, they're supposed to reset the author to themselves, but sometimes it doesn't happen. > > Search for 'auh' in oe-core list for monthly summaries of AUH work. Thanks. The maintainers sometimes forgetting to reset the author was the part I was missing. Maybe the patch checker could be updated to check for that? > Alex > > On Tue, 25 Feb 2020 at 20:43, Andre McCurdy wrote: >> >> On Fri, Feb 21, 2020 at 2:46 PM Khem Raj wrote: >> > >> > From: Upgrade Helper >> >> Why does the author sometimes get set to "Upgrade Helper"? It doesn't >> seem to happen very often (4 times in the past 6 years in oe-core). >> What's special about those 4 cases? >> >> I think it would be clearer if the author was set to whoever ran the tool. >> >> > Signed-off-by: Khem Raj >> > --- >> > .../ninja/ninja/fix-musl.patch | 46 ------------------- >> > .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- >> > 2 files changed, 2 insertions(+), 50 deletions(-) >> > delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch >> > rename meta/recipes-devtools/ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} (87%) >> > >> > diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch >> > deleted file mode 100644 >> > index 7fd779110d..0000000000 >> > --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch >> > +++ /dev/null >> > @@ -1,46 +0,0 @@ >> > -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 >> > -From: makepost >> > -Date: Mon, 24 Dec 2018 03:13:16 +0200 >> > -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 >> > - >> > -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward >> > -compatibility macro. Should help avoid hardcoding platform detection. >> > - >> > -Signed-off-by: Oleksandr Kravchuk >> > - >> > -Upstream-Status: Pending >> > ---- >> > - src/disk_interface.cc | 14 ++++---------- >> > - 1 file changed, 4 insertions(+), 10 deletions(-) >> > - >> > -diff --git a/src/disk_interface.cc b/src/disk_interface.cc >> > -index d4c2fb0..dc297c4 100644 >> > ---- a/src/disk_interface.cc >> > -+++ b/src/disk_interface.cc >> > -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { >> > - // that it doesn't exist. >> > - if (st.st_mtime == 0) >> > - return 1; >> > --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) >> > -+#if defined(_AIX) >> > -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; >> > -+#elif defined(__APPLE__) >> > - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + >> > - st.st_mtimespec.tv_nsec); >> > --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ >> > -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) >> > -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html >> > -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. >> > -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar >> > -- // For bionic, C and POSIX API is always enabled. >> > -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. >> > -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. >> > - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; >> > --#elif defined(_AIX) >> > -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; >> > - #else >> > - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; >> > - #endif >> > --- >> > -2.17.1 >> > - >> > diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb >> > similarity index 87% >> > rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb >> > rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb >> > index f1236e8ac8..bdc6365052 100644 >> > --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb >> > +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb >> > @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" >> > >> > DEPENDS = "re2c-native ninja-native" >> > >> > -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" >> > +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" >> > >> > -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ >> > - file://fix-musl.patch \ >> > -" >> > +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" >> > UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" >> > >> > S = "${WORKDIR}/git" >> > -- >> > 2.25.1 >> > >> > -- >> > _______________________________________________ >> > Openembedded-core mailing list >> > Openembedded-core at lists.openembedded.org >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From bunk at stusta.de Tue Feb 25 20:07:49 2020 From: bunk at stusta.de (Adrian Bunk) Date: Tue, 25 Feb 2020 22:07:49 +0200 Subject: [OE-core] [PATCH v3] make: 4.2.1 -> 4.3 In-Reply-To: <20200224143920.19383-1-sno@netbsd.org> References: <20200224143920.19383-1-sno@netbsd.org> Message-ID: <20200225200749.GA16017@localhost> On Mon, Feb 24, 2020 at 03:39:20PM +0100, Jens Rehsack wrote: >... > -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ >... > +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \ >... Please use the .tar.gz instead. Building lzip-native just for being able to build make is not worth the small space savings, especially since this creates a bottleneck that can slow down the whole build. cu Adrian From alex.kanavin at gmail.com Tue Feb 25 20:25:05 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 21:25:05 +0100 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: References: <20200221224537.4052134-1-raj.khem@gmail.com> <20200221224537.4052134-3-raj.khem@gmail.com> Message-ID: On Tue, 25 Feb 2020 at 20:57, Andre McCurdy wrote: > Thanks. The maintainers sometimes forgetting to reset the author was > the part I was missing. Maybe the patch checker could be updated to > check for that? > The patch checker already does this too :) Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From armccurdy at gmail.com Tue Feb 25 20:56:53 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 25 Feb 2020 12:56:53 -0800 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: References: <20200221224537.4052134-1-raj.khem@gmail.com> <20200221224537.4052134-3-raj.khem@gmail.com> Message-ID: On Tue, Feb 25, 2020 at 12:25 PM Alexander Kanavin wrote: > > On Tue, 25 Feb 2020 at 20:57, Andre McCurdy wrote: >> >> Thanks. The maintainers sometimes forgetting to reset the author was >> the part I was missing. Maybe the patch checker could be updated to >> check for that? > > The patch checker already does this too :) So how did this commit get through? From alex.kanavin at gmail.com Tue Feb 25 21:01:39 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 22:01:39 +0100 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: References: <20200221224537.4052134-1-raj.khem@gmail.com> <20200221224537.4052134-3-raj.khem@gmail.com> Message-ID: On Tue, 25 Feb 2020 at 21:57, Andre McCurdy wrote: > >> Thanks. The maintainers sometimes forgetting to reset the author was > >> the part I was missing. Maybe the patch checker could be updated to > >> check for that? > > > > The patch checker already does this too :) > > So how did this commit get through? > Patch checker sends suggestions to the mailing list and doesn't block commits from getting into master-next, and then master. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From armccurdy at gmail.com Tue Feb 25 21:13:05 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Tue, 25 Feb 2020 13:13:05 -0800 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: References: <20200221224537.4052134-1-raj.khem@gmail.com> <20200221224537.4052134-3-raj.khem@gmail.com> Message-ID: On Tue, Feb 25, 2020 at 1:01 PM Alexander Kanavin wrote: > > On Tue, 25 Feb 2020 at 21:57, Andre McCurdy wrote: >> >> >> Thanks. The maintainers sometimes forgetting to reset the author was >> >> the part I was missing. Maybe the patch checker could be updated to >> >> check for that? >> > >> > The patch checker already does this too :) >> >> So how did this commit get through? > > Patch checker sends suggestions to the mailing list and doesn't block commits from getting into master-next, and then master. OK. I suppose in the end getting this right isn't a high priority so no need to dissect any further. Thanks! From timothy.t.orling at linux.intel.com Tue Feb 25 21:22:33 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Tue, 25 Feb 2020 13:22:33 -0800 Subject: [OE-core] [PATCH] libmodule-build-perl: upgrade 0.4229 -> 0.4231 Message-ID: <20200225212233.30114-1-timothy.t.orling@linux.intel.com> Upstream release notes: " 0.4231 - Wed Jan 29 08:47:56 CET 2020 - Released 0.42_30 without code changes 0.42_30 - Wed Jul 31 13:15:39 CEST 2019 - Add dependency on ExtUtils::PL2Bat " Add ptest RDEPENDS: - ExtUtils::Command::MM for t/compat.t - gcc, make didn't seem like enough for ptest, replace with packagegroup-core-buildessential which definitely works - perl-dev for EXTERN.h in t/xs.t Add INSANE_SKIP dev-deps for the -ptest package because of perl-dev Five tests from t/help.t are skipped because they are TODO t/par.t is skipped because PAR::Dist (0.17+) is not present t/ppm.t is skipped because "HTML support not installed" All other tests pass. --- ...001-Committing-changes-from-do_patch.patch | 22 +++++++++++++++++++ ...4229.bb => libmodule-build-perl_0.4231.bb} | 16 +++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} (87%) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch b/meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch new file mode 100644 index 0000000000..398f94ec5f --- /dev/null +++ b/meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch @@ -0,0 +1,22 @@ +From e1d8264d1d88456ce608a51b9a8f4addb0da6e3b Mon Sep 17 00:00:00 2001 +From: OpenEmbedded +Date: Thu, 20 Feb 2020 19:55:31 +0000 +Subject: [PATCH] Committing changes from do_patch + +--- + lib/Module/Build/Base.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm +index b900b17..a97a722 100644 +--- a/lib/Module/Build/Base.pm ++++ b/lib/Module/Build/Base.pm +@@ -3089,7 +3089,7 @@ sub fix_shebang_line { # Adapted from fixin() in ExtUtils::MM_Unix 1.35 + + my ($cmd, $arg) = (split(' ', $line, 2), ''); + next unless $cmd =~ /perl/i; +- my $interpreter = $self->{properties}{perl}; ++ my $interpreter = "/usr/bin/perl"; + + $self->log_verbose("Changing sharpbang in $file to $interpreter\n"); + my $shb = ''; diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb similarity index 87% rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index e3ba40d96c..91dbfb8606 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -15,9 +15,11 @@ LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \ file://run-ptest \ - " -SRC_URI[md5sum] = "1447d9e02e63f7a1643986789a8f1ba9" -SRC_URI[sha256sum] = "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18" + file://ptest-perl/run-ptest \ + file://0001-Committing-changes-from-do_patch.patch \ + " +SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001" +SRC_URI[sha256sum] = "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717" S = "${WORKDIR}/Module-Build-${PV}" @@ -75,9 +77,10 @@ RDEPENDS_${PN} += " \ " RDEPENDS_${PN}-ptest += " \ - gcc \ - make \ + packagegroup-core-buildessential \ + perl-dev \ perl-module-blib \ + perl-module-extutils-command-mm \ perl-module-file-temp \ perl-module-lib \ perl-module-perlio \ @@ -103,4 +106,7 @@ RPROVIDES_${PN} += "\ libmodule-build-podparser-perl \ " +# t/xs.t RDEPENDS on "EXTERN.h" provided by perl-dev +INSANE_SKIP_${PN}-ptest = "dev-deps" + BBCLASSEXTEND = "native" -- 2.24.0 From alex.kanavin at gmail.com Tue Feb 25 21:58:49 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 22:58:49 +0100 Subject: [OE-core] [PATCH] libmodule-build-perl: upgrade 0.4229 -> 0.4231 In-Reply-To: <20200225212233.30114-1-timothy.t.orling@linux.intel.com> References: <20200225212233.30114-1-timothy.t.orling@linux.intel.com> Message-ID: On Tue, 25 Feb 2020 at 22:30, Tim Orling wrote: > + file://ptest-perl/run-ptest \ > + file://0001-Committing-changes-from-do_patch.patch \ These two are 'devtool upgrade' noise, and should be removed. The recipe does weird things which triggers devtool to add items unnecessarily. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Tue Feb 25 22:00:10 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Tue, 25 Feb 2020 23:00:10 +0100 Subject: [OE-core] [PATCH] libmodule-build-perl: upgrade 0.4229 -> 0.4231 In-Reply-To: References: <20200225212233.30114-1-timothy.t.orling@linux.intel.com> Message-ID: But probably a better solution would be to keep the patch, and drop the custom sed hack! Alex On Tue, 25 Feb 2020 at 22:58, Alexander Kanavin wrote: > On Tue, 25 Feb 2020 at 22:30, Tim Orling > wrote: > >> + file://ptest-perl/run-ptest \ >> + file://0001-Committing-changes-from-do_patch.patch \ > > > These two are 'devtool upgrade' noise, and should be removed. The recipe > does weird things which triggers devtool to add items unnecessarily. > > Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From patchwork at patchwork.openembedded.org Tue Feb 25 22:02:17 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Tue, 25 Feb 2020 22:02:17 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_libmodule-?= =?utf-8?q?build-perl=3A_upgrade_0=2E4229_-=3E_0=2E4231?= In-Reply-To: <20200225212233.30114-1-timothy.t.orling@linux.intel.com> References: <20200225212233.30114-1-timothy.t.orling@linux.intel.com> Message-ID: <20200225220217.2274.10801@do> == Series Details == Series: libmodule-build-perl: upgrade 0.4229 -> 0.4231 Revision: 1 URL : https://patchwork.openembedded.org/series/22948/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch libmodule-build-perl: upgrade 0.4229 -> 0.4231 Issue Patch is missing Signed-off-by [test_signed_off_by_presence] Suggested fix Sign off the patch (either manually or with "git commit --amend -s") * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fix Sign off the added patch file (meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch) * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-devtools/perl/libmodule-build-perl/0001-Committing-changes-from-do_patch.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From anuj.mittal at intel.com Tue Feb 25 22:39:26 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Wed, 26 Feb 2020 06:39:26 +0800 Subject: [OE-core] [PATCH 04/12] ncurses: upgrade 6.1+20191019 -> 6.2 In-Reply-To: <20200225185335.19326-4-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> <20200225185335.19326-4-alex.kanavin@gmail.com> Message-ID: <5a077658-77ab-c3db-1845-469eaf7bfa5a@intel.com> On 26-Feb-20 02:53 AM, Alexander Kanavin wrote: > License-Update: copyright years and holders > Signed-off-by: Alexander Kanavin > --- > meta/recipes-core/ncurses/ncurses.inc | 2 +- > .../ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-core/ncurses/{ncurses_6.1+20191019.bb => ncurses_6.2.bb} (89%) > > diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc > index b7bf4c0d81..4156bf4f7d 100644 > --- a/meta/recipes-core/ncurses/ncurses.inc > +++ b/meta/recipes-core/ncurses/ncurses.inc > @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" > DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." > HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" > LICENSE = "MIT" > -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" > +LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" > SECTION = "libs" > DEPENDS = "ncurses-native" > DEPENDS_class-native = "" > diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb > similarity index 89% > rename from meta/recipes-core/ncurses/ncurses_6.1+20191019.bb > rename to meta/recipes-core/ncurses/ncurses_6.2.bb > index 187777f6ef..b6d899c878 100644 > --- a/meta/recipes-core/ncurses/ncurses_6.1+20191019.bb > +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb > @@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ > file://config.cache \ > " > # commit id corresponds to the revision in package version > -SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" > +SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" > S = "${WORKDIR}/git" > EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" > UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" > I think the CVE_VERSION added earlier should no longer be necessary and can be removed too. Thanks, Anuj From timothy.t.orling at linux.intel.com Tue Feb 25 23:12:40 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Tue, 25 Feb 2020 15:12:40 -0800 Subject: [OE-core] [PATCH] libmodule-build-perl: upgrade 0.4229 -> 0.4231 In-Reply-To: References: <20200225212233.30114-1-timothy.t.orling@linux.intel.com> Message-ID: <530098E8-9036-4FCC-AA97-34324C8ACA84@linux.intel.com> Somehow I totally missed this when sending the patch (obviously). Sigh. I?m on the fence about patch versus sed. I?m inclined to stop mucking about? Thank you for the catch! > On Feb 25, 2020, at 2:00 PM, Alexander Kanavin wrote: > > But probably a better solution would be to keep the patch, and drop the custom sed hack! > > Alex > > On Tue, 25 Feb 2020 at 22:58, Alexander Kanavin > wrote: > On Tue, 25 Feb 2020 at 22:30, Tim Orling > wrote: > + file://ptest-perl/run-ptest \ > + file://0001-Committing-changes-from-do_patch.patch \ > > These two are 'devtool upgrade' noise, and should be removed. The recipe does weird things which triggers devtool to add items unnecessarily. > > Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From raj.khem at gmail.com Tue Feb 25 23:32:49 2020 From: raj.khem at gmail.com (Khem Raj) Date: Tue, 25 Feb 2020 15:32:49 -0800 Subject: [OE-core] [PATCH 2/4] ninja: upgrade 1.9.0 -> 1.10.0 In-Reply-To: References: <20200221224537.4052134-1-raj.khem@gmail.com> <20200221224537.4052134-3-raj.khem@gmail.com> Message-ID: On Tue, Feb 25, 2020 at 11:43 AM Andre McCurdy wrote: > > On Fri, Feb 21, 2020 at 2:46 PM Khem Raj wrote: > > > > From: Upgrade Helper > > Why does the author sometimes get set to "Upgrade Helper"? It doesn't > seem to happen very often (4 times in the past 6 years in oe-core). > What's special about those 4 cases? well this was an oversight on my part, since the next steps in the email did suggest - amend the patch and sign it off: git commit -s --reset-author --amend I only did git am -s and then testing but on a lighter note, it might be worth giving credit to Upgrade Helper since it did author the patch, perhaps will keep the AI in these machines happy. > > I think it would be clearer if the author was set to whoever ran the tool. > > > Signed-off-by: Khem Raj > > --- > > .../ninja/ninja/fix-musl.patch | 46 ------------------- > > .../ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} | 6 +-- > > 2 files changed, 2 insertions(+), 50 deletions(-) > > delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch > > rename meta/recipes-devtools/ninja/{ninja_1.9.0.bb => ninja_1.10.0.bb} (87%) > > > > diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch > > deleted file mode 100644 > > index 7fd779110d..0000000000 > > --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch > > +++ /dev/null > > @@ -1,46 +0,0 @@ > > -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 > > -From: makepost > > -Date: Mon, 24 Dec 2018 03:13:16 +0200 > > -Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 > > - > > -In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward > > -compatibility macro. Should help avoid hardcoding platform detection. > > - > > -Signed-off-by: Oleksandr Kravchuk > > - > > -Upstream-Status: Pending > > ---- > > - src/disk_interface.cc | 14 ++++---------- > > - 1 file changed, 4 insertions(+), 10 deletions(-) > > - > > -diff --git a/src/disk_interface.cc b/src/disk_interface.cc > > -index d4c2fb0..dc297c4 100644 > > ---- a/src/disk_interface.cc > > -+++ b/src/disk_interface.cc > > -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { > > - // that it doesn't exist. > > - if (st.st_mtime == 0) > > - return 1; > > --#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) > > -+#if defined(_AIX) > > -+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; > > -+#elif defined(__APPLE__) > > - return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL + > > - st.st_mtimespec.tv_nsec); > > --#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ > > -- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__)) > > -- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html > > -- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above. > > -- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar > > -- // For bionic, C and POSIX API is always enabled. > > -- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. > > -+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. > > - return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec; > > --#elif defined(_AIX) > > -- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n; > > - #else > > - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; > > - #endif > > --- > > -2.17.1 > > - > > diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb > > similarity index 87% > > rename from meta/recipes-devtools/ninja/ninja_1.9.0.bb > > rename to meta/recipes-devtools/ninja/ninja_1.10.0.bb > > index f1236e8ac8..bdc6365052 100644 > > --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb > > +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb > > @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" > > > > DEPENDS = "re2c-native ninja-native" > > > > -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" > > +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" > > > > -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ > > - file://fix-musl.patch \ > > -" > > +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" > > UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" > > > > S = "${WORKDIR}/git" > > -- > > 2.25.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core From timothy.t.orling at linux.intel.com Tue Feb 25 23:46:03 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Tue, 25 Feb 2020 15:46:03 -0800 Subject: [OE-core] [PATCH v2] libmodule-build-perl: upgrade 0.4229 -> 0.4231 Message-ID: <20200225234603.36012-1-timothy.t.orling@linux.intel.com> Upstream release notes: " 0.4231 - Wed Jan 29 08:47:56 CET 2020 - Released 0.42_30 without code changes 0.42_30 - Wed Jul 31 13:15:39 CEST 2019 - Add dependency on ExtUtils::PL2Bat " Add ptest RDEPENDS: - ExtUtils::Command::MM for t/compat.t - gcc, make didn't seem like enough for ptest, replace with packagegroup-core-buildessential which definitely works - perl-dev for EXTERN.h in t/xs.t Add INSANE_SKIP dev-deps for the -ptest package because of perl-dev Five tests from t/help.t are skipped because they are TODO t/par.t is skipped because PAR::Dist (0.17+) is not present t/ppm.t is skipped because "HTML support not installed" All other tests pass. Signed-off-by: Tim Orling --- ...rl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} (90%) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb similarity index 90% rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index e3ba40d96c..b1967c7b03 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \ file://run-ptest \ - " -SRC_URI[md5sum] = "1447d9e02e63f7a1643986789a8f1ba9" -SRC_URI[sha256sum] = "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18" + " +SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001" +SRC_URI[sha256sum] = "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717" S = "${WORKDIR}/Module-Build-${PV}" @@ -75,9 +75,10 @@ RDEPENDS_${PN} += " \ " RDEPENDS_${PN}-ptest += " \ - gcc \ - make \ + packagegroup-core-buildessential \ + perl-dev \ perl-module-blib \ + perl-module-extutils-command-mm \ perl-module-file-temp \ perl-module-lib \ perl-module-perlio \ @@ -103,4 +104,7 @@ RPROVIDES_${PN} += "\ libmodule-build-podparser-perl \ " +# t/xs.t RDEPENDS on "EXTERN.h" provided by perl-dev +INSANE_SKIP_${PN}-ptest = "dev-deps" + BBCLASSEXTEND = "native" -- 2.24.0 From ticotimo at gmail.com Wed Feb 26 02:04:43 2020 From: ticotimo at gmail.com (Tim Orling) Date: Tue, 25 Feb 2020 18:04:43 -0800 Subject: [OE-core] [PATCH 01/12] libmodule-build-perl: upgrade 0.4229 -> 0.4231 In-Reply-To: <20200225185335.19326-1-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> Message-ID: The V2 I sent earlier today should be used instead, as it improves ptests. The V1 I sent should be shredded and burned. On Tue, Feb 25, 2020 at 10:54 AM Alexander Kanavin wrote: > Signed-off-by: Alexander Kanavin > --- > ...-build-perl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => > libmodule-build-perl_0.4231.bb} (95%) > > diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb > b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb > similarity index 95% > rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb > rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb > index e3ba40d96c..b3bc314ee7 100644 > --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb > +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb > @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = > "file://README;beginline=949;endline=954;md5=624c06db56a2af4d > > SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz > \ > file://run-ptest \ > - " > -SRC_URI[md5sum] = "1447d9e02e63f7a1643986789a8f1ba9" > -SRC_URI[sha256sum] = > "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18" > + " > +SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001" > +SRC_URI[sha256sum] = > "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717" > > S = "${WORKDIR}/Module-Build-${PV}" > > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Wed Feb 26 04:47:01 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 26 Feb 2020 04:47:01 +0000 Subject: [OE-core] [PATCH] linux-yocto/5.2: update to v5.2.32 In-Reply-To: <20200224200202.61426-1-bruce.ashfield@gmail.com> References: <20200224200202.61426-1-bruce.ashfield@gmail.com> Message-ID: On Mon, 2020-02-24 at 15:02 -0500, bruce.ashfield at gmail.com wrote: > From: Bruce Ashfield > > Updating linux-yocto/5.2 to the latest korg -stable release that > comprises > the following commits: This was included in testing on the autobuilder and we saw: https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1612 https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/315 https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1616 and I'm not sure if they're from this? Cheers, Richard From anuj.mittal at intel.com Wed Feb 26 04:52:00 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Wed, 26 Feb 2020 12:52:00 +0800 Subject: [OE-core] [zeus][PATCH] sqlite: fix numerous CVEs In-Reply-To: <20200221205942.27168-1-bunk@stusta.de> References: <20200221205942.27168-1-bunk@stusta.de> Message-ID: On 22-Feb-20 04:59 AM, Adrian Bunk wrote: > From: Ross Burton > > Fix the following CVEs: > > - CVE-2019-19244 > - CVE-2019-19880 > - CVE-2019-19923 > - CVE-2019-19924 > - CVE-2019-19925 > - CVE-2019-19926 > - CVE-2019-19959 > - CVE-2019-20218 > > Signed-off-by: Ross Burton > Signed-off-by: Richard Purdie > Signed-off-by: Adrian Bunk > --- > .../sqlite/sqlite3/CVE-2019-19244.patch | 33 ++++++++++ > .../sqlite/sqlite3/CVE-2019-19880.patch | 33 ++++++++++ This one is giving a warning: WARNING: sqlite3-native-3_3.29.0-r0 do_patch: Fuzz detected: Applying patch CVE-2019-19880.patch patching file sqlite3.c Hunk #1 succeeded at 146849 with fuzz 1 (offset -735 lines). The context lines in the patches can be updated with devtool: devtool modify sqlite3-native devtool finish --force-patch-refresh sqlite3-native Don't forget to review changes done by devtool! Thanks, Anuj > .../sqlite/sqlite3/CVE-2019-19923.patch | 50 ++++++++++++++ > .../sqlite/sqlite3/CVE-2019-19924.patch | 65 +++++++++++++++++++ > .../sqlite/sqlite3/CVE-2019-19925.patch | 33 ++++++++++ > .../sqlite/sqlite3/CVE-2019-19926.patch | 31 +++++++++ > .../sqlite/sqlite3/CVE-2019-19959.patch | 46 +++++++++++++ > .../sqlite/sqlite3/CVE-2019-20218.patch | 31 +++++++++ > meta/recipes-support/sqlite/sqlite3_3.29.0.bb | 11 +++- > 9 files changed, 332 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch > create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch > > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch > new file mode 100644 > index 0000000000..3f70979acc > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch > @@ -0,0 +1,33 @@ > +CVE: CVE-2019-19244 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 0f690d4ae5ffe656762fdbb7f36cc4c2dcbb2d9d Mon Sep 17 00:00:00 2001 > +From: dan > +Date: Fri, 22 Nov 2019 10:14:01 +0000 > +Subject: [PATCH] Fix a crash that could occur if a sub-select that uses both > + DISTINCT and window functions also used an ORDER BY that is the same as its > + select list. > + > +Amalgamation version of the patch: > +FossilOrigin-Name: bcdd66c1691955c697f3d756c2b035acfe98f6aad72e90b0021bab6e9023b3ba > +--- > + sqlite3.c | 5 +++-- > + sqlite3.h | 2 +- > + 2 files changed, 4 insertions(+), 3 deletions(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index 8fd740b..db1c649 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( > + */ > + if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct > + && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 > ++ && p->pWin==0 > + ){ > + p->selFlags &= ~SF_Distinct; > + pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch > new file mode 100644 > index 0000000000..ca5c31c57b > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19880.patch > @@ -0,0 +1,33 @@ > +CVE: CVE-2019-19880 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 3622d20ad10dfac9586d4423547ed960cbc66fcf Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Wed, 18 Dec 2019 00:05:50 +0000 > +Subject: [PATCH] When processing constant integer values in ORDER BY clauses > + of window definitions (see check-in [7e4 --- > + > +--- > + sqlite3.c | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index db1c649..a83b3d2 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -147584,9 +147584,11 @@ static ExprList *exprListAppendList( > + int nInit = pList ? pList->nExpr : 0; > + for(i=0; inExpr; i++){ > + Expr *pDup = sqlite3ExprDup(pParse->db, pAppend->a[i].pExpr, 0); > ++ assert( pDup==0 || !ExprHasProperty(pDup, EP_MemToken) ); > + if( bIntToNull && pDup && pDup->op==TK_INTEGER ){ > + pDup->op = TK_NULL; > + pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse); > ++ pDup->u.zToken = 0; > + } > + pList = sqlite3ExprListAppend(pParse, pList, pDup); > + if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags; > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch > new file mode 100644 > index 0000000000..b1b866b250 > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch > @@ -0,0 +1,50 @@ > +CVE: CVE-2019-19923 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From b64463719dc53bde98b0ce3930b10a32560c3a02 Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Wed, 18 Dec 2019 20:51:58 +0000 > +Subject: [PATCH] Continue to back away from the LEFT JOIN optimization of > + check-in [41c27bc0ff1d3135] by disallowing query flattening if the outer > + query is DISTINCT. Without this fix, if an index scan is run on the table > + within the view on the right-hand side of the LEFT JOIN, stale result > + registers might be accessed yielding incorrect results, and/or an > + OP_IfNullRow opcode might be invoked on the un-opened table, resulting in a > + NULL-pointer dereference. This problem was found by the Yongheng and Rui > + fuzzer. > + > +FossilOrigin-Name: 862974312edf00e9d1068115d1a39b7235b7db68b6d86b81d38a12f025a4748e > +--- > + sqlite3.c | 10 +++++++--- > + 1 file changed, 7 insertions(+), 3 deletions(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index d29da07..5bc06c8 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -129216,6 +129216,7 @@ static void substSelect( > + ** (3b) the FROM clause of the subquery may not contain a virtual > + ** table and > + ** (3c) the outer query may not be an aggregate. > ++** (3d) the outer query may not be DISTINCT. > + ** > + ** (4) The subquery can not be DISTINCT. > + ** > +@@ -129412,8 +129413,11 @@ static int flattenSubquery( > + */ > + if( (pSubitem->fg.jointype & JT_OUTER)!=0 ){ > + isLeftJoin = 1; > +- if( pSubSrc->nSrc>1 || isAgg || IsVirtual(pSubSrc->a[0].pTab) ){ > +- /* (3a) (3c) (3b) */ > ++ if( pSubSrc->nSrc>1 /* (3a) */ > ++ || isAgg /* (3b) */ > ++ || IsVirtual(pSubSrc->a[0].pTab) /* (3c) */ > ++ || (p->selFlags & SF_Distinct)!=0 /* (3d) */ > ++ ){ > + return 0; > + } > + } > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch > new file mode 100644 > index 0000000000..80d5edbb0c > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch > @@ -0,0 +1,65 @@ > +CVE: CVE-2019-19924 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 854fe21e8a987f84da81f6bb9e90abc5355c6621 Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Thu, 19 Dec 2019 20:37:32 +0000 > +Subject: [PATCH] When an error occurs while rewriting the parser tree for > + window functions in the sqlite3WindowRewrite() routine, make sure that > + pParse->nErr is set, and make sure that this shuts down any subsequent code > + generation that might depend on the transformations that were implemented. > + This fixes a problem discovered by the Yongheng and Rui fuzzer. > + > +Amalgamation format of backported patch > +FossilOrigin-Name: e2bddcd4c55ba3cbe0130332679ff4b048630d0ced9a8899982edb5a3569ba7f > +--- > + sqlite3.c | 16 +++++++++++----- > + sqlite3.h | 2 +- > + 2 files changed, 12 insertions(+), 6 deletions(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index 408ec4c..857c28e 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -77798,7 +77798,8 @@ SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse *pParse, Index *pIdx){ > + */ > + static void vdbeVComment(Vdbe *p, const char *zFormat, va_list ap){ > + assert( p->nOp>0 || p->aOp==0 ); > +- assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed ); > ++ assert( p->aOp==0 || p->aOp[p->nOp-1].zComment==0 || p->db->mallocFailed > ++ || p->pParse->nErr>0 ); > + if( p->nOp ){ > + assert( p->aOp ); > + sqlite3DbFree(p->db, p->aOp[p->nOp-1].zComment); > +@@ -97872,6 +97873,7 @@ static int codeCompare( > + int addr; > + CollSeq *p4; > + > ++ if( pParse->nErr ) return 0; > + p4 = sqlite3BinaryCompareCollSeq(pParse, pLeft, pRight); > + p5 = binaryCompareP5(pLeft, pRight, jumpIfNull); > + addr = sqlite3VdbeAddOp4(pParse->pVdbe, opcode, in2, dest, in1, > +@@ -147627,7 +147629,7 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ > + > + pTab = sqlite3DbMallocZero(db, sizeof(Table)); > + if( pTab==0 ){ > +- return SQLITE_NOMEM; > ++ return sqlite3ErrorToParser(db, SQLITE_NOMEM); > + } > + > + p->pSrc = 0; > +@@ -147731,6 +147733,10 @@ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){ > + sqlite3DbFree(db, pTab); > + } > + > ++ if( rc && pParse->nErr==0 ){ > ++ assert( pParse->db->mallocFailed ); > ++ return sqlite3ErrorToParser(pParse->db, SQLITE_NOMEM); > ++ } > + return rc; > + } > + > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch > new file mode 100644 > index 0000000000..ffc2c6afff > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch > @@ -0,0 +1,33 @@ > +CVE: CVE-2019-19925 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From e92580434d2cdca228649d32f76167492de4f512 Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Thu, 19 Dec 2019 15:15:40 +0000 > +Subject: [PATCH] Fix the zipfile extension so that INSERT works even if the > + pathname of the file being inserted is a NULL. Bug discovered by the > + Yongheng and Rui fuzzer. > + > +FossilOrigin-Name: a80f84b511231204658304226de3e075a55afc2e3f39ac063716f7a57f585c06 > +--- > + shell.c | 1 + > + sqlite3.c | 4 ++-- > + sqlite3.h | 2 +- > + 3 files changed, 4 insertions(+), 3 deletions(-) > + > +diff --git a/shell.c b/shell.c > +index 053180c..404a8d4 100644 > +--- a/shell.c > ++++ b/shell.c > +@@ -5827,6 +5827,7 @@ static int zipfileUpdate( > + > + if( rc==SQLITE_OK ){ > + zPath = (const char*)sqlite3_value_text(apVal[2]); > ++ if( zPath==0 ) zPath = ""; > + nPath = (int)strlen(zPath); > + mTime = zipfileGetTime(apVal[4]); > + } > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch > new file mode 100644 > index 0000000000..92bc7908bc > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch > @@ -0,0 +1,31 @@ > +CVE: CVE-2019-19926 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 4165b1e1e0001165ace9051a70f938099505eadc Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Thu, 19 Dec 2019 22:08:19 +0000 > +Subject: [PATCH] Continuation of [e2bddcd4c55ba3cb]: Add another spot where it > + is necessary to abort early due to prior errors in sqlite3WindowRewrite(). > + > +FossilOrigin-Name: cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2 > +--- > + sqlite3.c | 7 ++++--- > + sqlite3.h | 2 +- > + 2 files changed, 5 insertions(+), 4 deletions(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index 857c28e..19a474d 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -128427,6 +128427,7 @@ static int multiSelect( > + } > + #endif > + } > ++ if( pParse->nErr ) goto multi_select_end; > + > + /* Compute collating sequences used by > + ** temporary tables needed to implement the compound select. > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch > new file mode 100644 > index 0000000000..cba8ec9d30 > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch > @@ -0,0 +1,46 @@ > +CVE: CVE-2019-19959 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From f83f7e8141ee7cbbf7f2dc8985279a7372b259b6 Mon Sep 17 00:00:00 2001 > +From: "D. Richard Hipp" > +Date: Mon, 23 Dec 2019 21:04:33 +0000 > +Subject: [PATCH] Fix the zipfile() function in the zipfile extension so that > + it is able to deal with goofy filenames that contain embedded zeros. > + > +FossilOrigin-Name: cc0fb00a128fd0773db5ff7891f7aa577a3671d570166d2cbb30df922344adcf > +--- > + shell.c | 4 ++-- > + sqlite3.c | 4 ++-- > + sqlite3.h | 2 +- > + 3 files changed, 5 insertions(+), 5 deletions(-) > + > +diff --git a/shell.c b/shell.c > +index 404a8d4..48065e9 100644 > +--- a/shell.c > ++++ b/shell.c > +@@ -5841,7 +5841,7 @@ static int zipfileUpdate( > + zFree = sqlite3_mprintf("%s/", zPath); > + if( zFree==0 ){ rc = SQLITE_NOMEM; } > + zPath = (const char*)zFree; > +- nPath++; > ++ nPath = (int)strlen(zPath); > + } > + } > + > +@@ -6242,11 +6242,11 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){ > + }else{ > + if( zName[nName-1]!='/' ){ > + zName = zFree = sqlite3_mprintf("%s/", zName); > +- nName++; > + if( zName==0 ){ > + rc = SQLITE_NOMEM; > + goto zipfile_step_out; > + } > ++ nName = (int)strlen(zName); > + }else{ > + while( nName>1 && zName[nName-2]=='/' ) nName--; > + } > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch > new file mode 100644 > index 0000000000..fb6cd6df2d > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch > @@ -0,0 +1,31 @@ > +CVE: CVE-2019-20218 > +Upstream-Status: Backport > +Signed-off-by: Ross Burton > + > +From 6bbd76d34f29f61483791231f2ce579dcadab8a5 Mon Sep 17 00:00:00 2001 > +From: Dan Kennedy > +Date: Fri, 27 Dec 2019 20:54:42 +0000 > +Subject: [PATCH] Do not attempt to unwind the WITH stack in the Parse object > + following an error. This fixes a separate case to [de6e6d68]. > + > +FossilOrigin-Name: d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92 > +--- > + sqlite3.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/sqlite3.c b/sqlite3.c > +index 5bc06c8..408ec4c 100644 > +--- a/sqlite3.c > ++++ b/sqlite3.c > +@@ -130570,7 +130570,7 @@ static int selectExpander(Walker *pWalker, Select *p){ > + > + /* Process NATURAL keywords, and ON and USING clauses of joins. > + */ > +- if( db->mallocFailed || sqliteProcessJoin(pParse, p) ){ > ++ if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){ > + return WRC_Abort; > + } > + > +-- > +2.24.1 > + > diff --git a/meta/recipes-support/sqlite/sqlite3_3.29.0.bb b/meta/recipes-support/sqlite/sqlite3_3.29.0.bb > index 34066fbe89..61145851be 100644 > --- a/meta/recipes-support/sqlite/sqlite3_3.29.0.bb > +++ b/meta/recipes-support/sqlite/sqlite3_3.29.0.bb > @@ -4,6 +4,15 @@ LICENSE = "PD" > LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" > > SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \ > - file://0001-Fix-CVE-2019-16168.patch" > + file://0001-Fix-CVE-2019-16168.patch \ > + file://CVE-2019-19244.patch \ > + file://CVE-2019-19880.patch \ > + file://CVE-2019-19923.patch \ > + file://CVE-2019-19924.patch \ > + file://CVE-2019-19925.patch \ > + file://CVE-2019-19926.patch \ > + file://CVE-2019-19959.patch \ > + file://CVE-2019-20218.patch \ > +" > SRC_URI[md5sum] = "8f3dfe83387e62ecb91c7c5c09c688dc" > SRC_URI[sha256sum] = "8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b" > From richard.purdie at linuxfoundation.org Wed Feb 26 04:57:10 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Wed, 26 Feb 2020 04:57:10 +0000 Subject: [OE-core] [PATCH] abi_version/sstatesig: Introduce HASHEQUIV_HASH_VERSION Message-ID: <20200226045710.393167-1-richard.purdie@linuxfoundation.org> We've found we need a way to cause a change in signatures and move to a new hash 'namespace' with hashequiv. This introduces a variable which allows us to do this. Signed-off-by: Richard Purdie --- meta/conf/abi_version.conf | 8 ++++++++ meta/lib/oe/sstatesig.py | 3 +++ 2 files changed, 11 insertions(+) diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index 49648801089..2bdc55695bd 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -5,3 +5,11 @@ # with general agreement from the core team. # OELAYOUT_ABI = "12" + +# +# HASHEQUIV_HASH_VERSION is injected into the output hash calculation used by +# hashequiv. Changing this means previous hashes will no longer match, allowing +# a reset of the equivalence, for example when reproducibility issues break the +# existing match data. Distros can also append to this value for the same effect. +# +HASHEQUIV_HASH_VERSION = "1" diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4325b66a9ee..d24e3738aeb 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,11 +477,14 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + extra_content = d.getVar('HASHEQUIV_HASH_VERSION') try: os.chdir(path) update_hash("OEOuthashBasic\n") + if extra_content: + update_hash(extra_content + "\n") # It is only currently useful to get equivalent hashes for things that # can be restored from sstate. Since the sstate object is named using -- 2.25.0 From ticotimo at gmail.com Wed Feb 26 05:35:09 2020 From: ticotimo at gmail.com (Tim Orling) Date: Tue, 25 Feb 2020 21:35:09 -0800 Subject: [OE-core] Atk, at-spi2-core, at-spi2-atk updates Message-ID: I have the above recipes upgraded and build tested on qemux86-64. Runtime testing is less obvious, although I have done some minor testing with python3-dogtail [WIP] and python3-pyatspi [WIP] on core-image-sato-sdk. Anuj mentioned he had seen issues with musl, so I?m waiting for clean build. Since they are all available on Alpine Linux, I?m not expecting issues. I?ll send patches in the morning. I have a strong desire to get these into 3.1. Cheers -------------- next part -------------- An HTML attachment was scrubbed... URL: From bunk at stusta.de Wed Feb 26 11:49:23 2020 From: bunk at stusta.de (Adrian Bunk) Date: Wed, 26 Feb 2020 13:49:23 +0200 Subject: [OE-core] [PATCH] webkitgtk: Remove obsolete woff2 comment Message-ID: <20200226114923.23580-1-bunk@stusta.de> woff2 is now available in meta-webkit. Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index b40699f4d1..2e923991e9 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -53,7 +53,6 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" -# Source is at https://github.com/google/woff2 PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" -- 2.17.1 From bunk at stusta.de Wed Feb 26 11:50:09 2020 From: bunk at stusta.de (Adrian Bunk) Date: Wed, 26 Feb 2020 13:50:09 +0200 Subject: [OE-core] [PATCH v2 1/6] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <20200225124627.23tpu5eknidqxrg3@jama> References: <20200223182933.6168-1-bunk@stusta.de> <20200224104635.GA27036@localhost> <20200224140801.GC27036@localhost> <20200225111955.GA13902@localhost> <20200225123807.GB13902@localhost> <20200225124627.23tpu5eknidqxrg3@jama> Message-ID: <20200226115009.GA26350@localhost> On Tue, Feb 25, 2020 at 01:46:27PM +0100, Martin Jansa wrote: > On Tue, Feb 25, 2020 at 02:38:07PM +0200, Adrian Bunk wrote: > > On Tue, Feb 25, 2020 at 12:32:55PM +0100, Alexander Kanavin wrote: > > > I would probably look into how > > > REQUIRED_DISTRO_FEATURE/ANY_OF_DISTRO_FEATURS is actually implemented, and > > > see if you can convince it to do the right thing, or maybe write a custom > > > re-implementation. > > > > I did already check meta/classes/features_check.bbclass, there is no > > obvious simple way for expressing more complicated dependencies. > > Doesn't this do what you wanted? > > REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland opengl', 'x11', d)}" Thanks, I now have a v3. cu Adrian From bunk at stusta.de Wed Feb 26 11:51:36 2020 From: bunk at stusta.de (Adrian Bunk) Date: Wed, 26 Feb 2020 13:51:36 +0200 Subject: [OE-core] [PATCH v3 1/2] webkitgtk: Move X library DEPENDS to the x11 PACKAGECONFIG Message-ID: <20200226115137.23733-1-bunk@stusta.de> Also adjust them to what OptionsGTK currently checks. Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 2e923991e9..1a0b504a51 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -30,10 +30,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" CVE_PRODUCT = "webkitgtk webkitgtk\+" -DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \ +DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ pango icu bison-native gawk intltool-native libwebp \ - atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \ + atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \ ruby-native libnotify gstreamer1.0-plugins-bad \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " @@ -45,7 +45,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" -PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" -- 2.17.1 From bunk at stusta.de Wed Feb 26 11:51:37 2020 From: bunk at stusta.de (Adrian Bunk) Date: Wed, 26 Feb 2020 13:51:37 +0200 Subject: [OE-core] [PATCH v3 2/2] webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements In-Reply-To: <20200226115137.23733-1-bunk@stusta.de> References: <20200226115137.23733-1-bunk@stusta.de> Message-ID: <20200226115137.23733-2-bunk@stusta.de> x11 can be replaced with wayland. opengl is mandatory only with wayland. Without x11, use gles2 for opengl. Signed-off-by: Adrian Bunk --- meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index 1a0b504a51..0a5ecace02 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb @@ -26,7 +26,8 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc -REQUIRED_DISTRO_FEATURES = "x11 opengl" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" CVE_PRODUCT = "webkitgtk webkitgtk\+" @@ -39,7 +40,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ enchant \ libsecret \ " -- 2.17.1 From bruce.ashfield at gmail.com Wed Feb 26 13:26:51 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Wed, 26 Feb 2020 08:26:51 -0500 Subject: [OE-core] [PATCH] linux-yocto/5.2: update to v5.2.32 In-Reply-To: References: <20200224200202.61426-1-bruce.ashfield@gmail.com> Message-ID: On Tue, Feb 25, 2020 at 11:47 PM Richard Purdie wrote: > > On Mon, 2020-02-24 at 15:02 -0500, bruce.ashfield at gmail.com wrote: > > From: Bruce Ashfield > > > > Updating linux-yocto/5.2 to the latest korg -stable release that > > comprises > > the following commits: > > This was included in testing on the autobuilder and we saw: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1612 > https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/315 > https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1616 > > and I'm not sure if they're from this? Me either. Hopefully one of the Wind River guys can have a look, otherwise, I'll poke at it next week. Cheers, Bruce > > Cheers, > > Richard > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From zboszor at pr.hu Wed Feb 26 13:57:13 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Wed, 26 Feb 2020 14:57:13 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <20200226135716.49255-1-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> Message-ID: <20200226135716.49255-2-zboszor@pr.hu> The package name exploits sstate.bbclass so it's not added as implicit dependency to packages. Signed-off-by: B?sz?rm?nyi Zolt?n --- meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc index ca1386d80b..5b1cdee7e3 100644 --- a/meta/recipes-graphics/libva/libva-2.6.1.inc +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc @@ -17,10 +17,12 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" +S = "${WORKDIR}/libva-${PV}" + UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" DEPENDS = "libdrm" diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb new file mode 100644 index 0000000000..828ef6fbca --- /dev/null +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb @@ -0,0 +1,5 @@ +require libva-${PV}.inc + +do_install_append () { + rm -f ${D}${libdir}/*.so* +} -- 2.24.1 From zboszor at pr.hu Wed Feb 26 13:57:16 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Wed, 26 Feb 2020 14:57:16 +0100 Subject: [OE-core] [RFC PATCH 5/5] mesa: Enforce TOOLCHAIN="gcc" In-Reply-To: <20200226135716.49255-1-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> Message-ID: <20200226135716.49255-5-zboszor@pr.hu> When meta-clang is used, for example to build chromium-x11 from meta-browser, a linker error occurs in Zeus. See: https://gitlab.freedesktop.org/mesa/mesa/issues/2533 Signed-off-by: B?sz?rm?nyi Zolt?n --- meta/recipes-graphics/mesa/mesa.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 800e8813c7..b8f09a2ed3 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -24,6 +24,8 @@ PROVIDES = " \ virtual/mesa \ " +TOOLCHAIN = "gcc" + inherit meson pkgconfig python3native gettext features_check # Unset these to stop python trying to report the target Python setup -- 2.24.1 From zboszor at pr.hu Wed Feb 26 13:57:12 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Wed, 26 Feb 2020 14:57:12 +0100 Subject: [OE-core] [PATCH 1/5] libva: Split out the base parts into an include file Message-ID: <20200226135716.49255-1-zboszor@pr.hu> Signed-off-by: B?sz?rm?nyi Zolt?n --- meta/recipes-graphics/libva/libva-2.6.1.inc | 30 ++++++++++++++++++++ meta/recipes-graphics/libva/libva_2.6.1.bb | 31 ++------------------- 2 files changed, 32 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-graphics/libva/libva-2.6.1.inc diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc new file mode 100644 index 0000000000..ca1386d80b --- /dev/null +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc @@ -0,0 +1,30 @@ +SUMMARY = "Video Acceleration (VA) API for Linux" +DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \ +and API specification which enables and provides access to graphics \ +hardware (GPU) acceleration for video processing on Linux and UNIX \ +based operating systems. Accelerated processing includes video \ +decoding, video encoding, subpicture blending and rendering. The \ +specification was originally designed by Intel for its GMA (Graphics \ +Media Accelerator) series of GPU hardware, the API is however not \ +limited to GPUs or Intel specific hardware, as other hardware and \ +manufacturers can also freely use this API for hardware accelerated \ +video decoding." + +HOMEPAGE = "https://01.org/linuxmedia/vaapi" +BUGTRACKER = "https://github.com/intel/libva/issues" + +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" + +SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" +SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" +SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" + +UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" + +DEPENDS = "libdrm" + +inherit meson pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta/recipes-graphics/libva/libva_2.6.1.bb b/meta/recipes-graphics/libva/libva_2.6.1.bb index 92cea83bc1..af4c1c98ab 100644 --- a/meta/recipes-graphics/libva/libva_2.6.1.bb +++ b/meta/recipes-graphics/libva/libva_2.6.1.bb @@ -1,33 +1,6 @@ -SUMMARY = "Video Acceleration (VA) API for Linux" -DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \ -and API specification which enables and provides access to graphics \ -hardware (GPU) acceleration for video processing on Linux and UNIX \ -based operating systems. Accelerated processing includes video \ -decoding, video encoding, subpicture blending and rendering. The \ -specification was originally designed by Intel for its GMA (Graphics \ -Media Accelerator) series of GPU hardware, the API is however not \ -limited to GPUs or Intel specific hardware, as other hardware and \ -manufacturers can also freely use this API for hardware accelerated \ -video decoding." +require libva-${PV}.inc -HOMEPAGE = "https://01.org/linuxmedia/vaapi" -BUGTRACKER = "https://github.com/intel/libva/issues" - -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" - -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" -SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" - -UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" - -DEPENDS = "libdrm virtual/mesa" - -inherit meson pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "opengl" +DEPENDS += "virtual/mesa" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no,virtual/libx11 libxext libxfixes" -- 2.24.1 From zboszor at pr.hu Wed Feb 26 13:57:15 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Wed, 26 Feb 2020 14:57:15 +0100 Subject: [OE-core] [PATCH 4/5] mesa: Add PACKAGECONFIG knob to enable VDPAU state tracker and drivers In-Reply-To: <20200226135716.49255-1-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> Message-ID: <20200226135716.49255-4-zboszor@pr.hu> Signed-off-by: B?sz?rm?nyi Zolt?n --- meta/recipes-graphics/mesa/mesa.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 479d3223fa..800e8813c7 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -144,6 +144,8 @@ PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llv PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" +PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=true,-Dgallium-vdpau=false,libvdpau" + PACKAGECONFIG[lima] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" @@ -179,6 +181,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ libxatracker libxatracker-dev \ mesa-megadriver mesa-vulkan-drivers \ + mesa-vdpau-drivers \ " do_install_append () { @@ -256,6 +259,7 @@ PACKAGES_DYNAMIC += "^mesa-driver-.*" FILES_mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf" FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" +FILES_${PN}-vdpau-drivers = "${libdir}/vdpau/*.so.*" FILES_libegl-mesa = "${libdir}/libEGL.so.*" FILES_libgbm = "${libdir}/libgbm.so.*" FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" @@ -265,7 +269,7 @@ FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libxatracker = "${libdir}/libxatracker.so.*" -FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan" +FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdpau/*.so" FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" -- 2.24.1 From randy.macleod at windriver.com Wed Feb 26 14:10:26 2020 From: randy.macleod at windriver.com (Randy MacLeod) Date: Wed, 26 Feb 2020 09:10:26 -0500 Subject: [OE-core] [PATCH] util-linux: upgrade 2.34 -> 2.35 In-Reply-To: References: <1579631324-16775-1-git-send-email-pjtexier@koncepto.io> <20200122092837.GH34396@korppu> Message-ID: <3166a29d-cff4-93c4-760a-0795f19af04f@windriver.com> On 1/22/20 1:06 PM, Pierre-Jean Texier via Openembedded-core wrote: > Hi Mikko, > > Le 22/01/2020 ? 10:28, Mikko.Rapeli at bmw.de a ?crit?: >> Which parts of util-linux are now licensed with GPLv3? > > As said by Peter previously, it's only for hwclock. In fact > since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use > parse_date function ") so the version 2.30, > hwclock is linked with parse_date.y from gnullib. > And gnulib code is distributed with GPLv3 > > Regards It would be nice to get util-linux updated for 3.1. Pierre-Jean do you have time to address the GPLv3/hwclock licensing and re-submit (2.35.1?) this week? -- # Randy MacLeod # Wind River Linux From zboszor at pr.hu Wed Feb 26 13:57:14 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Wed, 26 Feb 2020 14:57:14 +0100 Subject: [OE-core] [PATCH 3/5] mesa: Add PACKAGECONFIG knob to enable VAAPI state tracker and drivers In-Reply-To: <20200226135716.49255-1-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> Message-ID: <20200226135716.49255-3-zboszor@pr.hu> Signed-off-by: B?sz?rm?nyi Zolt?n --- meta/recipes-graphics/mesa/mesa.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 87f167c507..479d3223fa 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -142,6 +142,7 @@ PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS}, -Dgallium-drivers PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" +PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" PACKAGECONFIG[lima] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" -- 2.24.1 From pbarker at konsulko.com Wed Feb 26 14:13:43 2020 From: pbarker at konsulko.com (Paul Barker) Date: Wed, 26 Feb 2020 14:13:43 +0000 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <20200226135716.49255-2-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: On Wed, 26 Feb 2020 at 14:04, B?sz?rm?nyi Zolt?n via Openembedded-core wrote: > > The package name exploits sstate.bbclass so it's not added as > implicit dependency to packages. > > Signed-off-by: B?sz?rm?nyi Zolt?n > --- > meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- > meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb > > diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc > index ca1386d80b..5b1cdee7e3 100644 > --- a/meta/recipes-graphics/libva/libva-2.6.1.inc > +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > @@ -17,10 +17,12 @@ SECTION = "x11" > LICENSE = "MIT" > LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > > -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" > +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" > SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > > +S = "${WORKDIR}/libva-${PV}" > + > UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > > DEPENDS = "libdrm" > diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > new file mode 100644 > index 0000000000..828ef6fbca > --- /dev/null > +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > @@ -0,0 +1,5 @@ > +require libva-${PV}.inc > + > +do_install_append () { > + rm -f ${D}${libdir}/*.so* > +} Can you avoid building libva in the -initial recipe and still get the headers and pkgconfig files? From zboszor at pr.hu Wed Feb 26 14:22:05 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 15:22:05 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: <9887b5bf-8f99-dd93-f34f-489be2431d31@pr.hu> 2020. 02. 26. 15:13 keltez?ssel, Paul Barker ?rta: > On Wed, 26 Feb 2020 at 14:04, B?sz?rm?nyi Zolt?n via Openembedded-core > wrote: >> >> The package name exploits sstate.bbclass so it's not added as >> implicit dependency to packages. >> >> Signed-off-by: B?sz?rm?nyi Zolt?n >> --- >> meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- >> meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ >> 2 files changed, 8 insertions(+), 1 deletion(-) >> create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> >> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc >> index ca1386d80b..5b1cdee7e3 100644 >> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >> @@ -17,10 +17,12 @@ SECTION = "x11" >> LICENSE = "MIT" >> LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >> >> -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" >> +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" >> SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >> SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >> >> +S = "${WORKDIR}/libva-${PV}" >> + >> UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >> >> DEPENDS = "libdrm" >> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> new file mode 100644 >> index 0000000000..828ef6fbca >> --- /dev/null >> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> @@ -0,0 +1,5 @@ >> +require libva-${PV}.inc >> + >> +do_install_append () { >> + rm -f ${D}${libdir}/*.so* >> +} > > Can you avoid building libva in the -initial recipe and still get the > headers and pkgconfig files? Not really, as "make install" would still build and install the libraries. I haven't found a set of "make -C ... install" commands to only install the headers and the pkgconfig files. I also wanted to avoid adding patches to keep the recipe minimal. From raj.khem at gmail.com Wed Feb 26 14:58:00 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 06:58:00 -0800 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <20200226135716.49255-2-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via Openembedded-core wrote: > > The package name exploits sstate.bbclass so it's not added as > implicit dependency to packages. > what is the use of this recipe and why should it be added to core ? > Signed-off-by: B?sz?rm?nyi Zolt?n > --- > meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- > meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb > > diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc > index ca1386d80b..5b1cdee7e3 100644 > --- a/meta/recipes-graphics/libva/libva-2.6.1.inc > +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > @@ -17,10 +17,12 @@ SECTION = "x11" > LICENSE = "MIT" > LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > > -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" > +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" > SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > > +S = "${WORKDIR}/libva-${PV}" > + > UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > > DEPENDS = "libdrm" > diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > new file mode 100644 > index 0000000000..828ef6fbca > --- /dev/null > +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > @@ -0,0 +1,5 @@ > +require libva-${PV}.inc > + > +do_install_append () { > + rm -f ${D}${libdir}/*.so* > +} > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From pjtexier at koncepto.io Wed Feb 26 14:58:43 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Wed, 26 Feb 2020 15:58:43 +0100 Subject: [OE-core] [PATCH] util-linux: upgrade 2.34 -> 2.35 In-Reply-To: <3166a29d-cff4-93c4-760a-0795f19af04f@windriver.com> References: <1579631324-16775-1-git-send-email-pjtexier@koncepto.io> <20200122092837.GH34396@korppu> <3166a29d-cff4-93c4-760a-0795f19af04f@windriver.com> Message-ID: <7212b6ab-17f1-2603-3f27-4847eed90d89@koncepto.io> Hello Randy, Le 26/02/2020 ? 15:10, Randy MacLeod a ?crit?: > > It would be nice to get util-linux updated for 3.1. > > Pierre-Jean do you have time to address the GPLv3/hwclock licensing > and re-submit (2.35.1?) this week? Sure, no problem, I will send a v2 with the 2.35.1 version with '--disable-hwclock-gplv3' enabled, option available since: https://github.com/karelzak/util-linux/commit/e8c21c894e69ba0c72ecf69e8297cb20ec5f9c1e Regards, -- Pierre-Jean Texier Embedded Linux Engineer https://koncepto.io From raj.khem at gmail.com Wed Feb 26 15:00:47 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 07:00:47 -0800 Subject: [OE-core] [RFC PATCH 5/5] mesa: Enforce TOOLCHAIN="gcc" In-Reply-To: <20200226135716.49255-5-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-5-zboszor@pr.hu> Message-ID: On Wed, Feb 26, 2020 at 6:08 AM B?sz?rm?nyi Zolt?n via Openembedded-core wrote: > > When meta-clang is used, for example to build chromium-x11 from > meta-browser, a linker error occurs in Zeus. > > See: https://gitlab.freedesktop.org/mesa/mesa/issues/2533 > > Signed-off-by: B?sz?rm?nyi Zolt?n > --- > meta/recipes-graphics/mesa/mesa.inc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc > index 800e8813c7..b8f09a2ed3 100644 > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -24,6 +24,8 @@ PROVIDES = " \ > virtual/mesa \ > " > > +TOOLCHAIN = "gcc" lets fix the linker error instead. > + > inherit meson pkgconfig python3native gettext features_check > > # Unset these to stop python trying to report the target Python setup > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From wenlin.kang at windriver.com Wed Feb 26 15:11:00 2020 From: wenlin.kang at windriver.com (Wenlin Kang) Date: Wed, 26 Feb 2020 23:11:00 +0800 Subject: [OE-core] [PATCH] libarchive: Fix CVE-2020-9308 Message-ID: <20200226151100.4723-1-wenlin.kang@windriver.com> Fix CVE-2020-9308 Signed-off-by: Wenlin Kang --- ...ct-files-that-declare-invalid-header.patch | 124 ++++++++++++++++++ .../libarchive/libarchive_3.4.1.bb | 4 +- 2 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch diff --git a/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch b/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch new file mode 100644 index 0000000000..c3e0af571e --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch @@ -0,0 +1,124 @@ +From 94821008d6eea81e315c5881cdf739202961040a Mon Sep 17 00:00:00 2001 +From: Grzegorz Antoniak +Date: Sun, 2 Feb 2020 08:04:41 +0100 +Subject: [PATCH] RAR5 reader: reject files that declare invalid header flags + +One of the fields in RAR5's base block structure is the size of the +header. Some invalid files declare a 0 header size setting, which can +confuse the unpacker. Minimum header size for RAR5 base blocks is 7 +bytes (4 bytes for CRC, and 3 bytes for the rest), so block size of 0 +bytes should be rejected at header parsing stage. + +The fix adds an error condition if header size of 0 bytes is detected. +In this case, the unpacker will not attempt to unpack the file, as the +header is corrupted. + +The commit also adds OSSFuzz #20459 sample to test further regressions +in this area. + +Upstream-Status: Backport[https://github.com/libarchive/libarchive/commit/94821008d6eea81e315c5881cdf739202961040a] +CVE-2020-9308 + +Signed-off-by: Wenlin Kang +--- + Makefile.am | 1 + + libarchive/archive_read_support_format_rar5.c | 17 +++++++++++++++-- + libarchive/test/test_read_format_rar5.c | 15 +++++++++++++++ + ...test_read_format_rar5_block_size_is_too_small.rar.uu | 8 ++++++++ + 4 files changed, 39 insertions(+), 2 deletions(-) + create mode 100644 libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu + +diff --git a/Makefile.am b/Makefile.am +index 06c2644..c65e243 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -877,6 +877,7 @@ libarchive_test_EXTRA_DIST=\ + libarchive/test/test_read_format_rar5_win32.rar.uu \ + libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu \ + libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu \ ++ libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu \ + libarchive/test/test_read_format_raw.bufr.uu \ + libarchive/test/test_read_format_raw.data.gz.uu \ + libarchive/test/test_read_format_raw.data.Z.uu \ +diff --git a/libarchive/archive_read_support_format_rar5.c b/libarchive/archive_read_support_format_rar5.c +index ff1d6f8..f7c163e 100644 +--- a/libarchive/archive_read_support_format_rar5.c ++++ b/libarchive/archive_read_support_format_rar5.c +@@ -2085,6 +2085,8 @@ static int scan_for_signature(struct archive_read* a); + static int process_base_block(struct archive_read* a, + struct archive_entry* entry) + { ++ const size_t SMALLEST_RAR5_BLOCK_SIZE = 3; ++ + struct rar5* rar = get_context(a); + uint32_t hdr_crc, computed_crc; + size_t raw_hdr_size = 0, hdr_size_len, hdr_size; +@@ -2114,15 +2116,26 @@ static int process_base_block(struct archive_read* a, + return ARCHIVE_EOF; + } + ++ hdr_size = raw_hdr_size + hdr_size_len; ++ + /* Sanity check, maximum header size for RAR5 is 2MB. */ +- if(raw_hdr_size > (2 * 1024 * 1024)) { ++ if(hdr_size > (2 * 1024 * 1024)) { + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Base block header is too large"); + + return ARCHIVE_FATAL; + } + +- hdr_size = raw_hdr_size + hdr_size_len; ++ /* Additional sanity checks to weed out invalid files. */ ++ if(raw_hdr_size == 0 || hdr_size_len == 0 || ++ hdr_size < SMALLEST_RAR5_BLOCK_SIZE) ++ { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, ++ "Too small block encountered (%ld bytes)", ++ raw_hdr_size); ++ ++ return ARCHIVE_FATAL; ++ } + + /* Read the whole header data into memory, maximum memory use here is + * 2MB. */ +diff --git a/libarchive/test/test_read_format_rar5.c b/libarchive/test/test_read_format_rar5.c +index bb94d4e..f91521e 100644 +--- a/libarchive/test/test_read_format_rar5.c ++++ b/libarchive/test/test_read_format_rar5.c +@@ -1256,3 +1256,18 @@ DEFINE_TEST(test_read_format_rar5_different_winsize_on_merge) + + EPILOGUE(); + } ++ ++DEFINE_TEST(test_read_format_rar5_block_size_is_too_small) ++{ ++ char buf[4096]; ++ PROLOGUE("test_read_format_rar5_block_size_is_too_small.rar"); ++ ++ /* This file is damaged, so those functions should return failure. ++ * Additionally, SIGSEGV shouldn't be raised during execution ++ * of those functions. */ ++ ++ assertA(archive_read_next_header(a, &ae) != ARCHIVE_OK); ++ assertA(archive_read_data(a, buf, sizeof(buf)) <= 0); ++ ++ EPILOGUE(); ++} +diff --git a/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu b/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu +new file mode 100644 +index 0000000..5cad219 +--- /dev/null ++++ b/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu +@@ -0,0 +1,8 @@ ++begin 644 test_read_format_rar5_block_size_is_too_small.rar ++M4F%R(1H'`0"-[P+2``+'(!P,("`@N`,!`B`@("`@("`@("`@("`@("#_("`@ ++M("`@("`@("`@((:Q;2!4-'-^4B`!((WO`M(``O\@$/\@-R`@("`@("`@("`@ ++M``X@("`@("`@____("`@("`@(/\@("`@("`@("`@("#_(+6U,2"UM;6UM[CU ++M)B`@*(0G(`!.`#D\3R``(/__(,+_````-0#_($&%*/HE=C+N`"```"```"`D ++J`)$#("#_("#__P`@__\@_R#_("`@("`@("#_("#__R`@(/__("#__R`" ++` ++end +-- +1.9.1 + diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb index 2d33dd80ab..91b0f58e8f 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb @@ -31,7 +31,9 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," EXTRA_OECONF += "--enable-largefile" -SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" +SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ + file://0001-RAR5-reader-reject-files-that-declare-invalid-header.patch \ + " SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" -- 2.17.1 From zboszor at pr.hu Wed Feb 26 15:12:24 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 16:12:24 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: > On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via > Openembedded-core wrote: >> >> The package name exploits sstate.bbclass so it's not added as >> implicit dependency to packages. >> > > what is the use of this recipe and why should it be added to core ? I should have added a cover letter, shouldn't I? See patch 3/5 in the series for enabling gallium-va in Mesa. > >> Signed-off-by: B?sz?rm?nyi Zolt?n >> --- >> meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- >> meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ >> 2 files changed, 8 insertions(+), 1 deletion(-) >> create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> >> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc >> index ca1386d80b..5b1cdee7e3 100644 >> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >> @@ -17,10 +17,12 @@ SECTION = "x11" >> LICENSE = "MIT" >> LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >> >> -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" >> +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" >> SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >> SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >> >> +S = "${WORKDIR}/libva-${PV}" >> + >> UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >> >> DEPENDS = "libdrm" >> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> new file mode 100644 >> index 0000000000..828ef6fbca >> --- /dev/null >> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> @@ -0,0 +1,5 @@ >> +require libva-${PV}.inc >> + >> +do_install_append () { >> + rm -f ${D}${libdir}/*.so* >> +} >> -- >> 2.24.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Wed Feb 26 15:13:46 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 07:13:46 -0800 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> Message-ID: On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n wrote: > > 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: > > On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via > > Openembedded-core wrote: > >> > >> The package name exploits sstate.bbclass so it's not added as > >> implicit dependency to packages. > >> > > > > what is the use of this recipe and why should it be added to core ? > > I should have added a cover letter, shouldn't I? > See patch 3/5 in the series for enabling gallium-va in Mesa. > recipe seems to build full libva, so why not just use that instead. > > > >> Signed-off-by: B?sz?rm?nyi Zolt?n > >> --- > >> meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- > >> meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ > >> 2 files changed, 8 insertions(+), 1 deletion(-) > >> create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >> > >> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc > >> index ca1386d80b..5b1cdee7e3 100644 > >> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc > >> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > >> @@ -17,10 +17,12 @@ SECTION = "x11" > >> LICENSE = "MIT" > >> LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > >> > >> -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" > >> +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" > >> SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > >> SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > >> > >> +S = "${WORKDIR}/libva-${PV}" > >> + > >> UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > >> > >> DEPENDS = "libdrm" > >> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >> new file mode 100644 > >> index 0000000000..828ef6fbca > >> --- /dev/null > >> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >> @@ -0,0 +1,5 @@ > >> +require libva-${PV}.inc > >> + > >> +do_install_append () { > >> + rm -f ${D}${libdir}/*.so* > >> +} > >> -- > >> 2.24.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > From zboszor at pr.hu Wed Feb 26 15:14:21 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 16:14:21 +0100 Subject: [OE-core] [RFC PATCH 5/5] mesa: Enforce TOOLCHAIN="gcc" In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-5-zboszor@pr.hu> Message-ID: <62608f92-9730-bbec-20cf-e0219a8d9ffb@pr.hu> 2020. 02. 26. 16:00 keltez?ssel, Khem Raj ?rta: > On Wed, Feb 26, 2020 at 6:08 AM B?sz?rm?nyi Zolt?n via > Openembedded-core wrote: >> >> When meta-clang is used, for example to build chromium-x11 from >> meta-browser, a linker error occurs in Zeus. >> >> See: https://gitlab.freedesktop.org/mesa/mesa/issues/2533 >> >> Signed-off-by: B?sz?rm?nyi Zolt?n >> --- >> meta/recipes-graphics/mesa/mesa.inc | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc >> index 800e8813c7..b8f09a2ed3 100644 >> --- a/meta/recipes-graphics/mesa/mesa.inc >> +++ b/meta/recipes-graphics/mesa/mesa.inc >> @@ -24,6 +24,8 @@ PROVIDES = " \ >> virtual/mesa \ >> " >> >> +TOOLCHAIN = "gcc" > > lets fix the linker error instead. The linker errors were similar to reports I found on some forums from a couple of years ago and they all pointed to RTTI needed to be enabled in LLVM/CLANG. But it didn't help. This is a good workaround until meta-clang is fixed to build Mesa. > >> + >> inherit meson pkgconfig python3native gettext features_check >> >> # Unset these to stop python trying to report the target Python setup >> -- >> 2.24.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Wed Feb 26 15:15:40 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 07:15:40 -0800 Subject: [OE-core] [RFC PATCH 5/5] mesa: Enforce TOOLCHAIN="gcc" In-Reply-To: <62608f92-9730-bbec-20cf-e0219a8d9ffb@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-5-zboszor@pr.hu> <62608f92-9730-bbec-20cf-e0219a8d9ffb@pr.hu> Message-ID: On Wed, Feb 26, 2020 at 7:14 AM B?sz?rm?nyi Zolt?n wrote: > > 2020. 02. 26. 16:00 keltez?ssel, Khem Raj ?rta: > > On Wed, Feb 26, 2020 at 6:08 AM B?sz?rm?nyi Zolt?n via > > Openembedded-core wrote: > >> > >> When meta-clang is used, for example to build chromium-x11 from > >> meta-browser, a linker error occurs in Zeus. > >> > >> See: https://gitlab.freedesktop.org/mesa/mesa/issues/2533 > >> > >> Signed-off-by: B?sz?rm?nyi Zolt?n > >> --- > >> meta/recipes-graphics/mesa/mesa.inc | 2 ++ > >> 1 file changed, 2 insertions(+) > >> > >> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc > >> index 800e8813c7..b8f09a2ed3 100644 > >> --- a/meta/recipes-graphics/mesa/mesa.inc > >> +++ b/meta/recipes-graphics/mesa/mesa.inc > >> @@ -24,6 +24,8 @@ PROVIDES = " \ > >> virtual/mesa \ > >> " > >> > >> +TOOLCHAIN = "gcc" > > > > lets fix the linker error instead. > > The linker errors were similar to reports I found on some forums > from a couple of years ago and they all pointed to RTTI needed > to be enabled in LLVM/CLANG. But it didn't help. > > This is a good workaround until meta-clang is fixed to build Mesa. > workaround is needed to be applied in meta-clang not in core > > > >> + > >> inherit meson pkgconfig python3native gettext features_check > >> > >> # Unset these to stop python trying to report the target Python setup > >> -- > >> 2.24.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > From zboszor at pr.hu Wed Feb 26 15:20:34 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 16:20:34 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> Message-ID: <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: > On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n wrote: >> >> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>> Openembedded-core wrote: >>>> >>>> The package name exploits sstate.bbclass so it's not added as >>>> implicit dependency to packages. >>>> >>> >>> what is the use of this recipe and why should it be added to core ? >> >> I should have added a cover letter, shouldn't I? >> See patch 3/5 in the series for enabling gallium-va in Mesa. >> > > recipe seems to build full libva, so why not just use that instead. You don't seem to be reading mails from openembedded-devel that you were cc-ed on. http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html > >>> >>>> Signed-off-by: B?sz?rm?nyi Zolt?n >>>> --- >>>> meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- >>>> meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ >>>> 2 files changed, 8 insertions(+), 1 deletion(-) >>>> create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>> >>>> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>> index ca1386d80b..5b1cdee7e3 100644 >>>> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>> @@ -17,10 +17,12 @@ SECTION = "x11" >>>> LICENSE = "MIT" >>>> LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >>>> >>>> -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" >>>> +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" >>>> SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >>>> SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >>>> >>>> +S = "${WORKDIR}/libva-${PV}" >>>> + >>>> UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >>>> >>>> DEPENDS = "libdrm" >>>> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>> new file mode 100644 >>>> index 0000000000..828ef6fbca >>>> --- /dev/null >>>> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>> @@ -0,0 +1,5 @@ >>>> +require libva-${PV}.inc >>>> + >>>> +do_install_append () { >>>> + rm -f ${D}${libdir}/*.so* >>>> +} >>>> -- >>>> 2.24.1 >>>> >>>> -- >>>> _______________________________________________ >>>> Openembedded-core mailing list >>>> Openembedded-core at lists.openembedded.org >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> From git at andred.net Wed Feb 26 15:26:06 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Wed, 26 Feb 2020 15:26:06 +0000 Subject: [OE-core] xz threads / memlimit behaviour (was: Re: [PATCH v2] bitbake.conf: omit XZ threads and RAM from sstate signatures) In-Reply-To: <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> References: <20200224125955.26771-1-git@andred.net> <20200224134022.GB27036@localhost> <669ba509f1df86a8f2c7ea172aa8ff23d7449744.camel@linuxfoundation.org> Message-ID: <0d393be75384a6d858d2a23f73ee5b3535d3868c.camel@andred.net> On Mon, 2020-02-24 at 16:44 +0000, Richard Purdie wrote: > On Mon, 2020-02-24 at 15:40 +0200, Adrian Bunk wrote: > > On Mon, Feb 24, 2020 at 12:59:55PM +0000, Andr? Draszik wrote: > > > The number of threads used, and the amount of memory allowed > > > to be used, should not affect sstate signatures, as they > > > don't affect the result. > > > > Unfortunately they can affect the result. > > I looked into this a bit and its complicated. The threads are used to > compress chunks and their compression should be deterministic whether > done serially or in parallel. > > I did some tests and: > > xz > gave equivalent output to: > xz --threads=1 > > and > > xz --threads=2 > xz --threads=5 > xz --threads=50 > > all give different identical output. > > So if we force --threads >=2 we should have determinism? I did another test... Even single threaded compression gives the same result as multi-threaded, if single threaded is a result of xz scaling down the memory usage due to --memlimit, ie: xz -f -c -9 --threads=2 --memlimit=2000M --keep --verbose --verbose xztest > xztest2_down_to_1.xz xz: Filter chain: --lzma2=dict=64MiB,lc=3,lp=0,pb=2,mode=normal,nice=64,mf=bt4,depth=0 xz: Using up to 2 threads. xz: 2499 MiB of memory is required. The limit is 2000 MiB. xz: Decompression will need 65 MiB of memory. xz: Adjusted the number of threads from 2 to 1 to not exceed the memory usage limit of 2000 MiB is different from xz -f -c -9 --threads=1 --memlimit=2000M --verbose --verbose xztest > xztest1.xz xz: Filter chain: --lzma2=dict=64MiB,lc=3,lp=0,pb=2,mode=normal,nice=64,mf=bt4,depth=0 xz: 674 MiB of memory is required. The limit is 2000 MiB. xz: Decompression will need 65 MiB of memory. There even is a comment in the xz sources about this. This simplifies things a bit... > > > Otherwise, it becomes impossible to re-use sstate from > > > automated builders on developer's machines (as the former > > > might execute bitbake with certain constraints different > > > compared to developer's machines). > > > ... > > > -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" > > > ... > > > > Threaded compression can result in slightly worse compression > > than single-threaded compression. > > > > With memlimit the problem is actually the opposite way, > > and worse than what you were trying to fix: > > > > When a developer hits memlimit during compression, the documented > > behavour of xz is to scale down the compression level. This is not what is actually happening - it appears the documentation only talks about single-threaded mode. If you look at the code and look at command output, xz only ever tries to reduce the number of threads if multi-threading was enabled. In that case, it will *never* even attempt to change the compression level. If it can't satisfy the memory limit by reducing the number of threads, it just errors out. So as long as all builders have at least 2 cores, i.e. --threads >= 2, memlimit doesn't ever affect the outcome (except that it can make the operation fail as a whole). Cheers, Andre' From zboszor at pr.hu Wed Feb 26 15:26:02 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 16:26:02 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> Message-ID: <8d85c619-ce7c-c08a-dbff-0577ab36f2b7@pr.hu> 2020. 02. 26. 16:20 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: > 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n wrote: >>> >>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>> Openembedded-core wrote: >>>>> >>>>> The package name exploits sstate.bbclass so it's not added as >>>>> implicit dependency to packages. >>>>> >>>> >>>> what is the use of this recipe and why should it be added to core ? >>> >>> I should have added a cover letter, shouldn't I? >>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>> >> >> recipe seems to build full libva, so why not just use that instead. > > You don't seem to be reading mails from openembedded-devel that > you were cc-ed on. > http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html TL;DR: Making mesa depend on libva would introduce a circular dependency. > >> >>>> >>>>> Signed-off-by: B?sz?rm?nyi Zolt?n >>>>> --- >>>>> ?? meta/recipes-graphics/libva/libva-2.6.1.inc??????? | 4 +++- >>>>> ?? meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ >>>>> ?? 2 files changed, 8 insertions(+), 1 deletion(-) >>>>> ?? create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>> >>>>> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>> b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>> index ca1386d80b..5b1cdee7e3 100644 >>>>> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>> @@ -17,10 +17,12 @@ SECTION = "x11" >>>>> ?? LICENSE = "MIT" >>>>> ?? LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >>>>> >>>>> -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" >>>>> +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" >>>>> ?? SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >>>>> ?? SRC_URI[sha256sum] = >>>>> "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >>>>> >>>>> +S = "${WORKDIR}/libva-${PV}" >>>>> + >>>>> ?? UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >>>>> >>>>> ?? DEPENDS = "libdrm" >>>>> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>> b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>> new file mode 100644 >>>>> index 0000000000..828ef6fbca >>>>> --- /dev/null >>>>> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>> @@ -0,0 +1,5 @@ >>>>> +require libva-${PV}.inc >>>>> + >>>>> +do_install_append () { >>>>> +?????? rm -f ${D}${libdir}/*.so* >>>>> +} >>>>> -- >>>>> 2.24.1 >>>>> >>>>> -- >>>>> _______________________________________________ >>>>> Openembedded-core mailing list >>>>> Openembedded-core at lists.openembedded.org >>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> > From raj.khem at gmail.com Wed Feb 26 15:30:18 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 07:30:18 -0800 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> Message-ID: On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n wrote: > > 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: > > On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n wrote: > >> > >> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: > >>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via > >>> Openembedded-core wrote: > >>>> > >>>> The package name exploits sstate.bbclass so it's not added as > >>>> implicit dependency to packages. > >>>> > >>> > >>> what is the use of this recipe and why should it be added to core ? > >> > >> I should have added a cover letter, shouldn't I? > >> See patch 3/5 in the series for enabling gallium-va in Mesa. > >> > > > > recipe seems to build full libva, so why not just use that instead. > > You don't seem to be reading mails from openembedded-devel that > you were cc-ed on. don't assume things > http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html > I am trying to make us thing if -dev package can be used somehow to avoid this or have we exhausted all possibilities. > > > >>> > >>>> Signed-off-by: B?sz?rm?nyi Zolt?n > >>>> --- > >>>> meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- > >>>> meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ > >>>> 2 files changed, 8 insertions(+), 1 deletion(-) > >>>> create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >>>> > >>>> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc > >>>> index ca1386d80b..5b1cdee7e3 100644 > >>>> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc > >>>> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > >>>> @@ -17,10 +17,12 @@ SECTION = "x11" > >>>> LICENSE = "MIT" > >>>> LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > >>>> > >>>> -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" > >>>> +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" > >>>> SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > >>>> SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > >>>> > >>>> +S = "${WORKDIR}/libva-${PV}" > >>>> + > >>>> UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > >>>> > >>>> DEPENDS = "libdrm" > >>>> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >>>> new file mode 100644 > >>>> index 0000000000..828ef6fbca > >>>> --- /dev/null > >>>> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >>>> @@ -0,0 +1,5 @@ > >>>> +require libva-${PV}.inc > >>>> + > >>>> +do_install_append () { > >>>> + rm -f ${D}${libdir}/*.so* > >>>> +} > >>>> -- > >>>> 2.24.1 > >>>> > >>>> -- > >>>> _______________________________________________ > >>>> Openembedded-core mailing list > >>>> Openembedded-core at lists.openembedded.org > >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core > >> > From patchwork at patchwork.openembedded.org Wed Feb 26 15:32:30 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Wed, 26 Feb 2020 15:32:30 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_libarchive?= =?utf-8?q?=3A_Fix_CVE-2020-9308?= In-Reply-To: <20200226151100.4723-1-wenlin.kang@windriver.com> References: <20200226151100.4723-1-wenlin.kang@windriver.com> Message-ID: <20200226153230.2277.96201@do> == Series Details == Series: libarchive: Fix CVE-2020-9308 Revision: 1 URL : https://patchwork.openembedded.org/series/22958/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch libarchive: Fix CVE-2020-9308 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX" If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From zboszor at pr.hu Wed Feb 26 15:58:49 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 16:58:49 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> Message-ID: <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> 2020. 02. 26. 16:30 keltez?ssel, Khem Raj ?rta: > On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n wrote: >> >> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >>> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n wrote: >>>> >>>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>>> Openembedded-core wrote: >>>>>> >>>>>> The package name exploits sstate.bbclass so it's not added as >>>>>> implicit dependency to packages. >>>>>> >>>>> >>>>> what is the use of this recipe and why should it be added to core ? >>>> >>>> I should have added a cover letter, shouldn't I? >>>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>>> >>> >>> recipe seems to build full libva, so why not just use that instead. >> >> You don't seem to be reading mails from openembedded-devel that >> you were cc-ed on. > > don't assume things Understood. >> http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html >> > > I am trying to make us thing if -dev package can be used somehow to avoid this > or have we exhausted all possibilities. Why is it a problem to exploit sstate.bbclass internals implicitly by using a *-initial package name for an arbitrary package? Surely it's not reserved for libgcc-initial and friends. It solves two problems nicely in one go: 1. by using a different package than libva, the libva-vs-mesa circular dependency is avoided. mesa needs a crippled libva (pkgconfig + headers) to build its VAAPI state tracker and the VAAPI drivers 2. by using libva-initial as the package name, the per-recipe sysroot issue is avoided where prepare-sysroot for a 3rd package like intel-vaapi-driver would fail because the real libva the crippled variant would install identical files > >>> >>>>> >>>>>> Signed-off-by: B?sz?rm?nyi Zolt?n >>>>>> --- >>>>>> meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- >>>>>> meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ >>>>>> 2 files changed, 8 insertions(+), 1 deletion(-) >>>>>> create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>> >>>>>> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>> index ca1386d80b..5b1cdee7e3 100644 >>>>>> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>> @@ -17,10 +17,12 @@ SECTION = "x11" >>>>>> LICENSE = "MIT" >>>>>> LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >>>>>> >>>>>> -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" >>>>>> +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" >>>>>> SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >>>>>> SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >>>>>> >>>>>> +S = "${WORKDIR}/libva-${PV}" >>>>>> + >>>>>> UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >>>>>> >>>>>> DEPENDS = "libdrm" >>>>>> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>> new file mode 100644 >>>>>> index 0000000000..828ef6fbca >>>>>> --- /dev/null >>>>>> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>> @@ -0,0 +1,5 @@ >>>>>> +require libva-${PV}.inc >>>>>> + >>>>>> +do_install_append () { >>>>>> + rm -f ${D}${libdir}/*.so* >>>>>> +} >>>>>> -- >>>>>> 2.24.1 >>>>>> >>>>>> -- >>>>>> _______________________________________________ >>>>>> Openembedded-core mailing list >>>>>> Openembedded-core at lists.openembedded.org >>>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>>> >> From zboszor at pr.hu Wed Feb 26 16:02:16 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 17:02:16 +0100 Subject: [OE-core] [RFC PATCH 5/5] mesa: Enforce TOOLCHAIN="gcc" In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-5-zboszor@pr.hu> <62608f92-9730-bbec-20cf-e0219a8d9ffb@pr.hu> Message-ID: <28afef34-49f2-d85a-6a23-dd841c0f81a0@pr.hu> 2020. 02. 26. 16:15 keltez?ssel, Khem Raj ?rta: > On Wed, Feb 26, 2020 at 7:14 AM B?sz?rm?nyi Zolt?n wrote: >> >> 2020. 02. 26. 16:00 keltez?ssel, Khem Raj ?rta: >>> On Wed, Feb 26, 2020 at 6:08 AM B?sz?rm?nyi Zolt?n via >>> Openembedded-core wrote: >>>> >>>> When meta-clang is used, for example to build chromium-x11 from >>>> meta-browser, a linker error occurs in Zeus. >>>> >>>> See: https://gitlab.freedesktop.org/mesa/mesa/issues/2533 >>>> >>>> Signed-off-by: B?sz?rm?nyi Zolt?n >>>> --- >>>> meta/recipes-graphics/mesa/mesa.inc | 2 ++ >>>> 1 file changed, 2 insertions(+) >>>> >>>> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc >>>> index 800e8813c7..b8f09a2ed3 100644 >>>> --- a/meta/recipes-graphics/mesa/mesa.inc >>>> +++ b/meta/recipes-graphics/mesa/mesa.inc >>>> @@ -24,6 +24,8 @@ PROVIDES = " \ >>>> virtual/mesa \ >>>> " >>>> >>>> +TOOLCHAIN = "gcc" >>> >>> lets fix the linker error instead. >> >> The linker errors were similar to reports I found on some forums >> from a couple of years ago and they all pointed to RTTI needed >> to be enabled in LLVM/CLANG. But it didn't help. >> >> This is a good workaround until meta-clang is fixed to build Mesa. >> > > workaround is needed to be applied in meta-clang not in core This is why this patch has RFC in the title. I'll send another patch against meta-clang. > >>> >>>> + >>>> inherit meson pkgconfig python3native gettext features_check >>>> >>>> # Unset these to stop python trying to report the target Python setup >>>> -- >>>> 2.24.1 >>>> >>>> -- >>>> _______________________________________________ >>>> Openembedded-core mailing list >>>> Openembedded-core at lists.openembedded.org >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> From alex.kanavin at gmail.com Wed Feb 26 16:08:10 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 26 Feb 2020 17:08:10 +0100 Subject: [OE-core] [PATCH 1/5] libva: Split out the base parts into an include file In-Reply-To: <20200226135716.49255-1-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> Message-ID: Don't version the .inc please, this will break automated version updates. Alex On Wed, 26 Feb 2020 at 15:08, B?sz?rm?nyi Zolt?n via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > Signed-off-by: B?sz?rm?nyi Zolt?n > --- > meta/recipes-graphics/libva/libva-2.6.1.inc | 30 ++++++++++++++++++++ > meta/recipes-graphics/libva/libva_2.6.1.bb | 31 ++------------------- > 2 files changed, 32 insertions(+), 29 deletions(-) > create mode 100644 meta/recipes-graphics/libva/libva-2.6.1.inc > > diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc > b/meta/recipes-graphics/libva/libva-2.6.1.inc > new file mode 100644 > index 0000000000..ca1386d80b > --- /dev/null > +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > @@ -0,0 +1,30 @@ > +SUMMARY = "Video Acceleration (VA) API for Linux" > +DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \ > +and API specification which enables and provides access to graphics \ > +hardware (GPU) acceleration for video processing on Linux and UNIX \ > +based operating systems. Accelerated processing includes video \ > +decoding, video encoding, subpicture blending and rendering. The \ > +specification was originally designed by Intel for its GMA (Graphics \ > +Media Accelerator) series of GPU hardware, the API is however not \ > +limited to GPUs or Intel specific hardware, as other hardware and \ > +manufacturers can also freely use this API for hardware accelerated \ > +video decoding." > + > +HOMEPAGE = "https://01.org/linuxmedia/vaapi" > +BUGTRACKER = "https://github.com/intel/libva/issues" > + > +SECTION = "x11" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > + > +SRC_URI = " > https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" > +SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > +SRC_URI[sha256sum] = > "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > + > +UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > + > +DEPENDS = "libdrm" > + > +inherit meson pkgconfig features_check > + > +REQUIRED_DISTRO_FEATURES = "opengl" > diff --git a/meta/recipes-graphics/libva/libva_2.6.1.bb > b/meta/recipes-graphics/libva/libva_2.6.1.bb > index 92cea83bc1..af4c1c98ab 100644 > --- a/meta/recipes-graphics/libva/libva_2.6.1.bb > +++ b/meta/recipes-graphics/libva/libva_2.6.1.bb > @@ -1,33 +1,6 @@ > -SUMMARY = "Video Acceleration (VA) API for Linux" > -DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \ > -and API specification which enables and provides access to graphics \ > -hardware (GPU) acceleration for video processing on Linux and UNIX \ > -based operating systems. Accelerated processing includes video \ > -decoding, video encoding, subpicture blending and rendering. The \ > -specification was originally designed by Intel for its GMA (Graphics \ > -Media Accelerator) series of GPU hardware, the API is however not \ > -limited to GPUs or Intel specific hardware, as other hardware and \ > -manufacturers can also freely use this API for hardware accelerated \ > -video decoding." > +require libva-${PV}.inc > > -HOMEPAGE = "https://01.org/linuxmedia/vaapi" > -BUGTRACKER = "https://github.com/intel/libva/issues" > - > -SECTION = "x11" > -LICENSE = "MIT" > -LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > - > -SRC_URI = " > https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" > -SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > -SRC_URI[sha256sum] = > "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > - > -UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > - > -DEPENDS = "libdrm virtual/mesa" > - > -inherit meson pkgconfig features_check > - > -REQUIRED_DISTRO_FEATURES = "opengl" > +DEPENDS += "virtual/mesa" > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', > d)}" > PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no,virtual/libx11 > libxext libxfixes" > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Wed Feb 26 16:12:54 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 26 Feb 2020 17:12:54 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <20200226135716.49255-2-zboszor@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: The 'circular dependency' thing must be explained in the commits, and not in a discussion link to some email elsewhere. I still don't get why this is needed. The -initial recipe is identical to the eventual 'real' recipe, so where is the circularity coming from? Alex On Wed, 26 Feb 2020 at 15:05, B?sz?rm?nyi Zolt?n via Openembedded-core < openembedded-core at lists.openembedded.org> wrote: > The package name exploits sstate.bbclass so it's not added as > implicit dependency to packages. > > Signed-off-by: B?sz?rm?nyi Zolt?n > --- > meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- > meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb > > diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc > b/meta/recipes-graphics/libva/libva-2.6.1.inc > index ca1386d80b..5b1cdee7e3 100644 > --- a/meta/recipes-graphics/libva/libva-2.6.1.inc > +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > @@ -17,10 +17,12 @@ SECTION = "x11" > LICENSE = "MIT" > LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > > -SRC_URI = " > https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" > +SRC_URI = " > https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 > " > SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > SRC_URI[sha256sum] = > "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > > +S = "${WORKDIR}/libva-${PV}" > + > UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > > DEPENDS = "libdrm" > diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > new file mode 100644 > index 0000000000..828ef6fbca > --- /dev/null > +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > @@ -0,0 +1,5 @@ > +require libva-${PV}.inc > + > +do_install_append () { > + rm -f ${D}${libdir}/*.so* > +} > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From zboszor at pr.hu Wed Feb 26 16:35:02 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 17:35:02 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: 2020. 02. 26. 17:12 keltez?ssel, Alexander Kanavin ?rta: > The 'circular dependency' thing must be explained in the commits, and not in a discussion > link to some email elsewhere. > > I still don't get why this is needed. The -initial recipe is identical to the eventual > 'real' recipe, so where is the circularity coming from? libva -> mesa -> libva > > Alex > > On Wed, 26 Feb 2020 at 15:05, B?sz?rm?nyi Zolt?n via Openembedded-core > > wrote: > > The package name exploits sstate.bbclass so it's not added as > implicit dependency to packages. > > Signed-off-by: B?sz?rm?nyi Zolt?n > > --- > ?meta/recipes-graphics/libva/libva-2.6.1.inc? ? ? ? | 4 +++- > ?meta/recipes-graphics/libva/libva-initial_2.6.1.bb | > 5 +++++ > ?2 files changed, 8 insertions(+), 1 deletion(-) > ?create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb > > > diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc > b/meta/recipes-graphics/libva/libva-2.6.1.inc > index ca1386d80b..5b1cdee7e3 100644 > --- a/meta/recipes-graphics/libva/libva-2.6.1.inc > +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > @@ -17,10 +17,12 @@ SECTION = "x11" > ?LICENSE = "MIT" > ?LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > > -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2 > " > +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 > " > ?SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > ?SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > > +S = "${WORKDIR}/libva-${PV}" > + > ?UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > > ?DEPENDS = "libdrm" > diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > > new file mode 100644 > index 0000000000..828ef6fbca > --- /dev/null > +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > @@ -0,0 +1,5 @@ > +require libva-${PV}.inc > + > +do_install_append () { > +? ? ? ?rm -f ${D}${libdir}/*.so* > +} > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > From zboszor at pr.hu Wed Feb 26 16:37:13 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 17:37:13 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: 2020. 02. 26. 17:35 keltez?ssel, B?sz?rm?nyi Zolt?n via Openembedded-core ?rta: > 2020. 02. 26. 17:12 keltez?ssel, Alexander Kanavin ?rta: >> The 'circular dependency' thing must be explained in the commits, and not in a >> discussion link to some email elsewhere. >> >> I still don't get why this is needed. The -initial recipe is identical to the eventual >> 'real' recipe, so where is the circularity coming from? > > libva -> mesa -> libva And the -initial recipe is NOT identical to the real one. The real one always had DEPENDS = "virtual/mesa" > >> >> Alex >> >> On Wed, 26 Feb 2020 at 15:05, B?sz?rm?nyi Zolt?n via Openembedded-core >> > > wrote: >> >> ??? The package name exploits sstate.bbclass so it's not added as >> ??? implicit dependency to packages. >> >> ??? Signed-off-by: B?sz?rm?nyi Zolt?n > >> ??? --- >> ???? ?meta/recipes-graphics/libva/libva-2.6.1.inc? ? ? ? | 4 +++- >> ???? ?meta/recipes-graphics/libva/libva-initial_2.6.1.bb | >> ??? 5 +++++ >> ???? ?2 files changed, 8 insertions(+), 1 deletion(-) >> ???? ?create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> ??? >> >> ??? diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc >> ??? b/meta/recipes-graphics/libva/libva-2.6.1.inc >> ??? index ca1386d80b..5b1cdee7e3 100644 >> ??? --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >> ??? +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >> ??? @@ -17,10 +17,12 @@ SECTION = "x11" >> ???? ?LICENSE = "MIT" >> ???? ?LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >> >> ??? -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2 >> ??? " >> ??? +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 >> ??? " >> ???? ?SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >> ???? ?SRC_URI[sha256sum] = >> "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >> >> ??? +S = "${WORKDIR}/libva-${PV}" >> ??? + >> ???? ?UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >> >> ???? ?DEPENDS = "libdrm" >> ??? diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> ??? b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> ??? >> ??? new file mode 100644 >> ??? index 0000000000..828ef6fbca >> ??? --- /dev/null >> ??? +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >> >> ??? @@ -0,0 +1,5 @@ >> ??? +require libva-${PV}.inc >> ??? + >> ??? +do_install_append () { >> ??? +? ? ? ?rm -f ${D}${libdir}/*.so* >> ??? +} >> ??? -- ??? 2.24.1 >> >> ??? -- ??? _______________________________________________ >> ??? Openembedded-core mailing list >> ??? Openembedded-core at lists.openembedded.org >> >> ??? http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > From raj.khem at gmail.com Wed Feb 26 16:51:00 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 08:51:00 -0800 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> Message-ID: <3a2f7872-9f55-f27a-3db9-66aa2fc786f5@gmail.com> On 2/26/20 7:58 AM, B?sz?rm?nyi Zolt?n wrote: > 2020. 02. 26. 16:30 keltez?ssel, Khem Raj ?rta: >> On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n wrote: >>> >>> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >>>> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n >>>> wrote: >>>>> >>>>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>>>> Openembedded-core wrote: >>>>>>> >>>>>>> The package name exploits sstate.bbclass so it's not added as >>>>>>> implicit dependency to packages. >>>>>>> >>>>>> >>>>>> what is the use of this recipe and why should it be added to core ? >>>>> >>>>> I should have added a cover letter, shouldn't I? >>>>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>>>> >>>> >>>> recipe seems to build full libva, so why not just use that instead. >>> >>> You don't seem to be reading mails from openembedded-devel that >>> you were cc-ed on. >> >> don't assume things > > Understood. > >>> http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html >>> >>> >> >> I am trying to make us thing if -dev package can be used somehow to >> avoid this >> or have we exhausted all possibilities. > > Why is it a problem to exploit sstate.bbclass internals implicitly > by using a *-initial package name for an arbitrary package? it is not a problem, however, it is a work to keep such setup going and also it has to be considered always in dependencies etc. > Surely it's not reserved for libgcc-initial and friends. > they are different usecases, libgcc-initial is a veneer/trampoline used to bootstrap toolchain, and that too we want to remove at every opportunity we get, we use to have lot of initial recipes and they are very few left, so we have to be mindful of adding another one. > It solves two problems nicely in one go: > 1. by using a different package than libva, the libva-vs-mesa > ?? circular dependency is avoided. mesa needs a crippled libva > (pkgconfig + headers) > ?? to build its VAAPI state tracker and the VAAPI drivers I see archlinux using full libva for this. how are other distros doing it? is this problem unique to OE > 2. by using libva-initial as the package name, the per-recipe sysroot issue > ?? is avoided where prepare-sysroot for a 3rd package like > intel-vaapi-driver > ?? would fail because the real libva the crippled variant would install > ?? identical files > right, this is the problem I am afraid of creating almost duplicate packages >> >>>> >>>>>> >>>>>>> Signed-off-by: B?sz?rm?nyi Zolt?n >>>>>>> --- >>>>>>> ??? meta/recipes-graphics/libva/libva-2.6.1.inc??????? | 4 +++- >>>>>>> ??? meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ >>>>>>> ??? 2 files changed, 8 insertions(+), 1 deletion(-) >>>>>>> ??? create mode 100644 >>>>>>> meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>> >>>>>>> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>> b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>> index ca1386d80b..5b1cdee7e3 100644 >>>>>>> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>> @@ -17,10 +17,12 @@ SECTION = "x11" >>>>>>> ??? LICENSE = "MIT" >>>>>>> ??? LIC_FILES_CHKSUM = >>>>>>> "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >>>>>>> >>>>>>> -SRC_URI = >>>>>>> "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" >>>>>>> >>>>>>> +SRC_URI = >>>>>>> "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" >>>>>>> >>>>>>> ??? SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >>>>>>> ??? SRC_URI[sha256sum] = >>>>>>> "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >>>>>>> >>>>>>> +S = "${WORKDIR}/libva-${PV}" >>>>>>> + >>>>>>> ??? UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >>>>>>> >>>>>>> ??? DEPENDS = "libdrm" >>>>>>> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>> b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>> new file mode 100644 >>>>>>> index 0000000000..828ef6fbca >>>>>>> --- /dev/null >>>>>>> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>> @@ -0,0 +1,5 @@ >>>>>>> +require libva-${PV}.inc >>>>>>> + >>>>>>> +do_install_append () { >>>>>>> +?????? rm -f ${D}${libdir}/*.so* >>>>>>> +} >>>>>>> -- >>>>>>> 2.24.1 >>>>>>> >>>>>>> -- >>>>>>> _______________________________________________ >>>>>>> Openembedded-core mailing list >>>>>>> Openembedded-core at lists.openembedded.org >>>>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>>>> >>> > From zboszor at pr.hu Wed Feb 26 17:08:28 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 18:08:28 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <3a2f7872-9f55-f27a-3db9-66aa2fc786f5@gmail.com> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> <3a2f7872-9f55-f27a-3db9-66aa2fc786f5@gmail.com> Message-ID: 2020. 02. 26. 17:51 keltez?ssel, Khem Raj ?rta: > > > On 2/26/20 7:58 AM, B?sz?rm?nyi Zolt?n wrote: >> 2020. 02. 26. 16:30 keltez?ssel, Khem Raj ?rta: >>> On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n wrote: >>>> >>>> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >>>>> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n >>>>> wrote: >>>>>> >>>>>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>>>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>>>>> Openembedded-core wrote: >>>>>>>> >>>>>>>> The package name exploits sstate.bbclass so it's not added as >>>>>>>> implicit dependency to packages. >>>>>>>> >>>>>>> >>>>>>> what is the use of this recipe and why should it be added to core ? >>>>>> >>>>>> I should have added a cover letter, shouldn't I? >>>>>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>>>>> >>>>> >>>>> recipe seems to build full libva, so why not just use that instead. >>>> >>>> You don't seem to be reading mails from openembedded-devel that >>>> you were cc-ed on. >>> >>> don't assume things >> >> Understood. >> >>>> http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html >>>> >>>> >>> >>> I am trying to make us thing if -dev package can be used somehow to >>> avoid this >>> or have we exhausted all possibilities. >> >> Why is it a problem to exploit sstate.bbclass internals implicitly >> by using a *-initial package name for an arbitrary package? > > it is not a problem, however, it is a work to keep such setup going and > also it has to be considered always in dependencies etc. > >> Surely it's not reserved for libgcc-initial and friends. >> > > they are different usecases, libgcc-initial is a veneer/trampoline used > to bootstrap toolchain, and that too we want to remove at every > opportunity we get, we use to have lot of initial recipes and they are > very few left, so we have to be mindful of adding another one. > >> It solves two problems nicely in one go: >> 1. by using a different package than libva, the libva-vs-mesa >> ?? circular dependency is avoided. mesa needs a crippled libva >> (pkgconfig + headers) >> ?? to build its VAAPI state tracker and the VAAPI drivers > > I see archlinux using full libva for this. how are other distros doing > it? is this problem unique to OE Fedora also uses the full libva. However, the chicken-and-egg circular dependency is broken by history for these distros. Koji and Mock build one package at a time with all their dependencies already available from the staging package repository and the results will be eventually uploaded to the same repository. Bitbake doesn't have have this loophole to download pre-built dependencies. > >> 2. by using libva-initial as the package name, the per-recipe sysroot issue >> ?? is avoided where prepare-sysroot for a 3rd package like >> intel-vaapi-driver >> ?? would fail because the real libva the crippled variant would install >> ?? identical files >> > > right, this is the problem I am afraid of creating almost duplicate packages > >>> >>>>> >>>>>>> >>>>>>>> Signed-off-by: B?sz?rm?nyi Zolt?n >>>>>>>> --- >>>>>>>> ??? meta/recipes-graphics/libva/libva-2.6.1.inc??????? | 4 +++- >>>>>>>> ??? meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ >>>>>>>> ??? 2 files changed, 8 insertions(+), 1 deletion(-) >>>>>>>> ??? create mode 100644 >>>>>>>> meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>>> >>>>>>>> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>>> b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>>> index ca1386d80b..5b1cdee7e3 100644 >>>>>>>> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>>> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>>> @@ -17,10 +17,12 @@ SECTION = "x11" >>>>>>>> ??? LICENSE = "MIT" >>>>>>>> ??? LIC_FILES_CHKSUM = >>>>>>>> "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >>>>>>>> >>>>>>>> -SRC_URI = >>>>>>>> "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" >>>>>>>> >>>>>>>> +SRC_URI = >>>>>>>> "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" >>>>>>>> >>>>>>>> ??? SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >>>>>>>> ??? SRC_URI[sha256sum] = >>>>>>>> "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >>>>>>>> >>>>>>>> +S = "${WORKDIR}/libva-${PV}" >>>>>>>> + >>>>>>>> ??? UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >>>>>>>> >>>>>>>> ??? DEPENDS = "libdrm" >>>>>>>> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>>> b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>>> new file mode 100644 >>>>>>>> index 0000000000..828ef6fbca >>>>>>>> --- /dev/null >>>>>>>> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>>> @@ -0,0 +1,5 @@ >>>>>>>> +require libva-${PV}.inc >>>>>>>> + >>>>>>>> +do_install_append () { >>>>>>>> +?????? rm -f ${D}${libdir}/*.so* >>>>>>>> +} >>>>>>>> -- >>>>>>>> 2.24.1 >>>>>>>> >>>>>>>> -- >>>>>>>> _______________________________________________ >>>>>>>> Openembedded-core mailing list >>>>>>>> Openembedded-core at lists.openembedded.org >>>>>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>>>>> >>>> >> From zboszor at pr.hu Wed Feb 26 17:14:55 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 18:14:55 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> <3a2f7872-9f55-f27a-3db9-66aa2fc786f5@gmail.com> Message-ID: 2020. 02. 26. 18:08 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: > 2020. 02. 26. 17:51 keltez?ssel, Khem Raj ?rta: >> >> >> On 2/26/20 7:58 AM, B?sz?rm?nyi Zolt?n wrote: >>> 2020. 02. 26. 16:30 keltez?ssel, Khem Raj ?rta: >>>> On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n wrote: >>>>> >>>>> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >>>>>> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n >>>>>> wrote: >>>>>>> >>>>>>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>>>>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>>>>>> Openembedded-core wrote: >>>>>>>>> >>>>>>>>> The package name exploits sstate.bbclass so it's not added as >>>>>>>>> implicit dependency to packages. >>>>>>>>> >>>>>>>> >>>>>>>> what is the use of this recipe and why should it be added to core ? >>>>>>> >>>>>>> I should have added a cover letter, shouldn't I? >>>>>>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>>>>>> >>>>>> >>>>>> recipe seems to build full libva, so why not just use that instead. >>>>> >>>>> You don't seem to be reading mails from openembedded-devel that >>>>> you were cc-ed on. >>>> >>>> don't assume things >>> >>> Understood. >>> >>>>> http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html >>>>> >>>>> >>>> >>>> I am trying to make us thing if -dev package can be used somehow to >>>> avoid this >>>> or have we exhausted all possibilities. >>> >>> Why is it a problem to exploit sstate.bbclass internals implicitly >>> by using a *-initial package name for an arbitrary package? >> >> it is not a problem, however, it is a work to keep such setup going and >> also it has to be considered always in dependencies etc. >> >>> Surely it's not reserved for libgcc-initial and friends. >>> >> >> they are different usecases, libgcc-initial is a veneer/trampoline used >> to bootstrap toolchain, and that too we want to remove at every >> opportunity we get, we use to have lot of initial recipes and they are >> very few left, so we have to be mindful of adding another one. >> >>> It solves two problems nicely in one go: >>> 1. by using a different package than libva, the libva-vs-mesa >>> ??? circular dependency is avoided. mesa needs a crippled libva >>> (pkgconfig + headers) >>> ??? to build its VAAPI state tracker and the VAAPI drivers >> >> I see archlinux using full libva for this. how are other distros doing >> it? is this problem unique to OE > > Fedora also uses the full libva. > > However, the chicken-and-egg circular dependency is broken by history > for these distros. > > Koji and Mock build one package at a time with all their dependencies > already available from the staging package repository and the results > will be eventually uploaded to the same repository. > > Bitbake doesn't have have this loophole to download pre-built dependencies. Also, somewhere on 01.org or in the libva sources the same solution I presented in this patchset is suggested: 1. build libva with --disable-glx (it is needed when Mesa SDK is present) but it's not needed by not depending on mesa in libva-initial 2. build mesa with libva build in (1) as it only needs the pkgconfig files and the headers 3. build libva with --enable-glx. It's autodetected, set to on with depending on mesa in the full libva recipe. Obviusly the same libva recipe can't be used to build mesa that depends on mesa. > >> >>> 2. by using libva-initial as the package name, the per-recipe sysroot issue >>> ??? is avoided where prepare-sysroot for a 3rd package like >>> intel-vaapi-driver >>> ??? would fail because the real libva the crippled variant would install >>> ??? identical files >>> >> >> right, this is the problem I am afraid of creating almost duplicate packages >> >>>> >>>>>> >>>>>>>> >>>>>>>>> Signed-off-by: B?sz?rm?nyi Zolt?n >>>>>>>>> --- >>>>>>>>> ???? meta/recipes-graphics/libva/libva-2.6.1.inc??????? | 4 +++- >>>>>>>>> ???? meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 5 +++++ >>>>>>>>> ???? 2 files changed, 8 insertions(+), 1 deletion(-) >>>>>>>>> ???? create mode 100644 >>>>>>>>> meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>>>> >>>>>>>>> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>>>> b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>>>> index ca1386d80b..5b1cdee7e3 100644 >>>>>>>>> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>>>> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc >>>>>>>>> @@ -17,10 +17,12 @@ SECTION = "x11" >>>>>>>>> ???? LICENSE = "MIT" >>>>>>>>> ???? LIC_FILES_CHKSUM = >>>>>>>>> "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" >>>>>>>>> >>>>>>>>> -SRC_URI = >>>>>>>>> "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" >>>>>>>>> >>>>>>>>> +SRC_URI = >>>>>>>>> "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" >>>>>>>>> >>>>>>>>> ???? SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" >>>>>>>>> ???? SRC_URI[sha256sum] = >>>>>>>>> "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" >>>>>>>>> >>>>>>>>> +S = "${WORKDIR}/libva-${PV}" >>>>>>>>> + >>>>>>>>> ???? UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" >>>>>>>>> >>>>>>>>> ???? DEPENDS = "libdrm" >>>>>>>>> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>>>> b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>>>> new file mode 100644 >>>>>>>>> index 0000000000..828ef6fbca >>>>>>>>> --- /dev/null >>>>>>>>> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb >>>>>>>>> @@ -0,0 +1,5 @@ >>>>>>>>> +require libva-${PV}.inc >>>>>>>>> + >>>>>>>>> +do_install_append () { >>>>>>>>> +?????? rm -f ${D}${libdir}/*.so* >>>>>>>>> +} >>>>>>>>> -- >>>>>>>>> 2.24.1 >>>>>>>>> >>>>>>>>> -- >>>>>>>>> _______________________________________________ >>>>>>>>> Openembedded-core mailing list >>>>>>>>> Openembedded-core at lists.openembedded.org >>>>>>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>>>>>> >>>>> >>> > From alex.kanavin at gmail.com Wed Feb 26 17:16:35 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 26 Feb 2020 18:16:35 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: Right, then I am okay with this, as long as there are proper commit messages, and no version in .inc filename. Alex On Wed, 26 Feb 2020 at 17:37, B?sz?rm?nyi Zolt?n wrote: > 2020. 02. 26. 17:35 keltez?ssel, B?sz?rm?nyi Zolt?n via Openembedded-core > ?rta: > > 2020. 02. 26. 17:12 keltez?ssel, Alexander Kanavin ?rta: > >> The 'circular dependency' thing must be explained in the commits, and > not in a > >> discussion link to some email elsewhere. > >> > >> I still don't get why this is needed. The -initial recipe is identical > to the eventual > >> 'real' recipe, so where is the circularity coming from? > > > > libva -> mesa -> libva > > And the -initial recipe is NOT identical to the real one. > The real one always had DEPENDS = "virtual/mesa" > > > > >> > >> Alex > >> > >> On Wed, 26 Feb 2020 at 15:05, B?sz?rm?nyi Zolt?n via Openembedded-core > >> >> > wrote: > >> > >> The package name exploits sstate.bbclass so it's not added as > >> implicit dependency to packages. > >> > >> Signed-off-by: B?sz?rm?nyi Zolt?n zboszor at pr.hu>> > >> --- > >> meta/recipes-graphics/libva/libva-2.6.1.inc | 4 +++- > >> meta/recipes-graphics/libva/libva-initial_2.6.1.bb < > http://libva-initial_2.6.1.bb> | > >> 5 +++++ > >> 2 files changed, 8 insertions(+), 1 deletion(-) > >> create mode 100644 meta/recipes-graphics/libva/ > libva-initial_2.6.1.bb > >> > >> > >> diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc > >> b/meta/recipes-graphics/libva/libva-2.6.1.inc > >> index ca1386d80b..5b1cdee7e3 100644 > >> --- a/meta/recipes-graphics/libva/libva-2.6.1.inc > >> +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > >> @@ -17,10 +17,12 @@ SECTION = "x11" > >> LICENSE = "MIT" > >> LIC_FILES_CHKSUM = > "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > >> > >> -SRC_URI = " > https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2 > >> < > https://github.com/intel/$%7BBPN%7D/releases/download/$%7BPV%7D/$%7BBP%7D.tar.bz2 > >" > >> +SRC_URI = " > https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 > >> < > https://github.com/intel/libva/releases/download/$%7BPV%7D/libva-$%7BPV%7D.tar.bz2 > >" > >> SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > >> SRC_URI[sha256sum] = > >> "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > >> > >> +S = "${WORKDIR}/libva-${PV}" > >> + > >> UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > >> > >> DEPENDS = "libdrm" > >> diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >> b/meta/recipes-graphics/libva/ > libva-initial_2.6.1.bb > >> > >> new file mode 100644 > >> index 0000000000..828ef6fbca > >> --- /dev/null > >> +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >> > >> @@ -0,0 +1,5 @@ > >> +require libva-${PV}.inc > >> + > >> +do_install_append () { > >> + rm -f ${D}${libdir}/*.so* > >> +} > >> -- 2.24.1 > >> > >> -- _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > >> > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > >> > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From pjtexier at koncepto.io Wed Feb 26 17:35:06 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Wed, 26 Feb 2020 18:35:06 +0100 Subject: [OE-core] [PATCH v2] util-linux: upgrade 2.34 -> 2.35.1 Message-ID: <1582738506-3389-1-git-send-email-pjtexier@koncepto.io> License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier --- Changes v1 -> v2 - bump to 2.35.1 instead of 2.35 - use disable-hwclock-gplv3 option to not use datetime parsing GPLv3 code FYI, hwclock will be made GPLv2-only again in v2.36, see: - https://lore.kernel.org/util-linux/20200127202152.4jh2w4chch37wgee at ws.net.home/T/#e0c176440ca3f7b10693ff8f0afaf114b4b94405d meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ---------------------- meta/recipes-core/util-linux/util-linux_2.34.bb | 14 --------- meta/recipes-core/util-linux/util-linux_2.35.1.bb | 13 ++++++++ 4 files changed, 15 insertions(+), 51 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch delete mode 100644 meta/recipes-core/util-linux/util-linux_2.34.bb create mode 100644 meta/recipes-core/util-linux/util-linux_2.35.1.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb deleted file mode 100644 index 557449d..0000000 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ /dev/null @@ -1,14 +0,0 @@ -require util-linux.inc - -SRC_URI += "file://configure-sbindir.patch \ - file://runuser.pamd \ - file://runuser-l.pamd \ - file://ptest.patch \ - file://run-ptest \ - file://display_testname_for_subtest.patch \ - file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ - file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ -" -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" diff --git a/meta/recipes-core/util-linux/util-linux_2.35.1.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb new file mode 100644 index 0000000..03afd2a --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -0,0 +1,13 @@ +require util-linux.inc + +SRC_URI += "file://configure-sbindir.patch \ + file://runuser.pamd \ + file://runuser-l.pamd \ + file://ptest.patch \ + file://run-ptest \ + file://display_testname_for_subtest.patch \ + file://avoid_parallel_tests.patch \ + file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ +" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- 2.7.4 From zboszor at pr.hu Wed Feb 26 17:38:02 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 18:38:02 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> Message-ID: <4cd13868-f411-e6a4-a2b8-d18be9c7a3a2@pr.hu> 2020. 02. 26. 18:16 keltez?ssel, Alexander Kanavin ?rta: > Right, then I am okay with this, as long as there are proper commit messages, and no > version in .inc filename. > > Alex Thank you, I'll send a v2 patchset with proper commit messages and a cover mail tomorrow. > > On Wed, 26 Feb 2020 at 17:37, B?sz?rm?nyi Zolt?n > wrote: > > 2020. 02. 26. 17:35 keltez?ssel, B?sz?rm?nyi Zolt?n via Openembedded-core ?rta: > > 2020. 02. 26. 17:12 keltez?ssel, Alexander Kanavin ?rta: > >> The 'circular dependency' thing must be explained in the commits, and not in a > >> discussion link to some email elsewhere. > >> > >> I still don't get why this is needed. The -initial recipe is identical to the > eventual > >> 'real' recipe, so where is the circularity coming from? > > > > libva -> mesa -> libva > > And the -initial recipe is NOT identical to the real one. > The real one always had DEPENDS = "virtual/mesa" > > > > >> > >> Alex > >> > >> On Wed, 26 Feb 2020 at 15:05, B?sz?rm?nyi Zolt?n via Openembedded-core > >> > >> >> wrote: > >> > >> ??? The package name exploits sstate.bbclass so it's not added as > >> ??? implicit dependency to packages. > >> > >> ??? Signed-off-by: B?sz?rm?nyi Zolt?n > >> > >> ??? --- > >> ???? ?meta/recipes-graphics/libva/libva-2.6.1.inc? ? ? ? | 4 +++- > >> ???? ?meta/recipes-graphics/libva/libva-initial_2.6.1.bb > | > >> ??? 5 +++++ > >> ???? ?2 files changed, 8 insertions(+), 1 deletion(-) > >> ???? ?create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb > > >> ??? > >> > >> ??? diff --git a/meta/recipes-graphics/libva/libva-2.6.1.inc > >> ??? b/meta/recipes-graphics/libva/libva-2.6.1.inc > >> ??? index ca1386d80b..5b1cdee7e3 100644 > >> ??? --- a/meta/recipes-graphics/libva/libva-2.6.1.inc > >> ??? +++ b/meta/recipes-graphics/libva/libva-2.6.1.inc > >> ??? @@ -17,10 +17,12 @@ SECTION = "x11" > >> ???? ?LICENSE = "MIT" > >> ???? ?LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" > >> > >> ??? -SRC_URI = > "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2 > > >> > " > >> ??? +SRC_URI = > "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 > > >> > " > >> ???? ?SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" > >> ???? ?SRC_URI[sha256sum] = > >> "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" > >> > >> ??? +S = "${WORKDIR}/libva-${PV}" > >> ??? + > >> ???? ?UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" > >> > >> ???? ?DEPENDS = "libdrm" > >> ??? diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > > >> ??? > b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > >> ??? > >> ??? new file mode 100644 > >> ??? index 0000000000..828ef6fbca > >> ??? --- /dev/null > >> ??? +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb > > >> > >> ??? @@ -0,0 +1,5 @@ > >> ??? +require libva-${PV}.inc > >> ??? + > >> ??? +do_install_append () { > >> ??? +? ? ? ?rm -f ${D}${libdir}/*.so* > >> ??? +} > >> ??? -- ??? 2.24.1 > >> > >> ??? -- ??? _______________________________________________ > >> ??? Openembedded-core mailing list > >> Openembedded-core at lists.openembedded.org > > >> > > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > >> > > > From bruce.ashfield at gmail.com Wed Feb 26 17:54:20 2020 From: bruce.ashfield at gmail.com (Bruce Ashfield) Date: Wed, 26 Feb 2020 12:54:20 -0500 Subject: [OE-core] [PATCH] linux-yocto/5.2: update to v5.2.32 In-Reply-To: References: <20200224200202.61426-1-bruce.ashfield@gmail.com> Message-ID: On Wed, Feb 26, 2020 at 8:26 AM Bruce Ashfield wrote: > > On Tue, Feb 25, 2020 at 11:47 PM Richard Purdie > wrote: > > > > On Mon, 2020-02-24 at 15:02 -0500, bruce.ashfield at gmail.com wrote: > > > From: Bruce Ashfield > > > > > > Updating linux-yocto/5.2 to the latest korg -stable release that > > > comprises > > > the following commits: > > > > This was included in testing on the autobuilder and we saw: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1612 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/315 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1616 > > > > and I'm not sure if they're from this? > > Me either. > > Hopefully one of the Wind River guys can have a look, otherwise, I'll > poke at it next week. I did spin up a patch of master + my version bump patch, and I am able to complete the test locally (core-image-sato-sdk). That permission denied error is very strange. I'll check the commits to see if any of the scripts/Make* changed in that stable version, but otherwise, I'm not seeing it and only have guesses as to how the version bump could trigger that. Cheers, Bruce > > Cheers, > > Bruce > > > > > Cheers, > > > > Richard > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II From trevor.gamblin at windriver.com Wed Feb 26 18:07:44 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Wed, 26 Feb 2020 10:07:44 -0800 Subject: [OE-core] [PATCH 0/2 v3] Add ptest support for coreutils Message-ID: <20200226180746.121476-1-trevor.gamblin@windriver.com> Sample test results: core-image-minimal: MACHINE | PASS | FAIL | SKIP | TOTAL | TIME (m) | qemux86-64 | 472 | 0 | 143 | 615 | 2.5 | qemuarm64 | 472 | 0 | 143 | 615 | 51 | core-image-sato: MACHINE | PASS | FAIL | SKIP | TOTAL | Time (m) | qemux86-64 | 472 | 0 | 143 | 615 | 2.4 | qemuarm64 | 472 | 0 | 143 | 615 | 52 | Trevor Gamblin (2): coreutils: add ptest ptest-packagelists.inc: add coreutils to SLOW list .../distro/include/ptest-packagelists.inc | 1 + .../coreutils/coreutils/run-ptest | 17 +++++++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest -- 2.24.1 From trevor.gamblin at windriver.com Wed Feb 26 18:07:46 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Wed, 26 Feb 2020 10:07:46 -0800 Subject: [OE-core] [PATCH 2/2 v3] ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <20200226180746.121476-1-trevor.gamblin@windriver.com> References: <20200226180746.121476-1-trevor.gamblin@windriver.com> Message-ID: <20200226180746.121476-3-trevor.gamblin@windriver.com> Signed-off-by: Trevor Gamblin --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 4afac58e3a..54ace39d53 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -65,6 +65,7 @@ PTESTS_FAST = "\ PTESTS_SLOW = "\ babeltrace-ptest \ busybox-ptest \ + coreutils-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ glib-2.0-ptest \ -- 2.24.1 From trevor.gamblin at windriver.com Wed Feb 26 18:07:45 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Wed, 26 Feb 2020 10:07:45 -0800 Subject: [OE-core] [PATCH 1/2 v3] coreutils: add ptest In-Reply-To: <20200226180746.121476-1-trevor.gamblin@windriver.com> References: <20200226180746.121476-1-trevor.gamblin@windriver.com> Message-ID: <20200226180746.121476-2-trevor.gamblin@windriver.com> coreutils has a large number of tests, including some added by the Makefile flags RUN_EXPENSIVE_TESTS and RUN_VERY_EXPENSIVE_TESTS that significantly increase runtime (and which have been disabled). Note that the coreutils ptest directory is given blanket permissions at runtime with chmod -R 777, to ensure that the user created for the tests will be able to run the test scripts and create the necessary files in the process without being impeded by permissions issues. There is still room to improve the results of this ptest without the aforementioned additions. Of the tests marked SKIP, there are 30 tests that are currently counted as SKIP because they require sudo permissions, and another 21 that require membership in multiple user groups. It is important to know that coreutils has tests for both root and non-root users. Testing showed that 42 tests are skipped when running as root versus 30 when running as a non-root user, so the decision was made to run the suite as the latter. Additionally, gdb, valgrind, and strace could be included in the RDEPENDS list to increase pass rate, but their total contribution is 13 tests, so they were omitted to reduce image size. Finally, note that at least one ptest (misc/head-write-error.sh) is prone to ERROR on builds of core-image-minimal if extra space is not provided with IMAGE_ROOTFS_EXTRA_SPACE. Signed-off-by: Trevor Gamblin --- .../coreutils/coreutils/run-ptest | 17 +++++++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest diff --git a/meta/recipes-core/coreutils/coreutils/run-ptest b/meta/recipes-core/coreutils/coreutils/run-ptest new file mode 100755 index 0000000000..6d4a7b365d --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +# remove any stale lock files so that the calls to groupadd/useradd don't stop +# the ptest if re-using the same image +rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock + +COREUTILSLIB=@libdir@/coreutils +LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log" +USERNAME="tester" +groupadd ugroup1 +groupadd ugroup2 +useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already exists" + +su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS top_srcdir=. srcdir=." 2>&1 | tee -a ${LOG} +userdel $USERNAME +groupdel ugroup1 +groupdel ugroup2 diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 57b2c1bdba..8bec4e0f3c 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://0001-uname-report-processor-and-hardware-correctly.patch \ file://disable-ls-output-quoting.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ + file://run-ptest \ " SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" @@ -143,3 +144,39 @@ python __anonymous() { } BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests + sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` + install -d ${D}${PTEST_PATH}/build-aux + install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ + cp ${B}/Makefile ${D}${PTEST_PATH}/ + cp ${S}/init.cfg ${D}${PTEST_PATH}/ + cp -r ${B}/src ${D}${PTEST_PATH}/ + cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src + sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile + sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile + chmod -R 777 ${D}${PTEST_PATH} + + # Disable subcase stty-pairs.sh, it will cause test framework hang + sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile + + # Tweak test d_type-check to use python3 instead of python + sed -i "1s at .*@#!/usr/bin/python3@" ${WORKDIR}/image/usr/lib/coreutils/ptest/tests/d_type-check + install ${B}/src/getlimits ${D}/${bindir} + + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest +} + +FILES_${PN}-ptest += "${bindir}/getlimits" -- 2.24.1 From alex.kanavin at gmail.com Wed Feb 26 18:13:09 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Wed, 26 Feb 2020 19:13:09 +0100 Subject: [OE-core] [PATCH 1/2 v3] coreutils: add ptest In-Reply-To: <20200226180746.121476-2-trevor.gamblin@windriver.com> References: <20200226180746.121476-1-trevor.gamblin@windriver.com> <20200226180746.121476-2-trevor.gamblin@windriver.com> Message-ID: valgrind, gdb and strace are already pulled into core-image-sato-sdk-ptest (the one that runs the slow ptests on the AB), so there is no harm in adding them here as well. Alex On Wed, 26 Feb 2020 at 19:08, Trevor Gamblin wrote: > coreutils has a large number of tests, including some added by the > Makefile flags RUN_EXPENSIVE_TESTS and RUN_VERY_EXPENSIVE_TESTS that > significantly increase runtime (and which have been disabled). Note > that the coreutils ptest directory is given blanket permissions at > runtime with chmod -R 777, to ensure that the user created for the > tests will be able to run the test scripts and create the necessary > files in the process without being impeded by permissions issues. > > There is still room to improve the results of this ptest without > the aforementioned additions. Of the tests marked SKIP, there are > 30 tests that are currently counted as SKIP because they require > sudo permissions, and another 21 that require membership in > multiple user groups. It is important to know that coreutils has > tests for both root and non-root users. Testing showed that 42 > tests are skipped when running as root versus 30 when running as a > non-root user, so the decision was made to run the suite as the > latter. Additionally, gdb, valgrind, and strace could be included > in the RDEPENDS list to increase pass rate, but their total > contribution is 13 tests, so they were omitted to reduce image size. > > Finally, note that at least one ptest (misc/head-write-error.sh) is > prone to ERROR on builds of core-image-minimal if extra space is > not provided with IMAGE_ROOTFS_EXTRA_SPACE. > > Signed-off-by: Trevor Gamblin > --- > .../coreutils/coreutils/run-ptest | 17 +++++++++ > meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++ > 2 files changed, 54 insertions(+) > create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest > > diff --git a/meta/recipes-core/coreutils/coreutils/run-ptest > b/meta/recipes-core/coreutils/coreutils/run-ptest > new file mode 100755 > index 0000000000..6d4a7b365d > --- /dev/null > +++ b/meta/recipes-core/coreutils/coreutils/run-ptest > @@ -0,0 +1,17 @@ > +#!/bin/sh > + > +# remove any stale lock files so that the calls to groupadd/useradd don't > stop > +# the ptest if re-using the same image > +rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock > + > +COREUTILSLIB=@libdir@/coreutils > +LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log" > +USERNAME="tester" > +groupadd ugroup1 > +groupadd ugroup2 > +useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already > exists" > + > +su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS top_srcdir=. > srcdir=." 2>&1 | tee -a ${LOG} > +userdel $USERNAME > +groupdel ugroup1 > +groupdel ugroup2 > diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb > b/meta/recipes-core/coreutils/coreutils_8.31.bb > index 57b2c1bdba..8bec4e0f3c 100644 > --- a/meta/recipes-core/coreutils/coreutils_8.31.bb > +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb > @@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ > > file://0001-uname-report-processor-and-hardware-correctly.patch \ > file://disable-ls-output-quoting.patch \ > file://0001-local.mk-fix-cross-compiling-problem.patch \ > + file://run-ptest \ > " > > SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" > @@ -143,3 +144,39 @@ python __anonymous() { > } > > BBCLASSEXTEND = "native nativesdk" > + > +inherit ptest > + > +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl > libmodule-build-perl make perl perl-module-file-stat python3-core sed > shadow" > + > +do_install_ptest () { > + install -d ${D}${PTEST_PATH}/tests > + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests > + sed -i 's/ginstall/install/g' `grep -R ginstall > ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` > + install -d ${D}${PTEST_PATH}/build-aux > + install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ > + cp ${B}/Makefile ${D}${PTEST_PATH}/ > + cp ${S}/init.cfg ${D}${PTEST_PATH}/ > + cp -r ${B}/src ${D}${PTEST_PATH}/ > + cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src > + sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' > ${D}${PTEST_PATH}/Makefile > + sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' > ${D}${PTEST_PATH}/Makefile > + sed -i '/^built_programs/s/ginstall/install/g' > ${D}${PTEST_PATH}/Makefile > + chmod -R 777 ${D}${PTEST_PATH} > + > + # Disable subcase stty-pairs.sh, it will cause test framework hang > + sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile > + > + # Tweak test d_type-check to use python3 instead of python > + sed -i "1s at .*@#!/usr/bin/python3@" > ${WORKDIR}/image/usr/lib/coreutils/ptest/tests/d_type-check > + install ${B}/src/getlimits ${D}/${bindir} > + > + # handle multilib > + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest > +} > + > +FILES_${PN}-ptest += "${bindir}/getlimits" > -- > 2.24.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From trevor.gamblin at windriver.com Wed Feb 26 18:39:02 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Wed, 26 Feb 2020 13:39:02 -0500 Subject: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37 Message-ID: <20200226183902.3616626-1-trevor.gamblin@windriver.com> https://dev.gnupg.org/T4459 was fixed in 1.37, so the backported patch is removed. Signed-off-by: Trevor Gamblin --- .../libgpg-error-1.36-gawk5-support.patch | 144 ------------------ ...gpg-error_1.36.bb => libgpg-error_1.37.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d1143b..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 92% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab0548d..bf1da84eb9 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,10 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- 2.24.1 From jonathan.rajotte-julien at efficios.com Wed Feb 26 19:01:03 2020 From: jonathan.rajotte-julien at efficios.com (Jonathan Rajotte-Julien) Date: Wed, 26 Feb 2020 14:01:03 -0500 (EST) Subject: [OE-core] [PATCH] lttng-modules: Check the pid_ns before using it because it may be NULL In-Reply-To: <91eec671-f8e8-96ed-1520-d91860644d85@windriver.com> References: <1582165584-187223-1-git-send-email-li.zhou@windriver.com> <1196510898.2098.1582210055795.JavaMail.zimbra@efficios.com> <91eec671-f8e8-96ed-1520-d91860644d85@windriver.com> Message-ID: <1647779561.8797.1582743663059.JavaMail.zimbra@efficios.com> Hi, We released patch level release for our stable branch [1]. These release includes the fix proposed here. Please validate that it fixes your issues. [1] https://lists.linuxfoundation.org/pipermail/diamon-discuss/2020-February/000196.html Cheers ----- Original Message ----- > From: "Li Zhou" > To: "Jonathan Rajotte-Julien" > Cc: "openembedded-core" > Sent: Tuesday, February 25, 2020 3:41:58 AM > Subject: Re: [OE-core] [PATCH] lttng-modules: Check the pid_ns before using it because it may be NULL > On 2/20/20 10:47 PM, Jonathan Rajotte-Julien wrote: >> Hi, >> >> Can we get more info on the kernel version and config? >> >> Did you submit this on our mailing list?(lttng-dev). If not I would highly >> recommend that you do so in the future so we can eliminate *custom* patches and >> get to the bottom of the issue at hand so that the whole community benefit from >> it. > > > Hi, Jonathan: > > ??????? Thank you for you help and suggestion on this. This issue is > seen on linux 4.18 + lttng-modules 2.10. > > >> >> Cheers >> >> ----- Li Zhou wrote: >>> Check the pid_ns before using it because it may be NULL to fix below >>> issue: >>> <1>[ 22.637196] Unable to handle kernel NULL pointer dereference at >>> virtual address 0000000000000080 >>> <1>[ 22.645982] Mem abort info: >>> <1>[ 22.648769] ESR = 0x96000007 >>> <1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits >>> <1>[ 22.657730] SET = 0, FnV = 0 >>> <1>[ 22.660777] EA = 0, S1PTW = 0 >>> <1>[ 22.663910] Data abort info: >>> <1>[ 22.666784] ISV = 0, ISS = 0x00000007 >>> <1>[ 22.670611] CM = 0, WnR = 0 >>> <1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = >>> 0000000012378f78 >>> <1>[ 22.680180] [0000000000000080] pgd=000000007f023003, >>> pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 >>> <0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP >>> <4>[ 22.690797] Modules linked in: adkNetD ncp >>> lttng_ring_buffer_client_overwrite(C) >>> lttng_ring_buffer_metadata_client(C) lttng_ring_buffer_client_discard(C) >>> lttng_ring_buffer_client_mmap_overwrite(C) >>> lttng_ring_buffer_client_mmap_discard(C) >>> lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) >>> lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) >>> lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) >>> lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) lttng_clock(C) >>> <0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = >>> 0x000000005d27910f) >>> <4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C >>> 4.18.37-rt820-custom #1 >>> <4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) >>> <4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) >>> <4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] >>> <4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] >>> <4>[ 22.690851] sp : ffffffc07fe57ad0 >>> <4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 >>> <4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 >>> <4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 >>> <4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 >>> <4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 >>> <4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe >>> <4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 >>> <4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f >>> <4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 >>> <4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f >>> <4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 >>> <4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 >>> <4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 >>> <4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 >>> <4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 >>> <4>[ 22.690896] Call trace: >>> <4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] >>> <4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] >>> <4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] >>> <4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] >>> <4>[ 22.691026] compat_sys_ioctl+0x110/0x778 >>> >>> Signed-off-by: Li Zhou >>> --- >>> ...es-Check-the-pid_ns-before-using-it-becau.patch | 86 ++++++++++++++++++++++ >>> meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb | 2 + >>> 2 files changed, 88 insertions(+) >>> create mode 100644 >>> meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >>> >>> diff --git >>> a/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >>> b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >>> new file mode 100644 >>> index 0000000..5306c79 >>> --- /dev/null >>> +++ >>> b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >>> @@ -0,0 +1,86 @@ >>> +From 0c0072e005ce9d591518d1819a39264859132561 Mon Sep 17 00:00:00 2001 >>> +From: Li Zhou >>> +Date: Wed, 19 Feb 2020 11:14:38 +0800 >>> +Subject: [PATCH] lttng-modules: Check the pid_ns before using it because it >>> + may be NULL >>> + >>> +<1>[ 22.637196] Unable to handle kernel NULL pointer dereference at >>> +virtual address 0000000000000080 >>> +<1>[ 22.645982] Mem abort info: >>> +<1>[ 22.648769] ESR = 0x96000007 >>> +<1>[ 22.651817] Exception class = DABT (current EL), IL = 32 bits >>> +<1>[ 22.657730] SET = 0, FnV = 0 >>> +<1>[ 22.660777] EA = 0, S1PTW = 0 >>> +<1>[ 22.663910] Data abort info: >>> +<1>[ 22.666784] ISV = 0, ISS = 0x00000007 >>> +<1>[ 22.670611] CM = 0, WnR = 0 >>> +<1>[ 22.673574] user pgtable: 4k pages, 39-bit VAs, pgdp = >>> +0000000012378f78 >>> +<1>[ 22.680180] [0000000000000080] pgd=000000007f023003, >>> +pud=000000007f023003, pmd=000000007f01f003, pte=0000000000000000 >>> +<0>[ 22.690794] Internal error: Oops: 96000007 [#1] PREEMPT SMP >>> +<4>[ 22.690797] Modules linked in: adkNetD ncp >>> +lttng_ring_buffer_client_overwrite(C) >>> +lttng_ring_buffer_metadata_client(C) lttng_ring_buffer_client_discard(C) >>> +lttng_ring_buffer_client_mmap_overwrite(C) >>> +lttng_ring_buffer_client_mmap_discard(C) >>> +lttng_ring_buffer_metadata_mmap_client(C) lttng_probe_signal(C) >>> +lttng_probe_printk(C) lttng_probe_sched(C) lttng_probe_irq(C) >>> +lttng_tracer(C) lttng_statedump(C) lttng_ftrace(C) >>> +lttng_lib_ring_buffer(C) lttng_clock_plugin_arm_cntpct(C) lttng_clock(C) >>> +<0>[ 22.690823] Process lttng-sessiond (pid: 3093, stack limit = >>> +0x000000005d27910f) >>> +<4>[ 22.690828] CPU: 1 PID: 3093 Comm: lttng-sessiond Tainted: G C >>> +4.18.37-rt820-custom #1 >>> +<4>[ 22.690830] Hardware name: DUS33 (CPM2-20) (DT) >>> +<4>[ 22.690833] pstate: 60000005 (nZCv daif -PAN -UAO) >>> +<4>[ 22.690845] pc : do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] >>> +<4>[ 22.690849] lr : do_lttng_statedump+0xc4/0x8a8 [lttng_statedump] >>> +<4>[ 22.690851] sp : ffffffc07fe57ad0 >>> +<4>[ 22.690852] x29: ffffffc07fe57ad0 x28: ffffffc008ae2700 >>> +<4>[ 22.690856] x27: ffffff8000724000 x26: 0000000000000001 >>> +<4>[ 22.690859] x25: ffffff80089c9620 x24: 0000000000000000 >>> +<4>[ 22.690862] x23: ffffffc008ae2e10 x22: ffffff80089d3380 >>> +<4>[ 22.690865] x21: ffffffc07f450000 x20: ffffffc008ae2700 >>> +<4>[ 22.690869] x19: 0000000000000007 x18: 00000000fffffffe >>> +<4>[ 22.690871] x17: 0000000000000000 x16: ffffff800824b980 >>> +<4>[ 22.690874] x15: 0000000000000000 x14: 736162203b656e6f >>> +<4>[ 22.690877] x13: 6e203d20676e6964 x12: 0000000000000000 >>> +<4>[ 22.690880] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f >>> +<4>[ 22.690882] x9 : 3c1f647968721eff x8 : ffffffc0877504c8 >>> +<4>[ 22.690886] x7 : 09093a7c093a7c08 x6 : ffffff8010c4b317 >>> +<4>[ 22.690888] x5 : 0000000000000000 x4 : 00000040a7575000 >>> +<4>[ 22.690891] x3 : ffffffc008ae2e28 x2 : 0000000000000000 >>> +<4>[ 22.690894] x1 : 0000000000000000 x0 : 0000000000000000 >>> +<4>[ 22.690896] Call trace: >>> +<4>[ 22.690902] do_lttng_statedump+0xcc/0x8a8 [lttng_statedump] >>> +<4>[ 22.690905] lttng_statedump_start+0x20/0x30 [lttng_statedump] >>> +<4>[ 22.690981] lttng_session_enable+0xf0/0x120 [lttng_tracer] >>> +<4>[ 22.691018] lttng_session_ioctl+0x22c/0x328 [lttng_tracer] >>> +<4>[ 22.691026] compat_sys_ioctl+0x110/0x778 >>> + >>> +Signed-off-by: Liguang Li >>> + >>> +Upstream-Status: Pending >>> + >>> +Signed-off-by: Li Zhou >>> +--- >>> + lttng-statedump-impl.c | 2 +- >>> + 1 file changed, 1 insertion(+), 1 deletion(-) >>> + >>> +diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c >>> +index 1c09e51..fb609e3 100644 >>> +--- a/lttng-statedump-impl.c >>> ++++ b/lttng-statedump-impl.c >>> +@@ -397,7 +397,7 @@ void lttng_statedump_process_ns(struct lttng_session >>> *session, >>> + do { >>> + trace_lttng_statedump_process_state(session, >>> + p, type, mode, submode, status, pid_ns); >>> +- pid_ns = pid_ns->parent; >>> ++ pid_ns = pid_ns ? pid_ns->parent : NULL; >>> + } while (pid_ns); >>> + } >>> + >>> +-- >>> +1.9.1 >>> + >>> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >>> b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >>> index c833ff7..cbd43e3 100644 >>> --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >>> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb >>> @@ -11,6 +11,7 @@ COMPATIBLE_HOST = >>> '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm|riscv).*-linux' >>> SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ >>> file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ >>> file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ >>> + >>> file://0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >>> \ >>> " >>> >>> SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" >>> @@ -36,6 +37,7 @@ DEFAULT_PREFERENCE_class-devupstream = "-1" >>> SRC_URI_class-devupstream = >>> "git://git.lttng.org/lttng-modules;branch=stable-2.11 \ >>> file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ >>> file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ >>> + >>> file://0001-lttng-modules-Check-the-pid_ns-before-using-it-becau.patch >>> \ >>> " >>> SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" >>> PV_class-devupstream = "2.11.1+git${SRCPV}" >>> -- >>> 1.9.1 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -- > Best Regards! > Zhou Li > Phone number: 86-10-84778511 From raj.khem at gmail.com Wed Feb 26 19:44:48 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 11:44:48 -0800 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> <3a2f7872-9f55-f27a-3db9-66aa2fc786f5@gmail.com> Message-ID: On 2/26/20 9:14 AM, B?sz?rm?nyi Zolt?n wrote: > 2020. 02. 26. 18:08 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: >> 2020. 02. 26. 17:51 keltez?ssel, Khem Raj ?rta: >>> >>> >>> On 2/26/20 7:58 AM, B?sz?rm?nyi Zolt?n wrote: >>>> 2020. 02. 26. 16:30 keltez?ssel, Khem Raj ?rta: >>>>> On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n >>>>> wrote: >>>>>> >>>>>> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >>>>>>> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n >>>>>>> wrote: >>>>>>>> >>>>>>>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>>>>>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>>>>>>> Openembedded-core >>>>>>>>> wrote: >>>>>>>>>> >>>>>>>>>> The package name exploits sstate.bbclass so it's not added as >>>>>>>>>> implicit dependency to packages. >>>>>>>>>> >>>>>>>>> >>>>>>>>> what is the use of this recipe and why should it be added to >>>>>>>>> core ? >>>>>>>> >>>>>>>> I should have added a cover letter, shouldn't I? >>>>>>>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>>>>>>> >>>>>>> >>>>>>> recipe seems to build full libva, so why not just use that instead. >>>>>> >>>>>> You don't seem to be reading mails from openembedded-devel that >>>>>> you were cc-ed on. >>>>> >>>>> don't assume things >>>> >>>> Understood. >>>> >>>>>> http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html >>>>>> >>>>>> >>>>>> >>>>> >>>>> I am trying to make us thing if -dev package can be used somehow to >>>>> avoid this >>>>> or have we exhausted all possibilities. >>>> >>>> Why is it a problem to exploit sstate.bbclass internals implicitly >>>> by using a *-initial package name for an arbitrary package? >>> >>> it is not a problem, however, it is a work to keep such setup going and >>> also it has to be considered always in dependencies etc. >>> >>>> Surely it's not reserved for libgcc-initial and friends. >>>> >>> >>> they are different usecases, libgcc-initial is a veneer/trampoline used >>> to bootstrap toolchain, and that too we want to remove at every >>> opportunity we get, we use to have lot of initial recipes and they are >>> very few left, so we have to be mindful of adding another one. >>> >>>> It solves two problems nicely in one go: >>>> 1. by using a different package than libva, the libva-vs-mesa >>>> ??? circular dependency is avoided. mesa needs a crippled libva >>>> (pkgconfig + headers) >>>> ??? to build its VAAPI state tracker and the VAAPI drivers >>> >>> I see archlinux using full libva for this. how are other distros doing >>> it? is this problem unique to OE >> >> Fedora also uses the full libva. >> >> However, the chicken-and-egg circular dependency is broken by history >> for these distros. >> >> Koji and Mock build one package at a time with all their dependencies >> already available from the staging package repository and the results >> will be eventually uploaded to the same repository. >> >> Bitbake doesn't have have this loophole to download pre-built >> dependencies. > > Also, somewhere on 01.org or in the libva sources the same solution > I presented in this patchset is suggested: > > 1. build libva with --disable-glx (it is needed when Mesa SDK is present) > ?? but it's not needed by not depending on mesa in libva-initial > 2. build mesa with libva build in (1) as it only needs the pkgconfig files > ?? and the headers > 3. build libva with --enable-glx. It's autodetected, set to on with > ?? depending on mesa in the full libva recipe. looking at the nature of the problem, it might be the way to unbreak the catch-22, does anything else needs this bootstrap header package ? do we need to ensure that content of libva-dev and the bootstrap packages do not overlap. > > Obviusly the same libva recipe can't be used to build mesa that depends > on mesa. > From armccurdy at gmail.com Wed Feb 26 20:07:46 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Wed, 26 Feb 2020 12:07:46 -0800 Subject: [OE-core] [PATCH] utils.bbclass: Avoid recursive symlink in oe_soinstall In-Reply-To: <20200225141733.54584-1-eugenyshcheglov@gmail.com> References: <20200225141733.54584-1-eugenyshcheglov@gmail.com> Message-ID: On Tue, Feb 25, 2020 at 6:17 AM Yevhenii Shchehlov wrote: > > This patch fixes an issue when oe_soinstall function creates > non-functional recursive symlinks in case library soname is equal > to library real (file) name. > > Signed-off-by: Yevhenii Shchehlov > --- > meta/classes/utils.bbclass | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass > index cd3d05709e..dea824f54f 100644 > --- a/meta/classes/utils.bbclass > +++ b/meta/classes/utils.bbclass > @@ -25,7 +25,7 @@ oe_soinstall() { > libname=`basename $1` > case "$libname" in > *.so) > - bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3)" > + bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3 instead of libfoo.so)" This patch look OK but it might be nice to also clean up this error message (and the Example comment a few lines above it) to drop the 3 levels of version number. There should only be 2, ie the fully versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 > ;; > esac > install -m 755 $1 $2/$libname > @@ -33,8 +33,12 @@ oe_soinstall() { > if [ -z $sonamelink ]; then > bbfatal "oe_soinstall: $libname is missing ELF tag 'SONAME'." > fi > + if [ "$sonamelink" == "$libname" ]; then > + bbwarn "oe_soinstall: $libname soname is equal to real (file) name. Minor version should be added to a real name (e.g. libfoo.so.1.2 instead of libfoo.so.1)" It might be clearer to say: "oe_soinstall: $libname soname is equal to fully versioned real (file) name. The soname should include the major version only (e.g. libfoo.so.1 instead of libfoo.so.1.2)" > + else > + ln -sf $libname $2/$sonamelink > + fi > solink=`echo $libname | sed -e 's/\.so\..*/.so/'` > - ln -sf $libname $2/$sonamelink > ln -sf $libname $2/$solink > } > > -- > 2.25.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From zboszor at pr.hu Wed Feb 26 20:21:11 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Wed, 26 Feb 2020 21:21:11 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> <3a2f7872-9f55-f27a-3db9-66aa2fc786f5@gmail.com> Message-ID: 2020. 02. 26. 20:44 keltez?ssel, Khem Raj ?rta: > > > On 2/26/20 9:14 AM, B?sz?rm?nyi Zolt?n wrote: >> 2020. 02. 26. 18:08 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: >>> 2020. 02. 26. 17:51 keltez?ssel, Khem Raj ?rta: >>>> >>>> >>>> On 2/26/20 7:58 AM, B?sz?rm?nyi Zolt?n wrote: >>>>> 2020. 02. 26. 16:30 keltez?ssel, Khem Raj ?rta: >>>>>> On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n wrote: >>>>>>> >>>>>>> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >>>>>>>> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n >>>>>>>> wrote: >>>>>>>>> >>>>>>>>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>>>>>>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>>>>>>>> Openembedded-core wrote: >>>>>>>>>>> >>>>>>>>>>> The package name exploits sstate.bbclass so it's not added as >>>>>>>>>>> implicit dependency to packages. >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> what is the use of this recipe and why should it be added to core ? >>>>>>>>> >>>>>>>>> I should have added a cover letter, shouldn't I? >>>>>>>>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>>>>>>>> >>>>>>>> >>>>>>>> recipe seems to build full libva, so why not just use that instead. >>>>>>> >>>>>>> You don't seem to be reading mails from openembedded-devel that >>>>>>> you were cc-ed on. >>>>>> >>>>>> don't assume things >>>>> >>>>> Understood. >>>>> >>>>>>> http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html >>>>>>> >>>>>>> >>>>>> >>>>>> I am trying to make us thing if -dev package can be used somehow to >>>>>> avoid this >>>>>> or have we exhausted all possibilities. >>>>> >>>>> Why is it a problem to exploit sstate.bbclass internals implicitly >>>>> by using a *-initial package name for an arbitrary package? >>>> >>>> it is not a problem, however, it is a work to keep such setup going and >>>> also it has to be considered always in dependencies etc. >>>> >>>>> Surely it's not reserved for libgcc-initial and friends. >>>>> >>>> >>>> they are different usecases, libgcc-initial is a veneer/trampoline used >>>> to bootstrap toolchain, and that too we want to remove at every >>>> opportunity we get, we use to have lot of initial recipes and they are >>>> very few left, so we have to be mindful of adding another one. >>>> >>>>> It solves two problems nicely in one go: >>>>> 1. by using a different package than libva, the libva-vs-mesa >>>>> ??? circular dependency is avoided. mesa needs a crippled libva >>>>> (pkgconfig + headers) >>>>> ??? to build its VAAPI state tracker and the VAAPI drivers >>>> >>>> I see archlinux using full libva for this. how are other distros doing >>>> it? is this problem unique to OE >>> >>> Fedora also uses the full libva. >>> >>> However, the chicken-and-egg circular dependency is broken by history >>> for these distros. >>> >>> Koji and Mock build one package at a time with all their dependencies >>> already available from the staging package repository and the results >>> will be eventually uploaded to the same repository. >>> >>> Bitbake doesn't have have this loophole to download pre-built dependencies. >> >> Also, somewhere on 01.org or in the libva sources the same solution >> I presented in this patchset is suggested: >> >> 1. build libva with --disable-glx (it is needed when Mesa SDK is present) >> ??? but it's not needed by not depending on mesa in libva-initial >> 2. build mesa with libva build in (1) as it only needs the pkgconfig files >> ??? and the headers >> 3. build libva with --enable-glx. It's autodetected, set to on with >> ??? depending on mesa in the full libva recipe. > > looking at the nature of the problem, it might be the way to unbreak the catch-22, does > anything else needs this bootstrap header package ? Besides DEPENDS="libdrm", no. > do we need to ensure that content of libva-dev and the bootstrap packages do not overlap. I don't think so. Apparently, the mesa-dev package built from this patchset doesn't depend on libva-initial-dev and this latter package doesn't get included into an image either. I guess the sstate.bbclass internals deal with this properly. > >> >> Obviusly the same libva recipe can't be used to build mesa that depends on mesa. >> > > From raj.khem at gmail.com Wed Feb 26 20:31:14 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 12:31:14 -0800 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> <3a2f7872-9f55-f27a-3db9-66aa2fc786f5@gmail.com> Message-ID: <07623f86-1952-8cd1-c651-8e35a69b6db8@gmail.com> On 2/26/20 12:21 PM, B?sz?rm?nyi Zolt?n wrote: > 2020. 02. 26. 20:44 keltez?ssel, Khem Raj ?rta: >> >> >> On 2/26/20 9:14 AM, B?sz?rm?nyi Zolt?n wrote: >>> 2020. 02. 26. 18:08 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: >>>> 2020. 02. 26. 17:51 keltez?ssel, Khem Raj ?rta: >>>>> >>>>> >>>>> On 2/26/20 7:58 AM, B?sz?rm?nyi Zolt?n wrote: >>>>>> 2020. 02. 26. 16:30 keltez?ssel, Khem Raj ?rta: >>>>>>> On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n >>>>>>> wrote: >>>>>>>> >>>>>>>> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >>>>>>>>> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n >>>>>>>>> wrote: >>>>>>>>>> >>>>>>>>>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>>>>>>>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>>>>>>>>> Openembedded-core >>>>>>>>>>> wrote: >>>>>>>>>>>> >>>>>>>>>>>> The package name exploits sstate.bbclass so it's not added as >>>>>>>>>>>> implicit dependency to packages. >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> what is the use of this recipe and why should it be added to >>>>>>>>>>> core ? >>>>>>>>>> >>>>>>>>>> I should have added a cover letter, shouldn't I? >>>>>>>>>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>>>>>>>>> >>>>>>>>> >>>>>>>>> recipe seems to build full libva, so why not just use that >>>>>>>>> instead. >>>>>>>> >>>>>>>> You don't seem to be reading mails from openembedded-devel that >>>>>>>> you were cc-ed on. >>>>>>> >>>>>>> don't assume things >>>>>> >>>>>> Understood. >>>>>> >>>>>>>> http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> I am trying to make us thing if -dev package can be used somehow to >>>>>>> avoid this >>>>>>> or have we exhausted all possibilities. >>>>>> >>>>>> Why is it a problem to exploit sstate.bbclass internals implicitly >>>>>> by using a *-initial package name for an arbitrary package? >>>>> >>>>> it is not a problem, however, it is a work to keep such setup going >>>>> and >>>>> also it has to be considered always in dependencies etc. >>>>> >>>>>> Surely it's not reserved for libgcc-initial and friends. >>>>>> >>>>> >>>>> they are different usecases, libgcc-initial is a veneer/trampoline >>>>> used >>>>> to bootstrap toolchain, and that too we want to remove at every >>>>> opportunity we get, we use to have lot of initial recipes and they are >>>>> very few left, so we have to be mindful of adding another one. >>>>> >>>>>> It solves two problems nicely in one go: >>>>>> 1. by using a different package than libva, the libva-vs-mesa >>>>>> ??? circular dependency is avoided. mesa needs a crippled libva >>>>>> (pkgconfig + headers) >>>>>> ??? to build its VAAPI state tracker and the VAAPI drivers >>>>> >>>>> I see archlinux using full libva for this. how are other distros doing >>>>> it? is this problem unique to OE >>>> >>>> Fedora also uses the full libva. >>>> >>>> However, the chicken-and-egg circular dependency is broken by history >>>> for these distros. >>>> >>>> Koji and Mock build one package at a time with all their dependencies >>>> already available from the staging package repository and the results >>>> will be eventually uploaded to the same repository. >>>> >>>> Bitbake doesn't have have this loophole to download pre-built >>>> dependencies. >>> >>> Also, somewhere on 01.org or in the libva sources the same solution >>> I presented in this patchset is suggested: >>> >>> 1. build libva with --disable-glx (it is needed when Mesa SDK is >>> present) >>> ??? but it's not needed by not depending on mesa in libva-initial >>> 2. build mesa with libva build in (1) as it only needs the pkgconfig >>> files >>> ??? and the headers >>> 3. build libva with --enable-glx. It's autodetected, set to on with >>> ??? depending on mesa in the full libva recipe. >> >> looking at the nature of the problem, it might be the way to unbreak >> the catch-22, does anything else needs this bootstrap header package ? > > Besides DEPENDS="libdrm", no. > >> do we need to ensure that content of libva-dev and the bootstrap >> packages do not overlap. > > I don't think so. > Apparently, the mesa-dev package built from this patchset > doesn't depend on libva-initial-dev and this latter package > doesn't get included into an image either. I guess the > sstate.bbclass internals deal with this properly. > OK, I guess, we should give it a test. > >> >>> >>> Obviusly the same libva recipe can't be used to build mesa that >>> depends on mesa. >>> >> >> > From timothy.t.orling at linux.intel.com Thu Feb 27 00:05:59 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Wed, 26 Feb 2020 16:05:59 -0800 Subject: [OE-core] [PATCH 0/4] Upgrade accessibility (a11y) atk packages Message-ID: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> This series updates to the latest stable (even) release of the accessibility (a11y) toolkit and related. These are one of the ways we can automated GUI testing in gtk and Qt applications. One notable improvement in this release is that accessibility is launched automatically in a GUI environment. Tested on core-image-sato-sdk for qemux86_64 and qemux86-musl. [PATCH 1/4] atk: upgrade 2.32.0 -> 2.34.1 [PATCH 2/4] at-spi2-core: upgrade 2.32.1 -> 2.34.0 [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 [PATCH 4/4] maintainers.inc: add self for atk, at-spi2-core, From timothy.t.orling at linux.intel.com Thu Feb 27 00:06:00 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Wed, 26 Feb 2020 16:06:00 -0800 Subject: [OE-core] [PATCH 1/4] atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> Message-ID: <20200227000603.14252-2-timothy.t.orling@linux.intel.com> From: Tim Orling Patch no longer applies (nor is needed) upstream. Release notes: https://gitlab.gnome.org/GNOME/atk/-/raw/633bde11f93ee971ba8902c6fadbc29c121f71af/NEWS Signed-off-by: Tim Orling --- ...able-introspection-for-cross-compile.patch | 29 ------------------- .../atk/{atk_2.32.0.bb => atk_2.34.1.bb} | 5 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch rename meta/recipes-support/atk/{atk_2.32.0.bb => atk_2.34.1.bb} (73%) diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index d1b08bc04b..0000000000 --- a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 44d46baa5e1519c6c3df7e4d34fb333e247b5bc8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Fri, 6 Apr 2018 12:04:00 +0800 -Subject: [PATCH] meson.build: enable introspection for cross-compile - -It works fine in OE-core and doesn't need to be disabled. Let the user decide -if it should be disabled or not. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal - ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 0ad67e5..1d2a49c 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk, - dependencies: glib_dep, - sources: atk_enum_h) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/meta/recipes-support/atk/atk_2.32.0.bb b/meta/recipes-support/atk/atk_2.34.1.bb similarity index 73% rename from meta/recipes-support/atk/atk_2.32.0.bb rename to meta/recipes-support/atk/atk_2.34.1.bb index 67223729e9..277397c694 100644 --- a/meta/recipes-support/atk/atk_2.32.0.bb +++ b/meta/recipes-support/atk/atk_2.34.1.bb @@ -14,9 +14,8 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI += " file://0001-meson.build-enable-introspection-for-cross-compile.patch" -SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d" -SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc" +SRC_URI[archive.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" +SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" BBCLASSEXTEND = "native nativesdk" -- 2.24.0 From timothy.t.orling at linux.intel.com Thu Feb 27 00:06:01 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Wed, 26 Feb 2020 16:06:01 -0800 Subject: [OE-core] [PATCH 2/4] at-spi2-core: upgrade 2.32.1 -> 2.34.0 In-Reply-To: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> Message-ID: <20200227000603.14252-3-timothy.t.orling@linux.intel.com> Release notes: https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/6da122f1e8d6b02dda0f368610ab72fc3d1720cf/NEWS License-Update: Changed to LPGL-2.1+ Signed-off-by: Tim Orling --- .../{at-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/atk/{at-spi2-core_2.32.1.bb => at-spi2-core_2.34.0.bb} (83%) diff --git a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb similarity index 83% rename from meta/recipes-support/atk/at-spi2-core_2.32.1.bb rename to meta/recipes-support/atk/at-spi2-core_2.34.0.bb index 18b5de2d58..84e05e77fc 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.32.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.34.0.bb @@ -1,15 +1,15 @@ SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Fix-source-reproducibility.patch" -SRC_URI[md5sum] = "998fd9d858f8fa22c4c8c15567bf6254" -SRC_URI[sha256sum] = "3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53" +SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b" +SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" X11DEPENDS = "virtual/libx11 libxi libxtst" -- 2.24.0 From timothy.t.orling at linux.intel.com Thu Feb 27 00:06:02 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Wed, 26 Feb 2020 16:06:02 -0800 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> Message-ID: <20200227000603.14252-4-timothy.t.orling@linux.intel.com> Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ Signed-off-by: Tim Orling --- .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (66%) diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb similarity index 66% rename from meta/recipes-support/atk/at-spi2-atk_2.32.0.bb rename to meta/recipes-support/atk/at-spi2-atk_2.34.1.bb index b717a9c7f7..b09cb6a392 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb @@ -1,10 +1,10 @@ SUMMARY = "AT-SPI 2 Toolkit Bridge" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291" -SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c" +SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" +SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" -- 2.24.0 From timothy.t.orling at linux.intel.com Thu Feb 27 00:06:03 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Wed, 26 Feb 2020 16:06:03 -0800 Subject: [OE-core] [PATCH 4/4] maintainers.inc: add self for atk, at-spi2-core, at-spi2-atk In-Reply-To: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> Message-ID: <20200227000603.14252-5-timothy.t.orling@linux.intel.com> For GUI automation purposes, strong motivation for accessibility (a11y) via python3-dogtail and python3-pyatspi2, so taking over from Anuj. Signed-off-by: Tim Orling --- meta/conf/distro/include/maintainers.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 8f612ace39..10095ffe76 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -49,9 +49,9 @@ RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao " RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal " RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal " RECIPE_MAINTAINER_pn-at = "Chen Qi " -RECIPE_MAINTAINER_pn-at-spi2-atk = "Anuj Mittal " -RECIPE_MAINTAINER_pn-at-spi2-core = "Anuj Mittal " -RECIPE_MAINTAINER_pn-atk = "Anuj Mittal " +RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling " +RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling " +RECIPE_MAINTAINER_pn-atk = "Tim Orling " RECIPE_MAINTAINER_pn-attr = "Chen Qi " RECIPE_MAINTAINER_pn-autoconf = "Robert Yang " RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang " -- 2.24.0 From joe.slater at windriver.com Thu Feb 27 00:26:45 2020 From: joe.slater at windriver.com (Joe Slater) Date: Wed, 26 Feb 2020 16:26:45 -0800 Subject: [OE-core] [oe-core][PATCH 1/1] python3: change two shebangs to python3 Message-ID: <20200227002645.13733-1-joe.slater@windriver.com> cgi.py and rot_13.py have outdated shebangs. Signed-off-by: Joe Slater --- .../recipes-devtools/python/python3/shebang3.patch | 22 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/shebang3.patch diff --git a/meta/recipes-devtools/python/python3/shebang3.patch b/meta/recipes-devtools/python/python3/shebang3.patch new file mode 100644 index 0000000..c4fde05 --- /dev/null +++ b/meta/recipes-devtools/python/python3/shebang3.patch @@ -0,0 +1,22 @@ +python3: change two shebangs to python3 + +Upstream-Status: Inappropriate [distribution] + +Signed-off-by: Joe Slater + +--- a/Lib/cgi.py ++++ b/Lib/cgi.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + + """Support module for CGI (Common Gateway Interface) scripts. + +--- a/Lib/encodings/rot_13.py ++++ b/Lib/encodings/rot_13.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ Python Character Mapping Codec for ROT13. + + This codec de/encodes from str to str. diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index 7796852..c1983d8 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -32,7 +32,9 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-configure.ac-fix-LIBPL.patch \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ + file://shebang3.patch \ " + SRC_URI_append_class-native = " \ file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ -- 2.7.4 From wenlin.kang at windriver.com Thu Feb 27 02:21:15 2020 From: wenlin.kang at windriver.com (Wenlin Kang) Date: Thu, 27 Feb 2020 10:21:15 +0800 Subject: [OE-core] [PATCH] libarchive: Fix CVE-2020-9308 In-Reply-To: <20200226151100.4723-1-wenlin.kang@windriver.com> References: <20200226151100.4723-1-wenlin.kang@windriver.com> Message-ID: <4cbc13af-b50f-a6b6-47e8-ec380b61f394@windriver.com> On 2/26/20 11:11 PM, Wenlin Kang wrote: Please ignore it. > Fix CVE-2020-9308 > > Signed-off-by: Wenlin Kang > --- > ...ct-files-that-declare-invalid-header.patch | 124 ++++++++++++++++++ > .../libarchive/libarchive_3.4.1.bb | 4 +- > 2 files changed, 127 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch > > diff --git a/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch b/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch > new file mode 100644 > index 0000000000..c3e0af571e > --- /dev/null > +++ b/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch > @@ -0,0 +1,124 @@ > +From 94821008d6eea81e315c5881cdf739202961040a Mon Sep 17 00:00:00 2001 > +From: Grzegorz Antoniak > +Date: Sun, 2 Feb 2020 08:04:41 +0100 > +Subject: [PATCH] RAR5 reader: reject files that declare invalid header flags > + > +One of the fields in RAR5's base block structure is the size of the > +header. Some invalid files declare a 0 header size setting, which can > +confuse the unpacker. Minimum header size for RAR5 base blocks is 7 > +bytes (4 bytes for CRC, and 3 bytes for the rest), so block size of 0 > +bytes should be rejected at header parsing stage. > + > +The fix adds an error condition if header size of 0 bytes is detected. > +In this case, the unpacker will not attempt to unpack the file, as the > +header is corrupted. > + > +The commit also adds OSSFuzz #20459 sample to test further regressions > +in this area. > + > +Upstream-Status: Backport[https://github.com/libarchive/libarchive/commit/94821008d6eea81e315c5881cdf739202961040a] > +CVE-2020-9308 > + > +Signed-off-by: Wenlin Kang > +--- > + Makefile.am | 1 + > + libarchive/archive_read_support_format_rar5.c | 17 +++++++++++++++-- > + libarchive/test/test_read_format_rar5.c | 15 +++++++++++++++ > + ...test_read_format_rar5_block_size_is_too_small.rar.uu | 8 ++++++++ > + 4 files changed, 39 insertions(+), 2 deletions(-) > + create mode 100644 libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu > + > +diff --git a/Makefile.am b/Makefile.am > +index 06c2644..c65e243 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -877,6 +877,7 @@ libarchive_test_EXTRA_DIST=\ > + libarchive/test/test_read_format_rar5_win32.rar.uu \ > + libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu \ > + libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu \ > ++ libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu \ > + libarchive/test/test_read_format_raw.bufr.uu \ > + libarchive/test/test_read_format_raw.data.gz.uu \ > + libarchive/test/test_read_format_raw.data.Z.uu \ > +diff --git a/libarchive/archive_read_support_format_rar5.c b/libarchive/archive_read_support_format_rar5.c > +index ff1d6f8..f7c163e 100644 > +--- a/libarchive/archive_read_support_format_rar5.c > ++++ b/libarchive/archive_read_support_format_rar5.c > +@@ -2085,6 +2085,8 @@ static int scan_for_signature(struct archive_read* a); > + static int process_base_block(struct archive_read* a, > + struct archive_entry* entry) > + { > ++ const size_t SMALLEST_RAR5_BLOCK_SIZE = 3; > ++ > + struct rar5* rar = get_context(a); > + uint32_t hdr_crc, computed_crc; > + size_t raw_hdr_size = 0, hdr_size_len, hdr_size; > +@@ -2114,15 +2116,26 @@ static int process_base_block(struct archive_read* a, > + return ARCHIVE_EOF; > + } > + > ++ hdr_size = raw_hdr_size + hdr_size_len; > ++ > + /* Sanity check, maximum header size for RAR5 is 2MB. */ > +- if(raw_hdr_size > (2 * 1024 * 1024)) { > ++ if(hdr_size > (2 * 1024 * 1024)) { > + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, > + "Base block header is too large"); > + > + return ARCHIVE_FATAL; > + } > + > +- hdr_size = raw_hdr_size + hdr_size_len; > ++ /* Additional sanity checks to weed out invalid files. */ > ++ if(raw_hdr_size == 0 || hdr_size_len == 0 || > ++ hdr_size < SMALLEST_RAR5_BLOCK_SIZE) > ++ { > ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, > ++ "Too small block encountered (%ld bytes)", > ++ raw_hdr_size); > ++ > ++ return ARCHIVE_FATAL; > ++ } > + > + /* Read the whole header data into memory, maximum memory use here is > + * 2MB. */ > +diff --git a/libarchive/test/test_read_format_rar5.c b/libarchive/test/test_read_format_rar5.c > +index bb94d4e..f91521e 100644 > +--- a/libarchive/test/test_read_format_rar5.c > ++++ b/libarchive/test/test_read_format_rar5.c > +@@ -1256,3 +1256,18 @@ DEFINE_TEST(test_read_format_rar5_different_winsize_on_merge) > + > + EPILOGUE(); > + } > ++ > ++DEFINE_TEST(test_read_format_rar5_block_size_is_too_small) > ++{ > ++ char buf[4096]; > ++ PROLOGUE("test_read_format_rar5_block_size_is_too_small.rar"); > ++ > ++ /* This file is damaged, so those functions should return failure. > ++ * Additionally, SIGSEGV shouldn't be raised during execution > ++ * of those functions. */ > ++ > ++ assertA(archive_read_next_header(a, &ae) != ARCHIVE_OK); > ++ assertA(archive_read_data(a, buf, sizeof(buf)) <= 0); > ++ > ++ EPILOGUE(); > ++} > +diff --git a/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu b/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu > +new file mode 100644 > +index 0000000..5cad219 > +--- /dev/null > ++++ b/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu > +@@ -0,0 +1,8 @@ > ++begin 644 test_read_format_rar5_block_size_is_too_small.rar > ++M4F%R(1H'`0"-[P+2``+'(!P,("`@N`,!`B`@("`@("`@("`@("`@("#_("`@ > ++M("`@("`@("`@((:Q;2!4-'-^4B`!((WO`M(``O\@$/\@-R`@("`@("`@("`@ > ++M``X@("`@("`@____("`@("`@(/\@("`@("`@("`@("#_(+6U,2"UM;6UM[CU > ++M)B`@*(0G(`!.`#D\3R``(/__(,+_````-0#_($&%*/HE=C+N`"```"```"`D > ++J`)$#("#_("#__P`@__\@_R#_("`@("`@("#_("#__R`@(/__("#__R`" > ++` > ++end > +-- > +1.9.1 > + > diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb > index 2d33dd80ab..91b0f58e8f 100644 > --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb > +++ b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb > @@ -31,7 +31,9 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," > > EXTRA_OECONF += "--enable-largefile" > > -SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" > +SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ > + file://0001-RAR5-reader-reject-files-that-declare-invalid-header.patch \ > + " > > SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" > SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" -- Thanks, Wenlin Kang From wenlin.kang at windriver.com Thu Feb 27 02:23:26 2020 From: wenlin.kang at windriver.com (Wenlin Kang) Date: Thu, 27 Feb 2020 10:23:26 +0800 Subject: [OE-core] [PATCH v2] libarchive: Fix CVE-2020-9308 Message-ID: <20200227022326.16307-1-wenlin.kang@windriver.com> Fix CVE-2020-9308 Signed-off-by: Wenlin Kang --- ...ct-files-that-declare-invalid-header.patch | 124 ++++++++++++++++++ .../libarchive/libarchive_3.4.1.bb | 4 +- 2 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch diff --git a/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch b/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch new file mode 100644 index 0000000000..2b37d68d82 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch @@ -0,0 +1,124 @@ +From 94821008d6eea81e315c5881cdf739202961040a Mon Sep 17 00:00:00 2001 +From: Grzegorz Antoniak +Date: Sun, 2 Feb 2020 08:04:41 +0100 +Subject: [PATCH] RAR5 reader: reject files that declare invalid header flags + +One of the fields in RAR5's base block structure is the size of the +header. Some invalid files declare a 0 header size setting, which can +confuse the unpacker. Minimum header size for RAR5 base blocks is 7 +bytes (4 bytes for CRC, and 3 bytes for the rest), so block size of 0 +bytes should be rejected at header parsing stage. + +The fix adds an error condition if header size of 0 bytes is detected. +In this case, the unpacker will not attempt to unpack the file, as the +header is corrupted. + +The commit also adds OSSFuzz #20459 sample to test further regressions +in this area. + +Upstream-Status: Backport[https://github.com/libarchive/libarchive/commit/94821008d6eea81e315c5881cdf739202961040a] +CVE: CVE-2020-9308 + +Signed-off-by: Wenlin Kang +--- + Makefile.am | 1 + + libarchive/archive_read_support_format_rar5.c | 17 +++++++++++++++-- + libarchive/test/test_read_format_rar5.c | 15 +++++++++++++++ + ...test_read_format_rar5_block_size_is_too_small.rar.uu | 8 ++++++++ + 4 files changed, 39 insertions(+), 2 deletions(-) + create mode 100644 libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu + +diff --git a/Makefile.am b/Makefile.am +index 06c2644..c65e243 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -877,6 +877,7 @@ libarchive_test_EXTRA_DIST=\ + libarchive/test/test_read_format_rar5_win32.rar.uu \ + libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu \ + libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu \ ++ libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu \ + libarchive/test/test_read_format_raw.bufr.uu \ + libarchive/test/test_read_format_raw.data.gz.uu \ + libarchive/test/test_read_format_raw.data.Z.uu \ +diff --git a/libarchive/archive_read_support_format_rar5.c b/libarchive/archive_read_support_format_rar5.c +index ff1d6f8..f7c163e 100644 +--- a/libarchive/archive_read_support_format_rar5.c ++++ b/libarchive/archive_read_support_format_rar5.c +@@ -2085,6 +2085,8 @@ static int scan_for_signature(struct archive_read* a); + static int process_base_block(struct archive_read* a, + struct archive_entry* entry) + { ++ const size_t SMALLEST_RAR5_BLOCK_SIZE = 3; ++ + struct rar5* rar = get_context(a); + uint32_t hdr_crc, computed_crc; + size_t raw_hdr_size = 0, hdr_size_len, hdr_size; +@@ -2114,15 +2116,26 @@ static int process_base_block(struct archive_read* a, + return ARCHIVE_EOF; + } + ++ hdr_size = raw_hdr_size + hdr_size_len; ++ + /* Sanity check, maximum header size for RAR5 is 2MB. */ +- if(raw_hdr_size > (2 * 1024 * 1024)) { ++ if(hdr_size > (2 * 1024 * 1024)) { + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Base block header is too large"); + + return ARCHIVE_FATAL; + } + +- hdr_size = raw_hdr_size + hdr_size_len; ++ /* Additional sanity checks to weed out invalid files. */ ++ if(raw_hdr_size == 0 || hdr_size_len == 0 || ++ hdr_size < SMALLEST_RAR5_BLOCK_SIZE) ++ { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, ++ "Too small block encountered (%ld bytes)", ++ raw_hdr_size); ++ ++ return ARCHIVE_FATAL; ++ } + + /* Read the whole header data into memory, maximum memory use here is + * 2MB. */ +diff --git a/libarchive/test/test_read_format_rar5.c b/libarchive/test/test_read_format_rar5.c +index bb94d4e..f91521e 100644 +--- a/libarchive/test/test_read_format_rar5.c ++++ b/libarchive/test/test_read_format_rar5.c +@@ -1256,3 +1256,18 @@ DEFINE_TEST(test_read_format_rar5_different_winsize_on_merge) + + EPILOGUE(); + } ++ ++DEFINE_TEST(test_read_format_rar5_block_size_is_too_small) ++{ ++ char buf[4096]; ++ PROLOGUE("test_read_format_rar5_block_size_is_too_small.rar"); ++ ++ /* This file is damaged, so those functions should return failure. ++ * Additionally, SIGSEGV shouldn't be raised during execution ++ * of those functions. */ ++ ++ assertA(archive_read_next_header(a, &ae) != ARCHIVE_OK); ++ assertA(archive_read_data(a, buf, sizeof(buf)) <= 0); ++ ++ EPILOGUE(); ++} +diff --git a/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu b/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu +new file mode 100644 +index 0000000..5cad219 +--- /dev/null ++++ b/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu +@@ -0,0 +1,8 @@ ++begin 644 test_read_format_rar5_block_size_is_too_small.rar ++M4F%R(1H'`0"-[P+2``+'(!P,("`@N`,!`B`@("`@("`@("`@("`@("#_("`@ ++M("`@("`@("`@((:Q;2!4-'-^4B`!((WO`M(``O\@$/\@-R`@("`@("`@("`@ ++M``X@("`@("`@____("`@("`@(/\@("`@("`@("`@("#_(+6U,2"UM;6UM[CU ++M)B`@*(0G(`!.`#D\3R``(/__(,+_````-0#_($&%*/HE=C+N`"```"```"`D ++J`)$#("#_("#__P`@__\@_R#_("`@("`@("#_("#__R`@(/__("#__R`" ++` ++end +-- +1.9.1 + diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb index 2d33dd80ab..91b0f58e8f 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.1.bb @@ -31,7 +31,9 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," EXTRA_OECONF += "--enable-largefile" -SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" +SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ + file://0001-RAR5-reader-reject-files-that-declare-invalid-header.patch \ + " SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" -- 2.17.1 From zboszor at pr.hu Thu Feb 27 04:05:43 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Thu, 27 Feb 2020 05:05:43 +0100 Subject: [OE-core] [PATCH 2/5] libva-initial: New recipe to carry only pkgconfig files and headers In-Reply-To: <07623f86-1952-8cd1-c651-8e35a69b6db8@gmail.com> References: <20200226135716.49255-1-zboszor@pr.hu> <20200226135716.49255-2-zboszor@pr.hu> <3b6928cc-d872-a9c9-942a-67f58d152790@pr.hu> <1753b549-7a12-ec88-a1e5-f23ff05b060e@pr.hu> <8a163a56-9558-222a-b24b-03001d7e3b1c@pr.hu> <3a2f7872-9f55-f27a-3db9-66aa2fc786f5@gmail.com> <07623f86-1952-8cd1-c651-8e35a69b6db8@gmail.com> Message-ID: <87be1a14-bb0f-934e-b697-0c4b5375c92e@pr.hu> 2020. 02. 26. 21:31 keltez?ssel, Khem Raj ?rta: > > > On 2/26/20 12:21 PM, B?sz?rm?nyi Zolt?n wrote: >> 2020. 02. 26. 20:44 keltez?ssel, Khem Raj ?rta: >>> >>> >>> On 2/26/20 9:14 AM, B?sz?rm?nyi Zolt?n wrote: >>>> 2020. 02. 26. 18:08 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: >>>>> 2020. 02. 26. 17:51 keltez?ssel, Khem Raj ?rta: >>>>>> >>>>>> >>>>>> On 2/26/20 7:58 AM, B?sz?rm?nyi Zolt?n wrote: >>>>>>> 2020. 02. 26. 16:30 keltez?ssel, Khem Raj ?rta: >>>>>>>> On Wed, Feb 26, 2020 at 7:20 AM B?sz?rm?nyi Zolt?n wrote: >>>>>>>>> >>>>>>>>> 2020. 02. 26. 16:13 keltez?ssel, Khem Raj ?rta: >>>>>>>>>> On Wed, Feb 26, 2020 at 7:12 AM B?sz?rm?nyi Zolt?n >>>>>>>>>> wrote: >>>>>>>>>>> >>>>>>>>>>> 2020. 02. 26. 15:58 keltez?ssel, Khem Raj ?rta: >>>>>>>>>>>> On Wed, Feb 26, 2020 at 6:05 AM B?sz?rm?nyi Zolt?n via >>>>>>>>>>>> Openembedded-core wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> The package name exploits sstate.bbclass so it's not added as >>>>>>>>>>>>> implicit dependency to packages. >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> what is the use of this recipe and why should it be added to core ? >>>>>>>>>>> >>>>>>>>>>> I should have added a cover letter, shouldn't I? >>>>>>>>>>> See patch 3/5 in the series for enabling gallium-va in Mesa. >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> recipe seems to build full libva, so why not just use that instead. >>>>>>>>> >>>>>>>>> You don't seem to be reading mails from openembedded-devel that >>>>>>>>> you were cc-ed on. >>>>>>>> >>>>>>>> don't assume things >>>>>>> >>>>>>> Understood. >>>>>>> >>>>>>>>> http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205142.html >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> I am trying to make us thing if -dev package can be used somehow to >>>>>>>> avoid this >>>>>>>> or have we exhausted all possibilities. >>>>>>> >>>>>>> Why is it a problem to exploit sstate.bbclass internals implicitly >>>>>>> by using a *-initial package name for an arbitrary package? >>>>>> >>>>>> it is not a problem, however, it is a work to keep such setup going and >>>>>> also it has to be considered always in dependencies etc. >>>>>> >>>>>>> Surely it's not reserved for libgcc-initial and friends. >>>>>>> >>>>>> >>>>>> they are different usecases, libgcc-initial is a veneer/trampoline used >>>>>> to bootstrap toolchain, and that too we want to remove at every >>>>>> opportunity we get, we use to have lot of initial recipes and they are >>>>>> very few left, so we have to be mindful of adding another one. >>>>>> >>>>>>> It solves two problems nicely in one go: >>>>>>> 1. by using a different package than libva, the libva-vs-mesa >>>>>>> ??? circular dependency is avoided. mesa needs a crippled libva >>>>>>> (pkgconfig + headers) >>>>>>> ??? to build its VAAPI state tracker and the VAAPI drivers >>>>>> >>>>>> I see archlinux using full libva for this. how are other distros doing >>>>>> it? is this problem unique to OE >>>>> >>>>> Fedora also uses the full libva. >>>>> >>>>> However, the chicken-and-egg circular dependency is broken by history >>>>> for these distros. >>>>> >>>>> Koji and Mock build one package at a time with all their dependencies >>>>> already available from the staging package repository and the results >>>>> will be eventually uploaded to the same repository. >>>>> >>>>> Bitbake doesn't have have this loophole to download pre-built dependencies. >>>> >>>> Also, somewhere on 01.org or in the libva sources the same solution >>>> I presented in this patchset is suggested: >>>> >>>> 1. build libva with --disable-glx (it is needed when Mesa SDK is present) >>>> ??? but it's not needed by not depending on mesa in libva-initial >>>> 2. build mesa with libva build in (1) as it only needs the pkgconfig files >>>> ??? and the headers >>>> 3. build libva with --enable-glx. It's autodetected, set to on with >>>> ??? depending on mesa in the full libva recipe. >>> >>> looking at the nature of the problem, it might be the way to unbreak the catch-22, does >>> anything else needs this bootstrap header package ? >> >> Besides DEPENDS="libdrm", no. Sorry, I misread the question, it was too late after a workday. Nothing else uses this bootstrap package just Mesa. >> >>> do we need to ensure that content of libva-dev and the bootstrap packages do not overlap. >> >> I don't think so. >> Apparently, the mesa-dev package built from this patchset >> doesn't depend on libva-initial-dev and this latter package >> doesn't get included into an image either. I guess the >> sstate.bbclass internals deal with this properly. >> > > OK, I guess, we should give it a test. > >> >>> >>>> >>>> Obviusly the same libva recipe can't be used to build mesa that depends on mesa. >>>> >>> >>> >> From akuster808 at gmail.com Thu Feb 27 04:26:58 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Wed, 26 Feb 2020 20:26:58 -0800 Subject: [OE-core] [PATCH] wic: Add include-dir option Message-ID: <20200227042658.19619-1-akuster808@gmail.com> This option allows for the inclusion of a single directory for a partition. Signed-off-by: Armin Kuster --- scripts/lib/wic/help.py | 3 +++ scripts/lib/wic/ksparser.py | 1 + scripts/lib/wic/partition.py | 1 + scripts/lib/wic/plugins/source/rootfs.py | 10 ++++++++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 4d342fcf05..517f68e11e 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -979,6 +979,9 @@ DESCRIPTION copies. This option only has an effect with the rootfs source plugin. + --include-dir: This option is specific to wic. It adds the contents + of the given directory to the resulting partition. + --extra-space: This option is specific to wic. It adds extra space after the space filled by the content of the partition. The final size can go diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 650b976223..b8abc33c87 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -138,6 +138,7 @@ class KickStart(): part.add_argument('--align', type=int) part.add_argument('--exclude-path', nargs='+') part.add_argument('--include-path', nargs='+') + part.add_argument('--include-dir') part.add_argument("--extra-space", type=sizetype) part.add_argument('--fsoptions', dest='fsopts') part.add_argument('--fstype', default='vfat', diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 2d95f78439..0b735fffd9 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -31,6 +31,7 @@ class Partition(): self.extra_space = args.extra_space self.exclude_path = args.exclude_path self.include_path = args.include_path + self.include_dir = args.include_dir self.fsopts = args.fsopts self.fstype = args.fstype self.label = args.label diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 705aeb5563..d1c59cab8a 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -71,7 +71,7 @@ class RootfsPlugin(SourcePlugin): new_rootfs = None # Handle excluded paths. - if part.exclude_path or part.include_path: + if part.exclude_path or part.include_path or part.include_dir: # We need a new rootfs directory we can delete files from. Copy to # workdir. new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno)) @@ -79,7 +79,13 @@ class RootfsPlugin(SourcePlugin): if os.path.lexists(new_rootfs): shutil.rmtree(os.path.join(new_rootfs)) - copyhardlinktree(part.rootfs_dir, new_rootfs) + if part.include_dir: + src = os.path.realpath(os.path.join(part.rootfs_dir, part.include_dir)) + dst = os.path.realpath(os.path.join(new_rootfs, part.include_dir)) + copyhardlinktree(src, dst) + + else: + copyhardlinktree(part.rootfs_dir, new_rootfs) for path in part.include_path or []: copyhardlinktree(path, new_rootfs) -- 2.17.1 From zboszor at pr.hu Thu Feb 27 05:24:46 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Thu, 27 Feb 2020 06:24:46 +0100 Subject: [OE-core] [PATCH v2 2/4] libva-initial: New bootstrap recipe In-Reply-To: <20200227052448.65435-1-zboszor@pr.hu> References: <20200227052448.65435-1-zboszor@pr.hu> Message-ID: <20200227052448.65435-3-zboszor@pr.hu> Mesa needs libva.pc and libva headers to enable the VAAPI state tracker and drivers. This recipe is a variant of the full libva package build as in: * it only depends on libdrm to build so it doesn't introduce the circular dependency between mesa and libva, and * it doesn't include the libraries in the final package. However, there is another issue with build dependency handling in Yocto. libva depends on mesa and mesa depends on this package. Any package that depends on libva therefore would pull in libva and this package resulting in an error in the prepare-sysroot phase because they would install identical files into the per-recipe sysroot. Using the package name "*-initial" avoids this because of the interaction between sstate.bbclass and staging.bbclass: any package with the pattern "*-initial" in the name is excluded from the dependency list unless explicitly added to DEPENDS. Signed-off-by: B?sz?rm?nyi Zolt?n --- v2: The include file is not versioned, more verbose commit message meta/recipes-graphics/libva/libva-initial_2.6.1.bb | 9 +++++++++ meta/recipes-graphics/libva/libva.inc | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/libva/libva-initial_2.6.1.bb diff --git a/meta/recipes-graphics/libva/libva-initial_2.6.1.bb b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb new file mode 100644 index 0000000000..a3b04eb02a --- /dev/null +++ b/meta/recipes-graphics/libva/libva-initial_2.6.1.bb @@ -0,0 +1,9 @@ +require libva.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" +SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" +SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" + +do_install_append () { + rm -f ${D}${libdir}/*.so* +} diff --git a/meta/recipes-graphics/libva/libva.inc b/meta/recipes-graphics/libva/libva.inc index 058581f7d1..6a3427b5b1 100644 --- a/meta/recipes-graphics/libva/libva.inc +++ b/meta/recipes-graphics/libva/libva.inc @@ -16,7 +16,9 @@ BUGTRACKER = "https://github.com/intel/libva/issues" SECTION = "x11" LICENSE = "MIT" -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" +SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" + +S = "${WORKDIR}/libva-${PV}" UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" -- 2.24.1 From zboszor at pr.hu Thu Feb 27 05:24:44 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Thu, 27 Feb 2020 06:24:44 +0100 Subject: [OE-core] [PATCH v2 0/4] Enable VAAPI and VDPAU video drivers in Mesa Message-ID: <20200227052448.65435-1-zboszor@pr.hu> Mesa needs libva to enable VAAPI state tracker and drivers. libva needs Mesa to enable its GLX part. This is a circular dependency that can be solved by introducing a new libva recipe variant that doesn't enable GLX. Actually, the presence of Mesa/OpenGL headers is autodetected in libva so it's enough to leave out Mesa from DEPENDS in the new libva recipe variant. With magic already existing in sstate.bbclass and staging.bbclass, naming the new libva recipe variant "libva-initial" avoids an error for every other recipe that pulls in libva as dependency, including libva-utils and intel-vaapi-driver. The error (if not naming the recipe as "*-initial") is that the prepare-sysroot phase of a package would pull in the files rom both libva build variants that would obviously install identical files. Enabling the VDPAU state tracker and libraries is trivial, it was just missing from the recipe. [PATCH v2 1/4] libva: Factor out base parts into an include file [PATCH v2 2/4] libva-initial: New bootstrap recipe [PATCH v2 3/4] mesa: Add PACKAGECONFIG knob to enable VAAPI [PATCH v2 4/4] mesa: Add PACKAGECONFIG knob to enable VDPAU state Signed-off-by: B?sz?rm?nyi Zolt?n From zboszor at pr.hu Thu Feb 27 05:24:47 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Thu, 27 Feb 2020 06:24:47 +0100 Subject: [OE-core] [PATCH v2 3/4] mesa: Add PACKAGECONFIG knob to enable VAAPI In-Reply-To: <20200227052448.65435-1-zboszor@pr.hu> References: <20200227052448.65435-1-zboszor@pr.hu> Message-ID: <20200227052448.65435-4-zboszor@pr.hu> The previously added libva-initial recipe makes it possible and trivial. Signed-off-by: B?sz?rm?nyi Zolt?n --- v2: Small explanation in the commit message meta/recipes-graphics/mesa/mesa.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 87f167c507..479d3223fa 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -142,6 +142,7 @@ PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS}, -Dgallium-drivers PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \ ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" +PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" PACKAGECONFIG[lima] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" -- 2.24.1 From zboszor at pr.hu Thu Feb 27 05:24:45 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Thu, 27 Feb 2020 06:24:45 +0100 Subject: [OE-core] [PATCH v2 1/4] libva: Factor out base parts into an include file In-Reply-To: <20200227052448.65435-1-zboszor@pr.hu> References: <20200227052448.65435-1-zboszor@pr.hu> Message-ID: <20200227052448.65435-2-zboszor@pr.hu> To enable the VAAPI state tracker and drivers in mesa, it needs libva.pc and the libva headers. At the recipe level, this would create a circular dependency between libva and mesa. This is a preparation step before introducing a new libva recipe variant to break the circular dependency. Signed-off-by: B?sz?rm?nyi Zolt?n --- v2: The include file is not versioned, verbose commit message meta/recipes-graphics/libva/libva.inc | 27 ++++++++++++++++++++++ meta/recipes-graphics/libva/libva_2.6.1.bb | 27 ++-------------------- 2 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 meta/recipes-graphics/libva/libva.inc diff --git a/meta/recipes-graphics/libva/libva.inc b/meta/recipes-graphics/libva/libva.inc new file mode 100644 index 0000000000..058581f7d1 --- /dev/null +++ b/meta/recipes-graphics/libva/libva.inc @@ -0,0 +1,27 @@ +SUMMARY = "Video Acceleration (VA) API for Linux" +DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \ +and API specification which enables and provides access to graphics \ +hardware (GPU) acceleration for video processing on Linux and UNIX \ +based operating systems. Accelerated processing includes video \ +decoding, video encoding, subpicture blending and rendering. The \ +specification was originally designed by Intel for its GMA (Graphics \ +Media Accelerator) series of GPU hardware, the API is however not \ +limited to GPUs or Intel specific hardware, as other hardware and \ +manufacturers can also freely use this API for hardware accelerated \ +video decoding." + +HOMEPAGE = "https://01.org/linuxmedia/vaapi" +BUGTRACKER = "https://github.com/intel/libva/issues" + +SECTION = "x11" +LICENSE = "MIT" + +SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" + +UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" + +DEPENDS = "libdrm" + +inherit meson pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta/recipes-graphics/libva/libva_2.6.1.bb b/meta/recipes-graphics/libva/libva_2.6.1.bb index 92cea83bc1..b68fb27136 100644 --- a/meta/recipes-graphics/libva/libva_2.6.1.bb +++ b/meta/recipes-graphics/libva/libva_2.6.1.bb @@ -1,33 +1,10 @@ -SUMMARY = "Video Acceleration (VA) API for Linux" -DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \ -and API specification which enables and provides access to graphics \ -hardware (GPU) acceleration for video processing on Linux and UNIX \ -based operating systems. Accelerated processing includes video \ -decoding, video encoding, subpicture blending and rendering. The \ -specification was originally designed by Intel for its GMA (Graphics \ -Media Accelerator) series of GPU hardware, the API is however not \ -limited to GPUs or Intel specific hardware, as other hardware and \ -manufacturers can also freely use this API for hardware accelerated \ -video decoding." +require libva.inc -HOMEPAGE = "https://01.org/linuxmedia/vaapi" -BUGTRACKER = "https://github.com/intel/libva/issues" - -SECTION = "x11" -LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" - -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" SRC_URI[md5sum] = "aef13eb48e01a47d1416d97462a22a11" SRC_URI[sha256sum] = "6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5" -UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" - -DEPENDS = "libdrm virtual/mesa" - -inherit meson pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "opengl" +DEPENDS += "virtual/mesa" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" PACKAGECONFIG[x11] = "-Dwith_x11=yes, -Dwith_x11=no,virtual/libx11 libxext libxfixes" -- 2.24.1 From zboszor at pr.hu Thu Feb 27 05:24:48 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Thu, 27 Feb 2020 06:24:48 +0100 Subject: [OE-core] [PATCH v2 4/4] mesa: Add PACKAGECONFIG knob to enable VDPAU state tracker and drivers In-Reply-To: <20200227052448.65435-1-zboszor@pr.hu> References: <20200227052448.65435-1-zboszor@pr.hu> Message-ID: <20200227052448.65435-5-zboszor@pr.hu> Signed-off-by: B?sz?rm?nyi Zolt?n --- v2: Replaced FILES_${PN}-vdpau-drivers with FILES_mesa-vdpau-drivers to match the name in PACKAGES. meta/recipes-graphics/mesa/mesa.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 479d3223fa..800e8813c7 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -144,6 +144,8 @@ PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llv PACKAGECONFIG[xa] = "-Dgallium-xa=true, -Dgallium-xa=false" PACKAGECONFIG[va] = "-Dgallium-va=true,-Dgallium-va=false,libva-initial" +PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=true,-Dgallium-vdpau=false,libvdpau" + PACKAGECONFIG[lima] = "" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" @@ -179,6 +181,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ libxatracker libxatracker-dev \ mesa-megadriver mesa-vulkan-drivers \ + mesa-vdpau-drivers \ " do_install_append () { @@ -256,6 +259,7 @@ PACKAGES_DYNAMIC += "^mesa-driver-.*" FILES_mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf" FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" +FILES_mesa-vdpau-drivers = "${libdir}/vdpau/*.so.*" FILES_libegl-mesa = "${libdir}/libEGL.so.*" FILES_libgbm = "${libdir}/libgbm.so.*" FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" @@ -265,7 +269,7 @@ FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libxatracker = "${libdir}/libxatracker.so.*" -FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan" +FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdpau/*.so" FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" -- 2.24.1 From changqing.li at windriver.com Thu Feb 27 05:25:46 2020 From: changqing.li at windriver.com (changqing.li at windriver.com) Date: Thu, 27 Feb 2020 13:25:46 +0800 Subject: [OE-core] [PATCH] qemu: fix CVE-2020-7039 Message-ID: <1582781146-253903-1-git-send-email-changqing.li@windriver.com> From: Changqing Li Signed-off-by: Changqing Li --- meta/recipes-devtools/qemu/qemu.inc | 3 + .../qemu/qemu/CVE-2020-7039-1.patch | 44 +++++++++++++++ .../qemu/qemu/CVE-2020-7039-2.patch | 59 ++++++++++++++++++++ .../qemu/qemu/CVE-2020-7039-3.patch | 64 ++++++++++++++++++++++ 4 files changed, 170 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a557e74..a9d5278 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,6 +29,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ + file://CVE-2020-7039-1.patch \ + file://CVE-2020-7039-2.patch \ + file://CVE-2020-7039-3.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch new file mode 100644 index 0000000..df6bca6 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch @@ -0,0 +1,44 @@ +From b2663d527a1992ba98c0266458b21ada3b9d0d2e Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 12:07:35 +0800 +Subject: [PATCH] tcp_emu: Fix oob access + +The main loop only checks for one available byte, while we sometimes +need two bytes. + +CVE: CVE-2020-7039 +Upstream-Status: Backport +[https://gitlab.freedesktop.org/slirp/libslirp/commit/2655fffed7a9e765bcb4701dd876e9dab975f289] + +Signed-off-by: Changqing Li +--- + slirp/src/tcp_subr.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c +index d6dd133..4bea2d4 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -886,6 +886,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + break; + + case 5: ++ if (bptr == m->m_data + m->m_len - 1) ++ return 1; /* We need two bytes */ + /* + * The difference between versions 1.0 and + * 2.0 is here. For future versions of +@@ -901,6 +903,10 @@ int tcp_emu(struct socket *so, struct mbuf *m) + /* This is the field containing the port + * number that RA-player is listening to. + */ ++ ++ if (bptr == m->m_data + m->m_len - 1) ++ return 1; /* We need two bytes */ ++ + lport = (((uint8_t *)bptr)[0] << 8) + ((uint8_t *)bptr)[1]; + if (lport < 6970) + lport += 256; /* don't know why */ +-- +2.7.4 + diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch new file mode 100644 index 0000000..4a00fa2 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch @@ -0,0 +1,59 @@ +From 8f67e76e4148e37f3d8d2bcbdee7417fdedb7669 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 12:10:34 +0800 +Subject: [PATCH] slirp: use correct size while emulating commands + +While emulating services in tcp_emu(), it uses 'mbuf' size +'m->m_size' to write commands via snprintf(3). Use M_FREEROOM(m) +size to avoid possible OOB access. +Signed-off-by: default avatarPrasad J Pandit +Signed-off-by: Samuel Thibault's avatarSamuel Thibault + +Message-Id: <20200109094228.79764-3-ppandit at redhat.com> + +CVE: CVE-2020-7039 +Upstream-Status: Backport +[https://gitlab.freedesktop.org/slirp/libslirp/commit/82ebe9c370a0e2970fb5695aa19aa5214a6a1c80] + +Signed-off-by: Changqing Li +--- + slirp/src/tcp_subr.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c +index 4bea2d4..e8ed4ef 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -696,7 +696,7 @@ int tcp_emu(struct socket *so, struct mbuf *m) + n4 = (laddr & 0xff); + + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += snprintf(bptr, m->m_size - m->m_len, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), + "ORT %d,%d,%d,%d,%d,%d\r\n%s", n1, n2, n3, n4, + n5, n6, x == 7 ? buff : ""); + return 1; +@@ -731,8 +731,7 @@ int tcp_emu(struct socket *so, struct mbuf *m) + n4 = (laddr & 0xff); + + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size - m->m_len, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), + "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s", + n1, n2, n3, n4, n5, n6, x == 7 ? buff : ""); + +@@ -758,8 +757,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + if (m->m_data[m->m_len - 1] == '\0' && lport != 0 && + (so = tcp_listen(slirp, INADDR_ANY, 0, so->so_laddr.s_addr, + htons(lport), SS_FACCEPTONCE)) != NULL) +- m->m_len = +- snprintf(m->m_data, m->m_size, "%d", ntohs(so->so_fport)) + 1; ++ m->m_len = snprintf(m->m_data, M_ROOM(m), ++ "%d", ntohs(so->so_fport)) + 1; + return 1; + + case EMU_IRC: +-- +2.7.4 + diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch new file mode 100644 index 0000000..70ce480 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch @@ -0,0 +1,64 @@ +From 0b03959b72036afce151783720d9e54988cf76ef Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 12:15:04 +0800 +Subject: [PATCH] slirp: use correct size while emulating IRC commands + +While emulating IRC DCC commands, tcp_emu() uses 'mbuf' size +'m->m_size' to write DCC commands via snprintf(3). This may +lead to OOB write access, because 'bptr' points somewhere in +the middle of 'mbuf' buffer, not at the start. Use M_FREEROOM(m) +size to avoid OOB access. +Reported-by: default avatarVishnu Dev TJ +Signed-off-by: default avatarPrasad J Pandit +Reviewed-by: Samuel Thibault's avatarSamuel Thibault + +Message-Id: <20200109094228.79764-2-ppandit at redhat.com> + +CVE: CVE-2020-7039 +Upstream-Status: Backport +[https://gitlab.freedesktop.org/slirp/libslirp/commit/ce131029d6d4a405cb7d3ac6716d03e58fb4a5d9] + +Signed-off-by: Changqing Li +--- + slirp/src/tcp_subr.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c +index e8ed4ef..3a4a8ee 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -777,7 +777,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += snprintf(bptr, m->m_size, "DCC CHAT chat %lu %u%c\n", ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC CHAT chat %lu %u%c\n", + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), 1); + } else if (sscanf(bptr, "DCC SEND %256s %u %u %u", buff, &laddr, &lport, +@@ -787,8 +788,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size, "DCC SEND %s %lu %u %u%c\n", buff, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC SEND %s %lu %u %u%c\n", buff, + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), n1, 1); + } else if (sscanf(bptr, "DCC MOVE %256s %u %u %u", buff, &laddr, &lport, +@@ -798,8 +799,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size, "DCC MOVE %s %lu %u %u%c\n", buff, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC MOVE %s %lu %u %u%c\n", buff, + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), n1, 1); + } +-- +2.7.4 + -- 2.7.4 From douglas.royds at taitradio.com Thu Feb 27 05:46:05 2020 From: douglas.royds at taitradio.com (Douglas Royds) Date: Thu, 27 Feb 2020 18:46:05 +1300 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> Message-ID: <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> On 26/02/20 4:53 am, Jacob Kroon wrote: > On 2/24/20 8:25 AM, Jacob Kroon wrote: >> Hi Douglas, >> >> You updated a comment in reproducible_build.bbclass, commit >> e7b891b76954c784f5a93bd0a1c91315673ce40d: >> >>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored >>> in the recipe's ${SDE_FILE}. >>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored >>> in the recipe's SDE_FILE. >>> +# If none of these mechanisms are suitable, replace the >>> do_deploy_source_date_epoch task >>> +# with recipe-specific functionality to write the appropriate >>> SOURCE_DATE_EPOCH into the SDE_FILE. >>> +# >> >> But I can't really get this to work. What did work for me was to >> replace "do_create_source_date_epoch_stamp()" in my recipe: >> >> do_create_source_date_epoch_stamp() { >> ???? mkdir -p ${SDE_DIR} >> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >> } >> >> What is the intended way to achieve the thing I'm trying to do here ? >> > > FYI, JPEW has a proposed patch here > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce > > > for allowing a recipe to just set SOURCE_DATE_EPOCH directly. > > But maybe that currently is at odds with SOURCE_DATE_EPOCH being in > BB_HASHBASE_WHITELIST ? > > /Jacob On the surface of it, my comment appears to be just wrong: It does make sense to replace do_create_source_date_epoch_stamp() as you suggest. Joshua's proposed patch looks promising: * Should the new function not be called first, so that it takes priority over the git, known files, and youngest file functions? If someone has explicitly set SOURCE_DATE_EPOCH, then they want it to take priority. * As you observe, SOURCE_DATE_EPOCH would need to be removed from BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in the first place. -------------- next part -------------- An HTML attachment was scrubbed... URL: From zboszor at pr.hu Thu Feb 27 06:16:57 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Thu, 27 Feb 2020 07:16:57 +0100 Subject: [OE-core] [meta-clang][PATCH] conf/nonclangable.conf: Always build mesa with gcc Message-ID: <20200227061657.66871-1-zboszor@pr.hu> Building mesa (at least version 19.3.4) with clang 9.0.1 leads to linker errors on x86/x86-64: "undefined reference to `typeinfo for llvm::raw_pwrite_stream'" in libvulkan_radeon.so and "undefined reference to `typeinfo for llvm::RTDyldMemoryManager'" in libgallium.a. It was reported at https://gitlab.freedesktop.org/mesa/mesa/issues/2533 It seems it is related to rtti not being enabled, at least reports from a few years ago on forums lead to that conclusion. But enabling rtti for clang in PACKAGECONFIG doesn't help. Just build mesa with gcc, it fixes the linker errors. Signed-off-by: B?sz?rm?nyi Zolt?n --- conf/nonclangable.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf index 70336bb..91b9965 100644 --- a/conf/nonclangable.conf +++ b/conf/nonclangable.conf @@ -45,10 +45,9 @@ TOOLCHAIN_pn-libssp-nonshared = "gcc" TOOLCHAIN_pn-libstd-rs = "gcc" TOOLCHAIN_pn-m4_powerpc = "gcc" # clang does not have 64bit atomics on mips32 -TOOLCHAIN_pn-mesa_mips = "gcc" -TOOLCHAIN_pn-mesa_mipsel = "gcc" -TOOLCHAIN_pn-mesa_riscv64 = "gcc" -TOOLCHAIN_pn-mesa_powerpc = "gcc" +# building Mesa 19.3.x with clang causes linker errors on x86/x86-64 +# See https://gitlab.freedesktop.org/mesa/mesa/issues/2533 +TOOLCHAIN_pn-mesa = "gcc" # multiple definition of 'mongo::error_details::isNamedCode<0>' TOOLCHAIN_pn-mongodb = "gcc" # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments -- 2.24.1 From zboszor at pr.hu Thu Feb 27 06:19:37 2020 From: zboszor at pr.hu (=?UTF-8?q?B=C3=B6sz=C3=B6rm=C3=A9nyi=20Zolt=C3=A1n?=) Date: Thu, 27 Feb 2020 07:19:37 +0100 Subject: [OE-core] [meta-clang][zeus][PATCH] conf/nonclangable.conf: Always build mesa with gcc Message-ID: <20200227061937.67057-1-zboszor@pr.hu> Building mesa (at least version 19.3.4) with clang 9.0.1 leads to linker errors on x86/x86-64: "undefined reference to `typeinfo for llvm::raw_pwrite_stream'" in libvulkan_radeon.so and "undefined reference to `typeinfo for llvm::RTDyldMemoryManager'" in libgallium.a. It was reported at https://gitlab.freedesktop.org/mesa/mesa/issues/2533 It seems it is related to rtti not being enabled, at least reports from a few years ago on forums lead to that conclusion. But enabling rtti for clang in PACKAGECONFIG doesn't help. Just build mesa with gcc, it fixes the linker errors. Signed-off-by: B?sz?rm?nyi Zolt?n --- conf/nonclangable.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf index 70336bb..91b9965 100644 --- a/conf/nonclangable.conf +++ b/conf/nonclangable.conf @@ -45,10 +45,9 @@ TOOLCHAIN_pn-libssp-nonshared = "gcc" TOOLCHAIN_pn-libstd-rs = "gcc" TOOLCHAIN_pn-m4_powerpc = "gcc" # clang does not have 64bit atomics on mips32 -TOOLCHAIN_pn-mesa_mips = "gcc" -TOOLCHAIN_pn-mesa_mipsel = "gcc" -TOOLCHAIN_pn-mesa_riscv64 = "gcc" -TOOLCHAIN_pn-mesa_powerpc = "gcc" +# building Mesa 19.3.x with clang causes linker errors on x86/x86-64 +# See https://gitlab.freedesktop.org/mesa/mesa/issues/2533 +TOOLCHAIN_pn-mesa = "gcc" # multiple definition of 'mongo::error_details::isNamedCode<0>' TOOLCHAIN_pn-mongodb = "gcc" # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments -- 2.24.1 From zboszor at pr.hu Thu Feb 27 06:21:07 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Thu, 27 Feb 2020 07:21:07 +0100 Subject: [OE-core] [meta-clang][PATCH] conf/nonclangable.conf: Always build mesa with gcc In-Reply-To: <20200227061657.66871-1-zboszor@pr.hu> References: <20200227061657.66871-1-zboszor@pr.hu> Message-ID: Ignore this, the patch is against the zeus branch. Re-sent with the proper subject. 2020. 02. 27. 7:16 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: > Building mesa (at least version 19.3.4) with clang 9.0.1 leads > to linker errors on x86/x86-64: > > "undefined reference to `typeinfo for llvm::raw_pwrite_stream'" > in libvulkan_radeon.so > > and > > "undefined reference to `typeinfo for llvm::RTDyldMemoryManager'" > in libgallium.a. > > It was reported at https://gitlab.freedesktop.org/mesa/mesa/issues/2533 > > It seems it is related to rtti not being enabled, at least reports > from a few years ago on forums lead to that conclusion. > But enabling rtti for clang in PACKAGECONFIG doesn't help. > > Just build mesa with gcc, it fixes the linker errors. > > Signed-off-by: B?sz?rm?nyi Zolt?n > --- > conf/nonclangable.conf | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf > index 70336bb..91b9965 100644 > --- a/conf/nonclangable.conf > +++ b/conf/nonclangable.conf > @@ -45,10 +45,9 @@ TOOLCHAIN_pn-libssp-nonshared = "gcc" > TOOLCHAIN_pn-libstd-rs = "gcc" > TOOLCHAIN_pn-m4_powerpc = "gcc" > # clang does not have 64bit atomics on mips32 > -TOOLCHAIN_pn-mesa_mips = "gcc" > -TOOLCHAIN_pn-mesa_mipsel = "gcc" > -TOOLCHAIN_pn-mesa_riscv64 = "gcc" > -TOOLCHAIN_pn-mesa_powerpc = "gcc" > +# building Mesa 19.3.x with clang causes linker errors on x86/x86-64 > +# See https://gitlab.freedesktop.org/mesa/mesa/issues/2533 > +TOOLCHAIN_pn-mesa = "gcc" > # multiple definition of 'mongo::error_details::isNamedCode<0>' > TOOLCHAIN_pn-mongodb = "gcc" > # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments > From patchwork at patchwork.openembedded.org Thu Feb 27 06:32:23 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Thu, 27 Feb 2020 06:32:23 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_conf/noncl?= =?utf-8?q?angable=2Econf=3A_Always_build_mesa_with_gcc?= In-Reply-To: <20200227061657.66871-1-zboszor@pr.hu> References: <20200227061657.66871-1-zboszor@pr.hu> Message-ID: <20200227063223.2275.20528@do> == Series Details == Series: conf/nonclangable.conf: Always build mesa with gcc Revision: 1 URL : https://patchwork.openembedded.org/series/22979/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [meta-clang] conf/nonclangable.conf: Always build mesa with gcc Issue Series sent to the wrong mailing list [test_target_mailing_list] Suggested fix Check the project's README (meta-clang) and send the patch to the indicated list * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at 23ad05b98a) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From patchwork at patchwork.openembedded.org Thu Feb 27 06:32:24 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Thu, 27 Feb 2020 06:32:24 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_conf/noncl?= =?utf-8?q?angable=2Econf=3A_Always_build_mesa_with_gcc_=28rev2=29?= In-Reply-To: <20200227061937.67057-1-zboszor@pr.hu> References: <20200227061937.67057-1-zboszor@pr.hu> Message-ID: <20200227063224.2274.39631@do> == Series Details == Series: conf/nonclangable.conf: Always build mesa with gcc (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/22979/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [meta-clang,zeus] conf/nonclangable.conf: Always build mesa with gcc Issue Series sent to the wrong mailing list [test_target_mailing_list] Suggested fix Check the project's README (meta-clang,zeus) and send the patch to the indicated list * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch zeus (currently at f39285bb82) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From raj.khem at gmail.com Thu Feb 27 07:44:39 2020 From: raj.khem at gmail.com (Khem Raj) Date: Wed, 26 Feb 2020 23:44:39 -0800 Subject: [OE-core] [meta-clang][PATCH] conf/nonclangable.conf: Always build mesa with gcc In-Reply-To: References: <20200227061657.66871-1-zboszor@pr.hu> Message-ID: Can you send it via github pull request please On Wed, Feb 26, 2020 at 10:21 PM B?sz?rm?nyi Zolt?n via Openembedded-core wrote: > > Ignore this, the patch is against the zeus branch. > Re-sent with the proper subject. > > 2020. 02. 27. 7:16 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: > > Building mesa (at least version 19.3.4) with clang 9.0.1 leads > > to linker errors on x86/x86-64: > > > > "undefined reference to `typeinfo for llvm::raw_pwrite_stream'" > > in libvulkan_radeon.so > > > > and > > > > "undefined reference to `typeinfo for llvm::RTDyldMemoryManager'" > > in libgallium.a. > > > > It was reported at https://gitlab.freedesktop.org/mesa/mesa/issues/2533 > > > > It seems it is related to rtti not being enabled, at least reports > > from a few years ago on forums lead to that conclusion. > > But enabling rtti for clang in PACKAGECONFIG doesn't help. > > > > Just build mesa with gcc, it fixes the linker errors. > > > > Signed-off-by: B?sz?rm?nyi Zolt?n > > --- > > conf/nonclangable.conf | 7 +++---- > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf > > index 70336bb..91b9965 100644 > > --- a/conf/nonclangable.conf > > +++ b/conf/nonclangable.conf > > @@ -45,10 +45,9 @@ TOOLCHAIN_pn-libssp-nonshared = "gcc" > > TOOLCHAIN_pn-libstd-rs = "gcc" > > TOOLCHAIN_pn-m4_powerpc = "gcc" > > # clang does not have 64bit atomics on mips32 > > -TOOLCHAIN_pn-mesa_mips = "gcc" > > -TOOLCHAIN_pn-mesa_mipsel = "gcc" > > -TOOLCHAIN_pn-mesa_riscv64 = "gcc" > > -TOOLCHAIN_pn-mesa_powerpc = "gcc" > > +# building Mesa 19.3.x with clang causes linker errors on x86/x86-64 > > +# See https://gitlab.freedesktop.org/mesa/mesa/issues/2533 > > +TOOLCHAIN_pn-mesa = "gcc" > > # multiple definition of 'mongo::error_details::isNamedCode<0>' > > TOOLCHAIN_pn-mongodb = "gcc" > > # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From raj.khem at gmail.com Thu Feb 27 08:05:54 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 00:05:54 -0800 Subject: [OE-core] [PATCH 0/4] Upgrade go to 1.16, kernel-headers and systemd fixes for musl Message-ID: <20200227080558.3819138-1-raj.khem@gmail.com> go 1.14 was just released, it seems to be an easy one to upgrade drop couple of musl-only linux-libc-headers patches, glibc should be unaffected Enable resolved in systemd for musl now that we can compile it Drop local patch to enable 64bit time_t in favor of backports Khem Raj (4): linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR systemd: Do not force removing resolved from PACKAGECONFIG systemd: Drop local time64 patch in favour of upstreamed patches go: Update to 1.14 release series meta/conf/distro/include/tcmode-default.inc | 2 +- ...ead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 ---------------- meta/recipes-core/systemd/systemd_244.3.bb | 6 +-- .../go/{go-1.13.inc => go-1.14.inc} | 8 ++-- ...ow-CC-and-CXX-to-have-multiple-words.patch | 7 +--- ...ent-based-hash-generation-less-pedan.patch | 33 +++++++---------- ...-to-be-overridden-in-the-environment.patch | 11 +----- ...4-ld-add-soname-to-shareable-objects.patch | 11 ++---- ...de-CC-when-building-dist-and-go_boot.patch | 9 +---- ...dist-separate-host-and-target-builds.patch | 37 ++++++++----------- ...d-go-make-GOROOT-precious-by-default.patch | 23 ++++-------- ...008-use-GOBUILDMODE-to-set-buildmode.patch | 9 +---- ...place-glibc-dynamic-linker-with-musl.patch | 23 +----------- ...dian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 ...o-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../{go-native_1.13.bb => go-native_1.14.bb} | 0 ...{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../go/{go_1.13.bb => go_1.14.bb} | 0 ...muslc-ethhdr-protection-to-uapi-file.patch | 31 ---------------- ...revent-redefinition-of-struct-ethhdr.patch | 30 --------------- .../linux-libc-headers_5.4.bb | 2 - 22 files changed, 56 insertions(+), 217 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch rename meta/recipes-devtools/go/{go-1.13.inc => go-1.14.inc} (81%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0001-allow-CC-and-CXX-to-have-multiple-words.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (83%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0004-ld-add-soname-to-shareable-objects.patch (82%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0006-cmd-dist-separate-host-and-target-builds.patch (95%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0007-cmd-go-make-GOROOT-precious-by-default.patch (79%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0008-use-GOBUILDMODE-to-set-buildmode.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0009-ld-replace-glibc-dynamic-linker-with-musl.patch (79%) rename meta/recipes-devtools/go/{go-cross-canadian_1.13.bb => go-cross-canadian_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.13.bb => go-cross_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.13.bb => go-native_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.13.bb => go-runtime_1.14.bb} (100%) rename meta/recipes-devtools/go/{go_1.13.bb => go_1.14.bb} (100%) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch -- 2.25.1 From raj.khem at gmail.com Thu Feb 27 08:05:55 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 00:05:55 -0800 Subject: [OE-core] [PATCH 1/4] linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR In-Reply-To: <20200227080558.3819138-1-raj.khem@gmail.com> References: <20200227080558.3819138-1-raj.khem@gmail.com> Message-ID: <20200227080558.3819138-2-raj.khem@gmail.com> __UAPI_DEF_ETHHDR has been defined in kernel UAPI [1] and musl already defined it to 0 via [2] So these patches can now be dropped. [1] https://patchwork.ozlabs.org/patch/872502/ [2] https://git.musl-libc.org/cgit/musl/commit/?id=b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Signed-off-by: Khem Raj Cc: Bruce Ashfield --- ...muslc-ethhdr-protection-to-uapi-file.patch | 31 ------------------- ...revent-redefinition-of-struct-ethhdr.patch | 30 ------------------ .../linux-libc-headers_5.4.bb | 2 -- 3 files changed, 63 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch deleted file mode 100644 index 68b244698f..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 1 Mar 2018 18:31:01 -0500 -Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file - -Signed-off-by: Bruce Ashfield -Upstream-Status: Pending ---- - include/uapi/linux/if_ether.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h -index 153c9c2..7b69b73 100644 ---- a/include/uapi/linux/if_ether.h -+++ b/include/uapi/linux/if_ether.h -@@ -149,6 +149,12 @@ - * This is an Ethernet frame header. - */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* allow libcs like musl to deactivate this, glibc does not implement this. */ - #ifndef __UAPI_DEF_ETHHDR - #define __UAPI_DEF_ETHHDR 1 --- -2.7.4 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch deleted file mode 100644 index fb7e1de17a..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Wed, 22 Jan 2014 00:57:48 +0100 -Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr - ---- -Signed-off-by: Khem Raj -Upstream-Status: Submitted - - include/uapi/linux/if_ether.h | 4 +++- - include/uapi/linux/libc-compat.h | 6 ++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -Index: linux-4.15/include/uapi/linux/libc-compat.h -=================================================================== ---- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500 -+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500 -@@ -51,6 +51,12 @@ - - #ifndef __KERNEL__ /* we're used from userspace */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb index 50377394f3..8a12103ee5 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb @@ -2,10 +2,8 @@ require linux-libc-headers.inc SRC_URI_append_libc-musl = "\ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " -- 2.25.1 From raj.khem at gmail.com Thu Feb 27 08:05:56 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 00:05:56 -0800 Subject: [OE-core] [PATCH 2/4] systemd: Do not force removing resolved from PACKAGECONFIG In-Reply-To: <20200227080558.3819138-1-raj.khem@gmail.com> References: <20200227080558.3819138-1-raj.khem@gmail.com> Message-ID: <20200227080558.3819138-3-raj.khem@gmail.com> This needs __UAPI_DEF_ETHHDR to be set to 0 which now taken care by CFLAGS Signed-off-by: Khem Raj --- meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 5d863410b8..e7d2997963 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ nss \ nss-mymachines \ nss-resolve \ - resolved \ smack \ sysusers \ utmp \ " +CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " + # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. -- 2.25.1 From raj.khem at gmail.com Thu Feb 27 08:05:57 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 00:05:57 -0800 Subject: [OE-core] [PATCH 3/4] systemd: Drop local time64 patch in favour of upstreamed patches In-Reply-To: <20200227080558.3819138-1-raj.khem@gmail.com> References: <20200227080558.3819138-1-raj.khem@gmail.com> Message-ID: <20200227080558.3819138-4-raj.khem@gmail.com> https://github.com/systemd/systemd/commit/9e7c8f64cfda101496f56f5546097221e8ad5d6a https://github.com/systemd/systemd/commit/601f91bec5646a9c6fbd4f1ec5f1b4ae28d3a770 Fixed this issue upstream and they are present in 244 release Signed-off-by: Khem Raj --- ...ead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 ------------------- meta/recipes-core/systemd/systemd_244.3.bb | 3 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch deleted file mode 100644 index 33c575871c..0000000000 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Dec 2019 12:49:07 -0800 -Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout - -kernel prior to 64bit time_t support might not entertain such large -timeout therefore reduce it to INT_MAX which would set timer expiration -event after 68 years of uptime, should be good for all practical -purposes - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Upstream-Status: Pending - ---- - src/basic/time-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index d7ef30d2fe52..4d3219f114b5 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -1487,7 +1487,7 @@ int time_change_fd(void) { - - /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ - static const struct itimerspec its = { -- .it_value.tv_sec = TIME_T_MAX, -+ .it_value.tv_sec = INT_MAX, - }; - - _cleanup_close_ int fd; diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index e7d2997963..dfb7ad59c0 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -17,9 +17,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ + file://99-default.preset \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://99-default.preset \ " # patches needed by musl @@ -42,7 +42,6 @@ SRC_URI_MUSL = "\ file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch \ file://0024-test-json.c-define-M_PIl.patch \ file://0001-do-not-disable-buffer-in-writing-files.patch \ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ -- 2.25.1 From raj.khem at gmail.com Thu Feb 27 08:05:58 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 00:05:58 -0800 Subject: [OE-core] [PATCH 4/4] go: Update to 1.14 release series In-Reply-To: <20200227080558.3819138-1-raj.khem@gmail.com> References: <20200227080558.3819138-1-raj.khem@gmail.com> Message-ID: <20200227080558.3819138-5-raj.khem@gmail.com> Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../go/{go-1.13.inc => go-1.14.inc} | 8 ++-- ...ow-CC-and-CXX-to-have-multiple-words.patch | 7 +--- ...ent-based-hash-generation-less-pedan.patch | 33 +++++++---------- ...-to-be-overridden-in-the-environment.patch | 11 +----- ...4-ld-add-soname-to-shareable-objects.patch | 11 ++---- ...de-CC-when-building-dist-and-go_boot.patch | 9 +---- ...dist-separate-host-and-target-builds.patch | 37 ++++++++----------- ...d-go-make-GOROOT-precious-by-default.patch | 23 ++++-------- ...008-use-GOBUILDMODE-to-set-buildmode.patch | 9 +---- ...place-glibc-dynamic-linker-with-musl.patch | 23 +----------- ...dian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 ...o-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../{go-native_1.13.bb => go-native_1.14.bb} | 0 ...{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../go/{go_1.13.bb => go_1.14.bb} | 0 17 files changed, 53 insertions(+), 120 deletions(-) rename meta/recipes-devtools/go/{go-1.13.inc => go-1.14.inc} (81%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0001-allow-CC-and-CXX-to-have-multiple-words.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (83%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0004-ld-add-soname-to-shareable-objects.patch (82%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0006-cmd-dist-separate-host-and-target-builds.patch (95%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0007-cmd-go-make-GOROOT-precious-by-default.patch (79%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0008-use-GOBUILDMODE-to-set-buildmode.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0009-ld-replace-glibc-dynamic-linker-with-musl.patch (79%) rename meta/recipes-devtools/go/{go-cross-canadian_1.13.bb => go-cross-canadian_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.13.bb => go-cross_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.13.bb => go-native_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.13.bb => go-runtime_1.14.bb} (100%) rename meta/recipes-devtools/go/{go_1.13.bb => go_1.14.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index e957e3a9bb..31d4b3b854 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" -GOVERSION ?= "1.13%" +GOVERSION ?= "1.14%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "9.0.1" diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.14.inc similarity index 81% rename from meta/recipes-devtools/go/go-1.13.inc rename to meta/recipes-devtools/go/go-1.14.inc index 7780aced89..ac7b95cf03 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -1,7 +1,7 @@ require go-common.inc -GO_BASEVERSION = "1.13" -GO_MINOR = ".8" +GO_BASEVERSION = "1.14" +GO_MINOR = "" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,5 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" -SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" +SRC_URI[main.md5sum] = "7c97bdb3b5218a5089612efb3ed30345" +SRC_URI[main.sha256sum] = "6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389" diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch rename to meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch index ddfd5e41d1..d47664d8e2 100644 --- a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch @@ -15,11 +15,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/envcmd/env.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 17852de..7b5ec5e 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -100,11 +100,11 @@ func MkEnv() []cfg.EnvVar { +@@ -102,11 +102,11 @@ func MkEnv() []cfg.EnvVar { cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { @@ -33,6 +31,3 @@ index 17852de..7b5ec5e 100644 } env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch rename to meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch index 4eddd39809..9e88567ebd 100644 --- a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -50,11 +50,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 19 deletions(-) -diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 7b5ec5e..292f117 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -154,7 +154,7 @@ func ExtraEnvVars() []cfg.EnvVar { +@@ -156,7 +156,7 @@ func ExtraEnvVars() []cfg.EnvVar { func ExtraEnvVarsCostly() []cfg.EnvVar { var b work.Builder b.Init() @@ -63,8 +61,6 @@ index 7b5ec5e..292f117 100644 if err != nil { // Should not happen - b.CFlags was given an empty package. fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 7dd9a90..ccebaf8 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -32,6 +32,8 @@ import ( @@ -76,16 +72,16 @@ index 7dd9a90..ccebaf8 100644 // actionList returns the list of actions in the dag rooted at root // as visited in a depth-first post-order traversal. func actionList(root *Action) []*Action { -@@ -205,7 +207,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { - // The compiler hides the exact value of $GOROOT - // when building things in GOROOT. +@@ -208,7 +210,7 @@ func (b *Builder) buildActionID(a *Actio // Assume b.WorkDir is being trimmed properly. + // When -trimpath is used with a package built from the module cache, + // use the module path and version instead of the directory. - if !p.Goroot && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { + if !p.Goroot && !omitGopath && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { fmt.Fprintf(h, "dir %s\n", p.Dir) - } - fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) -@@ -219,13 +221,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { + } else if cfg.BuildTrimpath && p.Module != nil { + fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) +@@ -224,13 +226,13 @@ func (b *Builder) buildActionID(a *Actio } if len(p.CgoFiles)+len(p.SwigFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) @@ -103,7 +99,7 @@ index 7dd9a90..ccebaf8 100644 } // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? } -@@ -2229,33 +2231,48 @@ var ( +@@ -2228,33 +2230,48 @@ var ( // gccCmd returns a gcc command line prefix // defaultCC is defined in zdefaultcc.go, written by cmd/dist. func (b *Builder) GccCmd(incdir, workdir string) []string { @@ -161,7 +157,7 @@ index 7dd9a90..ccebaf8 100644 } // compilerExe returns the compiler to use given an -@@ -2264,11 +2281,16 @@ func (b *Builder) fcExe() []string { +@@ -2263,11 +2280,16 @@ func (b *Builder) fcExe() []string { // of the compiler but can have additional arguments if they // were present in the environment value. // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. @@ -179,7 +175,7 @@ index 7dd9a90..ccebaf8 100644 return compiler } -@@ -2429,7 +2451,7 @@ func envList(key, def string) []string { +@@ -2428,7 +2450,7 @@ func envList(key, def string) []string { } // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. @@ -188,7 +184,7 @@ index 7dd9a90..ccebaf8 100644 defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2448,6 +2470,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l +@@ -2447,6 +2469,14 @@ func (b *Builder) CFlags(p *load.Package return } @@ -203,7 +199,7 @@ index 7dd9a90..ccebaf8 100644 return } -@@ -2462,7 +2492,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2461,7 +2491,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -212,7 +208,7 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return nil, nil, err } -@@ -2821,7 +2851,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { +@@ -2820,7 +2850,7 @@ func (b *Builder) swigIntSize(objdir str // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { @@ -221,6 +217,3 @@ index 7dd9a90..ccebaf8 100644 if err != nil { return "", "", err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch similarity index 83% rename from meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch rename to meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch index 9aa0119ae9..662c705471 100644 --- a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/cfg/cfg.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 9e50311..683ca6f 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -244,7 +244,9 @@ func xinit() { +@@ -246,7 +246,9 @@ func xinit() { workdir = xworkdir() xatexit(rmworkdir) @@ -32,11 +30,9 @@ index 9e50311..683ca6f 100644 } // compilerEnv returns a map from "goos/goarch" to the -diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index a3277a6..db96350 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -60,7 +60,11 @@ func defaultContext() build.Context { +@@ -64,7 +64,11 @@ func defaultContext() build.Context { // variables. This matches the initialization of ToolDir in // go/build, except for using ctxt.GOROOT rather than // runtime.GOROOT. @@ -49,6 +45,3 @@ index a3277a6..db96350 100644 } ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH) --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch similarity index 82% rename from meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch rename to meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch index 40763ad5b1..75c9c75211 100644 --- a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch +++ b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/ld/lib.go | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 3fa258d..f96fb02 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1215,6 +1215,7 @@ func (ctxt *Link) hostlink() { +@@ -1280,6 +1280,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -29,7 +27,7 @@ index 3fa258d..f96fb02 100644 if ctxt.HeadType != objabi.Hwindows { // Pass -z nodelete to mark the shared library as // non-closeable: a dlclose will do nothing. -@@ -1226,6 +1227,7 @@ func (ctxt *Link) hostlink() { +@@ -1291,6 +1292,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -37,7 +35,7 @@ index 3fa258d..f96fb02 100644 case BuildModePlugin: if ctxt.HeadType == objabi.Hdarwin { argv = append(argv, "-dynamiclib") -@@ -1234,6 +1236,7 @@ func (ctxt *Link) hostlink() { +@@ -1299,6 +1301,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -45,6 +43,3 @@ index 3fa258d..f96fb02 100644 } } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch similarity index 88% rename from meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch rename to meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 4f2a46c6ce..59c12d9546 100644 --- a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube src/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/make.bash b/src/make.bash -index 92d1481..0c2822f 100755 --- a/src/make.bash +++ b/src/make.bash -@@ -177,7 +177,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then +@@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; exit 1 fi rm -f cmd/dist/dist @@ -30,7 +28,7 @@ index 92d1481..0c2822f 100755 # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) -@@ -208,7 +208,7 @@ fi +@@ -209,7 +209,7 @@ fi # Run dist bootstrap to complete make.bash. # Bootstrap installs a proper cmd/dist, built with the new toolchain. # Throw ours, built with Go 1.4, away after bootstrap. @@ -39,6 +37,3 @@ index 92d1481..0c2822f 100755 rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch similarity index 95% rename from meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch rename to meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch index 354aaca3a1..7aee0bac43 100644 --- a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch @@ -38,8 +38,6 @@ Signed-off-by: Alexander J Kube src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ 1 file changed, 112 insertions(+), 43 deletions(-) -diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 683ca6f..0ad082b 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -41,6 +41,7 @@ var ( @@ -58,7 +56,7 @@ index 683ca6f..0ad082b 100644 vflag int // verbosity ) -@@ -247,6 +249,8 @@ func xinit() { +@@ -249,6 +251,8 @@ func xinit() { if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) } @@ -67,7 +65,7 @@ index 683ca6f..0ad082b 100644 } // compilerEnv returns a map from "goos/goarch" to the -@@ -478,8 +482,10 @@ func setup() { +@@ -480,8 +484,10 @@ func setup() { p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) if rebuildall { xremoveall(p) @@ -78,7 +76,7 @@ index 683ca6f..0ad082b 100644 if goos != gohostos || goarch != gohostarch { p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) -@@ -1207,12 +1213,29 @@ func cmdbootstrap() { +@@ -1244,12 +1250,29 @@ func cmdbootstrap() { var noBanner bool var debug bool @@ -109,7 +107,7 @@ index 683ca6f..0ad082b 100644 // Set GOPATH to an internal directory. We shouldn't actually // need to store files here, since the toolchain won't // depend on modules outside of vendor directories, but if -@@ -1266,8 +1289,13 @@ func cmdbootstrap() { +@@ -1303,8 +1326,13 @@ func cmdbootstrap() { xprintf("\n") } @@ -125,7 +123,7 @@ index 683ca6f..0ad082b 100644 goBootstrap := pathf("%s/go_bootstrap", tooldir) cmdGo := pathf("%s/go", gobin) if debug { -@@ -1296,7 +1324,11 @@ func cmdbootstrap() { +@@ -1333,7 +1361,11 @@ func cmdbootstrap() { xprintf("\n") } xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") @@ -138,7 +136,7 @@ index 683ca6f..0ad082b 100644 goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) if debug { run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -@@ -1333,50 +1365,84 @@ func cmdbootstrap() { +@@ -1370,50 +1402,84 @@ func cmdbootstrap() { } checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) @@ -190,8 +188,6 @@ index 683ca6f..0ad082b 100644 - timelog("build", "host toolchain") - if vflag > 0 { - xprintf("\n") -- } -- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) + + if goos == oldgoos && goarch == oldgoarch { + // Common case - not setting up for cross-compilation. @@ -223,7 +219,8 @@ index 683ca6f..0ad082b 100644 + os.Setenv("GOARCH", goarch) + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) + xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) -+ } + } +- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) goInstall(goBootstrap, "std", "cmd") checkNotStale(goBootstrap, "std", "cmd") checkNotStale(cmdGo, "std", "cmd") @@ -231,12 +228,7 @@ index 683ca6f..0ad082b 100644 - timelog("build", "target toolchain") - if vflag > 0 { - xprintf("\n") -+ if debug { -+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) -+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) -+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) - } +- } - goos = oldgoos - goarch = oldgoarch - os.Setenv("GOOS", goos) @@ -257,10 +249,16 @@ index 683ca6f..0ad082b 100644 - run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ if debug { ++ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") ++ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) ++ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) ++ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) ++ } } // Check that there are no new files in $GOROOT/bin other than -@@ -1393,8 +1459,11 @@ func cmdbootstrap() { +@@ -1430,8 +1496,11 @@ func cmdbootstrap() { } } @@ -274,6 +272,3 @@ index 683ca6f..0ad082b 100644 if goos == "android" { // Make sure the exec wrapper will sync a fresh $GOROOT to the device. --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch rename to meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch index e232c79199..b93f83de69 100644 --- a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch @@ -27,11 +27,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) -diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 33b7818..7617b4c 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -662,6 +662,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { +@@ -670,6 +670,9 @@ func (b *Builder) addTransitiveLinkDeps( if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { continue } @@ -41,11 +39,9 @@ index 33b7818..7617b4c 100644 haveShlib[filepath.Base(p1.Shlib)] = true // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, // we'll end up building an overall library or executable that depends at runtime -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 9305b2d..6560317 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -155,6 +155,8 @@ See also: go install, go get, go clean. +@@ -167,6 +167,8 @@ See also: go install, go get, go clean. const concurrentGCBackendCompilationEnabledByDefault = true @@ -54,10 +50,10 @@ index 9305b2d..6560317 100644 func init() { // break init cycle CmdBuild.Run = runBuild -@@ -167,6 +169,10 @@ func init() { +@@ -179,6 +181,10 @@ func init() { - AddBuildFlags(CmdBuild) - AddBuildFlags(CmdInstall) + AddBuildFlags(CmdBuild, DefaultBuildFlags) + AddBuildFlags(CmdInstall, DefaultBuildFlags) + + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { + goRootPrecious = false @@ -65,11 +61,9 @@ index 9305b2d..6560317 100644 } // Note that flags consulted by other parts of the code -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index ccebaf8..59450d7 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -455,6 +455,23 @@ func (b *Builder) build(a *Action) (err error) { +@@ -464,6 +464,23 @@ func (b *Builder) build(a *Action) (err return errors.New("binary-only packages are no longer supported") } @@ -93,7 +87,7 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } -@@ -1499,6 +1516,14 @@ func BuildInstallFunc(b *Builder, a *Action) (err error) { +@@ -1493,6 +1510,14 @@ func BuildInstallFunc(b *Builder, a *Act return nil } @@ -108,6 +102,3 @@ index ccebaf8..59450d7 100644 if err := b.Mkdir(a.Objdir); err != nil { return err } --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch rename to meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch index 68e132f30a..b15d9812aa 100644 --- a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -23,11 +23,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/work/build.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 6560317..5f3a988 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -231,7 +231,13 @@ func AddBuildFlags(cmd *base.Command) { +@@ -251,7 +251,13 @@ func AddBuildFlags(cmd *base.Command, ma cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") cmd.Flag.Var(buildCompiler{}, "compiler", "") @@ -41,7 +39,4 @@ index 6560317..5f3a988 100644 + cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") - cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") --- -2.17.1 (Apple Git-112) - + if mask&OmitModFlag == 0 { diff --git a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch similarity index 79% rename from meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch rename to meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch index 4bb1106f09..427cfb0dd2 100644 --- a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch +++ b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch @@ -25,11 +25,9 @@ Signed-off-by: Alexander J Kube src/cmd/link/internal/x86/obj.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go -index 23741eb..8e74576 100644 --- a/src/cmd/link/internal/amd64/obj.go +++ b/src/cmd/link/internal/amd64/obj.go -@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) { +@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { PEreloc1: pereloc1, TLSIEtoLE: tlsIEtoLE, @@ -38,8 +36,6 @@ index 23741eb..8e74576 100644 Freebsddynld: "/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go -index 45a406e..724d3e3 100644 --- a/src/cmd/link/internal/arm/obj.go +++ b/src/cmd/link/internal/arm/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -51,8 +47,6 @@ index 45a406e..724d3e3 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/libexec/ld.elf_so", -diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go -index 7c66623..d8b1db1 100644 --- a/src/cmd/link/internal/arm64/obj.go +++ b/src/cmd/link/internal/arm64/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -62,10 +56,8 @@ index 7c66623..d8b1db1 100644 - Linuxdynld: "/lib/ld-linux-aarch64.so.1", + Linuxdynld: "/lib/ld-musl-aarch64.so.1", - Freebsddynld: "XXX", + Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", -diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go -index 231e1ff..631dd7a 100644 --- a/src/cmd/link/internal/mips/obj.go +++ b/src/cmd/link/internal/mips/obj.go @@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -77,8 +69,6 @@ index 231e1ff..631dd7a 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go -index 9604208..5ef3ffc 100644 --- a/src/cmd/link/internal/mips64/obj.go +++ b/src/cmd/link/internal/mips64/obj.go @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -90,8 +80,6 @@ index 9604208..5ef3ffc 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", Netbsddynld: "XXX", -diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go -index 51d1791..b15da85 100644 --- a/src/cmd/link/internal/ppc64/obj.go +++ b/src/cmd/link/internal/ppc64/obj.go @@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -103,8 +91,6 @@ index 51d1791..b15da85 100644 Freebsddynld: "XXX", Openbsddynld: "XXX", -diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go -index 3454476..42cc346 100644 --- a/src/cmd/link/internal/s390x/obj.go +++ b/src/cmd/link/internal/s390x/obj.go @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -116,8 +102,6 @@ index 3454476..42cc346 100644 // not relevant for s390x Freebsddynld: "XXX", -diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go -index f1fad20..d2ca10c 100644 --- a/src/cmd/link/internal/x86/obj.go +++ b/src/cmd/link/internal/x86/obj.go @@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) { @@ -129,6 +113,3 @@ index f1fad20..d2ca10c 100644 Freebsddynld: "/usr/libexec/ld-elf.so.1", Openbsddynld: "/usr/libexec/ld.so", Netbsddynld: "/usr/libexec/ld.elf_so", --- -2.17.1 (Apple Git-112) - diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.13.bb b/meta/recipes-devtools/go/go-cross-canadian_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.13.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.14.bb diff --git a/meta/recipes-devtools/go/go-cross_1.13.bb b/meta/recipes-devtools/go/go-cross_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.13.bb rename to meta/recipes-devtools/go/go-cross_1.14.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.13.bb b/meta/recipes-devtools/go/go-crosssdk_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.13.bb rename to meta/recipes-devtools/go/go-crosssdk_1.14.bb diff --git a/meta/recipes-devtools/go/go-native_1.13.bb b/meta/recipes-devtools/go/go-native_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.13.bb rename to meta/recipes-devtools/go/go-native_1.14.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.13.bb b/meta/recipes-devtools/go/go-runtime_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.13.bb rename to meta/recipes-devtools/go/go-runtime_1.14.bb diff --git a/meta/recipes-devtools/go/go_1.13.bb b/meta/recipes-devtools/go/go_1.14.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.13.bb rename to meta/recipes-devtools/go/go_1.14.bb -- 2.25.1 From martin at geanix.com Thu Feb 27 08:12:15 2020 From: martin at geanix.com (=?UTF-8?Q?Martin_Hundeb=c3=b8ll?=) Date: Thu, 27 Feb 2020 09:12:15 +0100 Subject: [OE-core] [PATCH] wic: Add include-dir option In-Reply-To: <20200227042658.19619-1-akuster808@gmail.com> References: <20200227042658.19619-1-akuster808@gmail.com> Message-ID: <312d477b-f5f5-16df-7867-c5c9f5619abb@geanix.com> Hi Armin, On 27/02/2020 05.26, Armin Kuster wrote: > This option allows for the inclusion of a single directory > for a partition. I am unsure how this is used in a .wks file. From the code it looks similar to the include-path option, but relative to the rootfs source dir instead of the wic working dir? But the include-dir value is also used in the destination path? Thanks, Martin > Signed-off-by: Armin Kuster > --- > scripts/lib/wic/help.py | 3 +++ > scripts/lib/wic/ksparser.py | 1 + > scripts/lib/wic/partition.py | 1 + > scripts/lib/wic/plugins/source/rootfs.py | 10 ++++++++-- > 4 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py > index 4d342fcf05..517f68e11e 100644 > --- a/scripts/lib/wic/help.py > +++ b/scripts/lib/wic/help.py > @@ -979,6 +979,9 @@ DESCRIPTION > copies. This option only has an effect with the rootfs > source plugin. > > + --include-dir: This option is specific to wic. It adds the contents > + of the given directory to the resulting partition. > + > --extra-space: This option is specific to wic. It adds extra > space after the space filled by the content > of the partition. The final size can go > diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py > index 650b976223..b8abc33c87 100644 > --- a/scripts/lib/wic/ksparser.py > +++ b/scripts/lib/wic/ksparser.py > @@ -138,6 +138,7 @@ class KickStart(): > part.add_argument('--align', type=int) > part.add_argument('--exclude-path', nargs='+') > part.add_argument('--include-path', nargs='+') > + part.add_argument('--include-dir') > part.add_argument("--extra-space", type=sizetype) > part.add_argument('--fsoptions', dest='fsopts') > part.add_argument('--fstype', default='vfat', > diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py > index 2d95f78439..0b735fffd9 100644 > --- a/scripts/lib/wic/partition.py > +++ b/scripts/lib/wic/partition.py > @@ -31,6 +31,7 @@ class Partition(): > self.extra_space = args.extra_space > self.exclude_path = args.exclude_path > self.include_path = args.include_path > + self.include_dir = args.include_dir > self.fsopts = args.fsopts > self.fstype = args.fstype > self.label = args.label > diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py > index 705aeb5563..d1c59cab8a 100644 > --- a/scripts/lib/wic/plugins/source/rootfs.py > +++ b/scripts/lib/wic/plugins/source/rootfs.py > @@ -71,7 +71,7 @@ class RootfsPlugin(SourcePlugin): > > new_rootfs = None > # Handle excluded paths. > - if part.exclude_path or part.include_path: > + if part.exclude_path or part.include_path or part.include_dir: > # We need a new rootfs directory we can delete files from. Copy to > # workdir. > new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno)) > @@ -79,7 +79,13 @@ class RootfsPlugin(SourcePlugin): > if os.path.lexists(new_rootfs): > shutil.rmtree(os.path.join(new_rootfs)) > > - copyhardlinktree(part.rootfs_dir, new_rootfs) > + if part.include_dir: > + src = os.path.realpath(os.path.join(part.rootfs_dir, part.include_dir)) > + dst = os.path.realpath(os.path.join(new_rootfs, part.include_dir)) > + copyhardlinktree(src, dst) > + > + else: > + copyhardlinktree(part.rootfs_dir, new_rootfs) > > for path in part.include_path or []: > copyhardlinktree(path, new_rootfs) > From zboszor at pr.hu Thu Feb 27 08:41:33 2020 From: zboszor at pr.hu (=?UTF-8?B?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?=) Date: Thu, 27 Feb 2020 09:41:33 +0100 Subject: [OE-core] [meta-clang][PATCH] conf/nonclangable.conf: Always build mesa with gcc In-Reply-To: References: <20200227061657.66871-1-zboszor@pr.hu> Message-ID: <39009389-fac8-edc3-66e1-9d51868f4ad6@pr.hu> 2020. 02. 27. 8:44 keltez?ssel, Khem Raj ?rta: > Can you send it via github pull request please Sure. > > On Wed, Feb 26, 2020 at 10:21 PM B?sz?rm?nyi Zolt?n via > Openembedded-core wrote: >> >> Ignore this, the patch is against the zeus branch. >> Re-sent with the proper subject. >> >> 2020. 02. 27. 7:16 keltez?ssel, B?sz?rm?nyi Zolt?n ?rta: >>> Building mesa (at least version 19.3.4) with clang 9.0.1 leads >>> to linker errors on x86/x86-64: >>> >>> "undefined reference to `typeinfo for llvm::raw_pwrite_stream'" >>> in libvulkan_radeon.so >>> >>> and >>> >>> "undefined reference to `typeinfo for llvm::RTDyldMemoryManager'" >>> in libgallium.a. >>> >>> It was reported at https://gitlab.freedesktop.org/mesa/mesa/issues/2533 >>> >>> It seems it is related to rtti not being enabled, at least reports >>> from a few years ago on forums lead to that conclusion. >>> But enabling rtti for clang in PACKAGECONFIG doesn't help. >>> >>> Just build mesa with gcc, it fixes the linker errors. >>> >>> Signed-off-by: B?sz?rm?nyi Zolt?n >>> --- >>> conf/nonclangable.conf | 7 +++---- >>> 1 file changed, 3 insertions(+), 4 deletions(-) >>> >>> diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf >>> index 70336bb..91b9965 100644 >>> --- a/conf/nonclangable.conf >>> +++ b/conf/nonclangable.conf >>> @@ -45,10 +45,9 @@ TOOLCHAIN_pn-libssp-nonshared = "gcc" >>> TOOLCHAIN_pn-libstd-rs = "gcc" >>> TOOLCHAIN_pn-m4_powerpc = "gcc" >>> # clang does not have 64bit atomics on mips32 >>> -TOOLCHAIN_pn-mesa_mips = "gcc" >>> -TOOLCHAIN_pn-mesa_mipsel = "gcc" >>> -TOOLCHAIN_pn-mesa_riscv64 = "gcc" >>> -TOOLCHAIN_pn-mesa_powerpc = "gcc" >>> +# building Mesa 19.3.x with clang causes linker errors on x86/x86-64 >>> +# See https://gitlab.freedesktop.org/mesa/mesa/issues/2533 >>> +TOOLCHAIN_pn-mesa = "gcc" >>> # multiple definition of 'mongo::error_details::isNamedCode<0>' >>> TOOLCHAIN_pn-mongodb = "gcc" >>> # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments >>> >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core From eugenyshcheglov at gmail.com Thu Feb 27 11:42:25 2020 From: eugenyshcheglov at gmail.com (Eugeny Shcheglov) Date: Thu, 27 Feb 2020 13:42:25 +0200 Subject: [OE-core] [PATCH] utils.bbclass: Avoid recursive symlink in oe_soinstall In-Reply-To: References: <20200225141733.54584-1-eugenyshcheglov@gmail.com> Message-ID: >This patch look OK but it might be nice to also clean up this error message (and the Example comment a few lines above it) to drop the 3 levels of version number. There should only be 2, ie the fully versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 Yeah, sound reasonable. According to the tLDP ( http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html) there can be be 3 levels, but last one is optional. Quote from tLDP: *"The real name adds to the soname a period, a minor * *number, another period, and the release number. The last period and release number are optional". * So yes, correct fully versioned name should contain at least two numbers >"oe_soinstall: $libname soname is equal to fully versioned real (file) name. The soname should include the major version only (e.g.libfoo.so.1 instead of libfoo.so.1.2)" Good point. But what if library real name is libfoo.so.1 and soname is libfoo.so.1 too? In my opinion there is two ways: 1) Add one more check: parse $sonamelink and throw bbwarn if soname is incorrect. "Incorrect" in this case means that soname contain more than one version (libfoo.so.1.2) 2) Mention both possible problems in bbwarn. Like: " $libname soname is equal to fully versioned real (file) name. The soname should include the major version only (e.g. libfoo.so.1 instead of libfoo.so.1.2) or minor version should be added to library real name (e.g. libfoo.so.1.2 instead of libfoo.so.1) ; " First one is definitely clearer. So I'm going to implement it and send version 2 of patch On Wed, Feb 26, 2020 at 10:08 PM Andre McCurdy wrote: > On Tue, Feb 25, 2020 at 6:17 AM Yevhenii Shchehlov > wrote: > > > > This patch fixes an issue when oe_soinstall function creates > > non-functional recursive symlinks in case library soname is equal > > to library real (file) name. > > > > Signed-off-by: Yevhenii Shchehlov > > --- > > meta/classes/utils.bbclass | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass > > index cd3d05709e..dea824f54f 100644 > > --- a/meta/classes/utils.bbclass > > +++ b/meta/classes/utils.bbclass > > @@ -25,7 +25,7 @@ oe_soinstall() { > > libname=`basename $1` > > case "$libname" in > > *.so) > > - bbfatal "oe_soinstall: Shared library must haved > versioned filename (e.g. libfoo.so.1.2.3)" > > + bbfatal "oe_soinstall: Shared library must haved > versioned filename (e.g. libfoo.so.1.2.3 instead of libfoo.so)" > > This patch look OK but it might be nice to also clean up this error > message (and the Example comment a few lines above it) to drop the 3 > levels of version number. There should only be 2, ie the fully > versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 > > > ;; > > esac > > install -m 755 $1 $2/$libname > > @@ -33,8 +33,12 @@ oe_soinstall() { > > if [ -z $sonamelink ]; then > > bbfatal "oe_soinstall: $libname is missing ELF tag > 'SONAME'." > > fi > > + if [ "$sonamelink" == "$libname" ]; then > > + bbwarn "oe_soinstall: $libname soname is equal to real > (file) name. Minor version should be added to a real name (e.g. > libfoo.so.1.2 instead of libfoo.so.1)" > > It might be clearer to say: > > "oe_soinstall: $libname soname is equal to fully versioned real (file) > name. The soname should include the major version only (e.g. > libfoo.so.1 instead of libfoo.so.1.2)" > > > + else > > + ln -sf $libname $2/$sonamelink > > + fi > > solink=`echo $libname | sed -e 's/\.so\..*/.so/'` > > - ln -sf $libname $2/$sonamelink > > ln -sf $libname $2/$solink > > } > > > > -- > > 2.25.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From ovidiu.panait at windriver.com Thu Feb 27 11:45:49 2020 From: ovidiu.panait at windriver.com (Ovidiu Panait) Date: Thu, 27 Feb 2020 13:45:49 +0200 Subject: [OE-core] [zeus][PATCH 1/1] dhcp: Fix REQUIRE(ctx->running) assertion triggered on SIGTERM/SIGINT Message-ID: <20200227114549.16867-1-ovidiu.panait@windriver.com> Closed a small window of time between the installation of graceful shutdown signal handlers and application context startup, during which the receipt of shutdown signal would cause a REQUIRE() assertion to occur. Note this issue is only visible when compiling with ENABLE_GENTLE_SHUTDOWN defined. Reference: https://gitlab.isc.org/isc-projects/dhcp/issues/53 Upstream patches: https://gitlab.isc.org/isc-projects/dhcp/commit/ce117de7a1ed3c4911b4009c1cc23fba85370a26 https://gitlab.isc.org/isc-projects/dhcp/commit/dbd36dfa82956b53683462afadfabb1b33fa3dd1 https://gitlab.isc.org/isc-projects/dhcp/commit/95944cab6035d20be270eec01254c7bb867ec705 Signed-off-by: Ovidiu Panait --- ...s-running-prior-to-calling-isc_app_c.patch | 165 ++++++++++++++++++ ...ed-shutdown-log-statment-to-dhcrelay.patch | 29 +++ .../dhcp/0003-Addressed-review-comment.patch | 31 ++++ meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb | 3 + 4 files changed, 228 insertions(+) create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch new file mode 100644 index 0000000000..34b2ae1e5c --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch @@ -0,0 +1,165 @@ +From f369dbb9e67eb5ef336944af63039b6d8f838384 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Thu, 12 Sep 2019 10:35:46 -0400 +Subject: [PATCH 1/3] Ensure context is running prior to calling + isc_app_ctxsuspend + +Add a release note. + +includes/omapip/isclib.h + Added actx_running flag to global context, dhcp_gbl_ctx + +omapip/isclib.c + set_ctx_running() - new function used as the ctxonrun callback + + dhcp_context_create() - installs set_ctx_running callback + + dhcp_signal_handler() - modified to use act_running flag to + determine is context is running and should be suspended + +Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/dhcp.git] + +Signed-off-by: Ovidiu Panait +--- + RELNOTES | 7 +++++ + includes/omapip/isclib.h | 3 ++- + omapip/isclib.c | 57 +++++++++++++++++++++++++++++++++------- + 3 files changed, 57 insertions(+), 10 deletions(-) + +diff --git a/RELNOTES b/RELNOTES +index f10305d..1730473 100644 +--- a/RELNOTES ++++ b/RELNOTES +@@ -6,6 +6,13 @@ + + NEW FEATURES + ++- Closed a small window of time between the installation of graceful ++ shutdown signal handlers and application context startup, during which ++ the receipt of shutdown signal would cause a REQUIRE() assertion to ++ occur. Note this issue is only visible when compiling with ++ ENABLE_GENTLE_SHUTDOWN defined. ++ [Gitlab #53,!18 git TBD] ++ + Please note that that ISC DHCP is now licensed under the Mozilla Public License, + MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0 + license terms. +diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h +index 6c20584..af6a6fc 100644 +--- a/includes/omapip/isclib.h ++++ b/includes/omapip/isclib.h +@@ -94,7 +94,8 @@ + typedef struct dhcp_context { + isc_mem_t *mctx; + isc_appctx_t *actx; +- int actx_started; ++ int actx_started; // ISC_TRUE if ctxstart has been called ++ int actx_running; // ISC_TRUE if ctxrun has been called + isc_taskmgr_t *taskmgr; + isc_task_t *task; + isc_socketmgr_t *socketmgr; +diff --git a/omapip/isclib.c b/omapip/isclib.c +index ce4b4a1..73e017c 100644 +--- a/omapip/isclib.c ++++ b/omapip/isclib.c +@@ -134,6 +134,35 @@ handle_signal(int sig, void (*handler)(int)) { + } + } + ++/* Callback passed to isc_app_ctxonrun ++ * ++ * BIND9 context code will invoke this handler once the context has ++ * entered the running state. We use it to set a global marker so that ++ * we can tell if the context is running. Several of the isc_app_ ++ * calls REQUIRE that the context is running and we need a way to ++ * know that. ++ * ++ * We also check to see if we received a shutdown signal prior to ++ * the context entering the run state. If we did, then we can just ++ * simply shut the context down now. This closes the relatively ++ * small window between start up and entering run via the call ++ * to dispatch(). ++ * ++ */ ++static void ++set_ctx_running(isc_task_t *task, isc_event_t *event) { ++ task = task; // unused; ++ dhcp_gbl_ctx.actx_running = ISC_TRUE; ++ ++ if (shutdown_signal) { ++ // We got signaled shutdown before we entered running state. ++ // Now that we've reached running state, shut'er down. ++ isc_app_ctxsuspend(dhcp_gbl_ctx.actx); ++ } ++ ++ isc_event_free(&event); ++} ++ + isc_result_t + dhcp_context_create(int flags, + struct in_addr *local4, +@@ -141,6 +170,9 @@ dhcp_context_create(int flags, + isc_result_t result; + + if ((flags & DHCP_CONTEXT_PRE_DB) != 0) { ++ dhcp_gbl_ctx.actx_started = ISC_FALSE; ++ dhcp_gbl_ctx.actx_running = ISC_FALSE; ++ + /* + * Set up the error messages, this isn't the right place + * for this call but it is convienent for now. +@@ -204,15 +236,24 @@ dhcp_context_create(int flags, + if (result != ISC_R_SUCCESS) + goto cleanup; + +- result = isc_task_create(dhcp_gbl_ctx.taskmgr, 0, &dhcp_gbl_ctx.task); ++ result = isc_task_create(dhcp_gbl_ctx.taskmgr, 0, ++ &dhcp_gbl_ctx.task); + if (result != ISC_R_SUCCESS) + goto cleanup; + + result = isc_app_ctxstart(dhcp_gbl_ctx.actx); + if (result != ISC_R_SUCCESS) +- return (result); ++ goto cleanup; ++ + dhcp_gbl_ctx.actx_started = ISC_TRUE; + ++ // Install the onrun callback. ++ result = isc_app_ctxonrun(dhcp_gbl_ctx.actx, dhcp_gbl_ctx.mctx, ++ dhcp_gbl_ctx.task, set_ctx_running, ++ dhcp_gbl_ctx.actx); ++ if (result != ISC_R_SUCCESS) ++ goto cleanup; ++ + /* Not all OSs support suppressing SIGPIPE through socket + * options, so set the sigal action to be ignore. This allows + * broken connections to fail gracefully with EPIPE on writes */ +@@ -335,19 +376,17 @@ isclib_make_dst_key(char *inname, + * @param signal signal code that we received + */ + void dhcp_signal_handler(int signal) { +- isc_appctx_t *ctx = dhcp_gbl_ctx.actx; +- int prev = shutdown_signal; +- +- if (prev != 0) { ++ if (shutdown_signal != 0) { + /* Already in shutdown. */ + return; + } ++ + /* Possible race but does it matter? */ + shutdown_signal = signal; + +- /* Use reload (aka suspend) for easier dispatch() reenter. */ +- if (ctx && ctx->methods && ctx->methods->ctxsuspend) { +- (void) isc_app_ctxsuspend(ctx); ++ /* If the application context is running tell it to shut down */ ++ if (dhcp_gbl_ctx.actx_running == ISC_TRUE) { ++ (void) isc_app_ctxsuspend(dhcp_gbl_ctx.actx); + } + } + +-- +2.23.0 + diff --git a/meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch b/meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch new file mode 100644 index 0000000000..78b2b74f45 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch @@ -0,0 +1,29 @@ +From adcd34ae1f56b16d7e9696d980332b4cf6c7ce91 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Fri, 13 Sep 2019 15:03:31 -0400 +Subject: [PATCH 2/3] Added shutdown log statment to dhcrelay + +Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/dhcp.git] + +Signed-off-by: Ovidiu Panait +--- + relay/dhcrelay.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index d8caaaf..4bd1d47 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c +@@ -2076,6 +2076,9 @@ dhcp_set_control_state(control_object_state_t oldstate, + if (newstate != server_shutdown) + return ISC_R_SUCCESS; + ++ /* Log shutdown on signal. */ ++ log_info("Received signal %d, initiating shutdown.", shutdown_signal); ++ + if (no_pid_file == ISC_FALSE) + (void) unlink(path_dhcrelay_pid); + +-- +2.23.0 + diff --git a/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch b/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch new file mode 100644 index 0000000000..a51b6cf526 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch @@ -0,0 +1,31 @@ +From e4b54b4d676783152d487103714cba2913661ef8 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Wed, 6 Nov 2019 15:53:50 -0500 +Subject: [PATCH 3/3] Addressed review comment. + +omapip/isclib.c + Added use of IGNORE_UNUSED() + +Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/dhcp.git] + +Signed-off-by: Ovidiu Panait +--- + omapip/isclib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/omapip/isclib.c b/omapip/isclib.c +index 73e017c..1d52463 100644 +--- a/omapip/isclib.c ++++ b/omapip/isclib.c +@@ -151,7 +151,7 @@ handle_signal(int sig, void (*handler)(int)) { + */ + static void + set_ctx_running(isc_task_t *task, isc_event_t *event) { +- task = task; // unused; ++ IGNORE_UNUSED(task); + dhcp_gbl_ctx.actx_running = ISC_TRUE; + + if (shutdown_signal) { +-- +2.23.0 + diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb index 275961a603..ddc8b60254 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb @@ -11,6 +11,9 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat file://0013-fixup_use_libbind.patch \ file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \ file://0001-Fix-a-NSUPDATE-compiling-issue.patch \ + file://0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch \ + file://0002-Added-shutdown-log-statment-to-dhcrelay.patch \ + file://0003-Addressed-review-comment.patch \ " SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" -- 2.17.1 From bunk at stusta.de Thu Feb 27 13:27:29 2020 From: bunk at stusta.de (Adrian Bunk) Date: Thu, 27 Feb 2020 15:27:29 +0200 Subject: [OE-core] [RFC][PATCH 1/2] nss: Move to meta-oe In-Reply-To: References: <20200223193408.5602-1-bunk@stusta.de> <20200224051745.GA6683@localhost> Message-ID: <20200227132729.GA6240@localhost> On Mon, Feb 24, 2020 at 08:32:24AM -0800, akuster808 wrote: >... > On 2/23/20 9:17 PM, Adrian Bunk wrote: > > On Sun, Feb 23, 2020 at 04:25:18PM -0800, Khem Raj wrote: > >> On Sun, Feb 23, 2020 at 11:34 AM Adrian Bunk wrote: > >>> rpm was the last user in OE-core. > >> we should also assess external dependencies especially on libraries, > >> there might be layers which do not depend on meta-oe but use nss > >> or enable nss packageconfigs in core components like curl. > >> ... > > Is providing a crypto library in OE-core without providing security > > support better than not shipping it? > > > > nss in warrior seems to lack fixes for at least 5 CVEs. > > I don't see how that is relevant to the RFC? >... It is a crypto library with a history of unfixed CVEs in supported stable Yocto releases. > - armin cu Adrian From alex.kanavin at gmail.com Thu Feb 27 14:03:18 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Thu, 27 Feb 2020 15:03:18 +0100 Subject: [OE-core] [RFC][PATCH 1/2] nss: Move to meta-oe In-Reply-To: <20200227132729.GA6240@localhost> References: <20200223193408.5602-1-bunk@stusta.de> <20200224051745.GA6683@localhost> <20200227132729.GA6240@localhost> Message-ID: On Thu, 27 Feb 2020 at 14:28, Adrian Bunk wrote: > >... > > It is a crypto library with a history of unfixed CVEs in supported > stable Yocto releases. > If the issue is unfixed CVEs, then I do not think it's particularly relevant which layer the recipe is in. Stable release maintainers are not expected to 'track and fix CVEs', that one is on users. Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From git at andred.net Thu Feb 27 14:24:25 2020 From: git at andred.net (=?ISO-8859-1?Q?Andr=E9?= Draszik) Date: Thu, 27 Feb 2020 14:24:25 +0000 Subject: [OE-core] [PATCH] utils.bbclass: Avoid recursive symlink in oe_soinstall In-Reply-To: <20200225141733.54584-1-eugenyshcheglov@gmail.com> References: <20200225141733.54584-1-eugenyshcheglov@gmail.com> Message-ID: <050fca8857e5e56a038562c3d1858bc69c9d3518.camel@andred.net> On Tue, 2020-02-25 at 16:17 +0200, Yevhenii Shchehlov wrote: > This patch fixes an issue when oe_soinstall function creates > non-functional recursive symlinks in case library soname is equal > to library real (file) name. > > Signed-off-by: Yevhenii Shchehlov > --- > meta/classes/utils.bbclass | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass > index cd3d05709e..dea824f54f 100644 > --- a/meta/classes/utils.bbclass > +++ b/meta/classes/utils.bbclass > @@ -25,7 +25,7 @@ oe_soinstall() { > libname=`basename $1` > case "$libname" in > *.so) > - bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3)" > + bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3 instead of > libfoo.so)" > ;; > esac > install -m 755 $1 $2/$libname > @@ -33,8 +33,12 @@ oe_soinstall() { > if [ -z $sonamelink ]; then > bbfatal "oe_soinstall: $libname is missing ELF tag 'SONAME'." > fi > + if [ "$sonamelink" == "$libname" ]; then ^^ == is a bashism, please use only one (1) = Cheers, Andre' > + bbwarn "oe_soinstall: $libname soname is equal to real (file) name. Minor version should be added to a > real name (e.g. libfoo.so.1.2 instead of libfoo.so.1)" > + else > + ln -sf $libname $2/$sonamelink > + fi > solink=`echo $libname | sed -e 's/\.so\..*/.so/'` > - ln -sf $libname $2/$sonamelink > ln -sf $libname $2/$solink > } > > -- > 2.25.1 > From jpewhacker at gmail.com Thu Feb 27 15:01:12 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 27 Feb 2020 09:01:12 -0600 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> Message-ID: On 2/26/20 11:46 PM, Douglas Royds wrote: > > On 26/02/20 4:53 am, Jacob Kroon wrote: > >> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>> Hi Douglas, >>> >>> You updated a comment in reproducible_build.bbclass, commit >>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>> >>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored >>>> in the recipe's ${SDE_FILE}. >>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored >>>> in the recipe's SDE_FILE. >>>> +# If none of these mechanisms are suitable, replace the >>>> do_deploy_source_date_epoch task >>>> +# with recipe-specific functionality to write the appropriate >>>> SOURCE_DATE_EPOCH into the SDE_FILE. >>>> +# >>> >>> But I can't really get this to work. What did work for me was to >>> replace "do_create_source_date_epoch_stamp()" in my recipe: >>> >>> do_create_source_date_epoch_stamp() { >>> ???? mkdir -p ${SDE_DIR} >>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>> } >>> >>> What is the intended way to achieve the thing I'm trying to do here ? >>> >> >> FYI, JPEW has a proposed patch here >> >> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >> >> >> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >> >> But maybe that currently is at odds with SOURCE_DATE_EPOCH being in >> BB_HASHBASE_WHITELIST ? >> >> /Jacob > > > On the surface of it, my comment appears to be just wrong: It does > make sense to replace do_create_source_date_epoch_stamp() as you suggest. > > Joshua's proposed patch looks promising: > > * Should the new function not be called first, so that it takes > priority over the git, known files, and youngest file functions? > If someone has explicitly set SOURCE_DATE_EPOCH, then they want it > to take priority. > Having that be the first option makes sense. The only case in which that might not work, is if a recipe does something like: ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" e.g. uses a function to get the SDE instead of setting to a fixed value, but that's probably going to be extremely rare. > * > > > > * As you observe, SOURCE_DATE_EPOCH would need to be removed from > BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in > the first place. > I'm not sure why exactly it is whitelisted; I didn't write the original code that whitelisted it, but I've CC'd Juro in case he happens to remember. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jpewhacker at gmail.com Thu Feb 27 16:04:01 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 27 Feb 2020 10:04:01 -0600 Subject: [OE-core] [wpe-webkit] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: <29f3b8e1-6989-c84e-5d50-4012389f0bab@igalia.com> References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-8-alex.kanavin@gmail.com> <29f3b8e1-6989-c84e-5d50-4012389f0bab@igalia.com> Message-ID: On Thu, Feb 27, 2020, 9:49 AM Carlos Alberto Lopez Perez wrote: > On 23/02/2020 15:33, Joshua Watt wrote: > > On Sun, Feb 16, 2020 at 2:52 PM Alexander Kanavin > > wrote: > >> > >> On Sun, 16 Feb 2020 at 21:15, Khem Raj wrote: > >>> > >>> On Sun, Feb 16, 2020 at 7:52 AM Alexander Kanavin > >>> wrote: > >>>> > >>>> webkit nowadays requires a couple of supplementary libraries for this, > >>>> so bring them in (courtesy of meta-browser, which will hopefully > >>>> adjust without a lot of trouble). > >>> > >>> its not meta-browser, I guess you should credit meta-wpe here [1] > >>> and perhaps Cc the meta-wpe maintainer as a courtesy. > >> > >> > >> Actually, it's copied from meta-webkit > >> https://github.com/Igalia/meta-webkit/ > >> which does not say in the readme who the maintainer is, so I am not > sure whom to CC. > >> I can adjust the commit msg though. > > > > I've CC'd the WPE mailing list. > > > > OE-core now has libwpe and wpebackend-fdo recipes. They should > > possibly be removed from meta-webkit to prevent duplication. > > > > > Thanks for the notification. Its great that those recipes are shipped > now on the oe-core layer. > > But I don't want to remove those recipes from meta-webkit, even if they > are shipped now there. > > That recipes are an essential part of meta-webkit, so I want to be able > to raise the version or change them without depending on oe-core. > For example: sometimes we need to use older versions of yocto, but we > still want to use the last stable version of wpe/libwpe/wpebackend-fdo. > So I find pretty useful to have all the core WPE related recipes on the > meta-webkit layer and not depend on whatever oe-core ships. > > There should be no conflict between the recipes as long as the name used > for them its the same, bitbake should simply pick the last version by > default. > The version compare actually only matters for recipes in the same layer; if multiple layers provide the same recipe, the priority of the layers is what determines which one gets chosen (even if that means an older version in a higher priority layer would be chosen over a newer version in a lower priority layer). Anyway, you should be fine because meta-webkit has a priority of 7 and oe-core is priority 5, so it will always choose the meta-webkit version, if that layer is present. > > Regards. > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From trevor.gamblin at windriver.com Thu Feb 27 16:24:18 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Thu, 27 Feb 2020 11:24:18 -0500 Subject: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <20200226183902.3616626-1-trevor.gamblin@windriver.com> References: <20200226183902.3616626-1-trevor.gamblin@windriver.com> Message-ID: Looks like I got beat by a day! On 2/26/20 1:39 PM, Trevor Gamblin wrote: > https://dev.gnupg.org/T4459 was fixed in 1.37, so the backported > patch is removed. > > Signed-off-by: Trevor Gamblin > --- > .../libgpg-error-1.36-gawk5-support.patch | 144 ------------------ > ...gpg-error_1.36.bb => libgpg-error_1.37.bb} | 5 +- > 2 files changed, 2 insertions(+), 147 deletions(-) > delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch > rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%) > > diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch > deleted file mode 100644 > index b936d1143b..0000000000 > --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch > +++ /dev/null > @@ -1,144 +0,0 @@ > -Upstream-Status: Backport [https://dev.gnupg.org/T4459] > -Signed-off-by: Khem Raj > - > -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 > -From: NIIBE Yutaka > -Date: Mon, 15 Apr 2019 15:10:44 +0900 > -Subject: [PATCH] awk: Prepare for Gawk 5.0. > - > -* src/Makefile.am: Use pkg_namespace (instead of namespace). > -* src/mkerrnos.awk: Likewise. > -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. > -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. > - > --- > - > -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, > -which only allows escaping specific characters. > - > -GnuPG-bug-id: 4459 > -Reported-by: Marius Schamschula > -Signed-off-by: NIIBE Yutaka > ---- > - lang/cl/mkerrcodes.awk | 2 +- > - src/Makefile.am | 2 +- > - src/mkerrcodes.awk | 2 +- > - src/mkerrcodes1.awk | 2 +- > - src/mkerrcodes2.awk | 2 +- > - src/mkerrnos.awk | 2 +- > - src/mkstrtable.awk | 10 +++++----- > - 7 files changed, 11 insertions(+), 11 deletions(-) > - > ---- a/lang/cl/mkerrcodes.awk > -+++ b/lang/cl/mkerrcodes.awk > -@@ -122,7 +122,7 @@ header { > - } > - > - !header { > -- sub (/\#.+/, ""); > -+ sub (/#.+/, ""); > - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. > - > - if (/^$/) > ---- a/src/Makefile.am > -+++ b/src/Makefile.am > -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO > - > - errnos-sym.h: Makefile mkstrtable.awk errnos.in > - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ > -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ > -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ > - $(srcdir)/errnos.in >$@ > - > - > ---- a/src/mkerrcodes.awk > -+++ b/src/mkerrcodes.awk > -@@ -85,7 +85,7 @@ header { > - } > - > - !header { > -- sub (/\#.+/, ""); > -+ sub (/#.+/, ""); > - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. > - > - if (/^$/) > ---- a/src/mkerrcodes1.awk > -+++ b/src/mkerrcodes1.awk > -@@ -81,7 +81,7 @@ header { > - } > - > - !header { > -- sub (/\#.+/, ""); > -+ sub (/#.+/, ""); > - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. > - > - if (/^$/) > ---- a/src/mkerrcodes2.awk > -+++ b/src/mkerrcodes2.awk > -@@ -91,7 +91,7 @@ header { > - } > - > - !header { > -- sub (/\#.+/, ""); > -+ sub (/#.+/, ""); > - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. > - > - if (/^$/) > ---- a/src/mkerrnos.awk > -+++ b/src/mkerrnos.awk > -@@ -83,7 +83,7 @@ header { > - } > - > - !header { > -- sub (/\#.+/, ""); > -+ sub (/#.+/, ""); > - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. > - > - if (/^$/) > ---- a/src/mkstrtable.awk > -+++ b/src/mkstrtable.awk > -@@ -77,7 +77,7 @@ > - # > - # The variable prefix can be used to prepend a string to each message. > - # > --# The variable namespace can be used to prepend a string to each > -+# The variable pkg_namespace can be used to prepend a string to each > - # variable and macro name. > - > - BEGIN { > -@@ -102,7 +102,7 @@ header { > - print "/* The purpose of this complex string table is to produce"; > - print " optimal code with a minimum of relocations. */"; > - print ""; > -- print "static const char " namespace "msgstr[] = "; > -+ print "static const char " pkg_namespace "msgstr[] = "; > - header = 0; > - } > - else > -@@ -110,7 +110,7 @@ header { > - } > - > - !header { > -- sub (/\#.+/, ""); > -+ sub (/#.+/, ""); > - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. > - > - if (/^$/) > -@@ -150,7 +150,7 @@ END { > - else > - print " gettext_noop (\"" last_msgstr "\");"; > - print ""; > -- print "static const int " namespace "msgidx[] ="; > -+ print "static const int " pkg_namespace "msgidx[] ="; > - print " {"; > - for (i = 0; i < coded_msgs; i++) > - print " " pos[i] ","; > -@@ -158,7 +158,7 @@ END { > - print " };"; > - print ""; > - print "static GPG_ERR_INLINE int"; > -- print namespace "msgidxof (int code)"; > -+ print pkg_namespace "msgidxof (int code)"; > - print "{"; > - print " return (0 ? 0"; > - > diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb > similarity index 92% > rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb > rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb > index b11ab0548d..bf1da84eb9 100644 > --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb > +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb > @@ -14,11 +14,10 @@ SECTION = "libs" > UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" > SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ > file://pkgconfig.patch \ > - file://libgpg-error-1.36-gawk5-support.patch \ > " > > -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" > -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" > +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" > +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" > > BINCONFIG = "${bindir}/gpg-error-config" > From clopez at igalia.com Thu Feb 27 15:49:21 2020 From: clopez at igalia.com (Carlos Alberto Lopez Perez) Date: Thu, 27 Feb 2020 16:49:21 +0100 Subject: [OE-core] [wpe-webkit] [PATCH 08/10] webkitgtk: unbreak wayland build In-Reply-To: References: <20200216155015.21738-1-alex.kanavin@gmail.com> <20200216155015.21738-8-alex.kanavin@gmail.com> Message-ID: <29f3b8e1-6989-c84e-5d50-4012389f0bab@igalia.com> On 23/02/2020 15:33, Joshua Watt wrote: > On Sun, Feb 16, 2020 at 2:52 PM Alexander Kanavin > wrote: >> >> On Sun, 16 Feb 2020 at 21:15, Khem Raj wrote: >>> >>> On Sun, Feb 16, 2020 at 7:52 AM Alexander Kanavin >>> wrote: >>>> >>>> webkit nowadays requires a couple of supplementary libraries for this, >>>> so bring them in (courtesy of meta-browser, which will hopefully >>>> adjust without a lot of trouble). >>> >>> its not meta-browser, I guess you should credit meta-wpe here [1] >>> and perhaps Cc the meta-wpe maintainer as a courtesy. >> >> >> Actually, it's copied from meta-webkit >> https://github.com/Igalia/meta-webkit/ >> which does not say in the readme who the maintainer is, so I am not sure whom to CC. >> I can adjust the commit msg though. > > I've CC'd the WPE mailing list. > > OE-core now has libwpe and wpebackend-fdo recipes. They should > possibly be removed from meta-webkit to prevent duplication. > Thanks for the notification. Its great that those recipes are shipped now on the oe-core layer. But I don't want to remove those recipes from meta-webkit, even if they are shipped now there. That recipes are an essential part of meta-webkit, so I want to be able to raise the version or change them without depending on oe-core. For example: sometimes we need to use older versions of yocto, but we still want to use the last stable version of wpe/libwpe/wpebackend-fdo. So I find pretty useful to have all the core WPE related recipes on the meta-webkit layer and not depend on whatever oe-core ships. There should be no conflict between the recipes as long as the name used for them its the same, bitbake should simply pick the last version by default. Regards. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 897 bytes Desc: OpenPGP digital signature URL: From jpewhacker at gmail.com Thu Feb 27 16:45:02 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 27 Feb 2020 10:45:02 -0600 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> Message-ID: On 2/27/20 9:01 AM, Joshua Watt wrote: > > > On 2/26/20 11:46 PM, Douglas Royds wrote: >> >> On 26/02/20 4:53 am, Jacob Kroon wrote: >> >>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>> Hi Douglas, >>>> >>>> You updated a comment in reproducible_build.bbclass, commit >>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>> >>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored >>>>> in the recipe's ${SDE_FILE}. >>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored >>>>> in the recipe's SDE_FILE. >>>>> +# If none of these mechanisms are suitable, replace the >>>>> do_deploy_source_date_epoch task >>>>> +# with recipe-specific functionality to write the appropriate >>>>> SOURCE_DATE_EPOCH into the SDE_FILE. >>>>> +# >>>> >>>> But I can't really get this to work. What did work for me was to >>>> replace "do_create_source_date_epoch_stamp()" in my recipe: >>>> >>>> do_create_source_date_epoch_stamp() { >>>> ???? mkdir -p ${SDE_DIR} >>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>> } >>>> >>>> What is the intended way to achieve the thing I'm trying to do here ? >>>> >>> >>> FYI, JPEW has a proposed patch here >>> >>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>> >>> >>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>> >>> But maybe that currently is at odds with SOURCE_DATE_EPOCH being in >>> BB_HASHBASE_WHITELIST ? >>> >>> /Jacob >> >> >> On the surface of it, my comment appears to be just wrong: It does >> make sense to replace do_create_source_date_epoch_stamp() as you suggest. >> >> Joshua's proposed patch looks promising: >> >> * Should the new function not be called first, so that it takes >> priority over the git, known files, and youngest file functions? >> If someone has explicitly set SOURCE_DATE_EPOCH, then they want >> it to take priority. >> > Having that be the first option makes sense. The only case in which > that might not work, is if a recipe does something like: > > ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" > > e.g. uses a function to get the SDE instead of setting to a fixed > value, but that's probably going to be extremely rare. > > >> * >> >> >> >> * As you observe, SOURCE_DATE_EPOCH would need to be removed from >> BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist >> in the first place. >> > I'm not sure why exactly it is whitelisted; I didn't write the > original code that whitelisted it, but I've CC'd Juro in case he > happens to remember. > After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable *must* be calculable at parse time before any task is ran, but in practice it's value is only available once the __source_date_epoch.txt file is present, which is after parsing. This causes the taskhash to be calculated differently during parsing and task execution which causes taskhash mismatch errors. -------------- next part -------------- An HTML attachment was scrubbed... URL: From offougajoris at gmail.com Thu Feb 27 17:41:12 2020 From: offougajoris at gmail.com (Joris Offouga) Date: Thu, 27 Feb 2020 18:41:12 +0100 Subject: [OE-core] Bug with extensible sdk Message-ID: Hi all, I am developing a custom distribution based on poky and I am creating an extensible sdk from my image, but when I install this extensible sdk, I find an error in python3 and an error in relocate.py. For my extensible sdk to work I have to install the sdk generated by populate_sdk in its default location. Do you have an idea to solve my problem? You can see raw log : SDK environment now set up; additionally you may now run devtool to perform development tasks. Run devtool --help for further details. /home/jun/poky-evbb_sdk/sysroots/x86_64-pokysdk-linux/usr/bin/python3: line 5: /home/jun/poky-evbb_sdk/sysroots/x86_64-pokysdk-linux/usr/bin/python3.7.real: No such file or directory post-relocate command "/home/jun/poky-evbb_sdk/sysroots/x86_64-pokysdk-linux/post-relocate-setup.d/meson-setup.py /home/jun/poky-evbb_sdk" failed with status 127 SDK has been successfully set up and is ready to be used. Each time you wish to use the SDK in a new shell session, you need to source the environment setup script e.g. ?$ . /home/jun/poky-evbb_sdk/environment-setup-armv7vet2hf-neon-evbox-linux-gnueabi Best regards, Joris Offouga From armccurdy at gmail.com Thu Feb 27 18:39:04 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Thu, 27 Feb 2020 10:39:04 -0800 Subject: [OE-core] [PATCH] utils.bbclass: Avoid recursive symlink in oe_soinstall In-Reply-To: References: <20200225141733.54584-1-eugenyshcheglov@gmail.com> Message-ID: On Thu, Feb 27, 2020 at 3:42 AM Eugeny Shcheglov wrote: > > >This patch look OK but it might be nice to also clean up this error > message (and the Example comment a few lines above it) to drop the 3 > levels of version number. There should only be 2, ie the fully > versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 > > Yeah, sound reasonable. According to the tLDP (http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html) > there can be be 3 levels, but last one is optional. Quote from tLDP: "The real name adds to the soname a period, a minor > number, another period, and the release number. The last period and release number are optional". In terms of creating symlinks there are only two levels to the version number: .so is a symlink to .so. and .so. is a symlink to a file called .so.. (and soname matches .so.). You can define the structure of to be just a minor number, a minor number and a release number, or something else it still works fine from the point of view of this function. The common case is for to just be the minor release number and I think it's clearer if the the comments and error messages for this function reflect that. > So yes, correct fully versioned name should contain at least two numbers > > >"oe_soinstall: $libname soname is equal to fully versioned real (file) name. The soname should include the major version only (e.g.libfoo.so.1 instead of libfoo.so.1.2)" > > Good point. But what if library real name is libfoo.so.1 and soname is libfoo.so.1 too? In my opinion there is two ways: That's a case where you only need one symlink (ie .so is a symlink to a file called .so. and soname matches .so.) and it doesn't seem to have been considered when this function was originally written. I agree it's a valid use case though (and I guess trying to fix that is the original motivation behind sending this patch?). Ideally the function should be able to distinguish between needing to create a single symlink and needing to create two symlinks but the soname is incorrect... and give a meaningful error in the second case. > 1) Add one more check: parse $sonamelink and throw bbwarn if soname is incorrect. "Incorrect" in this case means that > soname contain more than one version (libfoo.so.1.2) > > 2) Mention both possible problems in bbwarn. Like: " $libname soname is equal to fully versioned real (file) > name. The soname should include the major version only (e.g. libfoo.so.1 instead of libfoo.so.1.2) or minor version > should be added to library real name (e.g. libfoo.so.1.2 instead of libfoo.so.1) ; " > > First one is definitely clearer. So I'm going to implement it and send version 2 of patch > > On Wed, Feb 26, 2020 at 10:08 PM Andre McCurdy wrote: >> >> On Tue, Feb 25, 2020 at 6:17 AM Yevhenii Shchehlov >> wrote: >> > >> > This patch fixes an issue when oe_soinstall function creates >> > non-functional recursive symlinks in case library soname is equal >> > to library real (file) name. >> > >> > Signed-off-by: Yevhenii Shchehlov >> > --- >> > meta/classes/utils.bbclass | 8 ++++++-- >> > 1 file changed, 6 insertions(+), 2 deletions(-) >> > >> > diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass >> > index cd3d05709e..dea824f54f 100644 >> > --- a/meta/classes/utils.bbclass >> > +++ b/meta/classes/utils.bbclass >> > @@ -25,7 +25,7 @@ oe_soinstall() { >> > libname=`basename $1` >> > case "$libname" in >> > *.so) >> > - bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3)" >> > + bbfatal "oe_soinstall: Shared library must haved versioned filename (e.g. libfoo.so.1.2.3 instead of libfoo.so)" >> >> This patch look OK but it might be nice to also clean up this error >> message (and the Example comment a few lines above it) to drop the 3 >> levels of version number. There should only be 2, ie the fully >> versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 >> >> > ;; >> > esac >> > install -m 755 $1 $2/$libname >> > @@ -33,8 +33,12 @@ oe_soinstall() { >> > if [ -z $sonamelink ]; then >> > bbfatal "oe_soinstall: $libname is missing ELF tag 'SONAME'." >> > fi >> > + if [ "$sonamelink" == "$libname" ]; then >> > + bbwarn "oe_soinstall: $libname soname is equal to real (file) name. Minor version should be added to a real name (e.g. libfoo.so.1.2 instead of libfoo.so.1)" >> >> It might be clearer to say: >> >> "oe_soinstall: $libname soname is equal to fully versioned real (file) >> name. The soname should include the major version only (e.g. >> libfoo.so.1 instead of libfoo.so.1.2)" >> >> > + else >> > + ln -sf $libname $2/$sonamelink >> > + fi >> > solink=`echo $libname | sed -e 's/\.so\..*/.so/'` >> > - ln -sf $libname $2/$sonamelink >> > ln -sf $libname $2/$solink >> > } >> > >> > -- >> > 2.25.1 >> > >> > -- >> > _______________________________________________ >> > Openembedded-core mailing list >> > Openembedded-core at lists.openembedded.org >> > http://lists.openembedded.org/mailman/listinfo/openembedded-core From jpewhacker at gmail.com Thu Feb 27 19:28:30 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 27 Feb 2020 13:28:30 -0600 Subject: [OE-core] [PATCH] tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES In-Reply-To: <1579813379-1724-1-git-send-email-jaewon.lee@xilinx.com> References: <1579813379-1724-1-git-send-email-jaewon.lee@xilinx.com> Message-ID: On Thu, Jan 23, 2020 at 3:03 PM Jaewon Lee wrote: > > Without the proper default tune in TUNE_FEATURES, certain variables > won't expand correctly. MACHINEOVERRIDES won't add cortexa72-cortexa53: > TUNE_CCARGS won't add -mtune=cortexa72.cortexa-53, generating the toolchain > incorrectly. > Adding missing 'cortexa72-cortexa53' to both > TUNE_FEATURES_tune-cortexa72-cortexa53 and > TUNE_FEATURES_tune-cortexa72-cortexa53-crypto I can confirm that this patch is required to correctly generate the tunes for cortexa72-cortexa53... did it get missed for being merged? > > Signed-off-by: Jaewon Lee > Signed-off-by: Alejandro Enedino Hernandez Samaniego > --- > meta/conf/machine/include/tune-cortexa72-cortexa53.inc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc > index 0d43531..f208b98 100644 > --- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc > +++ b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc > @@ -14,8 +14,8 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa72-cortexa53", " - > AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto" > ARMPKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" > ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53" > -TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc}" > -TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto}" > +TUNE_FEATURES_tune-cortexa72-cortexa53 = "${TUNE_FEATURES_tune-armv8a-crc} cortexa72-cortexa53" > +TUNE_FEATURES_tune-cortexa72-cortexa53-crypto = "${TUNE_FEATURES_tune-armv8a-crc-crypto} cortexa72-cortexa53" > PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa72-cortexa53" > PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72-cortexa53 cortexa72-cortexa53-crypto" > BASE_LIB_tune-cortexa72-cortexa53 = "lib64" > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From akuster808 at gmail.com Thu Feb 27 19:43:19 2020 From: akuster808 at gmail.com (akuster808) Date: Thu, 27 Feb 2020 11:43:19 -0800 Subject: [OE-core] [PATCH] wic: Add include-dir option In-Reply-To: <312d477b-f5f5-16df-7867-c5c9f5619abb@geanix.com> References: <20200227042658.19619-1-akuster808@gmail.com> <312d477b-f5f5-16df-7867-c5c9f5619abb@geanix.com> Message-ID: <4e4b134c-3ac1-814b-5055-3a539904f52e@gmail.com> On 2/27/20 12:12 AM, Martin Hundeb?ll wrote: > Hi Armin, > > On 27/02/2020 05.26, Armin Kuster wrote: >> This option allows for the inclusion of a single directory >> for a partition. > > I am unsure how this is used in a .wks file. Yeah, the documentation does not cover this. This is what I used to verified it works part? / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs --align 4096 --exclude-path=var part? /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var --align 4096 --include-dir=var > > From the code it looks similar to the include-path option, but > relative to the rootfs source dir instead of the wic working dir? the --include-path adds an entire rootfs? to the partition. I don't want the another rootfs. The help file even says that.? I want on directory. --exclude-dir allows me to "exclude" a dir . I used wic ls {path to partition}:{partition number}? to view the contents? of the partition. > > But the include-dir value is also used in the destination path? Then please document it and I don't mean the "help" file which is unclear. So how would you have "home" or "var" be in their own partitions? Please show an example. - armin > > Thanks, > Martin > >> Signed-off-by: Armin Kuster >> --- >> ? scripts/lib/wic/help.py????????????????? |? 3 +++ >> ? scripts/lib/wic/ksparser.py????????????? |? 1 + >> ? scripts/lib/wic/partition.py???????????? |? 1 + >> ? scripts/lib/wic/plugins/source/rootfs.py | 10 ++++++++-- >> ? 4 files changed, 13 insertions(+), 2 deletions(-) >> >> diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py >> index 4d342fcf05..517f68e11e 100644 >> --- a/scripts/lib/wic/help.py >> +++ b/scripts/lib/wic/help.py >> @@ -979,6 +979,9 @@ DESCRIPTION >> ?????????????????????????? copies. This option only has an effect >> with the rootfs >> ?????????????????????????? source plugin. >> ? +???????? --include-dir: This option is specific to wic. It adds >> the contents >> +??????????????????????? of the given directory to the resulting >> partition. >> + >> ?????????? --extra-space: This option is specific to wic. It adds extra >> ????????????????????????? space after the space filled by the content >> ????????????????????????? of the partition. The final size can go >> diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py >> index 650b976223..b8abc33c87 100644 >> --- a/scripts/lib/wic/ksparser.py >> +++ b/scripts/lib/wic/ksparser.py >> @@ -138,6 +138,7 @@ class KickStart(): >> ????????? part.add_argument('--align', type=int) >> ????????? part.add_argument('--exclude-path', nargs='+') >> ????????? part.add_argument('--include-path', nargs='+') >> +??????? part.add_argument('--include-dir') >> ????????? part.add_argument("--extra-space", type=sizetype) >> ????????? part.add_argument('--fsoptions', dest='fsopts') >> ????????? part.add_argument('--fstype', default='vfat', >> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py >> index 2d95f78439..0b735fffd9 100644 >> --- a/scripts/lib/wic/partition.py >> +++ b/scripts/lib/wic/partition.py >> @@ -31,6 +31,7 @@ class Partition(): >> ????????? self.extra_space = args.extra_space >> ????????? self.exclude_path = args.exclude_path >> ????????? self.include_path = args.include_path >> +??????? self.include_dir = args.include_dir >> ????????? self.fsopts = args.fsopts >> ????????? self.fstype = args.fstype >> ????????? self.label = args.label >> diff --git a/scripts/lib/wic/plugins/source/rootfs.py >> b/scripts/lib/wic/plugins/source/rootfs.py >> index 705aeb5563..d1c59cab8a 100644 >> --- a/scripts/lib/wic/plugins/source/rootfs.py >> +++ b/scripts/lib/wic/plugins/source/rootfs.py >> @@ -71,7 +71,7 @@ class RootfsPlugin(SourcePlugin): >> ? ????????? new_rootfs = None >> ????????? # Handle excluded paths. >> -??????? if part.exclude_path or part.include_path: >> +??????? if part.exclude_path or part.include_path or part.include_dir: >> ????????????? # We need a new rootfs directory we can delete files >> from. Copy to >> ????????????? # workdir. >> ????????????? new_rootfs = os.path.realpath(os.path.join(cr_workdir, >> "rootfs%d" % part.lineno)) >> @@ -79,7 +79,13 @@ class RootfsPlugin(SourcePlugin): >> ????????????? if os.path.lexists(new_rootfs): >> ????????????????? shutil.rmtree(os.path.join(new_rootfs)) >> ? -??????????? copyhardlinktree(part.rootfs_dir, new_rootfs) >> +??????????? if part.include_dir: >> +??????????????? src = os.path.realpath(os.path.join(part.rootfs_dir, >> part.include_dir)) >> +??????????????? dst = os.path.realpath(os.path.join(new_rootfs, >> part.include_dir)) >> +??????????????? copyhardlinktree(src, dst) >> + >> +??????????? else: >> +??????????????? copyhardlinktree(part.rootfs_dir, new_rootfs) >> ? ????????????? for path in part.include_path or []: >> ????????????????? copyhardlinktree(path, new_rootfs) >> From pbarker at konsulko.com Thu Feb 27 19:50:59 2020 From: pbarker at konsulko.com (Paul Barker) Date: Thu, 27 Feb 2020 19:50:59 +0000 Subject: [OE-core] [PATCH] wic: Add include-dir option In-Reply-To: <4e4b134c-3ac1-814b-5055-3a539904f52e@gmail.com> References: <20200227042658.19619-1-akuster808@gmail.com> <312d477b-f5f5-16df-7867-c5c9f5619abb@geanix.com> <4e4b134c-3ac1-814b-5055-3a539904f52e@gmail.com> Message-ID: On Thu, 27 Feb 2020 at 19:43, akuster808 wrote: > > > > On 2/27/20 12:12 AM, Martin Hundeb?ll wrote: > > Hi Armin, > > > > On 27/02/2020 05.26, Armin Kuster wrote: > >> This option allows for the inclusion of a single directory > >> for a partition. > > > > I am unsure how this is used in a .wks file. > Yeah, the documentation does not cover this. > > This is what I used to verified it works > > part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs > --align 4096 --exclude-path=var > part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var > --align 4096 --include-dir=var > > > > > > From the code it looks similar to the include-path option, but > > relative to the rootfs source dir instead of the wic working dir? > > the --include-path adds an entire rootfs to the partition. I don't want > the another rootfs. The help file even says that. I want on directory. > --exclude-dir allows me to "exclude" a dir . > > > I used wic ls {path to partition}:{partition number} to view the > contents of the partition. > > > > > But the include-dir value is also used in the destination path? > Then please document it and I don't mean the "help" file which is unclear. > > So how would you have "home" or "var" be in their own partitions? Please > show an example. IIRC, part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs --align 4096 --exclude-path=var part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var --align 4096 --rootfs-dir=${IMAGE_ROOTFS}/var For an example see scripts/lib/wic/canned-wks/efi-bootdisk.wks.in Thanks, Paul From petr.vorel at gmail.com Thu Feb 27 20:34:55 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Feb 2020 21:34:55 +0100 Subject: [OE-core] [PATCH 1/2] ltp: Update to 20200120 Message-ID: <20200227203456.7395-1-petr.vorel@gmail.com> Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Hi, tested only on glibc. But upstream release is tested also on MUSL (travis, via Alpine + glibc) and tested also on Buildroot (uclibc, musl, glibc). Actual list of MUSL incompatible tests is in travis/alpine.sh [1]. Kind regards, Petr [1] https://github.com/linux-test-project/ltp/blob/master/travis/alpine.sh .../ltp/0001-Add-more-musl-exclusions.patch | 32 +-------- ...option-to-select-libc-implementation.patch | 72 ++++--------------- ...udevadm-trigger-before-swap-verifica.patch | 35 --------- ...ix-zeros-of-the-addresses-output-by-.patch | 43 ----------- ...or-time64-unsafe-syscalls-before-usi.patch | 41 ++++++++--- ...es-fix-an-absent-format-string-issue.patch | 24 ------- ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 ------------ ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 --------- ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++---- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 7 +- 10 files changed, 60 insertions(+), 303 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (92%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..baf28bbecb 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ 4 files changed, 18 insertions(+) @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS := accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..e0cd860935 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -11,8 +11,19 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel --- Makefile | 5 +++++ testcases/kernel/Makefile | 5 ++++- @@ -84,65 +95,8 @@ index 45a00cf7d..d1becd054 100644 mincore mprotect nftw profil remap_file_pages sbrk endif +ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif ifeq ($(UCLIBC),1) FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex -+endif -+ - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3ad3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e7314e0..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669716..ecc6660f93 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844509..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0741..0000000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa1b4..0000000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325eaf3..350091a70c 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 92% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc9c6..38fd0f6f87 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -27,21 +27,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From petr.vorel at gmail.com Thu Feb 27 20:34:56 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Feb 2020 21:34:56 +0100 Subject: [OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <20200227203456.7395-1-petr.vorel@gmail.com> References: <20200227203456.7395-1-petr.vorel@gmail.com> Message-ID: <20200227203456.7395-2-petr.vorel@gmail.com> Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Hi, please don't deliver this patch to users, it's wrong. Kind regards, Petr ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 38fd0f6f87..069d9c2e0b 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From raj.khem at gmail.com Thu Feb 27 20:46:15 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 12:46:15 -0800 Subject: [OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <20200227203456.7395-2-petr.vorel@gmail.com> References: <20200227203456.7395-1-petr.vorel@gmail.com> <20200227203456.7395-2-petr.vorel@gmail.com> Message-ID: On Thu, Feb 27, 2020 at 12:35 PM Petr Vorel wrote: > > Upstream just disagree on this patch > https://patchwork.ozlabs.org/comment/2012045/ > > Signed-off-by: Petr Vorel > --- > Hi, > > please don't deliver this patch to users, it's wrong. > Thanks Petr, is there an alternative approach we can take ? > Kind regards, > Petr > > ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- > meta/recipes-extended/ltp/ltp_20200120.bb | 1 - > 2 files changed, 69 deletions(-) > delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch > > diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch > deleted file mode 100644 > index d32ac1dd7c..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 > -From: "Hongzhi.Song" > -Date: Wed, 10 Oct 2018 22:07:05 -0400 > -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit > - > -Mips will return EINVAL instead of ENOMEM as expected > -if the range [addr + len) exceeds TASK_SIZE. > - > -Linux kernel code: arch/mips/mm/mmap.c > -if (flags & MAP_FIXED) { > - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ > - if (TASK_SIZE - len < addr) > - return -EINVAL; > - > -Relax the condition and accept both ENOMEM and EINVAL > -as expected outcome. > - > -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] > - > -Signed-off-by: Hongzhi.Song > ---- > - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- > - 1 file changed, 5 insertions(+), 5 deletions(-) > - > -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c > -index 9cf83d9..55090a6 100644 > ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c > -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c > -@@ -7,7 +7,7 @@ > - * source tree. > - * > - * The mmap() function shall fail if: > -- * [ENOMEM] MAP_FIXED was specified, > -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, > - * and the range [addr,addr+len) exceeds that allowed > - * for the address space of a process; or, if MAP_FIXED was not specified and > - * there is insufficient room in the address space to effect the mapping. > -@@ -15,7 +15,7 @@ > - * Test Step: > - * 1. Map a shared memory object, with size exceeding the value get from > - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; > -- * 3. Should get ENOMEM. > -+ * 3. Should get ENOMEM or EINVAL. > - */ > - > - #include > -@@ -92,8 +92,8 @@ int main(void) > - (unsigned long)len); > - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, > - 0); > -- if (pa == MAP_FAILED && errno == ENOMEM) { > -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); > -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { > -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); > - exit(PTS_PASS); > - } > - > -@@ -102,6 +102,6 @@ int main(void) > - else > - munmap(pa, len); > - close(fd); > -- printf("Test Fail: Did not get ENOMEM as expected\n"); > -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); > - return PTS_FAIL; > - } > --- > -2.7.4 > - > diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb > index 38fd0f6f87..069d9c2e0b 100644 > --- a/meta/recipes-extended/ltp/ltp_20200120.bb > +++ b/meta/recipes-extended/ltp/ltp_20200120.bb > @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ > file://0004-guard-mallocopt-with-__GLIBC__.patch \ > file://0007-Fix-test_proc_kill-hanging.patch \ > file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ > - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ > file://0001-Add-more-musl-exclusions.patch \ > file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ > " > -- > 2.25.1 > From petr.vorel at gmail.com Thu Feb 27 20:47:00 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Feb 2020 21:47:00 +0100 Subject: [OE-core] [PATCH v2 1/2] ltp: Update to 20200120 Message-ID: <20200227204701.3830-1-petr.vorel@gmail.com> Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Changes v1->v2: * fix rebasing 0001-build-Add-option-to-select-libc-implementation.patch Kind regards, Petr .../ltp/0001-Add-more-musl-exclusions.patch | 37 +------ ...option-to-select-libc-implementation.patch | 103 +++++------------- ...udevadm-trigger-before-swap-verifica.patch | 35 ------ ...ix-zeros-of-the-addresses-output-by-.patch | 43 -------- ...or-time64-unsafe-syscalls-before-usi.patch | 41 +++++-- ...es-fix-an-absent-format-string-issue.patch | 24 ---- ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 -------- ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 ------ ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 7 +- 10 files changed, 80 insertions(+), 319 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (92%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS := accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..0598046b28 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3ad3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e7314e0..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669716..ecc6660f93 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844509..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0741..0000000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa1b4..0000000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325eaf3..350091a70c 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 92% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc9c6..38fd0f6f87 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -27,21 +27,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From petr.vorel at gmail.com Thu Feb 27 20:47:01 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Feb 2020 21:47:01 +0100 Subject: [OE-core] [PATCH v2 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <20200227204701.3830-1-petr.vorel@gmail.com> References: <20200227204701.3830-1-petr.vorel@gmail.com> Message-ID: <20200227204701.3830-2-petr.vorel@gmail.com> Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Changes v1->v2: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 38fd0f6f87..069d9c2e0b 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From petr.vorel at gmail.com Thu Feb 27 20:51:26 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Feb 2020 21:51:26 +0100 Subject: [OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: References: <20200227203456.7395-1-petr.vorel@gmail.com> <20200227203456.7395-2-petr.vorel@gmail.com> Message-ID: <20200227205126.GB3446@dell5510> Hi Khem, > > please don't deliver this patch to users, it's wrong. > Thanks Petr, is there an alternative approach we can take ? Cyril suggested at the time to skipping the test in the testrunner. Is that feasible? He also asked how do you run the test. i.e. not changing the code of the test, just don't run it. https://patchwork.ozlabs.org/comment/2012168/ Kind regards, Petr PS: better to ask on LTP ML, Cc Cyril and me. From akuster808 at gmail.com Thu Feb 27 20:56:06 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 27 Feb 2020 12:56:06 -0800 Subject: [OE-core] [PATCH 0/2] Update bind to lates ESV version 9.16 Message-ID: <20200227205608.26788-1-akuster808@gmail.com> Please consider this last minute addition to 3.1. Bind 9.16.0 just dropped and is the latest ESV. It requires libuv from meta-oe so please it should be added to core too. The current 9.11 ESV is planned to be EOL'd in the middle 3.1 LTS release. Armin Kuster (2): libuv: needed by bind 9.16 bind: Update to latest ESV version 9.16 ....in-remove-useless-L-use_openssl-lib.patch | 30 -------------- ...d-V-and-start-log-hide-build-options.patch | 33 +++++++-------- ...ching-for-json-headers-searches-sysr.patch | 14 +++---- .../bind/{bind_9.11.13.bb => bind_9.16.0.bb} | 40 +++++++------------ .../libuv/libuv_1.34.0.bb | 19 +++++++++ 5 files changed, 57 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch rename meta/recipes-connectivity/bind/{bind_9.11.13.bb => bind_9.16.0.bb} (77%) create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.0.bb -- 2.17.1 From akuster808 at gmail.com Thu Feb 27 20:56:07 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 27 Feb 2020 12:56:07 -0800 Subject: [OE-core] [PATCH 1/2] libuv: needed by bind 9.16 In-Reply-To: <20200227205608.26788-1-akuster808@gmail.com> References: <20200227205608.26788-1-akuster808@gmail.com> Message-ID: <20200227205608.26788-2-akuster808@gmail.com> From: Armin Kuster move from meta-oe to core Signed-off-by: Armin Kuster --- .../libuv/libuv_1.34.0.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.0.bb diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.0.bb b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb new file mode 100644 index 0000000000..b842bbda7a --- /dev/null +++ b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" +HOMEPAGE = "https://github.com/libuv/libuv" +BUGTRACKER = "https://github.com/libuv/libuv/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" + +SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" + +S = "${WORKDIR}/git" + +inherit autotools + +do_configure() { + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +BBCLASSEXTEND = "native" -- 2.17.1 From akuster808 at gmail.com Thu Feb 27 20:56:08 2020 From: akuster808 at gmail.com (Armin Kuster) Date: Thu, 27 Feb 2020 12:56:08 -0800 Subject: [OE-core] [PATCH 2/2] bind: Update to latest ESV version 9.16 In-Reply-To: <20200227205608.26788-1-akuster808@gmail.com> References: <20200227205608.26788-1-akuster808@gmail.com> Message-ID: <20200227205608.26788-3-akuster808@gmail.com> From: Armin Kuster Removed obsolete packageconfig options License change to MPL-2.0 https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE Refreshed: bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch Signed-off-by: Armin Kuster --- ....in-remove-useless-L-use_openssl-lib.patch | 30 -------------- ...d-V-and-start-log-hide-build-options.patch | 33 +++++++-------- ...ching-for-json-headers-searches-sysr.patch | 14 +++---- .../bind/{bind_9.11.13.bb => bind_9.16.0.bb} | 40 +++++++------------ 4 files changed, 38 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch rename meta/recipes-connectivity/bind/{bind_9.11.13.bb => bind_9.16.0.bb} (77%) diff --git a/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch b/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch deleted file mode 100644 index 9d31b98080..0000000000 --- a/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2325a92f1896a2a7f586611686801b41fbc91b50 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 27 Aug 2018 15:00:51 +0800 -Subject: [PATCH] configure.in: remove useless `-L$use_openssl/lib' - -Since `--with-openssl=${STAGING_DIR_HOST}${prefix}' is used in bind recipe, -the `-L$use_openssl/lib' has a hardcoded suffix, removing it is harmless -and helpful for clean up host build path in isc-config.sh - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e85a5c6..2bbfc58 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1631,7 +1631,7 @@ If you don't want OpenSSL, use --without-openssl]) - fi - ;; - *) -- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" -+ DST_OPENSSL_LIBS="-lcrypto" - ;; - esac - fi diff --git a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch index 75908aa638..5bcc16c9b2 100644 --- a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch @@ -12,23 +12,24 @@ $ named -V Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia + +Refreshed for 9.16.0 +Signed-off-by: Armin Kuster + --- bin/named/include/named/globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index ba3457e..7741da7 100644 ---- a/bin/named/include/named/globals.h -+++ b/bin/named/include/named/globals.h -@@ -68,7 +68,7 @@ EXTERN const char * ns_g_version INIT(VERSION); - EXTERN const char * ns_g_product INIT(PRODUCT); - EXTERN const char * ns_g_description INIT(DESCRIPTION); - EXTERN const char * ns_g_srcid INIT(SRCID); --EXTERN const char * ns_g_configargs INIT(CONFIGARGS); -+EXTERN const char * ns_g_configargs INIT("*** (options are hidden)"); - EXTERN const char * ns_g_builder INIT(BUILDER); - EXTERN in_port_t ns_g_port INIT(0); - EXTERN isc_dscp_t ns_g_dscp INIT(-1); --- -2.7.4 - +Index: bind-9.16.0/bin/named/include/named/globals.h +=================================================================== +--- bind-9.16.0.orig/bin/named/include/named/globals.h ++++ bind-9.16.0/bin/named/include/named/globals.h +@@ -69,7 +69,7 @@ EXTERN const char *named_g_version I + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +-EXTERN const char *named_g_configargs INIT(CONFIGARGS); ++EXTERN const char *named_g_configargs INIT("*** (options are hidden)"); + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); diff --git a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch index 84559e5f37..19f1a25ad7 100644 --- a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch +++ b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch @@ -32,16 +32,16 @@ Signed-off-by: Paul Gortmaker configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 17392fd..e85a5c6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2449,7 +2449,7 @@ case "$use_libjson" in - libjson_libs="" +Index: bind-9.16.0/configure.ac +=================================================================== +--- bind-9.16.0.orig/configure.ac ++++ bind-9.16.0/configure.ac +@@ -1214,7 +1214,7 @@ case "$use_lmdb" in + lmdb_libs="" ;; auto|yes) - for d in /usr /usr/local /opt/local + for d in "${STAGING_INCDIR}" do - if test -f "${d}/include/json/json.h" + if test -f "${d}/include/lmdb.h" then diff --git a/meta/recipes-connectivity/bind/bind_9.11.13.bb b/meta/recipes-connectivity/bind/bind_9.16.0.bb similarity index 77% rename from meta/recipes-connectivity/bind/bind_9.11.13.bb rename to meta/recipes-connectivity/bind/bind_9.16.0.bb index 4e64171cc1..62e9be4c87 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.13.bb +++ b/meta/recipes-connectivity/bind/bind_9.16.0.bb @@ -2,12 +2,12 @@ SUMMARY = "ISC Internet Domain Name Server" HOMEPAGE = "http://www.isc.org/sw/bind/" SECTION = "console/network" -LICENSE = "ISC & BSD" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8f17f64e47e83b60cd920a1e4b54419e" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1" -DEPENDS = "openssl libcap zlib" +DEPENDS = "openssl libcap zlib libuv" -SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ +SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://conf.patch \ file://named.service \ file://bind9 \ @@ -15,22 +15,20 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://make-etc-initd-bind-stop-work.patch \ file://init.d-add-support-for-read-only-rootfs.patch \ file://bind-ensure-searching-for-json-headers-searches-sysr.patch \ - file://0001-configure.in-remove-useless-L-use_openssl-lib.patch \ file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[md5sum] = "17de0d024ab1eac377f1c2854dc25057" -SRC_URI[sha256sum] = "fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d" +SRC_URI[md5sum] = "f973848bf32797c5f546de7d92a6fd07" +SRC_URI[sha256sum] = "af4bd9bdaeb1aa7399429972f3a8aa01dd6886b7ae046d703ab8da45330f2e28" +SRC_URI[sha1sum] = "01678973598db55dfb03cd12a004d3d75a8ab2bf" +SRC_URI[sha384sum] = "29df1a4a9d2a460ff970ea3d9abb47ff1204c762fa5c23da0627b0eeb847560f706d333796f61c5aeba09b8333532359" +SRC_URI[sha512sum] = "6f836fe4cb12d3e2e3a871f69e5b249b2bae6ae1dc542395c79cc974ca95aa595e963b6716a38f6c9d5cb3c54ec606fcd932412a6fbe596651123ac1379dd010" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" -# stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4 +# stay at 9.16 follow the ESV versions divisible by 4 UPSTREAM_CHECK_REGEX = "(?P9.(11|16|20|24|28)(\.\d+)+(-P\d+)*)/" -# BIND >= 9.11.2 need dhcpd >= 4.4.0, -# don't report it here since dhcpd is already recent enough. -CVE_CHECK_WHITELIST += "CVE-2019-6470" - inherit autotools update-rc.d systemd useradd pkgconfig multilib_script multilib_header MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh" @@ -40,17 +38,14 @@ PACKAGECONFIG ?= "readline" PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2" PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline" PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit" -PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,," PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native," -ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" -EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \ - --disable-devpoll --enable-epoll --with-gost=no \ - --with-gssapi=no --with-ecdsa=yes --with-eddsa=no \ - --with-lmdb=no \ +EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \ + --with-gssapi=no --with-lmdb=no --with-zlib \ --sysconfdir=${sysconfdir}/bind \ --with-openssl=${STAGING_DIR_HOST}${prefix} \ " +LDFLAGS_append = " -lz" inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)} @@ -66,13 +61,6 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE_${PN} = "named.service" -do_install_prepend() { - # clean host path in isc-config.sh before the hardlink created - # by "make install": - # bind9-config -> isc-config.sh - sed -i -e "s,${STAGING_LIBDIR},${libdir}," ${B}/isc-config.sh -} - do_install_append() { rmdir "${D}${localstatedir}/run" @@ -130,7 +118,7 @@ FILES_${PN}-dev += "${bindir}/isc-config.h" FILES_${PN} += "${sbindir}/generate-rndc-key.sh" PACKAGE_BEFORE_PN += "${PN}-libs" -FILES_${PN}-libs = "${libdir}/*.so*" +FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.so*" FILES_${PN}-staticdev += "${libdir}/*.la" PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" -- 2.17.1 From douglas.royds at taitradio.com Thu Feb 27 21:22:51 2020 From: douglas.royds at taitradio.com (Douglas Royds) Date: Fri, 28 Feb 2020 10:22:51 +1300 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> Message-ID: On 28/02/20 5:45 am, Joshua Watt wrote: > On 2/27/20 9:01 AM, Joshua Watt wrote: >> On 2/26/20 11:46 PM, Douglas Royds wrote: >>> >>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>> >>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>> Hi Douglas, >>>>> >>>>> You updated a comment in reproducible_build.bbclass, commit >>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>> >>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>> stored in the recipe's ${SDE_FILE}. >>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>> stored in the recipe's SDE_FILE. >>>>>> +# If none of these mechanisms are suitable, replace the >>>>>> do_deploy_source_date_epoch task >>>>>> +# with recipe-specific functionality to write the appropriate >>>>>> SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>> +# >>>>> >>>>> But I can't really get this to work. What did work for me was to >>>>> replace "do_create_source_date_epoch_stamp()" in my recipe: >>>>> >>>>> do_create_source_date_epoch_stamp() { >>>>> ???? mkdir -p ${SDE_DIR} >>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>> } >>>>> >>>>> What is the intended way to achieve the thing I'm trying to do here ? >>>>> >>>> >>>> FYI, JPEW has a proposed patch here >>>> >>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>> >>>> >>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>> >>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH being in >>>> BB_HASHBASE_WHITELIST ? >>>> >>>> /Jacob >>> >>> >>> On the surface of it, my comment appears to be just wrong: It does >>> make sense to replace do_create_source_date_epoch_stamp() as you >>> suggest. >>> >>> Joshua's proposed patch looks promising: >>> >>> * Should the new function not be called first, so that it takes >>> priority over the git, known files, and youngest file functions? >>> If someone has explicitly set SOURCE_DATE_EPOCH, then they want >>> it to take priority. >>> >> Having that be the first option makes sense. The only case in which >> that might not work, is if a recipe does something like: >> >> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >> >> e.g. uses a function to get the SDE instead of setting to a fixed >> value, but that's probably going to be extremely rare. >> >> >>> * >>> >>> >>> >>> * As you observe, SOURCE_DATE_EPOCH would need to be removed from >>> BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist >>> in the first place. >>> >> I'm not sure why exactly it is whitelisted; I didn't write the >> original code that whitelisted it, but I've CC'd Juro in case he >> happens to remember. >> > After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH > has to be whitelisted. The value of the variable *must* be calculable > at parse time before any task is ran, but in practice it's value is > only available once the __source_date_epoch.txt file is present, which > is after parsing. This causes the taskhash to be calculated > differently during parsing and task execution which causes taskhash > mismatch errors. > True. What to do? Would it work to use a different non-whitelisted variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? -------------- next part -------------- An HTML attachment was scrubbed... URL: From petr.vorel at gmail.com Thu Feb 27 21:29:39 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Feb 2020 22:29:39 +0100 Subject: [OE-core] [PATCH v3 1/2] ltp: Update to 20200120 Message-ID: <20200227212940.12327-1-petr.vorel@gmail.com> Removed ffsb copying file (tool removed from upstream) Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Changes v2->v3: ffsb-6.0-rc2 has been removed => remove it from upstream. Kind regards, Petr .../ltp/0001-Add-more-musl-exclusions.patch | 37 +------ ...option-to-select-libc-implementation.patch | 103 +++++------------- ...udevadm-trigger-before-swap-verifica.patch | 35 ------ ...ix-zeros-of-the-addresses-output-by-.patch | 43 -------- ...or-time64-unsafe-syscalls-before-usi.patch | 41 +++++-- ...es-fix-an-absent-format-string-issue.patch | 24 ---- ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 -------- ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 ------ ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 8 +- 10 files changed, 80 insertions(+), 320 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS := accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..0598046b28 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3ad3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e7314e0..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669716..ecc6660f93 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844509..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0741..0000000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa1b4..0000000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325eaf3..350091a70c 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 90% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc9c6..579a763431 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From petr.vorel at gmail.com Thu Feb 27 21:29:40 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Thu, 27 Feb 2020 22:29:40 +0100 Subject: [OE-core] [PATCH v3 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <20200227212940.12327-1-petr.vorel@gmail.com> References: <20200227212940.12327-1-petr.vorel@gmail.com> Message-ID: <20200227212940.12327-2-petr.vorel@gmail.com> Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Changes v2->v3: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 579a763431..537cc72644 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From jpewhacker at gmail.com Thu Feb 27 21:49:31 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 27 Feb 2020 15:49:31 -0600 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> Message-ID: <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> On 2/27/20 3:22 PM, Douglas Royds wrote: > > On 28/02/20 5:45 am, Joshua Watt wrote: > >> On 2/27/20 9:01 AM, Joshua Watt wrote: >>> On 2/26/20 11:46 PM, Douglas Royds wrote: >>>> >>>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>>> >>>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>>> Hi Douglas, >>>>>> >>>>>> You updated a comment in reproducible_build.bbclass, commit >>>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>>> >>>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>> stored in the recipe's ${SDE_FILE}. >>>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>> stored in the recipe's SDE_FILE. >>>>>>> +# If none of these mechanisms are suitable, replace the >>>>>>> do_deploy_source_date_epoch task >>>>>>> +# with recipe-specific functionality to write the appropriate >>>>>>> SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>>> +# >>>>>> >>>>>> But I can't really get this to work. What did work for me was to >>>>>> replace "do_create_source_date_epoch_stamp()" in my recipe: >>>>>> >>>>>> do_create_source_date_epoch_stamp() { >>>>>> ???? mkdir -p ${SDE_DIR} >>>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>>> } >>>>>> >>>>>> What is the intended way to achieve the thing I'm trying to do >>>>>> here ? >>>>>> >>>>> >>>>> FYI, JPEW has a proposed patch here >>>>> >>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>>> >>>>> >>>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>>> >>>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH being >>>>> in BB_HASHBASE_WHITELIST ? >>>>> >>>>> /Jacob >>>> >>>> >>>> On the surface of it, my comment appears to be just wrong: It does >>>> make sense to replace do_create_source_date_epoch_stamp() as you >>>> suggest. >>>> >>>> Joshua's proposed patch looks promising: >>>> >>>> * Should the new function not be called first, so that it takes >>>> priority over the git, known files, and youngest file >>>> functions? If someone has explicitly set SOURCE_DATE_EPOCH, >>>> then they want it to take priority. >>>> >>> Having that be the first option makes sense. The only case in which >>> that might not work, is if a recipe does something like: >>> >>> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >>> >>> e.g. uses a function to get the SDE instead of setting to a fixed >>> value, but that's probably going to be extremely rare. >>> >>> >>>> * >>>> >>>> >>>> >>>> * As you observe, SOURCE_DATE_EPOCH would need to be removed from >>>> BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist >>>> in the first place. >>>> >>> I'm not sure why exactly it is whitelisted; I didn't write the >>> original code that whitelisted it, but I've CC'd Juro in case he >>> happens to remember. >>> >> After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH >> has to be whitelisted. The value of the variable *must* be calculable >> at parse time before any task is ran, but in practice it's value is >> only available once the __source_date_epoch.txt file is present, >> which is after parsing. This causes the taskhash to be calculated >> differently during parsing and task execution which causes taskhash >> mismatch errors. >> > > True. > > What to do? Would it work to use a different non-whitelisted variable > in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? > Ya, that would work. You'd have to figure out how to get the variable to be included in each taskhash even though it's not directly referenced, but I'm sure that's possible. Another option that's at lot more "magic" would be something like this: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd That's really weird, and I'm not sure I like it, but worth a thought. -------------- next part -------------- An HTML attachment was scrubbed... URL: From jpuhlman at mvista.com Thu Feb 27 22:15:33 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Thu, 27 Feb 2020 14:15:33 -0800 Subject: [OE-core] [PATCH 1/3] sysvinit: remove logsave.8 Message-ID: <20200227221535.8622-1-jpuhlman@mvista.com> From: Jeremy Puhlman logsave is a duplicate from e2fsprogs, which was already removed, but the man page remained which is also a duplicate. However it does not get modifed on install so it conflicts with the e2fsprogs version. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 63c10848b4..d2b85ed9c0 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -110,4 +110,5 @@ do_install () { # Already provided by e2fsprogs; sysvinit's version is a copy from there rm ${D}${base_sbindir}/logsave + rm ${D}${mandir}/man8/logsave.8 } -- 2.20.1 From jpuhlman at mvista.com Thu Feb 27 22:15:34 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Thu, 27 Feb 2020 14:15:34 -0800 Subject: [OE-core] [PATCH 2/3] rt-tests: make manpages reproducible In-Reply-To: <20200227221535.8622-1-jpuhlman@mvista.com> References: <20200227221535.8622-1-jpuhlman@mvista.com> Message-ID: <20200227221535.8622-2-jpuhlman@mvista.com> From: Jeremy Puhlman add -n to gzip call Signed-off-by: Jeremy A. Puhlman --- ...gzip-with-n-for-build-reproducibilty.patch | 62 +++++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch diff --git a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch new file mode 100644 index 0000000000..3bafbbe08f --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch @@ -0,0 +1,62 @@ +From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Tue, 25 Feb 2020 22:58:59 +0000 +Subject: [PATCH] gzip with -n for build reproducibilty + +The date can get encoded in the header of the gz file, which +causes the binary files between two different builds of the +same data to be different. Add -n for reproducibilty + +Signed-off-by: Jeremy Puhlman + +Upstream-Status: Submitted [mailinglist] + +--- + Makefile | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index a54d82b..e9f0d5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -168,17 +168,17 @@ install: all install_hwlatdetect + cp $(TARGETS) "$(DESTDIR)$(bindir)" + install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" + install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" +- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" +- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" +- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" +- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" +- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" +- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" +- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" +- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" +- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" +- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" +- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" ++ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" ++ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" ++ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" ++ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" ++ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" ++ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" ++ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" ++ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" ++ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" ++ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" ++ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" + + .PHONY: install_hwlatdetect + install_hwlatdetect: hwlatdetect +@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect + install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ + rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ + ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ + fi + + .PHONY: tarball +-- +2.23.0 + diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index 5aa0aa10c3..dad252b4ed 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -13,6 +13,7 @@ inherit ptest SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ + file://0001-gzip-with-n-for-build-reproducibilty.patch \ " # rt-tests needs PI mutex support in libc -- 2.20.1 From jpuhlman at mvista.com Thu Feb 27 22:15:35 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Thu, 27 Feb 2020 14:15:35 -0800 Subject: [OE-core] [PATCH 3/3] lsb-release: fix likely reproducabilty timestamp In-Reply-To: <20200227221535.8622-1-jpuhlman@mvista.com> References: <20200227221535.8622-1-jpuhlman@mvista.com> Message-ID: <20200227221535.8622-3-jpuhlman@mvista.com> From: Jeremy Puhlman Remove timestamp from gzipped manpage. Signed-off-by: Jeremy A. Puhlman --- .../0001-Remove-timestamp-from-manpage.patch | 25 +++++++++++++++++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch new file mode 100644 index 0000000000..e7ff00d132 --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch @@ -0,0 +1,25 @@ +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 19:01:28 +0000 +Subject: [PATCH] Remove timestamp from manpage + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04fdecd..5be8081 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ man: lsb_release.1.gz + + lsb_release.1.gz: lsb_release + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 +- @gzip -9f lsb_release.1 ++ @gzip -9fn lsb_release.1 + + install: all + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz +-- +2.13.3 + diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 52e30267f5..a06cbcf845 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + file://0001-Remove-timestamp-from-manpage.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- 2.20.1 From douglas.royds at taitradio.com Thu Feb 27 22:29:45 2020 From: douglas.royds at taitradio.com (Douglas Royds) Date: Fri, 28 Feb 2020 11:29:45 +1300 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> Message-ID: <47d8bb87-b3be-1789-c1cb-124b446462d8@taitradio.com> On 28/02/20 10:49 am, Joshua Watt wrote: > > On 2/27/20 3:22 PM, Douglas Royds wrote: >> >> On 28/02/20 5:45 am, Joshua Watt wrote: >> >>> On 2/27/20 9:01 AM, Joshua Watt wrote: >>>> On 2/26/20 11:46 PM, Douglas Royds wrote: >>>>> >>>>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>>>> >>>>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>>>> Hi Douglas, >>>>>>> >>>>>>> You updated a comment in reproducible_build.bbclass, commit >>>>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>>>> >>>>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>> stored in the recipe's ${SDE_FILE}. >>>>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>> stored in the recipe's SDE_FILE. >>>>>>>> +# If none of these mechanisms are suitable, replace the >>>>>>>> do_deploy_source_date_epoch task >>>>>>>> +# with recipe-specific functionality to write the appropriate >>>>>>>> SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>>>> +# >>>>>>> >>>>>>> But I can't really get this to work. What did work for me was to >>>>>>> replace "do_create_source_date_epoch_stamp()" in my recipe: >>>>>>> >>>>>>> do_create_source_date_epoch_stamp() { >>>>>>> ???? mkdir -p ${SDE_DIR} >>>>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>>>> } >>>>>>> >>>>>>> What is the intended way to achieve the thing I'm trying to do >>>>>>> here ? >>>>>>> >>>>>> >>>>>> FYI, JPEW has a proposed patch here >>>>>> >>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>>>> >>>>>> >>>>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>>>> >>>>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH being >>>>>> in BB_HASHBASE_WHITELIST ? >>>>>> >>>>>> /Jacob >>>>> >>>>> >>>>> On the surface of it, my comment appears to be just wrong: It does >>>>> make sense to replace do_create_source_date_epoch_stamp() as you >>>>> suggest. >>>>> >>>>> Joshua's proposed patch looks promising: >>>>> >>>>> * Should the new function not be called first, so that it takes >>>>> priority over the git, known files, and youngest file >>>>> functions? If someone has explicitly set SOURCE_DATE_EPOCH, >>>>> then they want it to take priority. >>>>> >>>> Having that be the first option makes sense. The only case in which >>>> that might not work, is if a recipe does something like: >>>> >>>> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >>>> >>>> e.g. uses a function to get the SDE instead of setting to a fixed >>>> value, but that's probably going to be extremely rare. >>>> >>>> >>>>> * >>>>> >>>>> >>>>> >>>>> * As you observe, SOURCE_DATE_EPOCH would need to be removed >>>>> from BB_HASHBASE_WHITELIST. I'm not sure why it was in the >>>>> whitelist in the first place. >>>>> >>>> I'm not sure why exactly it is whitelisted; I didn't write the >>>> original code that whitelisted it, but I've CC'd Juro in case he >>>> happens to remember. >>>> >>> After a discussion with Richard, we figured out why >>> SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable >>> *must* be calculable at parse time before any task is ran, but in >>> practice it's value is only available once the >>> __source_date_epoch.txt file is present, which is after parsing. >>> This causes the taskhash to be calculated differently during parsing >>> and task execution which causes taskhash mismatch errors. >>> >> >> True. >> >> What to do? Would it work to use a different non-whitelisted variable >> in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? >> > > Ya, that would work. You'd have to figure out how to get the variable > to be included in each taskhash even though it's not directly > referenced, but I'm sure that's possible. > > > Another option that's at lot more "magic" would be something like > this: > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd > > > That's really weird, and I'm not sure I like it, but worth a thought. > If it works, it's good. I like the fact that the user can just set SOURCE_DATE_EPOCH directly in their recipe. How about ... BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not source_date_epoch_var(d) else ''}" -------------- next part -------------- An HTML attachment was scrubbed... URL: From patchwork at patchwork.openembedded.org Thu Feb 27 22:32:25 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Thu, 27 Feb 2020 22:32:25 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_=22sysvini?= =?utf-8?q?t=3A_remove_logsave=2E8=2E=2E=2E=22_and_2_more?= In-Reply-To: <20200227221535.8622-1-jpuhlman@mvista.com> References: <20200227221535.8622-1-jpuhlman@mvista.com> Message-ID: <20200227223225.2276.63769@do> == Series Details == Series: "sysvinit: remove logsave.8..." and 2 more Revision: 1 URL : https://patchwork.openembedded.org/series/22997/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fix Sign off the added patch file (meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch) * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fix Add Upstream-Status: to the header of meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From anuj.mittal at intel.com Thu Feb 27 22:33:35 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 06:33:35 +0800 Subject: [OE-core] [PATCH 1/2] libuv: needed by bind 9.16 In-Reply-To: <20200227205608.26788-2-akuster808@gmail.com> References: <20200227205608.26788-1-akuster808@gmail.com> <20200227205608.26788-2-akuster808@gmail.com> Message-ID: <7c57c85f-d26b-0a10-f4fe-f6b7e68056b9@intel.com> On 28-Feb-20 04:56 AM, Armin Kuster wrote: > From: Armin Kuster > > move from meta-oe to core > > Signed-off-by: Armin Kuster > --- > .../libuv/libuv_1.34.0.bb | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.0.bb This will need an entry in maintainers.inc as well. Thanks, Anuj > > diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.0.bb b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb > new file mode 100644 > index 0000000000..b842bbda7a > --- /dev/null > +++ b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb > @@ -0,0 +1,19 @@ > +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" > +HOMEPAGE = "https://github.com/libuv/libuv" > +BUGTRACKER = "https://github.com/libuv/libuv/issues" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" > + > +SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" > +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" > + > +S = "${WORKDIR}/git" > + > +inherit autotools > + > +do_configure() { > + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" > + oe_runconf > +} > + > +BBCLASSEXTEND = "native" > From jpewhacker at gmail.com Thu Feb 27 22:34:51 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Thu, 27 Feb 2020 16:34:51 -0600 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: <47d8bb87-b3be-1789-c1cb-124b446462d8@taitradio.com> References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> <47d8bb87-b3be-1789-c1cb-124b446462d8@taitradio.com> Message-ID: <91a70cd8-3e44-1381-e2df-15b1fbe3c7f5@gmail.com> On 2/27/20 4:29 PM, Douglas Royds wrote: > > On 28/02/20 10:49 am, Joshua Watt wrote: > >> >> On 2/27/20 3:22 PM, Douglas Royds wrote: >>> >>> On 28/02/20 5:45 am, Joshua Watt wrote: >>> >>>> On 2/27/20 9:01 AM, Joshua Watt wrote: >>>>> On 2/26/20 11:46 PM, Douglas Royds wrote: >>>>>> >>>>>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>>>>> >>>>>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>>>>> Hi Douglas, >>>>>>>> >>>>>>>> You updated a comment in reproducible_build.bbclass, commit >>>>>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>>>>> >>>>>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>>> stored in the recipe's ${SDE_FILE}. >>>>>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>>> stored in the recipe's SDE_FILE. >>>>>>>>> +# If none of these mechanisms are suitable, replace the >>>>>>>>> do_deploy_source_date_epoch task >>>>>>>>> +# with recipe-specific functionality to write the appropriate >>>>>>>>> SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>>>>> +# >>>>>>>> >>>>>>>> But I can't really get this to work. What did work for me was >>>>>>>> to replace "do_create_source_date_epoch_stamp()" in my recipe: >>>>>>>> >>>>>>>> do_create_source_date_epoch_stamp() { >>>>>>>> ???? mkdir -p ${SDE_DIR} >>>>>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>>>>> } >>>>>>>> >>>>>>>> What is the intended way to achieve the thing I'm trying to do >>>>>>>> here ? >>>>>>>> >>>>>>> >>>>>>> FYI, JPEW has a proposed patch here >>>>>>> >>>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>>>>> >>>>>>> >>>>>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>>>>> >>>>>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH being >>>>>>> in BB_HASHBASE_WHITELIST ? >>>>>>> >>>>>>> /Jacob >>>>>> >>>>>> >>>>>> On the surface of it, my comment appears to be just wrong: It >>>>>> does make sense to replace do_create_source_date_epoch_stamp() as >>>>>> you suggest. >>>>>> >>>>>> Joshua's proposed patch looks promising: >>>>>> >>>>>> * Should the new function not be called first, so that it takes >>>>>> priority over the git, known files, and youngest file >>>>>> functions? If someone has explicitly set SOURCE_DATE_EPOCH, >>>>>> then they want it to take priority. >>>>>> >>>>> Having that be the first option makes sense. The only case in >>>>> which that might not work, is if a recipe does something like: >>>>> >>>>> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >>>>> >>>>> e.g. uses a function to get the SDE instead of setting to a fixed >>>>> value, but that's probably going to be extremely rare. >>>>> >>>>> >>>>>> * >>>>>> >>>>>> >>>>>> >>>>>> * As you observe, SOURCE_DATE_EPOCH would need to be removed >>>>>> from BB_HASHBASE_WHITELIST. I'm not sure why it was in the >>>>>> whitelist in the first place. >>>>>> >>>>> I'm not sure why exactly it is whitelisted; I didn't write the >>>>> original code that whitelisted it, but I've CC'd Juro in case he >>>>> happens to remember. >>>>> >>>> After a discussion with Richard, we figured out why >>>> SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable >>>> *must* be calculable at parse time before any task is ran, but in >>>> practice it's value is only available once the >>>> __source_date_epoch.txt file is present, which is after parsing. >>>> This causes the taskhash to be calculated differently during >>>> parsing and task execution which causes taskhash mismatch errors. >>>> >>> >>> True. >>> >>> What to do? Would it work to use a different non-whitelisted >>> variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? >>> >> >> Ya, that would work. You'd have to figure out how to get the variable >> to be included in each taskhash even though it's not directly >> referenced, but I'm sure that's possible. >> >> >> Another option that's at lot more "magic" would be something like >> this: >> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd >> >> >> That's really weird, and I'm not sure I like it, but worth a thought. >> > If it works, it's good. I like the fact that the user can just set > SOURCE_DATE_EPOCH directly in their recipe. > > How about ... > > BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not > source_date_epoch_var(d) else ''}" > Ya, that works. The only reason I chose "is None" was in case a user really wanted to do ? SOURCE_DATE_EPOCH = "0" -------------- next part -------------- An HTML attachment was scrubbed... URL: From douglas.royds at taitradio.com Thu Feb 27 22:35:51 2020 From: douglas.royds at taitradio.com (Douglas Royds) Date: Fri, 28 Feb 2020 11:35:51 +1300 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: <91a70cd8-3e44-1381-e2df-15b1fbe3c7f5@gmail.com> References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> <47d8bb87-b3be-1789-c1cb-124b446462d8@taitradio.com> <91a70cd8-3e44-1381-e2df-15b1fbe3c7f5@gmail.com> Message-ID: On 28/02/20 11:34 am, Joshua Watt wrote: > > On 2/27/20 4:29 PM, Douglas Royds wrote: >> >> On 28/02/20 10:49 am, Joshua Watt wrote: >> >>> >>> On 2/27/20 3:22 PM, Douglas Royds wrote: >>>> >>>> On 28/02/20 5:45 am, Joshua Watt wrote: >>>> >>>>> On 2/27/20 9:01 AM, Joshua Watt wrote: >>>>>> On 2/26/20 11:46 PM, Douglas Royds wrote: >>>>>>> >>>>>>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>>>>>> >>>>>>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>>>>>> Hi Douglas, >>>>>>>>> >>>>>>>>> You updated a comment in reproducible_build.bbclass, commit >>>>>>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>>>>>> >>>>>>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>>>> stored in the recipe's ${SDE_FILE}. >>>>>>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>>>> stored in the recipe's SDE_FILE. >>>>>>>>>> +# If none of these mechanisms are suitable, replace the >>>>>>>>>> do_deploy_source_date_epoch task >>>>>>>>>> +# with recipe-specific functionality to write the >>>>>>>>>> appropriate SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>>>>>> +# >>>>>>>>> >>>>>>>>> But I can't really get this to work. What did work for me was >>>>>>>>> to replace "do_create_source_date_epoch_stamp()" in my recipe: >>>>>>>>> >>>>>>>>> do_create_source_date_epoch_stamp() { >>>>>>>>> ???? mkdir -p ${SDE_DIR} >>>>>>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>>>>>> } >>>>>>>>> >>>>>>>>> What is the intended way to achieve the thing I'm trying to do >>>>>>>>> here ? >>>>>>>>> >>>>>>>> >>>>>>>> FYI, JPEW has a proposed patch here >>>>>>>> >>>>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>>>>>> >>>>>>>> >>>>>>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>>>>>> >>>>>>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH >>>>>>>> being in BB_HASHBASE_WHITELIST ? >>>>>>>> >>>>>>>> /Jacob >>>>>>> >>>>>>> >>>>>>> On the surface of it, my comment appears to be just wrong: It >>>>>>> does make sense to replace do_create_source_date_epoch_stamp() >>>>>>> as you suggest. >>>>>>> >>>>>>> Joshua's proposed patch looks promising: >>>>>>> >>>>>>> * Should the new function not be called first, so that it >>>>>>> takes priority over the git, known files, and youngest file >>>>>>> functions? If someone has explicitly set SOURCE_DATE_EPOCH, >>>>>>> then they want it to take priority. >>>>>>> >>>>>> Having that be the first option makes sense. The only case in >>>>>> which that might not work, is if a recipe does something like: >>>>>> >>>>>> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >>>>>> >>>>>> e.g. uses a function to get the SDE instead of setting to a fixed >>>>>> value, but that's probably going to be extremely rare. >>>>>> >>>>>> >>>>>>> * >>>>>>> >>>>>>> >>>>>>> >>>>>>> * As you observe, SOURCE_DATE_EPOCH would need to be removed >>>>>>> from BB_HASHBASE_WHITELIST. I'm not sure why it was in the >>>>>>> whitelist in the first place. >>>>>>> >>>>>> I'm not sure why exactly it is whitelisted; I didn't write the >>>>>> original code that whitelisted it, but I've CC'd Juro in case he >>>>>> happens to remember. >>>>>> >>>>> After a discussion with Richard, we figured out why >>>>> SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable >>>>> *must* be calculable at parse time before any task is ran, but in >>>>> practice it's value is only available once the >>>>> __source_date_epoch.txt file is present, which is after parsing. >>>>> This causes the taskhash to be calculated differently during >>>>> parsing and task execution which causes taskhash mismatch errors. >>>>> >>>> >>>> True. >>>> >>>> What to do? Would it work to use a different non-whitelisted >>>> variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? >>>> >>> >>> Ya, that would work. You'd have to figure out how to get the >>> variable to be included in each taskhash even though it's not >>> directly referenced, but I'm sure that's possible. >>> >>> >>> Another option that's at lot more "magic" would be something like >>> this: >>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd >>> >>> >>> That's really weird, and I'm not sure I like it, but worth a thought. >>> >> If it works, it's good. I like the fact that the user can just set >> SOURCE_DATE_EPOCH directly in their recipe. >> >> How about ... >> >> BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not >> source_date_epoch_var(d) else ''}" >> > Ya, that works. The only reason I chose "is None" was in case a user > really wanted to do > > ? SOURCE_DATE_EPOCH = "0" > True, best to allow for that. -------------- next part -------------- An HTML attachment was scrubbed... URL: From akuster808 at gmail.com Thu Feb 27 22:35:55 2020 From: akuster808 at gmail.com (akuster808) Date: Thu, 27 Feb 2020 14:35:55 -0800 Subject: [OE-core] [PATCH 3/3] lsb-release: fix likely reproducabilty timestamp In-Reply-To: <20200227221535.8622-3-jpuhlman@mvista.com> References: <20200227221535.8622-1-jpuhlman@mvista.com> <20200227221535.8622-3-jpuhlman@mvista.com> Message-ID: <38925dad-bc5b-adda-281f-aefcc5f06934@gmail.com> On 2/27/20 2:15 PM, Jeremy A. Puhlman wrote: > From: Jeremy Puhlman > > Remove timestamp from gzipped manpage. > > Signed-off-by: Jeremy A. Puhlman > --- > .../0001-Remove-timestamp-from-manpage.patch | 25 +++++++++++++++++++ > meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + > 2 files changed, 26 insertions(+) > create mode 100644 meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch > > diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch > new file mode 100644 > index 0000000000..e7ff00d132 > --- /dev/null > +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch > @@ -0,0 +1,25 @@ > +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 > +From: Jeremy Puhlman > +Date: Sat, 22 Feb 2020 19:01:28 +0000 > +Subject: [PATCH] Remove timestamp from manpage Missing "Upstream-Status:" and "signed-off-by" in patch - armin > + > +--- > + Makefile | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index 04fdecd..5be8081 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -17,7 +17,7 @@ man: lsb_release.1.gz > + > + lsb_release.1.gz: lsb_release > + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 > +- @gzip -9f lsb_release.1 > ++ @gzip -9fn lsb_release.1 > + > + install: all > + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz > +-- > +2.13.3 > + > diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb > index 52e30267f5..a06cbcf845 100644 > --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb > +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb > @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" > > SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ > file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ > + file://0001-Remove-timestamp-from-manpage.patch \ > " > > SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" From akuster808 at gmail.com Thu Feb 27 22:43:31 2020 From: akuster808 at gmail.com (akuster808) Date: Thu, 27 Feb 2020 14:43:31 -0800 Subject: [OE-core] [PATCH 1/2] libuv: needed by bind 9.16 In-Reply-To: <7c57c85f-d26b-0a10-f4fe-f6b7e68056b9@intel.com> References: <20200227205608.26788-1-akuster808@gmail.com> <20200227205608.26788-2-akuster808@gmail.com> <7c57c85f-d26b-0a10-f4fe-f6b7e68056b9@intel.com> Message-ID: On 2/27/20 2:33 PM, Anuj Mittal wrote: > > > On 28-Feb-20 04:56 AM, Armin Kuster wrote: >> From: Armin Kuster >> >> move from meta-oe to core >> >> Signed-off-by: Armin Kuster >> --- >> ? .../libuv/libuv_1.34.0.bb???????????????????? | 19 +++++++++++++++++++ >> ? 1 file changed, 19 insertions(+) >> ? create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.0.bb > > This will need an entry in maintainers.inc as well. Interesting question. Does that default to the meta-oe maintainer as that is where we are getting the recipe from? or the person submitting the patch? - armin > > Thanks, > > Anuj > >> >> diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.0.bb >> b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb >> new file mode 100644 >> index 0000000000..b842bbda7a >> --- /dev/null >> +++ b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb >> @@ -0,0 +1,19 @@ >> +SUMMARY = "A multi-platform support library with a focus on >> asynchronous I/O" >> +HOMEPAGE = "https://github.com/libuv/libuv" >> +BUGTRACKER = "https://github.com/libuv/libuv/issues" >> +LICENSE = "MIT" >> +LIC_FILES_CHKSUM = >> "file://LICENSE;md5=a68902a430e32200263d182d44924d47" >> + >> +SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" >> +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" >> + >> +S = "${WORKDIR}/git" >> + >> +inherit autotools >> + >> +do_configure() { >> +??? ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" >> +??? oe_runconf >> +} >> + >> +BBCLASSEXTEND = "native" >> From jpuhlman at mvista.com Thu Feb 27 23:04:30 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Thu, 27 Feb 2020 15:04:30 -0800 Subject: [OE-core] [PATCH v2] lsb-release: fix likely reproducabilty timestamp Message-ID: <20200227230430.10770-1-jpuhlman@mvista.com> Remove timestamp from gzipped manpage. Signed-off-by: Jeremy A. Puhlman --- .../0001-Remove-timestamp-from-manpage.patch | 27 +++++++++++++++++++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch new file mode 100644 index 0000000000..af095fd322 --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch @@ -0,0 +1,27 @@ +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 19:01:28 +0000 +Subject: [PATCH] Remove timestamp from manpage + +Upstream-Status: Submitted [lsb-discuss at lists.linux-foundation.org] +Signed-off-by: Jeremy A. Puhlman +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04fdecd..5be8081 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ man: lsb_release.1.gz + + lsb_release.1.gz: lsb_release + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 +- @gzip -9f lsb_release.1 ++ @gzip -9fn lsb_release.1 + + install: all + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz +-- +2.13.3 + diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 52e30267f5..a06cbcf845 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + file://0001-Remove-timestamp-from-manpage.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- 2.20.1 From richard.purdie at linuxfoundation.org Thu Feb 27 23:06:36 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 27 Feb 2020 23:06:36 +0000 Subject: [OE-core] [PATCH 10/12] libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <20200225185335.19326-10-alex.kanavin@gmail.com> References: <20200225185335.19326-1-alex.kanavin@gmail.com> <20200225185335.19326-10-alex.kanavin@gmail.com> Message-ID: <5eb7414b5329974a4e52c39256c65835a1115ac4.camel@linuxfoundation.org> On Tue, 2020-02-25 at 19:53 +0100, Alexander Kanavin wrote: > Signed-off-by: Alexander Kanavin > --- > .../libgpg-error-1.36-gawk5-support.patch | 144 ---------------- > -- > ...gpg-error_1.36.bb => libgpg-error_1.37.bb} | 7 +- > 2 files changed, 3 insertions(+), 148 deletions(-) > delete mode 100644 meta/recipes-support/libgpg-error/libgpg- > error/libgpg-error-1.36-gawk5-support.patch > rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => > libgpg-error_1.37.bb} (92%) Fails on x32. It did this when proposed last time :/ https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/1605 Cheers, Richard From richard.purdie at linuxfoundation.org Thu Feb 27 23:14:23 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 27 Feb 2020 23:14:23 +0000 Subject: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: References: <20200226183902.3616626-1-trevor.gamblin@windriver.com> Message-ID: <2fd5b0c062bfee215cd7a4d15789a20293cee8aa.camel@linuxfoundation.org> On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote: > Looks like I got beat by a day! Does your version work on x32 though? :) We need one that does... Cheers, Richard From richard.purdie at linuxfoundation.org Thu Feb 27 23:26:49 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 27 Feb 2020 23:26:49 +0000 Subject: [OE-core] [PATCH 1/2 v3] coreutils: add ptest In-Reply-To: References: <20200226180746.121476-1-trevor.gamblin@windriver.com> <20200226180746.121476-2-trevor.gamblin@windriver.com> Message-ID: On Wed, 2020-02-26 at 19:13 +0100, Alexander Kanavin wrote: > valgrind, gdb and strace are already pulled into core-image-sato-sdk- > ptest (the one that runs the slow ptests on the AB), so there is no > harm in adding them here as well. Actually, there is. Adding valgrind to the RDEPENDS of coreutils means all builds end up needing to include valgrind. We really don't want that. I know this is bad but it is the way dependencies work today :( Cheers, Richard From anuj.mittal at intel.com Thu Feb 27 23:42:48 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 07:42:48 +0800 Subject: [OE-core] [PATCH] linux-yocto/5.2: update to v5.2.32 In-Reply-To: References: <20200224200202.61426-1-bruce.ashfield@gmail.com> Message-ID: <1a0c08fc-2643-2d32-86f2-77ed17ea05e9@intel.com> On 26-Feb-20 12:47 PM, Richard Purdie wrote: > On Mon, 2020-02-24 at 15:02 -0500, bruce.ashfield at gmail.com wrote: >> From: Bruce Ashfield >> >> Updating linux-yocto/5.2 to the latest korg -stable release that >> comprises >> the following commits: > > This was included in testing on the autobuilder and we saw: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1612 > https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/315 > https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1616 > > and I'm not sure if they're from this? > I had picked this for zeus as well and didn't get this error on autobuilder. The builds failing above are building v5.4 by default. So it doesn't look like it's related. I am not sure what could be causing this problem though ... Thanks, Anuj From trevor.gamblin at windriver.com Thu Feb 27 23:41:49 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Thu, 27 Feb 2020 18:41:49 -0500 Subject: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <2fd5b0c062bfee215cd7a4d15789a20293cee8aa.camel@linuxfoundation.org> References: <20200226183902.3616626-1-trevor.gamblin@windriver.com> <2fd5b0c062bfee215cd7a4d15789a20293cee8aa.camel@linuxfoundation.org> Message-ID: <6ac82a00-615a-4cc5-c4b9-46f37e12bbac@windriver.com> On 2/27/20 6:14 PM, Richard Purdie wrote: > On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote: >> Looks like I got beat by a day! > Does your version work on x32 though? :) > > We need one that does... They look the same, unfortunately. Will take a look in between some other tasks, unless Alex gets to it first (he usually does, that guy's a machine). > > Cheers, > > Richard > From armccurdy at gmail.com Thu Feb 27 23:46:38 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Thu, 27 Feb 2020 15:46:38 -0800 Subject: [OE-core] [PATCH 2/4] systemd: Do not force removing resolved from PACKAGECONFIG In-Reply-To: <20200227080558.3819138-3-raj.khem@gmail.com> References: <20200227080558.3819138-1-raj.khem@gmail.com> <20200227080558.3819138-3-raj.khem@gmail.com> Message-ID: On Thu, Feb 27, 2020 at 12:06 AM Khem Raj wrote: > > This needs __UAPI_DEF_ETHHDR to be set to 0 which now > taken care by CFLAGS > > Signed-off-by: Khem Raj > --- > meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb > index 5d863410b8..e7d2997963 100644 > --- a/meta/recipes-core/systemd/systemd_244.3.bb > +++ b/meta/recipes-core/systemd/systemd_244.3.bb > @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ > nss \ > nss-mymachines \ > nss-resolve \ > - resolved \ > smack \ > sysusers \ > utmp \ > " > > +CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " Should have a leading space (and no trailing space). > # Use the upstream systemd serial-getty at .service and rely on > # systemd-getty-generator instead of using the OE-core specific > # systemd-serialgetty.bb - not enabled by default. > -- > 2.25.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Thu Feb 27 23:48:23 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Thu, 27 Feb 2020 23:48:23 +0000 Subject: [OE-core] [PATCH] linux-yocto/5.2: update to v5.2.32 In-Reply-To: <1a0c08fc-2643-2d32-86f2-77ed17ea05e9@intel.com> References: <20200224200202.61426-1-bruce.ashfield@gmail.com> <1a0c08fc-2643-2d32-86f2-77ed17ea05e9@intel.com> Message-ID: On Fri, 2020-02-28 at 07:42 +0800, Anuj Mittal wrote: > > On 26-Feb-20 12:47 PM, Richard Purdie wrote: > > On Mon, 2020-02-24 at 15:02 -0500, bruce.ashfield at gmail.com wrote: > > > From: Bruce Ashfield > > > > > > Updating linux-yocto/5.2 to the latest korg -stable release that > > > comprises > > > the following commits: > > > > This was included in testing on the autobuilder and we saw: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1612 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/315 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1616 > > > > and I'm not sure if they're from this? > > > > I had picked this for zeus as well and didn't get this error on > autobuilder. The builds failing above are building v5.4 by default. > So > it doesn't look like it's related. > > I am not sure what could be causing this problem though ... I've come to the same conclusion having run builds without this patch, its something else in -next, maybe the make patch. Trying with the reverted, failing that we'll have to bisect next :/. Cheers, Richard From trevor.gamblin at windriver.com Thu Feb 27 23:51:46 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Thu, 27 Feb 2020 18:51:46 -0500 Subject: [OE-core] [PATCH 1/2 v3] coreutils: add ptest In-Reply-To: References: <20200226180746.121476-1-trevor.gamblin@windriver.com> <20200226180746.121476-2-trevor.gamblin@windriver.com> Message-ID: <40e95e22-241a-d98b-63a4-f557bdb8ef9b@windriver.com> On 2/27/20 6:26 PM, Richard Purdie wrote: > On Wed, 2020-02-26 at 19:13 +0100, Alexander Kanavin wrote: >> valgrind, gdb and strace are already pulled into core-image-sato-sdk- >> ptest (the one that runs the slow ptests on the AB), so there is no >> harm in adding them here as well. > Actually, there is. > > Adding valgrind to the RDEPENDS of coreutils means all builds end up > needing to include valgrind. We really don't want that. > > I know this is bad but it is the way dependencies work today :( Should I resubmit with gdb and strace? > > Cheers, > > Richard > > > From raj.khem at gmail.com Fri Feb 28 00:04:37 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 16:04:37 -0800 Subject: [OE-core] [PATCH v2 2/4] systemd: Do not force removing resolved from PACKAGECONFIG Message-ID: <20200228000437.1848815-1-raj.khem@gmail.com> This needs __UAPI_DEF_ETHHDR to be set to 0 which now taken care by CFLAGS Signed-off-by: Khem Raj --- v2: Fix typo in append meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 5d863410b8..a56a28a189 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ nss \ nss-mymachines \ nss-resolve \ - resolved \ smack \ sysusers \ utmp \ " +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0" + # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. -- 2.25.1 From anuj.mittal at intel.com Fri Feb 28 03:54:51 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 11:54:51 +0800 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <20200227000603.14252-4-timothy.t.orling@linux.intel.com> References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> <20200227000603.14252-4-timothy.t.orling@linux.intel.com> Message-ID: <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> Hi Tim, On 27-Feb-20 08:06 AM, Tim Orling wrote: > Release notes: > https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS > > License-Update: Changed to LGPL-2.1+ > > Signed-off-by: Tim Orling > --- > .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (66%) This is failing on musl-qemu86: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ?tv_sec? specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ?timeout?) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ?tv_nsec? specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ?timeout?) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ?timeout? isn?t known struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ?nanosleep? [-Wimplicit-function-declaration] nanosleep(&timeout, NULL); ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ?terminate_app?: ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ?timeout? has initializer but incomplete type struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ?tv_sec? specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ?timeout?) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ?tv_nsec? specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ?timeout?) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ?timeout? isn?t known struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; From anuj.mittal at intel.com Fri Feb 28 03:59:58 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 11:59:58 +0800 Subject: [OE-core] [PATCH 1/2 v3] coreutils: add ptest In-Reply-To: <20200226180746.121476-2-trevor.gamblin@windriver.com> References: <20200226180746.121476-1-trevor.gamblin@windriver.com> <20200226180746.121476-2-trevor.gamblin@windriver.com> Message-ID: <9c7ef360-2a30-2783-5c35-3caa7987954c@intel.com> On 27-Feb-20 02:07 AM, Trevor Gamblin wrote: > coreutils has a large number of tests, including some added by the > Makefile flags RUN_EXPENSIVE_TESTS and RUN_VERY_EXPENSIVE_TESTS that > significantly increase runtime (and which have been disabled). Note > that the coreutils ptest directory is given blanket permissions at > runtime with chmod -R 777, to ensure that the user created for the > tests will be able to run the test scripts and create the necessary > files in the process without being impeded by permissions issues. > > There is still room to improve the results of this ptest without > the aforementioned additions. Of the tests marked SKIP, there are > 30 tests that are currently counted as SKIP because they require > sudo permissions, and another 21 that require membership in > multiple user groups. It is important to know that coreutils has > tests for both root and non-root users. Testing showed that 42 > tests are skipped when running as root versus 30 when running as a > non-root user, so the decision was made to run the suite as the > latter. Additionally, gdb, valgrind, and strace could be included > in the RDEPENDS list to increase pass rate, but their total > contribution is 13 tests, so they were omitted to reduce image size. > > Finally, note that at least one ptest (misc/head-write-error.sh) is > prone to ERROR on builds of core-image-minimal if extra space is > not provided with IMAGE_ROOTFS_EXTRA_SPACE. > > Signed-off-by: Trevor Gamblin > --- > .../coreutils/coreutils/run-ptest | 17 +++++++++ > meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++ > 2 files changed, 54 insertions(+) > create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest > > diff --git a/meta/recipes-core/coreutils/coreutils/run-ptest b/meta/recipes-core/coreutils/coreutils/run-ptest > new file mode 100755 > index 0000000000..6d4a7b365d > --- /dev/null > +++ b/meta/recipes-core/coreutils/coreutils/run-ptest > @@ -0,0 +1,17 @@ > +#!/bin/sh > + > +# remove any stale lock files so that the calls to groupadd/useradd don't stop > +# the ptest if re-using the same image > +rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock > + > +COREUTILSLIB=@libdir@/coreutils > +LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log" > +USERNAME="tester" > +groupadd ugroup1 > +groupadd ugroup2 > +useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already exists" > + > +su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS top_srcdir=. srcdir=." 2>&1 | tee -a ${LOG} > +userdel $USERNAME > +groupdel ugroup1 > +groupdel ugroup2 > diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb > index 57b2c1bdba..8bec4e0f3c 100644 > --- a/meta/recipes-core/coreutils/coreutils_8.31.bb > +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb > @@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ > file://0001-uname-report-processor-and-hardware-correctly.patch \ > file://disable-ls-output-quoting.patch \ > file://0001-local.mk-fix-cross-compiling-problem.patch \ > + file://run-ptest \ > " > > SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" > @@ -143,3 +144,39 @@ python __anonymous() { > } > > BBCLASSEXTEND = "native nativesdk" > + > +inherit ptest > + > +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" > + > +do_install_ptest () { > + install -d ${D}${PTEST_PATH}/tests > + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests > + sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` > + install -d ${D}${PTEST_PATH}/build-aux > + install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ > + cp ${B}/Makefile ${D}${PTEST_PATH}/ > + cp ${S}/init.cfg ${D}${PTEST_PATH}/ > + cp -r ${B}/src ${D}${PTEST_PATH}/ > + cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src > + sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile > + sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile > + chmod -R 777 ${D}${PTEST_PATH} > + > + # Disable subcase stty-pairs.sh, it will cause test framework hang > + sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile > + > + # Tweak test d_type-check to use python3 instead of python > + sed -i "1s at .*@#!/usr/bin/python3@" ${WORKDIR}/image/usr/lib/coreutils/ptest/tests/d_type-check This is assuming /usr/lib and failing with multilib: https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/1642/steps/8/logs/step3b ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/temp/log.do_install_ptest_base.4366 Log data follows: | DEBUG: Executing shell function do_install_ptest_base | sed: can't read /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/image/usr/lib/coreutils/ptest/tests/d_type-check: No such file or directory | WARNING: /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/temp/run.do_install_ptest_base.4366:1 exit 2 from 'sed -i "1s at .*@#!/usr/bin/python3@" /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/image/usr/lib/coreutils/ptest/tests/d_type-check' | ERROR: Execution of '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/temp/run.do_install_ptest_base.4366' failed with exit code 2: | sed: can't read /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/image/usr/lib/coreutils/ptest/tests/d_type-check: No such file or directory | WARNING: /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/temp/run.do_install_ptest_base.4366:1 exit 2 from 'sed -i "1s at .*@#!/usr/bin/python3@" /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/image/usr/lib/coreutils/ptest/tests/d_type-check' | Thanks, Anuj From anuj.mittal at intel.com Fri Feb 28 04:02:29 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 12:02:29 +0800 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> <20200227000603.14252-4-timothy.t.orling@linux.intel.com> <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> Message-ID: <185c60c7-a44e-fe7c-b49e-7a95909e900b@intel.com> It looks like this is failing on non musl as well: https://autobuilder.yoctoproject.org/typhoon/#/builders/59/builds/1617 https://autobuilder.yoctoproject.org/typhoon/#/builders/110/builds/524 Thanks, Anuj On 28-Feb-20 11:54 AM, Anuj Mittal wrote: > Hi Tim, > > On 27-Feb-20 08:06 AM, Tim Orling wrote: >> Release notes: >> https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS >> >> >> License-Update: Changed to LGPL-2.1+ >> >> Signed-off-by: Tim Orling >> --- >> ? .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb}? | 8 ++++---- >> ? 1 file changed, 4 insertions(+), 4 deletions(-) >> ? rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => >> at-spi2-atk_2.34.1.bb} (66%) > > This is failing on musl-qemu86: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field > ?tv_sec? specified in initializer > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess > elements in struct initializer [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near > initialization for ?timeout?) [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field > ?tv_nsec? specified in initializer > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess > elements in struct initializer [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near > initialization for ?timeout?) [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size > of ?timeout? isn?t known > ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > ?????????????????? ^ > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit > declaration of function ?nanosleep? [-Wimplicit-function-declaration] > ???? nanosleep(&timeout, NULL); > ???? ^ > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ?terminate_app?: > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable > ?timeout? has initializer but incomplete type > ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > ????????? ^ > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field > ?tv_sec? specified in initializer > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess > elements in struct initializer [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near > initialization for ?timeout?) [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field > ?tv_nsec? specified in initializer > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess > elements in struct initializer [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near > initialization for ?timeout?) [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size > of ?timeout? isn?t known > ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > From anuj.mittal at intel.com Fri Feb 28 04:06:51 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 12:06:51 +0800 Subject: [OE-core] [PATCH v3 1/2] ltp: Update to 20200120 In-Reply-To: <20200227212940.12327-1-petr.vorel@gmail.com> References: <20200227212940.12327-1-petr.vorel@gmail.com> Message-ID: <3db4501b-68e6-7a41-2ac5-268675583bec@intel.com> On 28-Feb-20 05:29 AM, Petr Vorel wrote: > Removed ffsb copying file (tool removed from upstream) > > Removed patches (accepted upstream) > * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > * 0001-testcases-fix-an-absent-format-string-issue.patch > * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > > Merged patches > * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > (into 0001-build-Add-option-to-select-libc-implementation.patch as they > touch the same files) > > Refreshed patches (some tests have been fixed for musl) > * 0001-Add-more-musl-exclusions.patch > * 0001-build-Add-option-to-select-libc-implementation.patch > > Updated status > * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > > Signed-off-by: Petr Vorel It looks like this is failing with musl: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_memory_test/../cpuset_lib/libcpu_set.a(libcpuset.o): in function `cpuset_fts_open': /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3214: undefined reference to `fts_open' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: undefined reference to `fts_close' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: undefined reference to `fts_close' Complete logs here: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623/steps/8/logs/step1b https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1627/steps/8/logs/step1b Thanks, Anuj > --- > Changes v2->v3: > ffsb-6.0-rc2 has been removed => remove it from upstream. > > Kind regards, > Petr > > .../ltp/0001-Add-more-musl-exclusions.patch | 37 +------ > ...option-to-select-libc-implementation.patch | 103 +++++------------- > ...udevadm-trigger-before-swap-verifica.patch | 35 ------ > ...ix-zeros-of-the-addresses-output-by-.patch | 43 -------- > ...or-time64-unsafe-syscalls-before-usi.patch | 41 +++++-- > ...es-fix-an-absent-format-string-issue.patch | 24 ---- > ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 -------- > ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 ------ > ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- > .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 8 +- > 10 files changed, 80 insertions(+), 320 deletions(-) > delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%) > > diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch > index d3af31f34a..773844d442 100644 > --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch > +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch > @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions > > Upstream-Status: Pending > Signed-off-by: Alexander Kanavin > +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] > +Signed-off-by: Petr Vorel > --- > testcases/kernel/syscalls/accept4/Makefile | 4 ++++ > - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ > - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ > testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ > - 4 files changed, 18 insertions(+) > + 2 files changed, 8 insertions(+) > > diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile > index 504042e11..94db06266 100644 > @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 > +ifeq ($(LIBC),musl) > +FILTER_OUT_MAKE_TARGETS := accept4_01 > +endif > -+ > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile > -index 5d01b4825..0263a6e20 100644 > ---- a/testcases/kernel/syscalls/fanotify/Makefile > -+++ b/testcases/kernel/syscalls/fanotify/Makefile > -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. > - fanotify11: CFLAGS+=-pthread > - include $(top_srcdir)/include/mk/testcases.mk > - > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 > -+endif > -+ > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > -+ > -+ > -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile > -index 72544c13e..7f20b2780 100644 > ---- a/testcases/kernel/syscalls/setxattr/Makefile > -+++ b/testcases/kernel/syscalls/setxattr/Makefile > -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. > - > - include $(top_srcdir)/include/mk/testcases.mk > - > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := setxattr03 > -+endif > + > include $(top_srcdir)/include/mk/generic_leaf_target.mk > diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile > @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 > CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include > > LDLIBS += -lpthread -lrt > +-- > +2.25.1 > + > diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch > index 1705abcf19..0598046b28 100644 > --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch > +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch > @@ -1,7 +1,7 @@ > -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 > +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Thu, 7 Jan 2016 18:19:03 +0000 > -Subject: [PATCH] build: Add option to select libc implementation > +Subject: [PATCH 1/6] build: Add option to select libc implementation > > There are more than glibc for C library implementation available on > linux now a days, uclibc cloaked like glibc but musl e.g. is very > @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems > > Upstream-Status: Pending > > -Signed-off-by: Khem Raj > +rt_tgsigqueueinfo fails with: > +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': > +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? > + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; > + | ^~~~~~~~~ > + | __si_fields > > +Signed-off-by: Khem Raj > +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, > +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, > +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo > +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] > +Signed-off-by: Petr Vorel > +Signed-off-by: Petr Vorel > --- > - Makefile | 5 +++++ > - testcases/kernel/Makefile | 5 ++++- > - testcases/kernel/sched/Makefile | 4 +++- > - testcases/kernel/syscalls/Makefile | 5 +++++ > - testcases/network/nfsv4/acl/Makefile | 4 ++++ > - testcases/network/rpc/basic_tests/Makefile | 5 +++++ > - testcases/realtime/func/pi-tests/Makefile | 4 ++++ > - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ > - 8 files changed, 35 insertions(+), 2 deletions(-) > + Makefile | 5 +++++ > + testcases/kernel/Makefile | 5 ++++- > + testcases/kernel/sched/Makefile | 4 +++- > + testcases/kernel/syscalls/Makefile | 4 ++++ > + 4 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 768ca4606..e9d679a71 100644 > @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 > +endif > include $(top_srcdir)/include/mk/generic_trunk_target.mk > diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile > -index 45a00cf7d..d1becd054 100644 > +index 45a00cf7d..af5a591a0 100644 > --- a/testcases/kernel/syscalls/Makefile > +++ b/testcases/kernel/syscalls/Makefile > -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) > - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ > +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ > mincore mprotect nftw profil remap_file_pages sbrk > endif > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ > -+ rt_sigsuspend setdomainname sethostname sigsuspend \ > -+ ustat > -+endif > - > - ifeq ($(UCLIBC),1) > - FILTER_OUT_DIRS += profil > -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile > -index 8c55a6bbd..f7cda621d 100644 > ---- a/testcases/network/nfsv4/acl/Makefile > -+++ b/testcases/network/nfsv4/acl/Makefile > -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk > - > - LDLIBS += $(ACL_LIBS) > - > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := acl1 > -+endif > -+ > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile > -index 66e9d5675..ea8eb8a98 100644 > ---- a/testcases/network/rpc/basic_tests/Makefile > -+++ b/testcases/network/rpc/basic_tests/Makefile > -@@ -23,4 +23,9 @@ > - top_srcdir ?= ../../../.. > - > - include $(top_srcdir)/include/mk/env_pre.mk > -+ > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_DIRS += rpc01 > -+endif > -+ > - include $(top_srcdir)/include/mk/generic_trunk_target.mk > -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile > -index 68616a711..748754bb4 100644 > ---- a/testcases/realtime/func/pi-tests/Makefile > -+++ b/testcases/realtime/func/pi-tests/Makefile > -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk > - include $(abs_srcdir)/../../config.mk > > - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex > +ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex > ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo > +endif > + > - > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile > -index 1881f7565..266e0b815 100644 > ---- a/testcases/realtime/stress/pi-tests/Makefile > -+++ b/testcases/realtime/stress/pi-tests/Makefile > -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. > - > - include $(top_srcdir)/include/mk/env_pre.mk > - include $(abs_srcdir)/../../config.mk > -+ > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := testpi-3 > -+endif > -+ > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > + ifeq ($(UCLIBC),1) > + FILTER_OUT_DIRS += profil > + endif > +-- > +2.25.1 > + > diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > deleted file mode 100644 > index 1b433d3ad3..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 > -From: Yongxin Liu > -Date: Tue, 12 Nov 2019 11:33:50 +0800 > -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification > - > -Fix: https://github.com/linux-test-project/ltp/issues/458 > - > -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ > -or /dev/disk/by-lable/ due to the issue #458. When this issue > -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show > -different UUID of the device. > - > -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] > - > -Signed-off-by: Yongxin Liu > ---- > - testcases/commands/mkswap/mkswap01.sh | 2 ++ > - 1 file changed, 2 insertions(+) > - > -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh > -index 3a348c6e6..9437c4a4e 100755 > ---- a/testcases/commands/mkswap/mkswap01.sh > -+++ b/testcases/commands/mkswap/mkswap01.sh > -@@ -129,6 +129,8 @@ mkswap_test() > - return > - fi > - > -+ udevadm trigger --name-match=$TST_DEVICE > -+ > - if [ -n "$device" ]; then > - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" > - if [ $? -ne 0 ]; then > --- > -2.14.4 > - > diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > deleted file mode 100644 > index fe5e7314e0..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 > -From: He Zhe > -Date: Tue, 31 Dec 2019 15:02:48 +0800 > -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm > - before comparing > - > -The latest nm v2.33.1 outputs symbols addresses without prefix zeros > -for "nm -f posix", which causes the following error. > -nm01 5 TFAIL: Got wrong format with -f bsd > - > -Let's remove the prefix zeros before comparing. > - > -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] > - > -Signed-off-by: He Zhe > -Reviewed-by: Li Wang > -Reviewed-by: Petr Vorel > -Tested-by: Petr Vorel > ---- > - testcases/commands/nm/nm01.sh | 7 +++++-- > - 1 file changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh > -index 30c41bd..fd9d3d9 100755 > ---- a/testcases/commands/nm/nm01.sh > -+++ b/testcases/commands/nm/nm01.sh > -@@ -84,8 +84,11 @@ test5() > - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out > - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out > - > -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out > -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out > -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out > -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out > -+ > -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out > -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out > - > - if diff nm1.out nm2.out > /dev/null; then > - tst_res TPASS "Got BSD format with -f bsd" > --- > -2.7.4 > - > diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > index c431669716..ecc6660f93 100644 > --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > @@ -1,28 +1,40 @@ > -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 > +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 > From: Khem Raj > -Date: Wed, 12 Feb 2020 22:22:17 -0800 > +Date: Wed, 19 Feb 2020 22:52:04 -0800 > Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them > > musl is using 64bit time_t now on 32bit architectures and these syscalls > no longer exist, therefore its better to check for them being available > before using them > > -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] > Signed-off-by: Khem Raj > +Reviewed-by: Yang Xu > +Reviewed-by: Petr Vorel > +Signed-off-by: Petr Vorel > +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 > --- > - lib/tst_clocks.c | 9 +++++---- > - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- > - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- > - 3 files changed, 10 insertions(+), 13 deletions(-) > + lib/tst_clocks.c | 16 ++++++---------- > + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- > + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- > + 3 files changed, 11 insertions(+), 19 deletions(-) > > +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c > +index 5195da38f..fa2f1cb84 100644 > --- a/lib/tst_clocks.c > +++ b/lib/tst_clocks.c > -@@ -22,21 +22,22 @@ > - #define _GNU_SOURCE > - #include > +@@ -3,28 +3,24 @@ > + * Copyright (c) 2017 Cyril Hrubis > + */ > + > +-/* > +- * clock_gettime() and clock_getres() functions > +- */ > +- > +-#define _GNU_SOURCE > +-#include > #include > -#include > -- > + > +#define TST_NO_DEFAULT_MAIN > +#include "tst_test.h" > #include "tst_clocks.h" > @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj > - return syscall(SYS_clock_settime, clk_id, ts); > + return tst_syscall(__NR_clock_settime, clk_id, ts); > } > +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c > +index 583d8f7b9..08ea1673a 100644 > --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c > +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c > @@ -38,10 +38,8 @@ > @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj > > /* gettimeofday returns an int, so we need to turn the long > * TEST_RETURN into an int to test with */ > +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c > +index 1d60f448e..5170ad2f7 100644 > --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c > +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c > @@ -16,14 +16,12 @@ > @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj > tst_res(TBROK | TERRNO, "gettimeofday() failed"); > return; > } > +-- > +2.25.1 > + > diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch > deleted file mode 100644 > index 9330844509..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch > +++ /dev/null > @@ -1,24 +0,0 @@ > -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin > -Date: Thu, 12 Dec 2019 17:56:02 +0100 > -Subject: [PATCH] testcases: fix an absent format string issue > - > -Upstream-Status: Pending > -Signed-off-by: Alexander Kanavin > ---- > - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c > -index 27dbc6626..19d943d06 100644 > ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c > -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c > -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) > - > - /* Manipulate PID for next process */ > - sprintf(pid_str, "%d", pid - 1); > -- SAFE_FILE_PRINTF(last_pid_file, pid_str); > -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); > - > - new_pid = SAFE_FORK(); > - if (new_pid == 0) { > diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > deleted file mode 100644 > index eff9ed0741..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > +++ /dev/null > @@ -1,47 +0,0 @@ > -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 > -From: Khem Raj > -Date: Thu, 7 Jan 2016 18:22:38 +0000 > -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl > - > -musl does not implement fts like glibc and therefore it depends on > -external implementation for all fts APIs > - > -Upstream-Status: Pending > - > -Signed-off-by: Khem Raj > ---- > - testcases/kernel/controllers/Makefile.inc | 3 +++ > - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ > - 2 files changed, 6 insertions(+) > - > -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc > -index 4ca0b5a..1d85e4d 100644 > ---- a/testcases/kernel/controllers/Makefile.inc > -+++ b/testcases/kernel/controllers/Makefile.inc > -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) > - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) > - > - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) > -+ifeq ($(LIBC),musl) > -+LDLIBS += -lfts > -+endif > - > - INSTALL_TARGETS ?= *.sh > - > -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc > -index db6a843..86dd2a8 100644 > ---- a/testcases/kernel/controllers/cpuset/Makefile.inc > -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc > -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) > - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) > - > - LDLIBS += -lcpu_set -lcontrollers -lltp > -+ifeq ($(LIBC),musl) > -+LDLIBS += -lfts > -+endif > - > - INSTALL_TARGETS ?= *.sh > - > --- > -2.7.4 > - > diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > deleted file mode 100644 > index 804edfa1b4..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 > -From: Yi Zhao > -Date: Thu, 18 Jul 2019 15:23:15 +0800 > -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl > - > -Fix build error with musl: > -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': > -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? > - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; > - | ^~~~~~~~~ > - | __si_fields > - > -Upstream-Status: Pending > - > -Signed-off-by: Yi Zhao > ---- > - testcases/kernel/syscalls/Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile > -index d1becd0..1f3ff34 100644 > ---- a/testcases/kernel/syscalls/Makefile > -+++ b/testcases/kernel/syscalls/Makefile > -@@ -31,7 +31,7 @@ endif > - ifeq ($(LIBC),musl) > - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ > - rt_sigsuspend setdomainname sethostname sigsuspend \ > -- ustat > -+ ustat rt_tgsigqueueinfo > - endif > - > - ifeq ($(UCLIBC),1) > --- > -2.7.4 > - > diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > index b46325eaf3..350091a70c 100644 > --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > @@ -1,33 +1,34 @@ > -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 > +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= > Date: Fri, 13 May 2016 11:11:28 -0500 > -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on > - string printf > +Subject: [PATCH] acl: Security fix on string printf > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > -Fixes: > +Fixes build error when compiled with -Werror=format-security: > > -acl1.c: In function 'test_acl_default': > -acl1.c:317:2: error: format not a string literal and no format arguments > -[-Werror=format-security] > - printf(cmd); > +acl1.c: In function ?test_acl_default?: > +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] > + 305 | printf(cmd); > > -[YOCTO #9548] > +Patch taken from openembedded-core, > +original bug report: https://bugzilla.yoctoproject.org/9548 > > -Upstream-Status: Pending > +[YOCTO #9548] > > Signed-off-by: An?bal Lim?n > +Signed-off-by: Petr Vorel > +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 > --- > testcases/network/nfsv4/acl/acl1.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c > -index bdf0180..898b7ca 100644 > +index aae9484e5..ad778cd33 100644 > --- a/testcases/network/nfsv4/acl/acl1.c > +++ b/testcases/network/nfsv4/acl/acl1.c > -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) > +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) > char *cmd = malloc(256); > > strcpy(cmd, "chmod 7777 "); > @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 > system(cmd); > acl2 = acl_get_file(path, ACL_TYPE_ACCESS); > -- > -2.7.4 > +2.25.1 > > diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb > similarity index 90% > rename from meta/recipes-extended/ltp/ltp_20190930.bb > rename to meta/recipes-extended/ltp/ltp_20200120.bb > index 19bd7bc9c6..579a763431 100644 > --- a/meta/recipes-extended/ltp/ltp_20190930.bb > +++ b/meta/recipes-extended/ltp/ltp_20200120.bb > @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "\ > file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ > file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ > file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ > - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ > " > > DEPENDS = "attr libaio libcap acl openssl zip-native" > @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" > > CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" > CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" > -SRCREV = "c9707b465a08397569920b676345474f44327200" > +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" > > SRC_URI = "git://github.com/linux-test-project/ltp.git \ > file://0001-build-Add-option-to-select-libc-implementation.patch \ > - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ > file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ > file://0004-guard-mallocopt-with-__GLIBC__.patch \ > - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ > file://0007-Fix-test_proc_kill-hanging.patch \ > file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ > file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ > - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ > - file://0001-testcases-fix-an-absent-format-string-issue.patch \ > file://0001-Add-more-musl-exclusions.patch \ > - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ > file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ > " > > From akuster808 at gmail.com Fri Feb 28 04:18:25 2020 From: akuster808 at gmail.com (akuster808) Date: Thu, 27 Feb 2020 20:18:25 -0800 Subject: [OE-core] [PATCH] wic: Add include-dir option In-Reply-To: References: <20200227042658.19619-1-akuster808@gmail.com> <312d477b-f5f5-16df-7867-c5c9f5619abb@geanix.com> <4e4b134c-3ac1-814b-5055-3a539904f52e@gmail.com> Message-ID: Paul, On 2/27/20 11:50 AM, Paul Barker wrote: > On Thu, 27 Feb 2020 at 19:43, akuster808 wrote: >> >> >> On 2/27/20 12:12 AM, Martin Hundeb?ll wrote: >>> Hi Armin, >>> >>> On 27/02/2020 05.26, Armin Kuster wrote: >>>> This option allows for the inclusion of a single directory >>>> for a partition. >>> I am unsure how this is used in a .wks file. >> Yeah, the documentation does not cover this. >> >> This is what I used to verified it works >> >> part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs >> --align 4096 --exclude-path=var >> part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var >> --align 4096 --include-dir=var >> >> >>> From the code it looks similar to the include-path option, but >>> relative to the rootfs source dir instead of the wic working dir? >> the --include-path adds an entire rootfs to the partition. I don't want >> the another rootfs. The help file even says that. I want on directory. >> --exclude-dir allows me to "exclude" a dir . >> >> >> I used wic ls {path to partition}:{partition number} to view the >> contents of the partition. >> >>> But the include-dir value is also used in the destination path? >> Then please document it and I don't mean the "help" file which is unclear. >> >> So how would you have "home" or "var" be in their own partitions? Please >> show an example. > IIRC, > > part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs > --align 4096 --exclude-path=var > part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var > --align 4096 --rootfs-dir=${IMAGE_ROOTFS}/var > > For an example see scripts/lib/wic/canned-wks/efi-bootdisk.wks.in Yeah, I looked all? the wks files an nothing jumped out at me.? The "--rootfs-dir" is not? intuitive for selecting a single dir? but I see that it does address my issue. thanks, Armin > > Thanks, > Paul From mingli.yu at windriver.com Fri Feb 28 04:20:12 2020 From: mingli.yu at windriver.com (mingli.yu at windriver.com) Date: Fri, 28 Feb 2020 12:20:12 +0800 Subject: [OE-core] [PATCH] rng-tools: only print the success message when initialize entropy sources Message-ID: <1582863612-310553-1-git-send-email-mingli.yu@windriver.com> From: Mingli Yu There is below message when check rngd service status in qemu env. [rdrand]: Initialization Failed The complete service status as below in qemu env: # systemctl status rngd rngd.service - Hardware RNG Entropy Gatherer Daemon Loaded: loaded (/lib/systemd/system/rngd.service; enabled; vendor preset: > Active: active (running) since Tue 2020-02-25 05:08:11 UTC; 42min ago Main PID: 133 (rngd) Tasks: 2 (limit: 3591) Memory: 1.0M CGroup: /system.slice/rngd.service `-133 /usr/sbin/rngd -f -r /dev/hwrng Feb 25 05:08:14 qemux86-64 rngd[133]: Initializing available sources Feb 25 05:08:14 qemux86-64 rngd[133]: [hwrng ]: Initialized Feb 25 05:08:14 qemux86-64 rngd[133]: [rdrand]: Initialization Failed Feb 25 05:08:14 qemux86-64 rngd[133]: [jitter]: Initializing AES buffer Feb 25 05:08:31 qemux86-64 rngd[133]: [jitter]: Enabling JITTER rng support Feb 25 05:08:39 qemux86-64 rngd[133]: [jitter]: Initialized Warning: Journal has been rotated since unit was started. Log output is incompl The message "[rdrand]: Initialization Failed" is misleading and also results in parselogs.ParseLogsTest.test_parselogs failed in do_testimage. In fact, the message only indicates the rdrand entropy source initialized failed and it doesn't affect the rngd function. So improve to only print the message for the entropy sources which initialized successfully to avoid misleading users. That makes sense as after check the available entropy sources, there is a logic to check whether there is at least one available entropy source exist as below in rngd.c if (!ent_sources) { message(LOG_DAEMON|LOG_ERR, "can't open any entropy source"); message(LOG_DAEMON|LOG_ERR, "Maybe RNG device modules are not loaded\n"); return 1; } That's to say, only printing the message for the entropy sources which initialized successfully is safe. Signed-off-by: Mingli Yu --- ...-print-the-success-message-when-initializ.patch | 47 ++++++++++++++++++++++ meta/recipes-support/rng-tools/rng-tools_6.9.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-support/rng-tools/rng-tools/0001-rngd.c-only-print-the-success-message-when-initializ.patch diff --git a/meta/recipes-support/rng-tools/rng-tools/0001-rngd.c-only-print-the-success-message-when-initializ.patch b/meta/recipes-support/rng-tools/rng-tools/0001-rngd.c-only-print-the-success-message-when-initializ.patch new file mode 100644 index 0000000..ba3958f --- /dev/null +++ b/meta/recipes-support/rng-tools/rng-tools/0001-rngd.c-only-print-the-success-message-when-initializ.patch @@ -0,0 +1,47 @@ +From 820d7fc8477b690803f9640452ce6df2f3eb6a79 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 28 Feb 2020 02:39:53 +0000 +Subject: [PATCH] rngd.c: only print the success message when initialize + +Only print the message for the entropy sources which +initialized successfully to avoid misleading users. + +That makes sense as after check the available entropy +sources, there is logic to check whether there is at +least one available entropy source exist as below: +if (!ent_sources) { + message(LOG_DAEMON|LOG_ERR, + "can't open any entropy source"); + message(LOG_DAEMON|LOG_ERR, + "Maybe RNG device modules are not loaded\n"); + return 1; +} + +That's to say, only printing the message for the entropy +sources which initialized successfully is safe. + +Upstream-Status: Submitted [https://github.com/nhorman/rng-tools/pull/84] + +Signed-off-by: Mingli Yu +--- + rngd.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/rngd.c b/rngd.c +index d8cd9af..78dae36 100644 +--- a/rngd.c ++++ b/rngd.c +@@ -795,9 +795,8 @@ int main(int argc, char **argv) + ent_sources++; + ent_src->fipsctx = malloc(sizeof(fips_ctx_t)); + fips_init(ent_src->fipsctx, discard_initial_data(ent_src)); +- message_entsrc(ent_src, LOG_DAEMON|LOG_INFO, "Initialized\n"); ++ message_entsrc(ent_src, LOG_DAEMON|LOG_INFO, "Initialized successfully\n"); + } else { +- message_entsrc(ent_src, LOG_DAEMON|LOG_ERR, "Initialization Failed\n"); + ent_src->disabled = true; + } + } +-- +2.24.1 + diff --git a/meta/recipes-support/rng-tools/rng-tools_6.9.bb b/meta/recipes-support/rng-tools/rng-tools_6.9.bb index 913342c..cce61aa 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.9.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.9.bb @@ -10,6 +10,7 @@ DEPENDS = "sysfsutils" SRC_URI = "\ git://github.com/nhorman/rng-tools.git \ + file://0001-rngd.c-only-print-the-success-message-when-initializ.patch \ file://init \ file://default \ file://rngd.service \ -- 2.7.4 From raj.khem at gmail.com Fri Feb 28 04:28:35 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 20:28:35 -0800 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> <20200227000603.14252-4-timothy.t.orling@linux.intel.com> <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> Message-ID: <7956231e-1523-6213-b757-633b75eb2eb2@gmail.com> On 2/27/20 7:54 PM, Anuj Mittal wrote: > Hi Tim, > > On 27-Feb-20 08:06 AM, Tim Orling wrote: >> Release notes: >> https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS >> >> >> License-Update: Changed to LGPL-2.1+ >> >> Signed-off-by: Tim Orling >> --- >> ? .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb}? | 8 ++++---- >> ? 1 file changed, 4 insertions(+), 4 deletions(-) >> ? rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => >> at-spi2-atk_2.34.1.bb} (66%) > > This is failing on musl-qemu86: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field > ?tv_sec? specified in initializer > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess > elements in struct initializer [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near > initialization for ?timeout?) [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field > ?tv_nsec? specified in initializer > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess > elements in struct initializer [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near > initialization for ?timeout?) [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size > of ?timeout? isn?t known > ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > ?????????????????? ^ > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit > declaration of function ?nanosleep? [-Wimplicit-function-declaration] > ???? nanosleep(&timeout, NULL); > ???? ^ > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ?terminate_app?: > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable > ?timeout? has initializer but incomplete type > ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > ????????? ^ > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field > ?tv_sec? specified in initializer > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess > elements in struct initializer [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near > initialization for ?timeout?) [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field > ?tv_nsec? specified in initializer > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess > elements in struct initializer [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near > initialization for ?timeout?) [enabled by default] > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size > of ?timeout? isn?t known > ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > yeah this is exposing a bug in use if time_t struct in this component. there are several patches done to address that, we will perhaps need one of these patches here. From raj.khem at gmail.com Fri Feb 28 04:29:48 2020 From: raj.khem at gmail.com (Khem Raj) Date: Thu, 27 Feb 2020 20:29:48 -0800 Subject: [OE-core] [PATCH v3 1/2] ltp: Update to 20200120 In-Reply-To: <3db4501b-68e6-7a41-2ac5-268675583bec@intel.com> References: <20200227212940.12327-1-petr.vorel@gmail.com> <3db4501b-68e6-7a41-2ac5-268675583bec@intel.com> Message-ID: On 2/27/20 8:06 PM, Anuj Mittal wrote: > > On 28-Feb-20 05:29 AM, Petr Vorel wrote: >> Removed ffsb copying file (tool removed from upstream) >> >> Removed patches (accepted upstream) >> * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch >> * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch >> * 0001-testcases-fix-an-absent-format-string-issue.patch >> * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch >> >> Merged patches >> * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch >> (into 0001-build-Add-option-to-select-libc-implementation.patch as they >> touch the same files) >> >> Refreshed patches (some tests have been fixed for musl) >> * 0001-Add-more-musl-exclusions.patch >> * 0001-build-Add-option-to-select-libc-implementation.patch >> >> Updated status >> * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch >> * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch >> >> Signed-off-by: Petr Vorel > > It looks like this is failing with musl: > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_memory_test/../cpuset_lib/libcpu_set.a(libcpuset.o): > in function `cpuset_fts_open': > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3214: > undefined reference to `fts_open' > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: > undefined reference to `fts_read' > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: > undefined reference to `fts_close' > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: > undefined reference to `fts_close' > I think we need to add DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" here. > Complete logs here: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623/steps/8/logs/step1b > > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1627/steps/8/logs/step1b > > > Thanks, > > Anuj > >> --- >> Changes v2->v3: >> ffsb-6.0-rc2 has been removed => remove it from upstream. >> >> Kind regards, >> Petr >> >> ? .../ltp/0001-Add-more-musl-exclusions.patch?? |? 37 +------ >> ? ...option-to-select-libc-implementation.patch | 103 +++++------------- >> ? ...udevadm-trigger-before-swap-verifica.patch |? 35 ------ >> ? ...ix-zeros-of-the-addresses-output-by-.patch |? 43 -------- >> ? ...or-time64-unsafe-syscalls-before-usi.patch |? 41 +++++-- >> ? ...es-fix-an-absent-format-string-issue.patch |? 24 ---- >> ? ...rs-Link-with-libfts-explicitly-on-mu.patch |? 47 -------- >> ? ..._tgsigqueueinfo-disable-test-on-musl.patch |? 35 ------ >> ? ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch |? 27 ++--- >> ? .../ltp/{ltp_20190930.bb => ltp_20200120.bb}? |?? 8 +- >> ? 10 files changed, 80 insertions(+), 320 deletions(-) >> ? delete mode 100644 >> meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch >> >> ? delete mode 100644 >> meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch >> >> ? delete mode 100644 >> meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch >> >> ? delete mode 100644 >> meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch >> >> ? delete mode 100644 >> meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch >> >> ? rename meta/recipes-extended/ltp/{ltp_20190930.bb => >> ltp_20200120.bb} (90%) >> >> diff --git >> a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch >> b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch >> index d3af31f34a..773844d442 100644 >> --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch >> +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch >> @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions >> ? Upstream-Status: Pending >> ? Signed-off-by: Alexander Kanavin >> +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, >> setxattr03 ] >> +Signed-off-by: Petr Vorel >> ? --- >> ?? testcases/kernel/syscalls/accept4/Makefile????? | 4 ++++ >> - testcases/kernel/syscalls/fanotify/Makefile???? | 6 ++++++ >> - testcases/kernel/syscalls/setxattr/Makefile???? | 4 ++++ >> ?? testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ >> - 4 files changed, 18 insertions(+) >> + 2 files changed, 8 insertions(+) >> ? diff --git a/testcases/kernel/syscalls/accept4/Makefile >> b/testcases/kernel/syscalls/accept4/Makefile >> ? index 504042e11..94db06266 100644 >> @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 >> ? +ifeq ($(LIBC),musl) >> ? +FILTER_OUT_MAKE_TARGETS??????? := accept4_01 >> ? +endif >> -+ >> - include $(top_srcdir)/include/mk/generic_leaf_target.mk >> -diff --git a/testcases/kernel/syscalls/fanotify/Makefile >> b/testcases/kernel/syscalls/fanotify/Makefile >> -index 5d01b4825..0263a6e20 100644 >> ---- a/testcases/kernel/syscalls/fanotify/Makefile >> -+++ b/testcases/kernel/syscalls/fanotify/Makefile >> -@@ -20,4 +20,10 @@ top_srcdir??????? ?= ../../../.. >> - fanotify11: CFLAGS+=-pthread >> - include $(top_srcdir)/include/mk/testcases.mk >> - >> -+ifeq ($(LIBC),musl) >> -+FILTER_OUT_MAKE_TARGETS??????? := fanotify13 fanotify15 >> -+endif >> -+ >> - include $(top_srcdir)/include/mk/generic_leaf_target.mk >> -+ >> -+ >> -diff --git a/testcases/kernel/syscalls/setxattr/Makefile >> b/testcases/kernel/syscalls/setxattr/Makefile >> -index 72544c13e..7f20b2780 100644 >> ---- a/testcases/kernel/syscalls/setxattr/Makefile >> -+++ b/testcases/kernel/syscalls/setxattr/Makefile >> -@@ -20,4 +20,8 @@ top_srcdir??????? ?= ../../../.. >> - >> - include $(top_srcdir)/include/mk/testcases.mk >> - >> -+ifeq ($(LIBC),musl) >> -+FILTER_OUT_MAKE_TARGETS??????? := setxattr03 >> -+endif >> ? + >> ?? include $(top_srcdir)/include/mk/generic_leaf_target.mk >> ? diff --git a/testcases/kernel/syscalls/timer_create/Makefile >> b/testcases/kernel/syscalls/timer_create/Makefile >> @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 >> ?? CPPFLAGS??????? += -D_GNU_SOURCE -I$(abs_srcdir)/../include >> ?? LDLIBS??????????? += -lpthread -lrt >> +-- >> +2.25.1 >> + >> diff --git >> a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch >> b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch >> >> index 1705abcf19..0598046b28 100644 >> --- >> a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch >> >> +++ >> b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch >> >> @@ -1,7 +1,7 @@ >> -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 >> +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 >> ? From: Khem Raj >> ? Date: Thu, 7 Jan 2016 18:19:03 +0000 >> -Subject: [PATCH] build: Add option to select libc implementation >> +Subject: [PATCH 1/6] build: Add option to select libc implementation >> ? There are more than glibc for C library implementation available on >> ? linux now a days, uclibc cloaked like glibc but musl e.g. is very >> @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on >> musl based systems >> ? Upstream-Status: Pending >> -Signed-off-by: Khem Raj >> +rt_tgsigqueueinfo fails with: >> +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': >> +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct >> '} has no member named '_sifields'; did you mean >> '__si_fields'? >> +?? 42 |? sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; >> +????? |????????????????????? ^~~~~~~~~ >> +????? |????????????????????? __si_fields >> +Signed-off-by: Khem Raj >> +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, >> +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, >> +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo >> +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] >> +Signed-off-by: Petr Vorel >> +Signed-off-by: Petr Vorel >> ? --- >> - Makefile??????????????????????????????????? | 5 +++++ >> - testcases/kernel/Makefile?????????????????? | 5 ++++- >> - testcases/kernel/sched/Makefile???????????? | 4 +++- >> - testcases/kernel/syscalls/Makefile????????? | 5 +++++ >> - testcases/network/nfsv4/acl/Makefile??????? | 4 ++++ >> - testcases/network/rpc/basic_tests/Makefile? | 5 +++++ >> - testcases/realtime/func/pi-tests/Makefile?? | 4 ++++ >> - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ >> - 8 files changed, 35 insertions(+), 2 deletions(-) >> + Makefile?????????????????????????? | 5 +++++ >> + testcases/kernel/Makefile????????? | 5 ++++- >> + testcases/kernel/sched/Makefile??? | 4 +++- >> + testcases/kernel/syscalls/Makefile | 4 ++++ >> + 4 files changed, 16 insertions(+), 2 deletions(-) >> ? diff --git a/Makefile b/Makefile >> ? index 768ca4606..e9d679a71 100644 >> @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 >> ? +endif >> ?? include $(top_srcdir)/include/mk/generic_trunk_target.mk >> ? diff --git a/testcases/kernel/syscalls/Makefile >> b/testcases/kernel/syscalls/Makefile >> -index 45a00cf7d..d1becd054 100644 >> +index 45a00cf7d..af5a591a0 100644 >> ? --- a/testcases/kernel/syscalls/Makefile >> ? +++ b/testcases/kernel/syscalls/Makefile >> -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) >> - FILTER_OUT_DIRS??? += capget capset chmod chown clone fork >> getcontext llseek \ >> +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS??? += capget capset chmod chown >> clone fork getcontext llseek \ >> ????????????? mincore mprotect nftw profil remap_file_pages sbrk >> ?? endif >> -+ifeq ($(LIBC),musl) >> -+FILTER_OUT_DIRS??? += confstr fmtmsg getcontext ioctl mallopt profil \ >> -+?????????? rt_sigsuspend setdomainname sethostname sigsuspend \ >> -+?????????? ustat >> -+endif >> - >> - ifeq ($(UCLIBC),1) >> - FILTER_OUT_DIRS??? += profil >> -diff --git a/testcases/network/nfsv4/acl/Makefile >> b/testcases/network/nfsv4/acl/Makefile >> -index 8c55a6bbd..f7cda621d 100644 >> ---- a/testcases/network/nfsv4/acl/Makefile >> -+++ b/testcases/network/nfsv4/acl/Makefile >> -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk >> - >> - LDLIBS??????????? += $(ACL_LIBS) >> - >> -+ifeq ($(LIBC),musl) >> -+FILTER_OUT_MAKE_TARGETS??? := acl1 >> -+endif >> -+ >> - include $(top_srcdir)/include/mk/generic_leaf_target.mk >> -diff --git a/testcases/network/rpc/basic_tests/Makefile >> b/testcases/network/rpc/basic_tests/Makefile >> -index 66e9d5675..ea8eb8a98 100644 >> ---- a/testcases/network/rpc/basic_tests/Makefile >> -+++ b/testcases/network/rpc/basic_tests/Makefile >> -@@ -23,4 +23,9 @@ >> - top_srcdir??????? ?= ../../../.. >> - >> - include $(top_srcdir)/include/mk/env_pre.mk >> -+ >> -+ifeq ($(LIBC),musl) >> -+FILTER_OUT_DIRS += rpc01 >> -+endif >> -+ >> - include $(top_srcdir)/include/mk/generic_trunk_target.mk >> -diff --git a/testcases/realtime/func/pi-tests/Makefile >> b/testcases/realtime/func/pi-tests/Makefile >> -index 68616a711..748754bb4 100644 >> ---- a/testcases/realtime/func/pi-tests/Makefile >> -+++ b/testcases/realtime/func/pi-tests/Makefile >> -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk >> - include $(abs_srcdir)/../../config.mk >> - MAKE_TARGETS??????? := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 >> testpi-6 testpi-7 sbrk_mutex >> ? +ifeq ($(LIBC),musl) >> -+FILTER_OUT_MAKE_TARGETS??? := testpi-5 testpi-6 sbrk_mutex >> ++FILTER_OUT_DIRS??? += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo >> ? +endif >> ? + >> - >> - include $(top_srcdir)/include/mk/generic_leaf_target.mk >> -diff --git a/testcases/realtime/stress/pi-tests/Makefile >> b/testcases/realtime/stress/pi-tests/Makefile >> -index 1881f7565..266e0b815 100644 >> ---- a/testcases/realtime/stress/pi-tests/Makefile >> -+++ b/testcases/realtime/stress/pi-tests/Makefile >> -@@ -24,4 +24,9 @@ top_srcdir??????? ?= ../../../.. >> - >> - include $(top_srcdir)/include/mk/env_pre.mk >> - include $(abs_srcdir)/../../config.mk >> -+ >> -+ifeq ($(LIBC),musl) >> -+FILTER_OUT_MAKE_TARGETS??? := testpi-3 >> -+endif >> -+ >> - include $(top_srcdir)/include/mk/generic_leaf_target.mk >> + ifeq ($(UCLIBC),1) >> + FILTER_OUT_DIRS??? += profil >> + endif >> +-- >> +2.25.1 >> + >> diff --git >> a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch >> b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch >> >> deleted file mode 100644 >> index 1b433d3ad3..0000000000 >> --- >> a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch >> >> +++ /dev/null >> @@ -1,35 +0,0 @@ >> -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 >> -From: Yongxin Liu >> -Date: Tue, 12 Nov 2019 11:33:50 +0800 >> -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap >> verification >> - >> -Fix: https://github.com/linux-test-project/ltp/issues/458 >> - >> -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ >> -or /dev/disk/by-lable/ due to the issue #458. When this issue >> -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show >> -different UUID of the device. >> - >> -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] >> - >> -Signed-off-by: Yongxin Liu >> ---- >> - testcases/commands/mkswap/mkswap01.sh | 2 ++ >> - 1 file changed, 2 insertions(+) >> - >> -diff --git a/testcases/commands/mkswap/mkswap01.sh >> b/testcases/commands/mkswap/mkswap01.sh >> -index 3a348c6e6..9437c4a4e 100755 >> ---- a/testcases/commands/mkswap/mkswap01.sh >> -+++ b/testcases/commands/mkswap/mkswap01.sh >> -@@ -129,6 +129,8 @@ mkswap_test() >> -???????? return >> -???? fi >> - >> -+??? udevadm trigger --name-match=$TST_DEVICE >> -+ >> -???? if [ -n "$device" ]; then >> -???????? mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" >> "$dev_file" >> -???????? if [ $? -ne 0 ]; then >> --- >> -2.14.4 >> - >> diff --git >> a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch >> b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch >> >> deleted file mode 100644 >> index fe5e7314e0..0000000000 >> --- >> a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch >> >> +++ /dev/null >> @@ -1,43 +0,0 @@ >> -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 >> -From: He Zhe >> -Date: Tue, 31 Dec 2019 15:02:48 +0800 >> -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm >> - before comparing >> - >> -The latest nm v2.33.1 outputs symbols addresses without prefix zeros >> -for "nm -f posix", which causes the following error. >> -nm01 5 TFAIL: Got wrong format with -f bsd >> - >> -Let's remove the prefix zeros before comparing. >> - >> -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] >> - >> -Signed-off-by: He Zhe >> -Reviewed-by: Li Wang >> -Reviewed-by: Petr Vorel >> -Tested-by: Petr Vorel >> ---- >> - testcases/commands/nm/nm01.sh | 7 +++++-- >> - 1 file changed, 5 insertions(+), 2 deletions(-) >> - >> -diff --git a/testcases/commands/nm/nm01.sh >> b/testcases/commands/nm/nm01.sh >> -index 30c41bd..fd9d3d9 100755 >> ---- a/testcases/commands/nm/nm01.sh >> -+++ b/testcases/commands/nm/nm01.sh >> -@@ -84,8 +84,11 @@ test5() >> -???? EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out >> -???? EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out >> - >> --??? ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out >> --??? ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out >> -+??? ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' >> nm_bsd.out \> trimmed_nm_bsd.out >> -+??? ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' >> nm_posix.out \> trimmed_nm_posix.out >> -+ >> -+??? ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out >> -+??? ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out >> - >> -???? if diff nm1.out nm2.out > /dev/null; then >> -???????? tst_res TPASS "Got BSD format with -f bsd" >> --- >> -2.7.4 >> - >> diff --git >> a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch >> b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch >> >> index c431669716..ecc6660f93 100644 >> --- >> a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch >> >> +++ >> b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch >> >> @@ -1,28 +1,40 @@ >> -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 >> +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 >> ? From: Khem Raj >> -Date: Wed, 12 Feb 2020 22:22:17 -0800 >> +Date: Wed, 19 Feb 2020 22:52:04 -0800 >> ? Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before >> using them >> ? musl is using 64bit time_t now on 32bit architectures and these >> syscalls >> ? no longer exist, therefore its better to check for them being available >> ? before using them >> -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] >> ? Signed-off-by: Khem Raj >> +Reviewed-by: Yang Xu >> +Reviewed-by: Petr Vorel >> +Signed-off-by: Petr Vorel >> +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 >> ? --- >> - lib/tst_clocks.c??????????????????????????????????????? | 9 +++++---- >> - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- >> - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- >> - 3 files changed, 10 insertions(+), 13 deletions(-) >> + lib/tst_clocks.c???????????????????????????????? | 16 ++++++---------- >> + .../syscalls/gettimeofday/gettimeofday01.c?????? |? 6 ++---- >> + .../syscalls/gettimeofday/gettimeofday02.c?????? |? 8 +++----- >> + 3 files changed, 11 insertions(+), 19 deletions(-) >> +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c >> +index 5195da38f..fa2f1cb84 100644 >> ? --- a/lib/tst_clocks.c >> ? +++ b/lib/tst_clocks.c >> -@@ -22,21 +22,22 @@ >> - #define _GNU_SOURCE >> - #include >> +@@ -3,28 +3,24 @@ >> +? * Copyright (c) 2017 Cyril Hrubis >> +? */ >> + >> +-/* >> +- * clock_gettime() and clock_getres() functions >> +- */ >> +- >> +-#define _GNU_SOURCE >> +-#include >> ?? #include >> ? -#include >> -- >> + >> ? +#define TST_NO_DEFAULT_MAIN >> ? +#include "tst_test.h" >> ?? #include "tst_clocks.h" >> @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj >> ? -??? return syscall(SYS_clock_settime, clk_id, ts); >> ? +??? return tst_syscall(__NR_clock_settime, clk_id, ts); >> ?? } >> +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c >> b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c >> +index 583d8f7b9..08ea1673a 100644 >> ? --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c >> ? +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c >> ? @@ -38,10 +38,8 @@ >> @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj >> ?????????? /* gettimeofday returns an int, so we need to turn the long >> ??????????? * TEST_RETURN into an int to test with */ >> +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c >> b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c >> +index 1d60f448e..5170ad2f7 100644 >> ? --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c >> ? +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c >> ? @@ -16,14 +16,12 @@ >> @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj >> ?????????????? tst_res(TBROK | TERRNO, "gettimeofday() failed"); >> ?????????????? return; >> ?????????? } >> +-- >> +2.25.1 >> + >> diff --git >> a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch >> b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch >> >> deleted file mode 100644 >> index 9330844509..0000000000 >> --- >> a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch >> >> +++ /dev/null >> @@ -1,24 +0,0 @@ >> -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 >> -From: Alexander Kanavin >> -Date: Thu, 12 Dec 2019 17:56:02 +0100 >> -Subject: [PATCH] testcases: fix an absent format string issue >> - >> -Upstream-Status: Pending >> -Signed-off-by: Alexander Kanavin >> ---- >> - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c???? | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git >> a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c >> b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c >> -index 27dbc6626..19d943d06 100644 >> ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c >> -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c >> -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) >> - >> -???????? /* Manipulate PID for next process */ >> -???????? sprintf(pid_str, "%d", pid - 1); >> --??????? SAFE_FILE_PRINTF(last_pid_file, pid_str); >> -+??????? SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); >> - >> -???????? new_pid = SAFE_FORK(); >> -???????? if (new_pid == 0) { >> diff --git >> a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch >> b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch >> >> deleted file mode 100644 >> index eff9ed0741..0000000000 >> --- >> a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch >> >> +++ /dev/null >> @@ -1,47 +0,0 @@ >> -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 >> -From: Khem Raj >> -Date: Thu, 7 Jan 2016 18:22:38 +0000 >> -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl >> - >> -musl does not implement fts like glibc and therefore it depends on >> -external implementation for all fts APIs >> - >> -Upstream-Status: Pending >> - >> -Signed-off-by: Khem Raj >> ---- >> - testcases/kernel/controllers/Makefile.inc??????? | 3 +++ >> - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ >> - 2 files changed, 6 insertions(+) >> - >> -diff --git a/testcases/kernel/controllers/Makefile.inc >> b/testcases/kernel/controllers/Makefile.inc >> -index 4ca0b5a..1d85e4d 100644 >> ---- a/testcases/kernel/controllers/Makefile.inc >> -+++ b/testcases/kernel/controllers/Makefile.inc >> -@@ -36,6 +36,9 @@ MAKE_DEPS??????? := $(LIB) >> - CPPFLAGS??????? += -I$(abs_srcdir)/../$(LIBDIR) >> - >> - LDFLAGS??????????? += -L$(abs_builddir)/../$(LIBDIR) >> -+ifeq ($(LIBC),musl) >> -+LDLIBS??????????? += -lfts >> -+endif >> - >> - INSTALL_TARGETS??????? ?= *.sh >> - >> -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc >> b/testcases/kernel/controllers/cpuset/Makefile.inc >> -index db6a843..86dd2a8 100644 >> ---- a/testcases/kernel/controllers/cpuset/Makefile.inc >> -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc >> -@@ -42,6 +42,9 @@ MAKE_DEPS??????? := $(LIBCONTROLLERS) $(LIBCPUSET) >> - LDFLAGS??????????? += -L$(abs_builddir)/$(LIBCPUSET_DIR) >> -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) >> - >> - LDLIBS??????????? += -lcpu_set -lcontrollers -lltp >> -+ifeq ($(LIBC),musl) >> -+LDLIBS??????????? += -lfts >> -+endif >> - >> - INSTALL_TARGETS??????? ?= *.sh >> - >> --- >> -2.7.4 >> - >> diff --git >> a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch >> b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch >> >> deleted file mode 100644 >> index 804edfa1b4..0000000000 >> --- >> a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch >> >> +++ /dev/null >> @@ -1,35 +0,0 @@ >> -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 >> -From: Yi Zhao >> -Date: Thu, 18 Jul 2019 15:23:15 +0800 >> -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl >> - >> -Fix build error with musl: >> -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': >> -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct >> '} has no member named '_sifields'; did you mean >> '__si_fields'? >> -?? 42 |? sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; >> -????? |????????????????????? ^~~~~~~~~ >> -????? |????????????????????? __si_fields >> - >> -Upstream-Status: Pending >> - >> -Signed-off-by: Yi Zhao >> ---- >> - testcases/kernel/syscalls/Makefile | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/testcases/kernel/syscalls/Makefile >> b/testcases/kernel/syscalls/Makefile >> -index d1becd0..1f3ff34 100644 >> ---- a/testcases/kernel/syscalls/Makefile >> -+++ b/testcases/kernel/syscalls/Makefile >> -@@ -31,7 +31,7 @@ endif >> - ifeq ($(LIBC),musl) >> - FILTER_OUT_DIRS??? += confstr fmtmsg getcontext ioctl mallopt profil \ >> -??????????? rt_sigsuspend setdomainname sethostname sigsuspend \ >> --?????????? ustat >> -+?????????? ustat rt_tgsigqueueinfo >> - endif >> - >> - ifeq ($(UCLIBC),1) >> --- >> -2.7.4 >> - >> diff --git >> a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch >> b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch >> >> index b46325eaf3..350091a70c 100644 >> --- >> a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch >> >> +++ >> b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch >> >> @@ -1,33 +1,34 @@ >> -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 >> +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 >> ? From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= >> >> ? Date: Fri, 13 May 2016 11:11:28 -0500 >> -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on >> - string printf >> +Subject: [PATCH] acl: Security fix on string printf >> ? MIME-Version: 1.0 >> ? Content-Type: text/plain; charset=UTF-8 >> ? Content-Transfer-Encoding: 8bit >> -Fixes: >> +Fixes build error when compiled with -Werror=format-security: >> -acl1.c: In function 'test_acl_default': >> -acl1.c:317:2: error: format not a string literal and no format arguments >> -[-Werror=format-security] >> -? printf(cmd); >> +acl1.c: In function ?test_acl_default?: >> +acl1.c:305:2: error: format not a string literal and no format >> arguments [-Werror=format-security] >> +? 305 |? printf(cmd); >> -[YOCTO #9548] >> +Patch taken from openembedded-core, >> +original bug report: https://bugzilla.yoctoproject.org/9548 >> -Upstream-Status: Pending >> +[YOCTO #9548] >> ? Signed-off-by: An?bal Lim?n >> +Signed-off-by: Petr Vorel >> +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 >> ? --- >> ?? testcases/network/nfsv4/acl/acl1.c | 2 +- >> ?? 1 file changed, 1 insertion(+), 1 deletion(-) >> ? diff --git a/testcases/network/nfsv4/acl/acl1.c >> b/testcases/network/nfsv4/acl/acl1.c >> -index bdf0180..898b7ca 100644 >> +index aae9484e5..ad778cd33 100644 >> ? --- a/testcases/network/nfsv4/acl/acl1.c >> ? +++ b/testcases/network/nfsv4/acl/acl1.c >> -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) >> +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) >> ?????? char *cmd = malloc(256); >> ?????? strcpy(cmd, "chmod 7777 "); >> @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 >> ?????? system(cmd); >> ?????? acl2 = acl_get_file(path, ACL_TYPE_ACCESS); >> ? -- >> -2.7.4 >> +2.25.1 >> diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb >> b/meta/recipes-extended/ltp/ltp_20200120.bb >> similarity index 90% >> rename from meta/recipes-extended/ltp/ltp_20190930.bb >> rename to meta/recipes-extended/ltp/ltp_20200120.bb >> index 19bd7bc9c6..579a763431 100644 >> --- a/meta/recipes-extended/ltp/ltp_20190930.bb >> +++ b/meta/recipes-extended/ltp/ltp_20200120.bb >> @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "\ >> >> file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 >> \ >> >> file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ >> >> file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f >> \ >> - >> file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ >> ? " >> ? DEPENDS = "attr libaio libcap acl openssl zip-native" >> @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" >> ? CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" >> ? CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" >> -SRCREV = "c9707b465a08397569920b676345474f44327200" >> +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" >> ? SRC_URI = "git://github.com/linux-test-project/ltp.git \ >> >> file://0001-build-Add-option-to-select-libc-implementation.patch \ >> - >> file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ >> >> file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ >> ???????????? file://0004-guard-mallocopt-with-__GLIBC__.patch \ >> -?????????? file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ >> ???????????? file://0007-Fix-test_proc_kill-hanging.patch \ >> >> file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ >> >> file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ >> - >> file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ >> - >> file://0001-testcases-fix-an-absent-format-string-issue.patch \ >> ???????????? file://0001-Add-more-musl-exclusions.patch \ >> - >> file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ >> >> file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ >> ???????????? " >> From ticotimo at gmail.com Fri Feb 28 04:32:18 2020 From: ticotimo at gmail.com (Tim Orling) Date: Thu, 27 Feb 2020 20:32:18 -0800 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: <7956231e-1523-6213-b757-633b75eb2eb2@gmail.com> References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> <20200227000603.14252-4-timothy.t.orling@linux.intel.com> <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> <7956231e-1523-6213-b757-633b75eb2eb2@gmail.com> Message-ID: Strange. I built it in new environment, tip of master, on Debian-10 and no problems. I?ll look into it tomorrow. Thank you for the information. On Thu, Feb 27, 2020 at 8:28 PM Khem Raj wrote: > > > On 2/27/20 7:54 PM, Anuj Mittal wrote: > > Hi Tim, > > > > On 27-Feb-20 08:06 AM, Tim Orling wrote: > >> Release notes: > >> > https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS > >> > >> > >> License-Update: Changed to LGPL-2.1+ > >> > >> Signed-off-by: Tim Orling > >> --- > >> .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 > ++++---- > >> 1 file changed, 4 insertions(+), 4 deletions(-) > >> rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => > >> at-spi2-atk_2.34.1.bb} (66%) > > > > This is failing on musl-qemu86: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 > > > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field > > ?tv_sec? specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near > > initialization for ?timeout?) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field > > ?tv_nsec? specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near > > initialization for ?timeout?) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size > > of ?timeout? isn?t known > > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > > ^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit > > declaration of function ?nanosleep? [-Wimplicit-function-declaration] > > nanosleep(&timeout, NULL); > > ^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ?terminate_app?: > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable > > ?timeout? has initializer but incomplete type > > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > > ^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field > > ?tv_sec? specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near > > initialization for ?timeout?) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field > > ?tv_nsec? specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near > > initialization for ?timeout?) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size > > of ?timeout? isn?t known > > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; > > > > yeah this is exposing a bug in use if time_t struct in this component. > there are several patches done to address that, we will perhaps need one > of these patches here. > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From ticotimo at gmail.com Fri Feb 28 04:35:18 2020 From: ticotimo at gmail.com (Tim Orling) Date: Thu, 27 Feb 2020 20:35:18 -0800 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> <20200227000603.14252-4-timothy.t.orling@linux.intel.com> <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> <7956231e-1523-6213-b757-633b75eb2eb2@gmail.com> Message-ID: All those build failures are on CentOS-7. Grumble grumble. On Thu, Feb 27, 2020 at 8:32 PM Tim Orling wrote: > Strange. I built it in new environment, tip of master, on Debian-10 and no > problems. I?ll look into it tomorrow. > > Thank you for the information. > > On Thu, Feb 27, 2020 at 8:28 PM Khem Raj wrote: > >> >> >> On 2/27/20 7:54 PM, Anuj Mittal wrote: >> > Hi Tim, >> > >> > On 27-Feb-20 08:06 AM, Tim Orling wrote: >> >> Release notes: >> >> >> https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS >> >> >> >> >> >> License-Update: Changed to LGPL-2.1+ >> >> >> >> Signed-off-by: Tim Orling >> >> --- >> >> .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 >> ++++---- >> >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => >> >> at-spi2-atk_2.34.1.bb} (66%) >> > >> > This is failing on musl-qemu86: >> > >> > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 >> > >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field >> > ?tv_sec? specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near >> > initialization for ?timeout?) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field >> > ?tv_nsec? specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near >> > initialization for ?timeout?) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size >> > of ?timeout? isn?t known >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; >> > ^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit >> > declaration of function ?nanosleep? [-Wimplicit-function-declaration] >> > nanosleep(&timeout, NULL); >> > ^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function >> ?terminate_app?: >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable >> > ?timeout? has initializer but incomplete type >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; >> > ^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown >> field >> > ?tv_sec? specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near >> > initialization for ?timeout?) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown >> field >> > ?tv_nsec? specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near >> > initialization for ?timeout?) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size >> > of ?timeout? isn?t known >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; >> > >> >> yeah this is exposing a bug in use if time_t struct in this component. >> there are several patches done to address that, we will perhaps need one >> of these patches here. >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From petr.vorel at gmail.com Fri Feb 28 06:12:24 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Fri, 28 Feb 2020 07:12:24 +0100 Subject: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120 Message-ID: <20200228061225.32003-1-petr.vorel@gmail.com> Removed ffsb copying file (tool removed from upstream) Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Changes v3->v4: * Fix musl build with LIBS=-lfts .../ltp/0001-Add-more-musl-exclusions.patch | 37 +------ ...option-to-select-libc-implementation.patch | 103 +++++------------- ...udevadm-trigger-before-swap-verifica.patch | 35 ------ ...ix-zeros-of-the-addresses-output-by-.patch | 43 -------- ...or-time64-unsafe-syscalls-before-usi.patch | 41 +++++-- ...es-fix-an-absent-format-string-issue.patch | 24 ---- ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 -------- ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 ------ ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- 10 files changed, 81 insertions(+), 321 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (89%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS := accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..0598046b28 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3ad3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e7314e0..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669716..ecc6660f93 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844509..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0741..0000000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa1b4..0000000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325eaf3..350091a70c 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 89% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc9c6..312eeca114 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From petr.vorel at gmail.com Fri Feb 28 06:12:25 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Fri, 28 Feb 2020 07:12:25 +0100 Subject: [OE-core] [PATCH v4 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <20200228061225.32003-1-petr.vorel@gmail.com> References: <20200228061225.32003-1-petr.vorel@gmail.com> Message-ID: <20200228061225.32003-2-petr.vorel@gmail.com> Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Changes v3->v4: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 312eeca114..847f267b0b 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From petr.vorel at gmail.com Fri Feb 28 06:18:34 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Fri, 28 Feb 2020 07:18:34 +0100 Subject: [OE-core] [PATCH v3 1/2] ltp: Update to 20200120 In-Reply-To: References: <20200227212940.12327-1-petr.vorel@gmail.com> <3db4501b-68e6-7a41-2ac5-268675583bec@intel.com> Message-ID: <20200228061834.GA30343@dell5510> Hi Khem, > > It looks like this is failing with musl: > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_memory_test/../cpuset_lib/libcpu_set.a(libcpuset.o): > > in function `cpuset_fts_open': > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3214: > > undefined reference to `fts_open' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: > > undefined reference to `fts_read' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: > > undefined reference to `fts_close' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: > > undefined reference to `fts_close' > I think we need to add > DEPENDS_append_libc-musl = " fts " > EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" Thanks! LIBS=-lfts should fix missing fts. I've sent it as v4. I'm trying to test it on TARGET_SYS = "x86_64-oe-linux-musl" (run via TCLIBC=musl bitbake ltp, I should probably test it also on other arch: MACHINE=qemuarm TCLIBC=musl bitbake ltp). Anuj, can you test it as well? Kind regards, Petr From brgl at bgdev.pl Fri Feb 28 07:12:18 2020 From: brgl at bgdev.pl (Bartosz Golaszewski) Date: Fri, 28 Feb 2020 08:12:18 +0100 Subject: [OE-core] [meta-security][PATCH] linux: drop the bbappend for linux v4.x series In-Reply-To: <8bf10a8d-3ea2-8f97-9d47-a3d37176c888@gmail.com> References: <20200224154549.17866-1-brgl@bgdev.pl> <8bf10a8d-3ea2-8f97-9d47-a3d37176c888@gmail.com> Message-ID: pon., 24 lut 2020 o 17:16 akuster808 napisa?(a): > > wrong ml. > > should be yocto at list.yoctoproject.org > > On 2/24/20 7:45 AM, Bartosz Golaszewski wrote: > > From: Bartosz Golaszewski > > > > v4.19 LTS has been dropped in poky in favor of v5.4. Drop the bbappend > > from meta-security as right now the build fails. > > Thanks for the patch. I saw this issue yesterday and you beat me to > fixing it. > Hi Armin, just a gentle ping as this is still broken - do you want me to resend it to the right mailing list? Bartosz From richard.purdie at linuxfoundation.org Fri Feb 28 07:38:39 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 28 Feb 2020 07:38:39 +0000 Subject: [OE-core] [PATCH v2] libmodule-build-perl: upgrade 0.4229 -> 0.4231 In-Reply-To: <20200225234603.36012-1-timothy.t.orling@linux.intel.com> References: <20200225234603.36012-1-timothy.t.orling@linux.intel.com> Message-ID: On Tue, 2020-02-25 at 15:46 -0800, Tim Orling wrote: > Upstream release notes: > " > 0.4231 - Wed Jan 29 08:47:56 CET 2020 > > - Released 0.42_30 without code changes > > 0.42_30 - Wed Jul 31 13:15:39 CEST 2019 > > - Add dependency on ExtUtils::PL2Bat > " > > Add ptest RDEPENDS: > - ExtUtils::Command::MM for t/compat.t > - gcc, make didn't seem like enough for ptest, replace with > packagegroup-core-buildessential which definitely works > - perl-dev for EXTERN.h in t/xs.t > > Add INSANE_SKIP dev-deps for the -ptest package because of perl-dev > > Five tests from t/help.t are skipped because they are TODO > > t/par.t is skipped because PAR::Dist (0.17+) is not present > > t/ppm.t is skipped because "HTML support not installed" > > All other tests pass. > > Signed-off-by: Tim Orling > --- > ...rl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 +++++++++--- > -- > 1 file changed, 9 insertions(+), 5 deletions(-) > rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => > libmodule-build-perl_0.4231.bb} (90%) unfortunately this has reproducibility issues: https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200228-93xlitnd/packages/diff-html/ (see after the gettext issue) Cheers, Richard From richard.purdie at linuxfoundation.org Fri Feb 28 07:45:55 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 28 Feb 2020 07:45:55 +0000 Subject: [OE-core] [PATCH v3] make: 4.2.1 -> 4.3 In-Reply-To: <20200224143920.19383-1-sno@netbsd.org> References: <20200224143920.19383-1-sno@netbsd.org> Message-ID: <3bdcf798302bbb0ce1de37eca82223dd8c3778e3.camel@linuxfoundation.org> On Mon, 2020-02-24 at 15:39 +0100, Jens Rehsack wrote: > Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html > > 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch > and 0002-glob-Do-not-assume-glibc-glob-internals.patch. > > 2) License has been changed to GPLv3 only > > 3) Important bug-fix is > * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html > > 4) Backward-incompatibilities: > * Number signs (#) appearing inside a macro reference or function invocation > no longer introduce comments and should not be escaped with backslashes > * Previously appending using '+=' to an empty variable would result in a value > starting with a space. Now the initial space is only added if the variable > already contains some value. Similarly, appending an empty string does not > add a trailing space. > > Fix incompatibility issues between gnulib bundled with updated make fix issues > in w32 compat sources. > > Signed-off-by: Jens Rehsack References: <20200226180746.121476-1-trevor.gamblin@windriver.com> <20200226180746.121476-2-trevor.gamblin@windriver.com> <40e95e22-241a-d98b-63a4-f557bdb8ef9b@windriver.com> Message-ID: <749ffe7adcb1acef017652e71e8d36b70d79d3fd.camel@linuxfoundation.org> On Thu, 2020-02-27 at 18:51 -0500, Trevor Gamblin wrote: > On 2/27/20 6:26 PM, Richard Purdie wrote: > > On Wed, 2020-02-26 at 19:13 +0100, Alexander Kanavin wrote: > > > valgrind, gdb and strace are already pulled into core-image-sato- > > > sdk- > > > ptest (the one that runs the slow ptests on the AB), so there is > > > no > > > harm in adding them here as well. > > Actually, there is. > > > > Adding valgrind to the RDEPENDS of coreutils means all builds end > > up > > needing to include valgrind. We really don't want that. > > > > I know this is bad but it is the way dependencies work today :( > Should I resubmit with gdb and strace? My personal opinion is no, these all end up enlarging the dependency chains too much :( Cheers, Richard From alex.kanavin at gmail.com Fri Feb 28 09:25:54 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 28 Feb 2020 10:25:54 +0100 Subject: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37 Message-ID: <20200228092554.15950-1-alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin --- ...not-fail-when-testing-config-scripts.patch | 27 ++++ .../libgpg-error-1.36-gawk5-support.patch | 144 ------------------ ...gpg-error_1.36.bb => libgpg-error_1.37.bb} | 8 +- 3 files changed, 31 insertions(+), 148 deletions(-) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (91%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch new file mode 100644 index 0000000000..a0ab4f23ff --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch @@ -0,0 +1,27 @@ +From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 28 Feb 2020 09:19:56 +0000 +Subject: [PATCH] Do not fail when testing config scripts + +In previous versions this was not a hard a failure, and so went +unnoticed. The test is unsuitable for building with sysroots anyway as the +failure is due to that. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9303954..7630540 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old + else \ + echo "no"; \ + echo "*** Please report to with gpg-error-config-test.log"; \ +- exit 1; \ + fi + cp gpg-error-config-old $@ + diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d1143b..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb similarity index 91% rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index b11ab0548d..b9a2b01c20 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -14,11 +14,11 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://libgpg-error-1.36-gawk5-support.patch \ - " + file://0001-Do-not-fail-when-testing-config-scripts.patch \ + " -SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" -- 2.25.1 From alex.kanavin at gmail.com Fri Feb 28 09:28:02 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 28 Feb 2020 10:28:02 +0100 Subject: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37 In-Reply-To: <6ac82a00-615a-4cc5-c4b9-46f37e12bbac@windriver.com> References: <20200226183902.3616626-1-trevor.gamblin@windriver.com> <2fd5b0c062bfee215cd7a4d15789a20293cee8aa.camel@linuxfoundation.org> <6ac82a00-615a-4cc5-c4b9-46f37e12bbac@windriver.com> Message-ID: Patch sent. :) Alex On Fri, 28 Feb 2020 at 00:42, Trevor Gamblin wrote: > > On 2/27/20 6:14 PM, Richard Purdie wrote: > > On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote: > >> Looks like I got beat by a day! > > Does your version work on x32 though? :) > > > > We need one that does... > > They look the same, unfortunately. > > Will take a look in between some other tasks, unless Alex gets to it > first (he usually does, that guy's a machine). > > > > > Cheers, > > > > Richard > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Fri Feb 28 09:30:13 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Fri, 28 Feb 2020 10:30:13 +0100 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> <20200227000603.14252-4-timothy.t.orling@linux.intel.com> <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> <7956231e-1523-6213-b757-633b75eb2eb2@gmail.com> Message-ID: I actually have a number of patches I have to hold because they don't build or don't work on centos 7. Latest atk and friends included: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates-later Something ought to be done about centos 7, I'm all for dropping it asap, if the newer compiler installation turns out unfeasible. Alex On Fri, 28 Feb 2020 at 05:35, Tim Orling wrote: > All those build failures are on CentOS-7. > Grumble grumble. > > On Thu, Feb 27, 2020 at 8:32 PM Tim Orling wrote: > >> Strange. I built it in new environment, tip of master, on Debian-10 and >> no problems. I?ll look into it tomorrow. >> >> Thank you for the information. >> >> On Thu, Feb 27, 2020 at 8:28 PM Khem Raj wrote: >> >>> >>> >>> On 2/27/20 7:54 PM, Anuj Mittal wrote: >>> > Hi Tim, >>> > >>> > On 27-Feb-20 08:06 AM, Tim Orling wrote: >>> >> Release notes: >>> >> >>> https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS >>> >> >>> >> >>> >> License-Update: Changed to LGPL-2.1+ >>> >> >>> >> Signed-off-by: Tim Orling >>> >> --- >>> >> .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 >>> ++++---- >>> >> 1 file changed, 4 insertions(+), 4 deletions(-) >>> >> rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => >>> >> at-spi2-atk_2.34.1.bb} (66%) >>> > >>> > This is failing on musl-qemu86: >>> > >>> > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 >>> > >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown >>> field >>> > ?tv_sec? specified in initializer >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess >>> > elements in struct initializer [enabled by default] >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near >>> > initialization for ?timeout?) [enabled by default] >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown >>> field >>> > ?tv_nsec? specified in initializer >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess >>> > elements in struct initializer [enabled by default] >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near >>> > initialization for ?timeout?) [enabled by default] >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size >>> > of ?timeout? isn?t known >>> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; >>> > ^ >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit >>> > declaration of function ?nanosleep? [-Wimplicit-function-declaration] >>> > nanosleep(&timeout, NULL); >>> > ^ >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function >>> ?terminate_app?: >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable >>> > ?timeout? has initializer but incomplete type >>> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; >>> > ^ >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown >>> field >>> > ?tv_sec? specified in initializer >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess >>> > elements in struct initializer [enabled by default] >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near >>> > initialization for ?timeout?) [enabled by default] >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown >>> field >>> > ?tv_nsec? specified in initializer >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess >>> > elements in struct initializer [enabled by default] >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near >>> > initialization for ?timeout?) [enabled by default] >>> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage >>> size >>> > of ?timeout? isn?t known >>> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; >>> > >>> >>> yeah this is exposing a bug in use if time_t struct in this component. >>> there are several patches done to address that, we will perhaps need one >>> of these patches here. >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core at lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> >> -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Fri Feb 28 11:59:22 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 28 Feb 2020 11:59:22 +0000 Subject: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120 In-Reply-To: <20200228061225.32003-1-petr.vorel@gmail.com> References: <20200228061225.32003-1-petr.vorel@gmail.com> Message-ID: <6558d8c05b858a831ecd4dd79df70f4764b10c6c.camel@linuxfoundation.org> On Fri, 2020-02-28 at 07:12 +0100, Petr Vorel wrote: > Removed ffsb copying file (tool removed from upstream) > > Added LIBS=-lfts for MUSL. > > Removed patches (accepted upstream) > * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > * 0001-testcases-fix-an-absent-format-string-issue.patch > * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > > Merged patches > * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > (into 0001-build-Add-option-to-select-libc-implementation.patch as > they > touch the same files) > > Refreshed patches (some tests have been fixed for musl) > * 0001-Add-more-musl-exclusions.patch > * 0001-build-Add-option-to-select-libc-implementation.patch > > Updated status > * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > > Signed-off-by: Petr Vorel > --- > Changes v3->v4: > * Fix musl build with LIBS=-lfts Unfortunately the musl build is still failing with this version: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 Cheers, Richard From petr.vorel at gmail.com Fri Feb 28 12:08:49 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Fri, 28 Feb 2020 13:08:49 +0100 Subject: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120 In-Reply-To: <6558d8c05b858a831ecd4dd79df70f4764b10c6c.camel@linuxfoundation.org> References: <20200228061225.32003-1-petr.vorel@gmail.com> <6558d8c05b858a831ecd4dd79df70f4764b10c6c.camel@linuxfoundation.org> Message-ID: <20200228120849.GA31133@dell5510> Hi Richard, > > Changes v3->v4: > > * Fix musl build with LIBS=-lfts > Unfortunately the musl build is still failing with this version: > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 Any idea, how to fix it? libcgroup uses the same flag LIBS=-lfts. Maybe the variable isn't propagated. Or is the dependency expressed enough? DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " I'll have to put back patch 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch, but that's bad, buildroot works without it. Kind regards, Petr From richard.purdie at linuxfoundation.org Fri Feb 28 12:17:05 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 28 Feb 2020 12:17:05 +0000 Subject: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120 In-Reply-To: <20200228120849.GA31133@dell5510> References: <20200228061225.32003-1-petr.vorel@gmail.com> <6558d8c05b858a831ecd4dd79df70f4764b10c6c.camel@linuxfoundation.org> <20200228120849.GA31133@dell5510> Message-ID: On Fri, 2020-02-28 at 13:08 +0100, Petr Vorel wrote: > Hi Richard, > > > > Changes v3->v4: > > > * Fix musl build with LIBS=-lfts > > Unfortunately the musl build is still failing with this version: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 > Any idea, how to fix it? libcgroup uses the same flag LIBS=-lfts. > Maybe the variable isn't propagated. > Or is the dependency expressed enough? > > DEPENDS_append_libc-musl = " fts " > EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " > > I'll have to put back patch > 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch, but > that's bad, buildroot works without it. I have to admit I haven't looked in detail at the issue. These builds are proving a bit tricky to sort out as there are so many issues with different patches. It will be later today before I could think about that. I'm hoping Khem may have more ideas. Unfortunately there is a second ltp issue (non-musl): https://autobuilder.yoctoproject.org/typhoon/#/builders/95/builds/574 It would be nice to move to the new version and drop some of the patches for 3.1... Cheers, Richard From richard.purdie at linuxfoundation.org Fri Feb 28 12:25:44 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 28 Feb 2020 12:25:44 +0000 Subject: [OE-core] [PATCH v2] util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: <1582738506-3389-1-git-send-email-pjtexier@koncepto.io> References: <1582738506-3389-1-git-send-email-pjtexier@koncepto.io> Message-ID: On Wed, 2020-02-26 at 18:35 +0100, Pierre-Jean Texier via Openembedded-core wrote: > License-Update: add GPLv3 text in README.licensing > > Also: > - Drop upstreamed patch > - Use 'disable-hwclock-gplv3' explicitly. > > Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked > with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. > So, we have to use '--disable-hwclock-gplv3' to exclude this code. > > See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u > > Signed-off-by: Pierre-Jean Texier > --- > Changes v1 -> v2 > - bump to 2.35.1 instead of 2.35 > - use disable-hwclock-gplv3 option to not use datetime parsing GPLv3 code > > FYI, hwclock will be made GPLv2-only again in v2.36, see: > > - https://lore.kernel.org/util-linux/20200127202152.4jh2w4chch37wgee at ws.net.home/T/#e0c176440ca3f7b10693ff8f0afaf114b4b94405d > > meta/recipes-core/util-linux/util-linux.inc | 3 +- > ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ---------------------- > meta/recipes-core/util-linux/util-linux_2.34.bb | 14 --------- > meta/recipes-core/util-linux/util-linux_2.35.1.bb | 13 ++++++++ > 4 files changed, 15 insertions(+), 51 deletions(-) > delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch > delete mode 100644 meta/recipes-core/util-linux/util-linux_2.34.bb > create mode 100644 meta/recipes-core/util-linux/util-linux_2.35.1.bb Unfortately this does seem to expose a problem with wic, e.g.: https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/732 which can be reproduced with: oe-selftest -r wic.Wic2.test_expand_mbr_image Cheers, Richard From trevor.gamblin at windriver.com Fri Feb 28 13:36:09 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Fri, 28 Feb 2020 08:36:09 -0500 Subject: [OE-core] [PATCH 1/2 v3] coreutils: add ptest In-Reply-To: <9c7ef360-2a30-2783-5c35-3caa7987954c@intel.com> References: <20200226180746.121476-1-trevor.gamblin@windriver.com> <20200226180746.121476-2-trevor.gamblin@windriver.com> <9c7ef360-2a30-2783-5c35-3caa7987954c@intel.com> Message-ID: <5391de85-0780-5890-b47f-1969861c08b8@windriver.com> On 2/27/20 10:59 PM, Anuj Mittal wrote: > > > On 27-Feb-20 02:07 AM, Trevor Gamblin wrote: >> coreutils has a large number of tests, including some added by the >> Makefile flags RUN_EXPENSIVE_TESTS and RUN_VERY_EXPENSIVE_TESTS that >> significantly increase runtime (and which have been disabled). Note >> that the coreutils ptest directory is given blanket permissions at >> runtime with chmod -R 777, to ensure that the user created for the >> tests will be able to run the test scripts and create the necessary >> files in the process without being impeded by permissions issues. >> >> There is still room to improve the results of this ptest without >> the aforementioned additions. Of the tests marked SKIP, there are >> 30 tests that are currently counted as SKIP because they require >> sudo permissions, and another 21 that require membership in >> multiple user groups. It is important to know that coreutils has >> tests for both root and non-root users. Testing showed that 42 >> tests are skipped when running as root versus 30 when running as a >> non-root user, so the decision was made to run the suite as the >> latter. Additionally, gdb, valgrind, and strace could be included >> in the RDEPENDS list to increase pass rate, but their total >> contribution is 13 tests, so they were omitted to reduce image size. >> >> Finally, note that at least one ptest (misc/head-write-error.sh) is >> prone to ERROR on builds of core-image-minimal if extra space is >> not provided with IMAGE_ROOTFS_EXTRA_SPACE. >> >> Signed-off-by: Trevor Gamblin >> --- >> ? .../coreutils/coreutils/run-ptest???????????? | 17 +++++++++ >> ? meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++ >> ? 2 files changed, 54 insertions(+) >> ? create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest >> >> diff --git a/meta/recipes-core/coreutils/coreutils/run-ptest >> b/meta/recipes-core/coreutils/coreutils/run-ptest >> new file mode 100755 >> index 0000000000..6d4a7b365d >> --- /dev/null >> +++ b/meta/recipes-core/coreutils/coreutils/run-ptest >> @@ -0,0 +1,17 @@ >> +#!/bin/sh >> + >> +# remove any stale lock files so that the calls to groupadd/useradd >> don't stop >> +# the ptest if re-using the same image >> +rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock >> + >> +COREUTILSLIB=@libdir@/coreutils >> +LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log" >> +USERNAME="tester" >> +groupadd ugroup1 >> +groupadd ugroup2 >> +useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already >> exists" >> + >> +su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS >> top_srcdir=. srcdir=." 2>&1 | tee -a ${LOG} >> +userdel $USERNAME >> +groupdel ugroup1 >> +groupdel ugroup2 >> diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb >> b/meta/recipes-core/coreutils/coreutils_8.31.bb >> index 57b2c1bdba..8bec4e0f3c 100644 >> --- a/meta/recipes-core/coreutils/coreutils_8.31.bb >> +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb >> @@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ >> file://0001-uname-report-processor-and-hardware-correctly.patch \ >> ???????????? file://disable-ls-output-quoting.patch \ >> file://0001-local.mk-fix-cross-compiling-problem.patch \ >> +?????????? file://run-ptest \ >> ??????????? " >> ? ? SRC_URI_append_libc-musl = >> "file://strtod_fix_clash_with_strtold.patch" >> @@ -143,3 +144,39 @@ python __anonymous() { >> ? } >> ? ? BBCLASSEXTEND = "native nativesdk" >> + >> +inherit ptest >> + >> +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl >> libmodule-build-perl make perl perl-module-file-stat python3-core sed >> shadow" >> + >> +do_install_ptest () { >> +??? install -d ${D}${PTEST_PATH}/tests >> +??? cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests >> +??? sed -i 's/ginstall/install/g'? `grep -R ginstall >> ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` >> +??? install -d ${D}${PTEST_PATH}/build-aux >> +??? install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ >> +??? cp ${B}/Makefile ${D}${PTEST_PATH}/ >> +??? cp ${S}/init.cfg ${D}${PTEST_PATH}/ >> +??? cp -r ${B}/src ${D}${PTEST_PATH}/ >> +??? cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src >> +??? sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile >> +??? sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile >> +??? sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile >> +??? sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' >> ${D}${PTEST_PATH}/Makefile >> +??? sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' >> ${D}${PTEST_PATH}/Makefile >> +??? sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' >> ${D}${PTEST_PATH}/Makefile >> +??? sed -i '/^built_programs/s/ginstall/install/g' >> ${D}${PTEST_PATH}/Makefile >> +??? chmod -R 777 ${D}${PTEST_PATH} >> + >> +??? # Disable subcase stty-pairs.sh, it will cause test framework hang >> +??? sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile >> + >> +??? # Tweak test d_type-check to use python3 instead of python >> +??? sed -i "1s at .*@#!/usr/bin/python3@" >> ${WORKDIR}/image/usr/lib/coreutils/ptest/tests/d_type-check > > This is assuming /usr/lib and failing with multilib: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/1642/steps/8/logs/step3b > Ah! Good catch. Will resend with the fix. > > ERROR: Logfile of failure stored in: > /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/temp/log.do_install_ptest_base.4366 > Log data follows: > | DEBUG: Executing shell function do_install_ptest_base > | sed: can't read > /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/image/usr/lib/coreutils/ptest/tests/d_type-check: > No such file or directory > | WARNING: > /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/temp/run.do_install_ptest_base.4366:1 > exit 2 from 'sed -i "1s at .*@#!/usr/bin/python3@" > /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/image/usr/lib/coreutils/ptest/tests/d_type-check' > | ERROR: Execution of > '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/temp/run.do_install_ptest_base.4366' > failed with exit code 2: > | sed: can't read > /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/image/usr/lib/coreutils/ptest/tests/d_type-check: > No such file or directory > | WARNING: > /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/temp/run.do_install_ptest_base.4366:1 > exit 2 from 'sed -i "1s at .*@#!/usr/bin/python3@" > /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/core2-64-poky-linux/coreutils/8.31-r0/image/usr/lib/coreutils/ptest/tests/d_type-check' > | > > Thanks, > > Anuj From jacob.kroon at gmail.com Fri Feb 28 13:39:16 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Fri, 28 Feb 2020 14:39:16 +0100 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> <47d8bb87-b3be-1789-c1cb-124b446462d8@taitradio.com> <91a70cd8-3e44-1381-e2df-15b1fbe3c7f5@gmail.com> Message-ID: <93699aff-562e-f637-0436-b7b3b53e0fdf@gmail.com> On 2/27/20 11:35 PM, Douglas Royds via Openembedded-core wrote: > On 28/02/20 11:34 am, Joshua Watt wrote: > >> >> On 2/27/20 4:29 PM, Douglas Royds wrote: >>> >>> On 28/02/20 10:49 am, Joshua Watt wrote: >>> >>>> >>>> On 2/27/20 3:22 PM, Douglas Royds wrote: >>>>> >>>>> On 28/02/20 5:45 am, Joshua Watt wrote: >>>>> >>>>>> On 2/27/20 9:01 AM, Joshua Watt wrote: >>>>>>> On 2/26/20 11:46 PM, Douglas Royds wrote: >>>>>>>> >>>>>>>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>>>>>>> >>>>>>>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>>>>>>> Hi Douglas, >>>>>>>>>> >>>>>>>>>> You updated a comment in reproducible_build.bbclass, commit >>>>>>>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>>>>>>> >>>>>>>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>>>>> stored in the recipe's ${SDE_FILE}. >>>>>>>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>>>>> stored in the recipe's SDE_FILE. >>>>>>>>>>> +# If none of these mechanisms are suitable, replace the >>>>>>>>>>> do_deploy_source_date_epoch task >>>>>>>>>>> +# with recipe-specific functionality to write the >>>>>>>>>>> appropriate SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>>>>>>> +# >>>>>>>>>> >>>>>>>>>> But I can't really get this to work. What did work for me was >>>>>>>>>> to replace "do_create_source_date_epoch_stamp()" in my recipe: >>>>>>>>>> >>>>>>>>>> do_create_source_date_epoch_stamp() { >>>>>>>>>> ???? mkdir -p ${SDE_DIR} >>>>>>>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>>>>>>> } >>>>>>>>>> >>>>>>>>>> What is the intended way to achieve the thing I'm trying to do >>>>>>>>>> here ? >>>>>>>>>> >>>>>>>>> >>>>>>>>> FYI, JPEW has a proposed patch here >>>>>>>>> >>>>>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>>>>>>> >>>>>>>>> >>>>>>>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>>>>>>> >>>>>>>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH >>>>>>>>> being in BB_HASHBASE_WHITELIST ? >>>>>>>>> >>>>>>>>> /Jacob >>>>>>>> >>>>>>>> >>>>>>>> On the surface of it, my comment appears to be just wrong: It >>>>>>>> does make sense to replace do_create_source_date_epoch_stamp() >>>>>>>> as you suggest. >>>>>>>> >>>>>>>> Joshua's proposed patch looks promising: >>>>>>>> >>>>>>>> * Should the new function not be called first, so that it >>>>>>>> takes priority over the git, known files, and youngest file >>>>>>>> functions? If someone has explicitly set SOURCE_DATE_EPOCH, >>>>>>>> then they want it to take priority. >>>>>>>> >>>>>>> Having that be the first option makes sense. The only case in >>>>>>> which that might not work, is if a recipe does something like: >>>>>>> >>>>>>> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >>>>>>> >>>>>>> e.g. uses a function to get the SDE instead of setting to a fixed >>>>>>> value, but that's probably going to be extremely rare. >>>>>>> >>>>>>> >>>>>>>> * >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> * As you observe, SOURCE_DATE_EPOCH would need to be removed >>>>>>>> from BB_HASHBASE_WHITELIST. I'm not sure why it was in the >>>>>>>> whitelist in the first place. >>>>>>>> >>>>>>> I'm not sure why exactly it is whitelisted; I didn't write the >>>>>>> original code that whitelisted it, but I've CC'd Juro in case he >>>>>>> happens to remember. >>>>>>> >>>>>> After a discussion with Richard, we figured out why >>>>>> SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable >>>>>> *must* be calculable at parse time before any task is ran, but in >>>>>> practice it's value is only available once the >>>>>> __source_date_epoch.txt file is present, which is after parsing. >>>>>> This causes the taskhash to be calculated differently during >>>>>> parsing and task execution which causes taskhash mismatch errors. >>>>>> >>>>> >>>>> True. >>>>> >>>>> What to do? Would it work to use a different non-whitelisted >>>>> variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? >>>>> >>>> >>>> Ya, that would work. You'd have to figure out how to get the >>>> variable to be included in each taskhash even though it's not >>>> directly referenced, but I'm sure that's possible. >>>> >>>> >>>> Another option that's at lot more "magic" would be something like >>>> this: >>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd >>>> >>>> >>>> That's really weird, and I'm not sure I like it, but worth a thought. >>>> >>> If it works, it's good. I like the fact that the user can just set >>> SOURCE_DATE_EPOCH directly in their recipe. >>> >>> How about ... >>> >>> BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not >>> source_date_epoch_var(d) else ''}" >>> >> Ya, that works. The only reason I chose "is None" was in case a user >> really wanted to do >> >> ? SOURCE_DATE_EPOCH = "0" >> > True, best to allow for that. > Joshua, I just tried the two top patches in your reproducible branch; I can see that SOURCE_DATE_EPOCH is not in BB_HASHBASE_WHITELIST, however, changing its value in my recipe doesn't trigger rebuilding for some reason.. From jacob.kroon at gmail.com Fri Feb 28 13:41:25 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Fri, 28 Feb 2020 14:41:25 +0100 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: <93699aff-562e-f637-0436-b7b3b53e0fdf@gmail.com> References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> <47d8bb87-b3be-1789-c1cb-124b446462d8@taitradio.com> <91a70cd8-3e44-1381-e2df-15b1fbe3c7f5@gmail.com> <93699aff-562e-f637-0436-b7b3b53e0fdf@gmail.com> Message-ID: <0bc2d250-0644-5d68-623c-8718604f7ee5@gmail.com> On 2/28/20 2:39 PM, Jacob Kroon wrote: > On 2/27/20 11:35 PM, Douglas Royds via Openembedded-core wrote: >> On 28/02/20 11:34 am, Joshua Watt wrote: >> >>> >>> On 2/27/20 4:29 PM, Douglas Royds wrote: >>>> >>>> On 28/02/20 10:49 am, Joshua Watt wrote: >>>> >>>>> >>>>> On 2/27/20 3:22 PM, Douglas Royds wrote: >>>>>> >>>>>> On 28/02/20 5:45 am, Joshua Watt wrote: >>>>>> >>>>>>> On 2/27/20 9:01 AM, Joshua Watt wrote: >>>>>>>> On 2/26/20 11:46 PM, Douglas Royds wrote: >>>>>>>>> >>>>>>>>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>>>>>>>> >>>>>>>>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>>>>>>>> Hi Douglas, >>>>>>>>>>> >>>>>>>>>>> You updated a comment in reproducible_build.bbclass, commit >>>>>>>>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>>>>>>>> >>>>>>>>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>>>>>> stored in the recipe's ${SDE_FILE}. >>>>>>>>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it is >>>>>>>>>>>> stored in the recipe's SDE_FILE. >>>>>>>>>>>> +# If none of these mechanisms are suitable, replace the >>>>>>>>>>>> do_deploy_source_date_epoch task >>>>>>>>>>>> +# with recipe-specific functionality to write the >>>>>>>>>>>> appropriate SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>>>>>>>> +# >>>>>>>>>>> >>>>>>>>>>> But I can't really get this to work. What did work for me was >>>>>>>>>>> to replace "do_create_source_date_epoch_stamp()" in my recipe: >>>>>>>>>>> >>>>>>>>>>> do_create_source_date_epoch_stamp() { >>>>>>>>>>> ???? mkdir -p ${SDE_DIR} >>>>>>>>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>>>>>>>> } >>>>>>>>>>> >>>>>>>>>>> What is the intended way to achieve the thing I'm trying to >>>>>>>>>>> do here ? >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> FYI, JPEW has a proposed patch here >>>>>>>>>> >>>>>>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>>>>>>>> >>>>>>>>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH >>>>>>>>>> being in BB_HASHBASE_WHITELIST ? >>>>>>>>>> >>>>>>>>>> /Jacob >>>>>>>>> >>>>>>>>> >>>>>>>>> On the surface of it, my comment appears to be just wrong: It >>>>>>>>> does make sense to replace do_create_source_date_epoch_stamp() >>>>>>>>> as you suggest. >>>>>>>>> >>>>>>>>> Joshua's proposed patch looks promising: >>>>>>>>> >>>>>>>>> ? * Should the new function not be called first, so that it >>>>>>>>> ??? takes priority over the git, known files, and youngest file >>>>>>>>> ??? functions? If someone has explicitly set SOURCE_DATE_EPOCH, >>>>>>>>> ??? then they want it to take priority. >>>>>>>>> >>>>>>>> Having that be the first option makes sense. The only case in >>>>>>>> which that might not work, is if a recipe does something like: >>>>>>>> >>>>>>>> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >>>>>>>> >>>>>>>> e.g. uses a function to get the SDE instead of setting to a >>>>>>>> fixed value, but that's probably going to be extremely rare. >>>>>>>> >>>>>>>> >>>>>>>>> ?* >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> ? * As you observe, SOURCE_DATE_EPOCH would need to be removed >>>>>>>>> ??? from BB_HASHBASE_WHITELIST. I'm not sure why it was in the >>>>>>>>> ??? whitelist in the first place. >>>>>>>>> >>>>>>>> I'm not sure why exactly it is whitelisted; I didn't write the >>>>>>>> original code that whitelisted it, but I've CC'd Juro in case he >>>>>>>> happens to remember. >>>>>>>> >>>>>>> After a discussion with Richard, we figured out why >>>>>>> SOURCE_DATE_EPOCH has to be whitelisted. The value of the >>>>>>> variable *must* be calculable at parse time before any task is >>>>>>> ran, but in practice it's value is only available once the >>>>>>> __source_date_epoch.txt file is present, which is after parsing. >>>>>>> This causes the taskhash to be calculated differently during >>>>>>> parsing and task execution which causes taskhash mismatch errors. >>>>>>> >>>>>> >>>>>> True. >>>>>> >>>>>> What to do? Would it work to use a different non-whitelisted >>>>>> variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? >>>>>> >>>>> >>>>> Ya, that would work. You'd have to figure out how to get the >>>>> variable to be included in each taskhash even though it's not >>>>> directly referenced, but I'm sure that's possible. >>>>> >>>>> >>>>> Another option that's at lot more "magic" would be something like >>>>> this: >>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd >>>>> >>>>> >>>>> That's really weird, and I'm not sure I like it, but worth a thought. >>>>> >>>> If it works, it's good. I like the fact that the user can just set >>>> SOURCE_DATE_EPOCH directly in their recipe. >>>> >>>> How about ... >>>> >>>> ??? BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not >>>> ??? source_date_epoch_var(d) else ''}" >>>> >>> Ya, that works. The only reason I chose "is None" was in case a user >>> really wanted to do >>> >>> ? SOURCE_DATE_EPOCH = "0" >>> >> True, best to allow for that. >> > > Joshua, I just tried the two top patches in your reproducible branch; I > can see that SOURCE_DATE_EPOCH is not in BB_HASHBASE_WHITELIST, however, > changing its value in my recipe doesn't trigger rebuilding for some > reason.. In case it makes a difference, I only reference ${SOURCE_DATE_EPOCH} in my do_install() task. From jpewhacker at gmail.com Fri Feb 28 14:18:40 2020 From: jpewhacker at gmail.com (Joshua Watt) Date: Fri, 28 Feb 2020 08:18:40 -0600 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: <0bc2d250-0644-5d68-623c-8718604f7ee5@gmail.com> References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> <47d8bb87-b3be-1789-c1cb-124b446462d8@taitradio.com> <91a70cd8-3e44-1381-e2df-15b1fbe3c7f5@gmail.com> <93699aff-562e-f637-0436-b7b3b53e0fdf@gmail.com> <0bc2d250-0644-5d68-623c-8718604f7ee5@gmail.com> Message-ID: On 2/28/20 7:41 AM, Jacob Kroon wrote: > On 2/28/20 2:39 PM, Jacob Kroon wrote: >> On 2/27/20 11:35 PM, Douglas Royds via Openembedded-core wrote: >>> On 28/02/20 11:34 am, Joshua Watt wrote: >>> >>>> >>>> On 2/27/20 4:29 PM, Douglas Royds wrote: >>>>> >>>>> On 28/02/20 10:49 am, Joshua Watt wrote: >>>>> >>>>>> >>>>>> On 2/27/20 3:22 PM, Douglas Royds wrote: >>>>>>> >>>>>>> On 28/02/20 5:45 am, Joshua Watt wrote: >>>>>>> >>>>>>>> On 2/27/20 9:01 AM, Joshua Watt wrote: >>>>>>>>> On 2/26/20 11:46 PM, Douglas Royds wrote: >>>>>>>>>> >>>>>>>>>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>>>>>>>>> >>>>>>>>>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>>>>>>>>> Hi Douglas, >>>>>>>>>>>> >>>>>>>>>>>> You updated a comment in reproducible_build.bbclass, commit >>>>>>>>>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>>>>>>>>> >>>>>>>>>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it >>>>>>>>>>>>> is stored in the recipe's ${SDE_FILE}. >>>>>>>>>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it >>>>>>>>>>>>> is stored in the recipe's SDE_FILE. >>>>>>>>>>>>> +# If none of these mechanisms are suitable, replace the >>>>>>>>>>>>> do_deploy_source_date_epoch task >>>>>>>>>>>>> +# with recipe-specific functionality to write the >>>>>>>>>>>>> appropriate SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>>>>>>>>> +# >>>>>>>>>>>> >>>>>>>>>>>> But I can't really get this to work. What did work for me >>>>>>>>>>>> was to replace "do_create_source_date_epoch_stamp()" in my >>>>>>>>>>>> recipe: >>>>>>>>>>>> >>>>>>>>>>>> do_create_source_date_epoch_stamp() { >>>>>>>>>>>> ???? mkdir -p ${SDE_DIR} >>>>>>>>>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>>>>>>>>> } >>>>>>>>>>>> >>>>>>>>>>>> What is the intended way to achieve the thing I'm trying to >>>>>>>>>>>> do here ? >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> FYI, JPEW has a proposed patch here >>>>>>>>>>> >>>>>>>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>>>>>>>>> >>>>>>>>>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH >>>>>>>>>>> being in BB_HASHBASE_WHITELIST ? >>>>>>>>>>> >>>>>>>>>>> /Jacob >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> On the surface of it, my comment appears to be just wrong: It >>>>>>>>>> does make sense to replace >>>>>>>>>> do_create_source_date_epoch_stamp() as you suggest. >>>>>>>>>> >>>>>>>>>> Joshua's proposed patch looks promising: >>>>>>>>>> >>>>>>>>>> ? * Should the new function not be called first, so that it >>>>>>>>>> ??? takes priority over the git, known files, and youngest file >>>>>>>>>> ??? functions? If someone has explicitly set SOURCE_DATE_EPOCH, >>>>>>>>>> ??? then they want it to take priority. >>>>>>>>>> >>>>>>>>> Having that be the first option makes sense. The only case in >>>>>>>>> which that might not work, is if a recipe does something like: >>>>>>>>> >>>>>>>>> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >>>>>>>>> >>>>>>>>> e.g. uses a function to get the SDE instead of setting to a >>>>>>>>> fixed value, but that's probably going to be extremely rare. >>>>>>>>> >>>>>>>>> >>>>>>>>>> ?* >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> ? * As you observe, SOURCE_DATE_EPOCH would need to be removed >>>>>>>>>> ??? from BB_HASHBASE_WHITELIST. I'm not sure why it was in the >>>>>>>>>> ??? whitelist in the first place. >>>>>>>>>> >>>>>>>>> I'm not sure why exactly it is whitelisted; I didn't write the >>>>>>>>> original code that whitelisted it, but I've CC'd Juro in case >>>>>>>>> he happens to remember. >>>>>>>>> >>>>>>>> After a discussion with Richard, we figured out why >>>>>>>> SOURCE_DATE_EPOCH has to be whitelisted. The value of the >>>>>>>> variable *must* be calculable at parse time before any task is >>>>>>>> ran, but in practice it's value is only available once the >>>>>>>> __source_date_epoch.txt file is present, which is after >>>>>>>> parsing. This causes the taskhash to be calculated differently >>>>>>>> during parsing and task execution which causes taskhash >>>>>>>> mismatch errors. >>>>>>>> >>>>>>> >>>>>>> True. >>>>>>> >>>>>>> What to do? Would it work to use a different non-whitelisted >>>>>>> variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? >>>>>>> >>>>>> >>>>>> Ya, that would work. You'd have to figure out how to get the >>>>>> variable to be included in each taskhash even though it's not >>>>>> directly referenced, but I'm sure that's possible. >>>>>> >>>>>> >>>>>> Another option that's at lot more "magic" would be something like >>>>>> this: >>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd >>>>>> >>>>>> >>>>>> That's really weird, and I'm not sure I like it, but worth a >>>>>> thought. >>>>>> >>>>> If it works, it's good. I like the fact that the user can just set >>>>> SOURCE_DATE_EPOCH directly in their recipe. >>>>> >>>>> How about ... >>>>> >>>>> ??? BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not >>>>> ??? source_date_epoch_var(d) else ''}" >>>>> >>>> Ya, that works. The only reason I chose "is None" was in case a >>>> user really wanted to do >>>> >>>> ? SOURCE_DATE_EPOCH = "0" >>>> >>> True, best to allow for that. >>> >> >> Joshua, I just tried the two top patches in your reproducible branch; >> I can see that SOURCE_DATE_EPOCH is not in BB_HASHBASE_WHITELIST, >> however, changing its value in my recipe doesn't trigger rebuilding >> for some reason.. > > In case it makes a difference, I only reference ${SOURCE_DATE_EPOCH} > in my do_install() task. I don't think it matters. My understanding is that an export variable (like SOURCE_DATE_EPOCH) is included in the taskhash of all tasks unless it is specifically whitelisted. It's possible there is some bug I haven't throughly tested it yet.... or it just can't work that way at all for some reason. You might be able to dump the task signature for your do_install task to see if SOURCE_DATE_EPOCH is being included. From jacob.kroon at gmail.com Fri Feb 28 14:32:04 2020 From: jacob.kroon at gmail.com (Jacob Kroon) Date: Fri, 28 Feb 2020 15:32:04 +0100 Subject: [OE-core] Overriding SDE_FILE In-Reply-To: References: <8b666dc3-e5a6-0417-82bd-2b15190d223f@gmail.com> <0319e121-7546-e456-50d6-4b224e87363f@taitradio.com> <79e170f8-e6ae-f87b-70ea-f67fb870a28b@gmail.com> <47d8bb87-b3be-1789-c1cb-124b446462d8@taitradio.com> <91a70cd8-3e44-1381-e2df-15b1fbe3c7f5@gmail.com> <93699aff-562e-f637-0436-b7b3b53e0fdf@gmail.com> <0bc2d250-0644-5d68-623c-8718604f7ee5@gmail.com> Message-ID: <22ffcfb1-dc88-0b1d-4d32-0f05a3956221@gmail.com> On 2/28/20 3:18 PM, Joshua Watt wrote: > > On 2/28/20 7:41 AM, Jacob Kroon wrote: >> On 2/28/20 2:39 PM, Jacob Kroon wrote: >>> On 2/27/20 11:35 PM, Douglas Royds via Openembedded-core wrote: >>>> On 28/02/20 11:34 am, Joshua Watt wrote: >>>> >>>>> >>>>> On 2/27/20 4:29 PM, Douglas Royds wrote: >>>>>> >>>>>> On 28/02/20 10:49 am, Joshua Watt wrote: >>>>>> >>>>>>> >>>>>>> On 2/27/20 3:22 PM, Douglas Royds wrote: >>>>>>>> >>>>>>>> On 28/02/20 5:45 am, Joshua Watt wrote: >>>>>>>> >>>>>>>>> On 2/27/20 9:01 AM, Joshua Watt wrote: >>>>>>>>>> On 2/26/20 11:46 PM, Douglas Royds wrote: >>>>>>>>>>> >>>>>>>>>>> On 26/02/20 4:53 am, Jacob Kroon wrote: >>>>>>>>>>> >>>>>>>>>>>> On 2/24/20 8:25 AM, Jacob Kroon wrote: >>>>>>>>>>>>> Hi Douglas, >>>>>>>>>>>>> >>>>>>>>>>>>> You updated a comment in reproducible_build.bbclass, commit >>>>>>>>>>>>> e7b891b76954c784f5a93bd0a1c91315673ce40d: >>>>>>>>>>>>> >>>>>>>>>>>>>> -# Once the value of SOURCE_DATE_EPOCH is determined, it >>>>>>>>>>>>>> is stored in the recipe's ${SDE_FILE}. >>>>>>>>>>>>>> +# Once the value of SOURCE_DATE_EPOCH is determined, it >>>>>>>>>>>>>> is stored in the recipe's SDE_FILE. >>>>>>>>>>>>>> +# If none of these mechanisms are suitable, replace the >>>>>>>>>>>>>> do_deploy_source_date_epoch task >>>>>>>>>>>>>> +# with recipe-specific functionality to write the >>>>>>>>>>>>>> appropriate SOURCE_DATE_EPOCH into the SDE_FILE. >>>>>>>>>>>>>> +# >>>>>>>>>>>>> >>>>>>>>>>>>> But I can't really get this to work. What did work for me >>>>>>>>>>>>> was to replace "do_create_source_date_epoch_stamp()" in my >>>>>>>>>>>>> recipe: >>>>>>>>>>>>> >>>>>>>>>>>>> do_create_source_date_epoch_stamp() { >>>>>>>>>>>>> ???? mkdir -p ${SDE_DIR} >>>>>>>>>>>>> ???? date -d "1981-03-03" "+%s" > ${SDE_FILE} >>>>>>>>>>>>> } >>>>>>>>>>>>> >>>>>>>>>>>>> What is the intended way to achieve the thing I'm trying to >>>>>>>>>>>>> do here ? >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> FYI, JPEW has a proposed patch here >>>>>>>>>>>> >>>>>>>>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> for allowing a recipe to just set SOURCE_DATE_EPOCH directly. >>>>>>>>>>>> >>>>>>>>>>>> But maybe that currently is at odds with SOURCE_DATE_EPOCH >>>>>>>>>>>> being in BB_HASHBASE_WHITELIST ? >>>>>>>>>>>> >>>>>>>>>>>> /Jacob >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> On the surface of it, my comment appears to be just wrong: It >>>>>>>>>>> does make sense to replace >>>>>>>>>>> do_create_source_date_epoch_stamp() as you suggest. >>>>>>>>>>> >>>>>>>>>>> Joshua's proposed patch looks promising: >>>>>>>>>>> >>>>>>>>>>> ? * Should the new function not be called first, so that it >>>>>>>>>>> ??? takes priority over the git, known files, and youngest file >>>>>>>>>>> ??? functions? If someone has explicitly set SOURCE_DATE_EPOCH, >>>>>>>>>>> ??? then they want it to take priority. >>>>>>>>>>> >>>>>>>>>> Having that be the first option makes sense. The only case in >>>>>>>>>> which that might not work, is if a recipe does something like: >>>>>>>>>> >>>>>>>>>> ?SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" >>>>>>>>>> >>>>>>>>>> e.g. uses a function to get the SDE instead of setting to a >>>>>>>>>> fixed value, but that's probably going to be extremely rare. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> ?* >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> ? * As you observe, SOURCE_DATE_EPOCH would need to be removed >>>>>>>>>>> ??? from BB_HASHBASE_WHITELIST. I'm not sure why it was in the >>>>>>>>>>> ??? whitelist in the first place. >>>>>>>>>>> >>>>>>>>>> I'm not sure why exactly it is whitelisted; I didn't write the >>>>>>>>>> original code that whitelisted it, but I've CC'd Juro in case >>>>>>>>>> he happens to remember. >>>>>>>>>> >>>>>>>>> After a discussion with Richard, we figured out why >>>>>>>>> SOURCE_DATE_EPOCH has to be whitelisted. The value of the >>>>>>>>> variable *must* be calculable at parse time before any task is >>>>>>>>> ran, but in practice it's value is only available once the >>>>>>>>> __source_date_epoch.txt file is present, which is after >>>>>>>>> parsing. This causes the taskhash to be calculated differently >>>>>>>>> during parsing and task execution which causes taskhash >>>>>>>>> mismatch errors. >>>>>>>>> >>>>>>>> >>>>>>>> True. >>>>>>>> >>>>>>>> What to do? Would it work to use a different non-whitelisted >>>>>>>> variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? >>>>>>>> >>>>>>> >>>>>>> Ya, that would work. You'd have to figure out how to get the >>>>>>> variable to be included in each taskhash even though it's not >>>>>>> directly referenced, but I'm sure that's possible. >>>>>>> >>>>>>> >>>>>>> Another option that's at lot more "magic" would be something like >>>>>>> this: >>>>>>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd >>>>>>> >>>>>>> >>>>>>> That's really weird, and I'm not sure I like it, but worth a >>>>>>> thought. >>>>>>> >>>>>> If it works, it's good. I like the fact that the user can just set >>>>>> SOURCE_DATE_EPOCH directly in their recipe. >>>>>> >>>>>> How about ... >>>>>> >>>>>> ??? BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not >>>>>> ??? source_date_epoch_var(d) else ''}" >>>>>> >>>>> Ya, that works. The only reason I chose "is None" was in case a >>>>> user really wanted to do >>>>> >>>>> ? SOURCE_DATE_EPOCH = "0" >>>>> >>>> True, best to allow for that. >>>> >>> >>> Joshua, I just tried the two top patches in your reproducible branch; >>> I can see that SOURCE_DATE_EPOCH is not in BB_HASHBASE_WHITELIST, >>> however, changing its value in my recipe doesn't trigger rebuilding >>> for some reason.. >> >> In case it makes a difference, I only reference ${SOURCE_DATE_EPOCH} >> in my do_install() task. > > > I don't think it matters. My understanding is that an export variable > (like SOURCE_DATE_EPOCH) is included in the taskhash of all tasks unless > it is specifically whitelisted. It's possible there is some bug I > haven't throughly tested it yet.... or it just can't work that way at > all for some reason. You might be able to dump the task signature for > your do_install task to see if SOURCE_DATE_EPOCH is being included. > Using bitbake-dumpsig I can see that SOURCE_DATE_EPOCH is still in "basewhitelist:" From trevor.gamblin at windriver.com Fri Feb 28 14:49:28 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Fri, 28 Feb 2020 06:49:28 -0800 Subject: [OE-core] [PATCH v4] coreutils: add ptest In-Reply-To: <20200228144929.164927-1-trevor.gamblin@windriver.com> References: <20200228144929.164927-1-trevor.gamblin@windriver.com> Message-ID: <20200228144929.164927-2-trevor.gamblin@windriver.com> coreutils has a large number of tests, including some added by the Makefile flags RUN_EXPENSIVE_TESTS and RUN_VERY_EXPENSIVE_TESTS that significantly increase runtime (and that have been disabled). Note that the coreutils ptest directory is given blanket permissions at runtime with chmod -R 777 to ensure that the user created for the tests will be able to run the test scripts and create the necessary files in the process. There is still room to improve the results of this ptest without the aforementioned additions. Of the tests marked SKIP, there are 30 tests that are currently counted as SKIP because they require sudo permissions, and another 21 that require membership in multiple user groups. It is important to know that coreutils has tests for both root and non-root users. Testing showed that 42 tests are skipped when running as root versus 30 when running as a non-root user, so the decision was made to run the suite as the latter. Additionally, gdb, valgrind, and strace could be included in the RDEPENDS list to increase pass rate, but their total contribution is 13 tests, so they were omitted to reduce image size. Finally, note that at least one ptest (misc/head-write-error.sh) is prone to ERROR on builds of core-image-minimal if extra space is not provided with IMAGE_ROOTFS_EXTRA_SPACE. Signed-off-by: Trevor Gamblin --- .../coreutils/coreutils/run-ptest | 17 +++++++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest diff --git a/meta/recipes-core/coreutils/coreutils/run-ptest b/meta/recipes-core/coreutils/coreutils/run-ptest new file mode 100755 index 0000000000..6d4a7b365d --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +# remove any stale lock files so that the calls to groupadd/useradd don't stop +# the ptest if re-using the same image +rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock + +COREUTILSLIB=@libdir@/coreutils +LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log" +USERNAME="tester" +groupadd ugroup1 +groupadd ugroup2 +useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already exists" + +su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS top_srcdir=. srcdir=." 2>&1 | tee -a ${LOG} +userdel $USERNAME +groupdel ugroup1 +groupdel ugroup2 diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 57b2c1bdba..04a0522713 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://0001-uname-report-processor-and-hardware-correctly.patch \ file://disable-ls-output-quoting.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ + file://run-ptest \ " SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" @@ -143,3 +144,39 @@ python __anonymous() { } BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests + sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` + install -d ${D}${PTEST_PATH}/build-aux + install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ + cp ${B}/Makefile ${D}${PTEST_PATH}/ + cp ${S}/init.cfg ${D}${PTEST_PATH}/ + cp -r ${B}/src ${D}${PTEST_PATH}/ + cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src + sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile + sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile + sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile + chmod -R 777 ${D}${PTEST_PATH} + + # Disable subcase stty-pairs.sh, it will cause test framework hang + sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile + + # Tweak test d_type-check to use python3 instead of python + sed -i "1s at .*@#!/usr/bin/python3@" ${D}${PTEST_PATH}/tests/d_type-check + install ${B}/src/getlimits ${D}/${bindir} + + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest +} + +FILES_${PN}-ptest += "${bindir}/getlimits" -- 2.17.1 From trevor.gamblin at windriver.com Fri Feb 28 14:49:27 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Fri, 28 Feb 2020 06:49:27 -0800 Subject: [OE-core] [PATCH 0/2 v4] Add ptest support for coreutils Message-ID: <20200228144929.164927-1-trevor.gamblin@windriver.com> v4 fixes a multilib issue - do_install_ptest was previously using sed to make the d_type-check test point at python3 instead of python, but hard-coded the path for the test file. Sample test results: core-image-minimal: MACHINE | PASS | FAIL | SKIP | TOTAL | TIME (m) | qemux86-64 | 472 | 0 | 143 | 615 | 2.5 | qemuarm64 | 472 | 0 | 143 | 615 | 51 | core-image-sato: MACHINE | PASS | FAIL | SKIP | TOTAL | Time (m) | qemux86-64 | 472 | 0 | 143 | 615 | 2.4 | qemuarm64 | 472 | 0 | 143 | 615 | 52 | Trevor Gamblin (2): coreutils: add ptest ptest-packagelists.inc: add coreutils to SLOW list .../distro/include/ptest-packagelists.inc | 1 + .../coreutils/coreutils/run-ptest | 17 +++++++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest -- 2.24.1 From trevor.gamblin at windriver.com Fri Feb 28 14:49:29 2020 From: trevor.gamblin at windriver.com (Trevor Gamblin) Date: Fri, 28 Feb 2020 06:49:29 -0800 Subject: [OE-core] [PATCH 2/2 v4] ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <20200228144929.164927-1-trevor.gamblin@windriver.com> References: <20200228144929.164927-1-trevor.gamblin@windriver.com> Message-ID: <20200228144929.164927-3-trevor.gamblin@windriver.com> Signed-off-by: Trevor Gamblin --- meta/conf/distro/include/ptest-packagelists.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 4afac58e3a..54ace39d53 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -65,6 +65,7 @@ PTESTS_FAST = "\ PTESTS_SLOW = "\ babeltrace-ptest \ busybox-ptest \ + coreutils-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ glib-2.0-ptest \ -- 2.24.1 From anuj.mittal at intel.com Fri Feb 28 15:23:24 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:24 +0800 Subject: [OE-core] [zeus][PATCH 00/22] zeus review request Message-ID: Next set of changes for zeus. Please review. Clean a-full on autobuilder except a single unrelated fetch failure for esdk test. https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/751 Thanks, Anuj The following changes since commit f39285bb82e68945a81034b84da09ca1078d6719: Revert "bash: Fix CVE-2019-18276" (2020-02-19 18:53:10 +0000) are available in the git repository at: git://push.openembedded.org/openembedded-core-contrib stable/zeus-next Alexander Kanavin (5): perl: update to 5.30.1 perl: package Config.pm from arch directory into the main perl package perl: install typemap and other extutils metadata as part of perl-core libmodule-build-perl: fix ptests perl: fix failing ptests Anuj Mittal (3): openssh: backport patch to fix "cert not yet valid" test ncurses: add CVE_VERSION libxml2: fix CVE-2020-7595 Bruce Ashfield (2): linux-yocto/5.2: update to v5.2.29 linux-yocto/5.2: update to v5.2.32 Jeremy Puhlman (1): toolchain-shar-extract: ignore timestamp on decompress Kevin Hao (1): xserver-nodm-init: Fix the start failure for non-root user Lee Chee Yang (2): qemu: Fix CVE-2020-1711 libxml2: Fix CVE-2019-20388 Nathan Rossi (2): glibc-testsuite: Remove the do_install task glibc-testsuite: Exclude this recipe from world builds Richard Purdie (2): perl: Fix encode module reproducibility issues perl: Fix makefile race causing configuration differences Ross Burton (1): perl: improve reproducibility Tim Orling (1): liberror-perl: upgrade 0.17028 -> 0.17029 Trevor Gamblin (1): qemurunner.py: add try/except for pid handling race Yi Zhao (1): ppp: Security fix CVE-2020-8597 meta/files/toolchain-shar-extract.sh | 2 +- meta/lib/oeqa/utils/qemurunner.py | 5 +- ...at-bozo-decided-to-use-2020-as-a-future-d.patch | 46 ++++++++++++++++ meta/recipes-connectivity/openssh/openssh_8.0p1.bb | 1 + .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 3 + .../libxml/libxml2/CVE-2019-20388.patch | 37 +++++++++++++ .../libxml/libxml2/CVE-2020-7595.patch | 36 ++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 2 + meta/recipes-core/ncurses/ncurses_6.1+20190803.bb | 2 + ...t-to-correctly-exclude-unbuilt-extensions.patch | 27 +++++++++ meta/recipes-devtools/perl/files/encodefix.patch | 20 +++++++ .../recipes-devtools/perl/files/fix-setgroup.patch | 49 ----------------- .../perl/files/perl-configpm-switch.patch | 4 +- meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++ ...or-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 +- .../perl/libmodule-build-perl/run-ptest | 2 - .../perl/libmodule-build-perl_0.4229.bb | 3 + .../perl/{perl_5.30.0.bb => perl_5.30.1.bb} | 31 ++++++++--- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ .../x11-common/xserver-nodm-init/capability.conf | 2 + .../x11-common/xserver-nodm-init/xserver-nodm | 8 +++ .../x11-common/xserver-nodm-init_3.0.bb | 7 ++- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 +-- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 ++++---- 28 files changed, 379 insertions(+), 87 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch create mode 100644 meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch create mode 100644 meta/recipes-devtools/perl/files/encodefix.patch delete mode 100644 meta/recipes-devtools/perl/files/fix-setgroup.patch create mode 100644 meta/recipes-devtools/perl/files/racefix.patch rename meta/recipes-devtools/perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} (89%) rename meta/recipes-devtools/perl/{perl_5.30.0.bb => perl_5.30.1.bb} (93%) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:25 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:25 +0800 Subject: [OE-core] [zeus][PATCH 01/22] glibc-testsuite: Remove the do_install task In-Reply-To: References: Message-ID: From: Nathan Rossi This task is not intended to be run as this recipe does not produce any packages or install any sysroot content. Additionally running this task behaves differently from a normal glibc build, and can result in issues. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie (cherry picked from commit 2b51252cb8bd9badfa28794f9ef9431b48752e3d) Signed-off-by: Armin Kuster --- meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.30.bb b/meta/recipes-core/glibc/glibc-testsuite_2.30.bb index 657fd4d..c44f30b 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.30.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.30.bb @@ -58,3 +58,4 @@ addtask do_check after do_compile inherit nopackages deltask do_stash_locale +deltask do_install -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:26 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:26 +0800 Subject: [OE-core] [zeus][PATCH 02/22] glibc-testsuite: Exclude this recipe from world builds In-Reply-To: References: Message-ID: <2b3235f10bb1759d651d28b41825ad53192c841a.1582902875.git.anuj.mittal@intel.com> From: Nathan Rossi This recipe is intended to be run manually or via oeqa. [YOCTO #13737] Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie (cherry picked from commit eadbe01bb8232de79e0827e6c6b3411f69ea7303) Signed-off-by: Armin Kuster --- meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.30.bb b/meta/recipes-core/glibc/glibc-testsuite_2.30.bb index c44f30b..d887aef 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.30.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.30.bb @@ -1,5 +1,7 @@ require glibc_${PV}.bb +EXCLUDE_FROM_WORLD = "1" + # handle PN differences FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:27 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:27 +0800 Subject: [OE-core] [zeus][PATCH 03/22] qemurunner.py: add try/except for pid handling race In-Reply-To: References: Message-ID: <0e94cfb4aa718b4842f608879b77d5671b5bf338.1582902875.git.anuj.mittal@intel.com> From: Trevor Gamblin In some instances, attempts to remove the qemu pidfile within the stop() method fail despite the os.path.exists() call immediately before implying that the file is present. Add a try/except block to log a warning if this occurs, rather than failing outright, since the process simply appears to be exiting at an inconvenient time. [YOCTO #13675] Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie (cherry picked from commit eadb899e23b18eb9eaff145c3bf5b20fb417c3e8) Signed-off-by: Armin Kuster --- meta/lib/oeqa/utils/qemurunner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index fe8b77d..0d63e44 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -396,7 +396,10 @@ class QemuRunner: self.qemupid = None self.ip = None if os.path.exists(self.qemu_pidfile): - os.remove(self.qemu_pidfile) + try: + os.remove(self.qemu_pidfile) + except FileNotFoundError as e: + self.logger.warning('qemu pidfile is no longer present') if self.monitorpipe: self.monitorpipe.close() -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:28 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:28 +0800 Subject: [OE-core] [zeus][PATCH 04/22] xserver-nodm-init: Fix the start failure for non-root user In-Reply-To: References: Message-ID: From: Kevin Hao In order to start the xserver, a non-root user should have the cap_sys_admin capability to set the drm master. We try to get the cap_sys_admin capability by setting it in both the thread and file inheritable set. The side effect of this is that we would have to add the "pam" to the distro features if we want use the xserver-nodm-init for a non-root user. [Yocto #11526] Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie (cherry picked from commit cfd71a68a4931c8bda15357ebb1e9ebcf0e302dc) Signed-off-by: Armin Kuster --- .../recipes-graphics/x11-common/xserver-nodm-init/capability.conf | 2 ++ meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 8 ++++++++ meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf new file mode 100644 index 0000000..7ab7460 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf @@ -0,0 +1,2 @@ +cap_sys_admin @USER@ +none * diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm index 6c54855..116bb27 100755 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm @@ -38,6 +38,14 @@ case "$1" in if [ -e /dev/hidraw0 ]; then chmod o+rw /dev/hidraw* fi + # Make sure that the Xorg has the cap_sys_admin capability which is + # needed for setting the drm master + if ! grep -q "^auth.*pam_cap\.so" /etc/pam.d/su; then + echo "auth optional pam_cap.so" >>/etc/pam.d/su + fi + if ! /usr/sbin/getcap $XSERVER | grep -q cap_sys_admin; then + /usr/sbin/setcap cap_sys_admin+eip $XSERVER + fi fi # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index a77c564..7f4e1e2 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb @@ -10,6 +10,7 @@ SRC_URI = "file://xserver-nodm \ file://gplv2-license.patch \ file://xserver-nodm.service.in \ file://xserver-nodm.conf.in \ + file://capability.conf \ " S = "${WORKDIR}" @@ -19,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d systemd distro_features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 ${@oe.utils.conditional('ROOTLESS_X', '1', 'pam', '', d)}" PACKAGECONFIG ??= "blank" # dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG @@ -40,6 +41,8 @@ do_install() { if [ "${ROOTLESS_X}" = "1" ] ; then XUSER_HOME="/home/xuser" XUSER="xuser" + install -D capability.conf ${D}${sysconfdir}/security/capability.conf + sed -i "s:@USER@:${XUSER}:" ${D}${sysconfdir}/security/capability.conf else XUSER_HOME=${ROOT_HOME} XUSER="root" @@ -60,7 +63,7 @@ do_install() { fi } -RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" +RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}" INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:29 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:29 +0800 Subject: [OE-core] [zeus][PATCH 05/22] openssh: backport patch to fix "cert not yet valid" test In-Reply-To: References: Message-ID: <1cacb300369fb062ad45b0460ed93bfc800d7323.1582902875.git.anuj.mittal@intel.com> Fixes [YOCTO #13796] Signed-off-by: Anuj Mittal Signed-off-by: Armin Kuster --- ...at-bozo-decided-to-use-2020-as-a-future-d.patch | 46 ++++++++++++++++++++++ meta/recipes-connectivity/openssh/openssh_8.0p1.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch diff --git a/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch new file mode 100644 index 0000000..e2930c3 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch @@ -0,0 +1,46 @@ +From 3cccc0a2ab597b8273bddf08e9a3cc5551d7e530 Mon Sep 17 00:00:00 2001 +From: "djm at openbsd.org" +Date: Fri, 3 Jan 2020 03:02:26 +0000 +Subject: [PATCH] upstream: what bozo decided to use 2020 as a future date in a + regress + +test? + +OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a + +Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381] + +[Dropped the script version and copyright year change at the top] + +Signed-off-by: Anuj Mittal +--- + regress/cert-hostkey.sh | 2 +- + regress/cert-userkey.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh +index 3ce7779..74d5a53 100644 +--- a/regress/cert-hostkey.sh ++++ b/regress/cert-hostkey.sh +@@ -248,7 +248,7 @@ test_one() { + test_one "user-certificate" failure "-n $HOSTS" + test_one "empty principals" success "-h" + test_one "wrong principals" failure "-h -n foo" +-test_one "cert not yet valid" failure "-h -V20200101:20300101" ++test_one "cert not yet valid" failure "-h -V20300101:20320101" + test_one "cert expired" failure "-h -V19800101:19900101" + test_one "cert valid interval" success "-h -V-1w:+2w" + test_one "cert has constraints" failure "-h -Oforce-command=false" +diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh +index 6849e99..de455b8 100644 +--- a/regress/cert-userkey.sh ++++ b/regress/cert-userkey.sh +@@ -327,7 +327,7 @@ test_one() { + test_one "correct principal" success "-n ${USER}" + test_one "host-certificate" failure "-n ${USER} -h" + test_one "wrong principals" failure "-n foo" +-test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" ++test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" + test_one "cert expired" failure "-n ${USER} -V19800101:19900101" + test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" + test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" diff --git a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb index 2ffbc9a..3d16f9d 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb @@ -25,6 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://sshd_check_keys \ file://add-test-support-for-busybox.patch \ file://0001-upstream-fix-integer-overflow-in-XMSS-private-key-pa.patch \ + file://0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch \ " SRC_URI[md5sum] = "bf050f002fe510e1daecd39044e1122d" SRC_URI[sha256sum] = "bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:30 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:30 +0800 Subject: [OE-core] [zeus][PATCH 06/22] linux-yocto/5.2: update to v5.2.29 In-Reply-To: References: Message-ID: <5c45a080ae140dfe890ac07f3c6914abfc35faa2.1582902875.git.anuj.mittal@intel.com> From: Bruce Ashfield Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: 928ea9c56927 Linux 5.2.29 4e41907620bc slip: Fix use-after-free Read in slip_open d11814f97a05 can: slcan: Fix use-after-free Read in slcan_open 01313dcf66e7 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices 7f006e58efc2 scsi: libsas: stop discovering if oob mode is disconnected 0e5c48d6b011 staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error d8b3d5fb8765 USB: serial: option: add support for Foxconn T77W968 LTE modules c4fe1d495f9c USB: serial: option: add support for DW5821e with eSIM support 4ac031b15d86 USB: serial: mos7840: fix remote wakeup 4d44a218aea6 USB: serial: mos7720: fix remote wakeup 3561f4d3242f USB: serial: mos7840: add USB ID to support Moxa UPort 2210 13a33fb9debe appledisplay: fix error handling in the scheduled work 0cd437d7c16b USB: chaoskey: fix error case of a timeout 2136119fde46 usb-serial: cp201x: support Mark-10 digital force gauge 3a71173a4a45 usbip: tools: fix fd leakage in the function of read_attr_usbip_status 726510907c68 USBIP: add config dependency for SGL_ALLOC 7dd553573bc5 media: mceusb: fix out of bounds read in MCE receiver buffer 1e4921f684ca media: imon: invalid dereference in imon_touch_event d482dfe2776a media: cxusb: detect cxusb_ctrl_msg error in query ab4952849dd8 media: b2c2-flexcop-usb: add sanity checking e2aa61cda115 media: uvcvideo: Fix error path in control parsing failure 115fa3afd4d1 cpufreq: Add NULL checks to show() and store() methods of cpufreq 767facdefa23 media: usbvision: Fix races among open, close, and disconnect ba90b62cb0bd media: usbvision: Fix invalid accesses after device disconnect 829b703e9706 media: vivid: Set vid_cap_streaming and vid_out_streaming to true 57f2b5c44f02 nfc: port100: handle command failure cleanly 5fc4dc967e06 ALSA: usb-audio: Fix NULL dereference at parsing BADD c938307a439a futex: Prevent robust futex exit race 8b0f13ee2b7b nbd: prevent memory leak 1bfd67a1c47b ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary a634776bcd5e md/raid10: prevent access of uninitialized resync_pages offset 40c0b4538c8b Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" 53eaf5993eea ath9k_hw: fix uninitialized variable data 5a1b959a78ea ath10k: Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe 8b16c7096bc9 ath10k: Fix HOST capability QMI incompatibility ceee3b64b0b5 ath10k: restore QCA9880-AR1A (v1) detection 08c0402ed497 Bluetooth: Fix invalid-free in bcsp_close() c1ed057fbe33 drm/i915/userptr: Try to acquire the page lock around set_page_dirty() 5ec5ba44bd85 drm/i915/pmu: "Frequency" is reported as accumulated cycles c7ceeaf80706 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs 1c3fb0c8357e drm/amdgpu: disable gfxoff on original raven ccd9d21f783e drm/amdgpu: disable gfxoff when using register read interface 6e745cbc5051 mm/ksm.c: don't WARN if page is still mapped in remove_stable_node() 79194b4a342c mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span() 01d151b7e74e virtio_balloon: fix shrinker count caae62219805 virtio_ring: fix return code on DMA mapping fails 272ed6b7ca4a virtio_console: allocate inbufs in add_port() only if it is needed abce58c3af15 nbd:fix memory leak in nbd_get_socket() 2601193dc253 tools: gpio: Correctly add make dependencies for gpio_utils 3608aa07bac2 gpio: max77620: Fixup debounce delays c6bf6af12a68 vhost/vsock: split packets to send using multiple buffers 95a617d1f70c net/mlx5: Update the list of the PCI supported devices febceda6db3f net/mlx5e: Do not use non-EXT link modes in EXT mode f8bddf0e192a net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6 e049e3c43308 taprio: don't reject same mqprio settings 8345d40b83bf ipv6/route: return if there is no fib_nh_gw_family 1edfc6649c92 net/tls: enable sk_msg redirect to tls socket egress 27845a1dd06b net/mlx5: Fix auto group size calculation ec6d299939c3 net/mlx5e: Fix set vf link state error flow bab144f2a957 net/mlxfw: Verify FSM error code translation doesn't exceed array size 3eb4c2e70dce sfc: Only cancel the PPS workqueue if it exists a03585b724bc net: sched: ensure opts_len <= IP_TUNNEL_OPTS_MAX in act_tunnel_key 285a19d8dde0 net/sched: act_pedit: fix WARN() in the traffic path 8e40158af458 net: rtnetlink: prevent underflows in do_setvfinfo() 1afad75b2dba net/mlx4_en: Fix wrong limitation for number of TX rings ce1291041c39 net/mlx4_en: fix mlx4 ethtool -N insertion 2a7ad86813a4 mlxsw: spectrum_router: Fix determining underlay for a GRE tunnel da957117e731 fbdev: Ditch fb_edid_add_monspecs 1f043415c4f5 arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault 0063e9b69796 mm/memory_hotplug: fix updating the node span d27074543286 mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() 62ca688436d3 block, bfq: deschedule empty bfq_queues not referred by any process 045a481acd16 slcan: Fix memory leak in error path 22bc38eae704 mmc: sdhci-of-at91: fix quirk2 overwrite 8505966cdc7e mm/page_io.c: do not free shared swap slots 349d5ccf8971 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() cb4df7d810ac mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() eec30082ea78 mm: mempolicy: fix the wrong return value and potential pages leak of mbind c4b3eaf0585b iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros 5a705e36d350 net: ethernet: dwmac-sun8i: Use the correct function in exit path 50d4170ffddd ntp/y2038: Remove incorrect time_t truncation f701a893aba0 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either 97dd5923ba23 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable 3c130e6cddae x86/quirks: Disable HPET on Intel Coffe Lake platforms a0f63a47ab13 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present ca7d1676d537 IB/hfi1: Use a common pad buffer for 9B and 16B packets b8b6479e3cc9 IB/hfi1: Ensure full Gen3 speed in a Gen4 system 72ff837e69c5 IB/hfi1: TID RDMA WRITE should not return IB_WC_RNR_RETRY_EXC_ERR 3c1db8a639ac IB/hfi1: Calculate flow weight based on QP MTU for TID RDMA d2f5dd2fd992 IB/hfi1: Ensure r_tid_ack is valid before building TID RDMA ACK packet e88f0707f216 KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved 9e35e5bc4a04 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing 2eaf311ccd38 Input: synaptics-rmi4 - clear IRQ enables for F54 f05aacf5a7b9 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) 7e649c757a1a Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver 4b482d7281a6 Input: synaptics-rmi4 - fix video buffer size 74e0752ee79e cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() a9cae67b7a20 Btrfs: fix log context list corruption after rename exchange operation 011e452b4d84 ALSA: usb-audio: not submit urb for stopped endpoint c7801593d92a ALSA: usb-audio: Fix missing error check at mixer resolution test ff24b83d0f73 dpaa2-eth: free already allocated channels on probe defer 21790068a579 tcp: remove redundant new line from tcp_event_sk_skb 364436976763 slip: Fix memory leak in slip_open error path b75c75d36816 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules c8a648ae5f96 net/smc: fix fastopen for non-blocking connect() b392b2d28e58 net: gemini: add missed free_netdev 612aeedfe77d ipmr: Fix skb headroom in ipmr_get_route(). 5fa89b3526c5 ax88172a: fix information leak on short answers 609d02229b16 scsi: core: Handle drivers which set sg_tablesize to zero efa2c8c477dd x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3 a0f6ee27e686 x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise 60418beeefd7 selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel 777b0ee4fd79 selftests/x86/mov_ss_trap: Fix the SYSENTER test 07b7c6191853 x86/entry/32: Fix NMI vs ESPFIX 62433c16a282 x86/entry/32: Unwind the ESPFIX stack earlier on exception entry 4a2364594599 x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL 0593a806b430 x86/entry/32: Use %ss segment where required 26ce03ac3327 x86/entry/32: Fix IRET exception f74d7e9547de x86/cpu_entry_area: Add guard page for entry stack on 32bit 41cb303e1436 x86/pti/32: Size initial_page_table correctly 2d2e7fe408eb x86/doublefault/32: Fix stack canaries in the double fault handler 1fd0ff871abe x86/xen/32: Simplify ring check in xen_iret_crit_fixup() 68ef02e30623 x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout ef15170227e2 x86/stackframe/32: Repair 32-bit Xen PV 37880a369c68 x86/speculation: Fix redundant MDS mitigation message 459c71f82b48 x86/speculation: Fix incorrect MDS/TAA mitigation status c77d64c158c6 x86/insn: Fix awk regexp warnings 41bbdde13b43 x86: Use CONFIG_PREEMPTION 217d051d8efd x86/entry/32: Pass cr2 to do_async_page_fault() 1ecceee4c859 x86/entry/64: Prevent clobbering of saved CR2 value 8ccce28352fe x86/mm, tracing: Fix CR2 corruption 8873fea5f2d4 x86/entry/64: Update comments and sanity tests for create_gap 7801660649a0 x86/entry/64: Simplify idtentry a little 5d305a697f40 x86/entry/32: Simplify common_exception 216401f82bef x86/paravirt: Make read_cr2() CALLEE_SAVE bf8b9dd0d0bf x86/asm: Move native_write_cr0/4() out of line 222093f0acfd x86/pgtable/32: Fix LOWMEM_PAGES constant 7998b2c4801a x86/alternatives: Fix int3_emulate_call() selftest stack corruption e4a8155be9bd x86/ldt: Initialize the context lock for init_mm f07a9a3a9ad4 x86/alternatives: Add int3_emulate_call() selftest 29b042bbfab8 x86/stackframe/32: Allow int3_emulate_push() 22334402db00 x86/stackframe/32: Provide consistent pt_regs ed6c118e4451 x86/stackframe, x86/ftrace: Add pt_regs frame annotations 7159ebba55a4 x86/stackframe, x86/kprobes: Fix frame pointer annotations ba09efb8b35b x86/stackframe: Move ENCODE_FRAME_POINTER to asm/frame.h c2f632a32c05 x86/entry/32: Clean up return from interrupt preemption path ce394d5e28c6 x86/asm: Pin sensitive CR0 bits b3327106585c x86/asm: Pin sensitive CR4 bits e3534ce1de0c Documentation/x86: Fix path to entry_32.S 487a6cb63d71 x86/asm: Remove unused TASK_TI_flags from asm-offsets.c 2bd8a406516b x86/entry/64: Don't compile ignore_sysret if 32-bit emulation is enabled Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit d320a03b697679dfe223883b23480b70f89ad649) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 5391e05..79da8c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e2d396270864afd14f5882ce8921d8fb562f5665" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index 986dd6e..d88cb5d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "d79fa780eef7c3b08fcff8a44070c211afa91214" -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 358c0ad..59cc08e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ed43b791f2cca6e87928fa47556e540333385187" -SRCREV_machine_qemuarm64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemumips ?= "5d47f37ab0b7bcd5c0aaf0ecbd6d00bb8a22ddf4" -SRCREV_machine_qemuppc ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemuriscv64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemux86 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemux86-64 ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_machine_qemumips64 ?= "894ee953d9c4036003f41e0800315efe3bab8492" -SRCREV_machine ?= "992280855e88289b7e7019ee2cf9dff867c58b94" -SRCREV_meta ?= "dd6019025cbb701b9818102f267c26e87031a59b" +SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" +SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" +SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" +SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" +SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.28" +LINUX_VERSION ?= "5.2.29" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:31 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:31 +0800 Subject: [OE-core] [zeus][PATCH 07/22] perl: update to 5.30.1 In-Reply-To: References: Message-ID: From: Alexander Kanavin Drop fix-setgroup.patch as the upstream has fixed the issue. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 45edc6d23e20f7634c50db71e419c7e3bb7f393e) [Bug fix only update] Signed-off-by: Armin Kuster --- .../recipes-devtools/perl/files/fix-setgroup.patch | 49 ---------------------- .../perl/{perl_5.30.0.bb => perl_5.30.1.bb} | 11 +++-- 2 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-devtools/perl/files/fix-setgroup.patch rename meta/recipes-devtools/perl/{perl_5.30.0.bb => perl_5.30.1.bb} (97%) diff --git a/meta/recipes-devtools/perl/files/fix-setgroup.patch b/meta/recipes-devtools/perl/files/fix-setgroup.patch deleted file mode 100644 index 2b490e6..0000000 --- a/meta/recipes-devtools/perl/files/fix-setgroup.patch +++ /dev/null @@ -1,49 +0,0 @@ -Test script to reproduce the problem: - -#!/usr/bin/env perl -$) = "2 2"; -print $!; - -Result from perl 5.28 under strace: - -setgroups(1, [2]) = 0 -setresgid(-1, 2, -1) = 0 - -Result from perl 5.30 under strace: - -setgroups(1, [-1]) = -1 EINVAL (Invalid argument) -setresgid(-1, 2, -1) = 0 - -Patch which broke this upstream: -https://perl5.git.perl.org/perl.git/commitdiff/5d4a52b5c68a11bfc97c2e24806993b84a61eade - -Issue is that the new function changes the endptr to the end of the -scanned number and needs to be reset to the end of the string for -each iteration of the loop. - -[YOCTO #13391] - -RP -2019/6/14 -Upstream-Status: Pending - -Index: perl-5.30.0/mg.c -=================================================================== ---- perl-5.30.0.orig/mg.c -+++ perl-5.30.0/mg.c -@@ -3179,6 +3256,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) - const char *p = SvPV_const(sv, len); - Groups_t *gary = NULL; - const char* endptr = p + len; -+ const char* realend = p + len; - UV uv; - #ifdef _SC_NGROUPS_MAX - int maxgrp = sysconf(_SC_NGROUPS_MAX); -@@ -3209,6 +3287,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) - Newx(gary, i + 1, Groups_t); - else - Renew(gary, i + 1, Groups_t); -+ endptr = realend; - if (grok_atoUV(p, &uv, &endptr)) - gary[i] = (Groups_t)uv; - else { diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb similarity index 97% rename from meta/recipes-devtools/perl/perl_5.30.0.bb rename to meta/recipes-devtools/perl/perl_5.30.1.bb index 838e52c..996f631 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ - https://github.com/arsv/perl-cross/releases/download/1.3/perl-cross-1.3.tar.gz;name=perl-cross \ + https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.tar.gz;name=perl-cross \ file://perl-rdepends.txt \ file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ @@ -18,7 +18,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ file://perl-dynloader.patch \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ - file://fix-setgroup.patch \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ @@ -27,10 +26,10 @@ SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ " -SRC_URI[perl.md5sum] = "9770584cdf9b5631c38097645ce33549" -SRC_URI[perl.sha256sum] = "851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2" -SRC_URI[perl-cross.md5sum] = "4dda3daf9c4fe42b3d6a5dd052852a48" -SRC_URI[perl-cross.sha256sum] = "49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703" +SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" +SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" +SRC_URI[perl-cross.md5sum] = "1e463b105cfa56d251a86979af23e3a7" +SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d" S = "${WORKDIR}/perl-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:32 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:32 +0800 Subject: [OE-core] [zeus][PATCH 08/22] perl: package Config.pm from arch directory into the main perl package In-Reply-To: References: Message-ID: <2d5fae94a889cd9558e3946ecec2362c94e1c1e9.1582902875.git.anuj.mittal@intel.com> From: Alexander Kanavin Otherwise, some modules such as libmodule-build-perl fail to work properly. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit e4072d53a7fb4fbbdacce9a20968e71ef6cff307) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 996f631..c79a725 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -201,6 +201,7 @@ require perl-ptest.inc FILES_${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/libperl.so* \ ${libdir}/perl5/site_perl \ ${libdir}/perl5/${PV}/Config.pm \ + ${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config.pm \ ${libdir}/perl5/${PV}/*/Config_git.pl \ ${libdir}/perl5/${PV}/*/Config_heavy-target.pl \ ${libdir}/perl5/config.sh \ -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:33 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:33 +0800 Subject: [OE-core] [zeus][PATCH 09/22] perl: install typemap and other extutils metadata as part of perl-core In-Reply-To: References: Message-ID: From: Alexander Kanavin Modules actually make use of these files, so they belong in perl-core other than perl-doc (the immediate failure was ptests for libmodule-build-perl failing). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 829e8c49833e4cb8de5db869769eb492c827e8c9) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/perl_5.30.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index c79a725..c68ffb1 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -210,6 +210,9 @@ FILES_${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/ ${libdir}/perl5/${PV}/warnings \ ${libdir}/perl5/${PV}/vars.pm \ ${libdir}/perl5/site_perl \ + ${libdir}/perl5/${PV}/ExtUtils/MANIFEST.SKIP \ + ${libdir}/perl5/${PV}/ExtUtils/xsubpp \ + ${libdir}/perl5/${PV}/ExtUtils/typemap \ " RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \ perl-module-warnings-register" @@ -220,9 +223,6 @@ FILES_${PN}-dev_append = " ${libdir}/perl5/${PV}/*/CORE" FILES_${PN}-doc_append = " ${libdir}/perl5/${PV}/Unicode/Collate/*.txt \ ${libdir}/perl5/${PV}/*/.packlist \ - ${libdir}/perl5/${PV}/ExtUtils/MANIFEST.SKIP \ - ${libdir}/perl5/${PV}/ExtUtils/xsubpp \ - ${libdir}/perl5/${PV}/ExtUtils/typemap \ ${libdir}/perl5/${PV}/Encode/encode.h \ " PACKAGES += "${PN}-misc" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:34 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:34 +0800 Subject: [OE-core] [zeus][PATCH 10/22] libmodule-build-perl: fix ptests In-Reply-To: References: Message-ID: <559fd361440898479937c887a0e4f8cfb8c46891.1582902875.git.anuj.mittal@intel.com> From: Alexander Kanavin Particularly remove a broken detection of skipped tests (which was marking tests that actually passed), and install additional artefacts needed for testing. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit dbbce0918617c21d0e43e9727d38372c22dff3dc) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/libmodule-build-perl/run-ptest | 2 -- meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest b/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest index 0d63d15..d802781 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest +++ b/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest @@ -6,8 +6,6 @@ for case in `find t -type f -name '*.t'`; do cat $case.output if [ $ret -ne 0 ]; then echo "FAIL: ${case%.t}" - elif grep -i 'SKIP' $case.output; then - echo "SKIP: ${case%.t}" else echo "PASS: ${case%.t}" fi diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb index f759f86..e3ba40d 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb @@ -36,7 +36,10 @@ do_patch[postfuncs] += "do_patch_module_build" do_install_ptest() { cp -r ${B}/inc ${D}${PTEST_PATH} cp -r ${B}/blib ${D}${PTEST_PATH} + cp -r ${B}/_build ${D}${PTEST_PATH} + cp -r ${B}/lib ${D}${PTEST_PATH} chown -R root:root ${D}${PTEST_PATH} + sed -i -e "s,'perl' => .*,'perl' => '/usr/bin/perl'\,,g" ${D}${PTEST_PATH}/_build/build_params } RDEPENDS_${PN} += " \ -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:35 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:35 +0800 Subject: [OE-core] [zeus][PATCH 11/22] perl: improve reproducibility In-Reply-To: References: Message-ID: <4ee9c60797e95674ae138245b3a4de063b2e95db.1582902875.git.anuj.mittal@intel.com> From: Ross Burton Occasionally the reproducibility selftest fails because perl-pod differs, specifically that the perltoc.pod file was sometimes missing modules. Debugging revealed that there are missing dependencies so there is a build race: building perltoc.pod from an clean build tree results in no modules being listed at all. A bug has been filed at https://github.com/arsv/perl-cross/issues/86 to solve this properly, but for now we can just delete perltoc.pod after make has finished and re-generate it. [ YOCTO #13726 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 7e0f6c9ea4f824f29dc30c6631fd8039ebe83a0b) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/perl_5.30.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index c68ffb1..15bc5a4 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -112,6 +112,14 @@ print(datetime.fromtimestamp($SOURCE_DATE_EPOCH, timezone.utc).strftime('%a %b % do_compile() { oe_runmake + # This isn't generated reliably so delete and re-generate. + # https://github.com/arsv/perl-cross/issues/86 + + if [ -e pod/perltoc.pod ]; then + bbnote Rebuilding perltoc.pod + rm -f pod/perltoc.pod + oe_runmake pod/perltoc.pod + fi } do_install() { -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:36 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:36 +0800 Subject: [OE-core] [zeus][PATCH 12/22] perl: fix failing ptests In-Reply-To: References: Message-ID: From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit f1da6355f13e707b3ffa5025067e509e0120784d) [Fixup for zeus context] Signed-off-by: Armin Kuster --- ...t-to-correctly-exclude-unbuilt-extensions.patch | 27 ++++++++++++++++++++++ .../perl/files/perl-configpm-switch.patch | 4 ++-- meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch diff --git a/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch b/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch new file mode 100644 index 0000000..0f3a2c6 --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch @@ -0,0 +1,27 @@ +From b0d53cfd785f64002128ac5eecc4aed0663d9c30 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 9 Jan 2020 17:26:55 +0100 +Subject: [PATCH] tests: adjust to correctly exclude unbuilt extensions + +Issue is reported here: +https://github.com/arsv/perl-cross/issues/85 + +Upstream-Status: Inappropriate [issue caused by perl-cross] +Signed-off-by: Alexander Kanavin +--- + t/TEST | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/TEST b/t/TEST +index a9c844f..8d3505f 100755 +--- a/t/TEST ++++ b/t/TEST +@@ -419,7 +419,7 @@ sub _tests_from_manifest { + while () { + if (m!^((?:cpan|dist|ext)/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) { + my $t = $1; +- my $extension = $2; ++ my $extension = $1."/".$2; + + # XXX Generates way too many error lines currently. Skip for + # v5.22 diff --git a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch index 3c2cecb..80ce4a6 100644 --- a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch +++ b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch @@ -1,4 +1,4 @@ -From 7f313cac31c55cbe62a4d0cdfa8321cc05a8eb3a Mon Sep 17 00:00:00 2001 +From 5120acaa2be5787d9657f6b91bc8ee3c2d664fbe Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 27 May 2007 21:04:11 +0000 Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE) @@ -20,7 +20,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/configpm b/configpm -index 09c4a3b..6a0a680 100755 +index c8de8bf..204613c 100755 --- a/configpm +++ b/configpm @@ -687,7 +687,7 @@ sub FETCH { diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 15bc5a4..96f0326 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -20,6 +20,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ + file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://determinism.patch \ " SRC_URI_append_class-native = " \ -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:37 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:37 +0800 Subject: [OE-core] [zeus][PATCH 13/22] perl: Fix encode module reproducibility issues In-Reply-To: References: Message-ID: <4b41afeea632f33a490d75621e2c0d6bb2bb6aca.1582902875.git.anuj.mittal@intel.com> From: Richard Purdie The code is encoding host compiler parameters into target builds. Avoid this for our target builds. This should resolve builds which aren't reproducible between hosts with different compilers. Signed-off-by: Richard Purdie (cherry picked from commit 71cdbf426e46e3ca1b5038f40e9f7ba958abc537) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/files/encodefix.patch | 20 ++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/encodefix.patch diff --git a/meta/recipes-devtools/perl/files/encodefix.patch b/meta/recipes-devtools/perl/files/encodefix.patch new file mode 100644 index 0000000..396ed0d --- /dev/null +++ b/meta/recipes-devtools/perl/files/encodefix.patch @@ -0,0 +1,20 @@ +The code is encoding host compiler parameters into target builds. Avoid +this for our target builds (patch is target specific, not native) + +Upstream-Status: Inappropriate [Cross compile hack] +RP 2020/2/18 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/cpan/Encode/bin/enc2xs +=================================================================== +--- perl-5.30.1.orig/cpan/Encode/bin/enc2xs ++++ perl-5.30.1/cpan/Encode/bin/enc2xs +@@ -195,7 +195,7 @@ sub compiler_info { + # above becomes false. + my $sized = $declaration && !($compat && !$pedantic); + +- return ($cpp, $static, $sized); ++ return (0, 1, 1); + } + + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 96f0326..e3915a5 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -26,6 +26,9 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ " +SRC_URI_append_class-target = " \ + file://encodefix.patch \ +" SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:38 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:38 +0800 Subject: [OE-core] [zeus][PATCH 14/22] perl: Fix makefile race causing configuration differences In-Reply-To: References: Message-ID: <1589115ff42e8c211bc0784bd8aca7d3a5b8f566.1582902875.git.anuj.mittal@intel.com> From: Richard Purdie Add a missing makefile dependency which can cause differences in configuration (submitted upstream). [YOCTO #13800] Signed-off-by: Richard Purdie (cherry picked from commit fe97845a45434902c5a994e253a127a462d7d3b4) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++++++++++++++++++ meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-devtools/perl/files/racefix.patch diff --git a/meta/recipes-devtools/perl/files/racefix.patch b/meta/recipes-devtools/perl/files/racefix.patch new file mode 100644 index 0000000..bac42d2 --- /dev/null +++ b/meta/recipes-devtools/perl/files/racefix.patch @@ -0,0 +1,24 @@ +In our builds Config_heavy.pl sometimes has lines: +cwarnflags=XXX +ccstdflags=XXX +and sometimes does not. +The reason is that this information is pulled from cflags by configpm and yet +there is no dependency in the Makefile. Add one to fix this. + +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89] +RP 2020/2/19 +Signed-off-by: Richard Purdie + +Index: perl-5.30.1/Makefile +=================================================================== +--- perl-5.30.1.orig/Makefile ++++ perl-5.30.1/Makefile +@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD) + git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X + ./miniperl_top make_patchnum.pl + +-lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \ ++lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \ + lib/Config_git.pl Porting/Glossary | miniperl$X + ./miniperl_top configpm + diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index e3915a5..32746c7 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -22,6 +22,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://determinism.patch \ + file://racefix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:39 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:39 +0800 Subject: [OE-core] [zeus][PATCH 15/22] liberror-perl: upgrade 0.17028 -> 0.17029 In-Reply-To: References: Message-ID: <8856aa960ff4c9c833e958082466d19259915d5f.1582902875.git.anuj.mittal@intel.com> From: Tim Orling Upstream release notes: " 0.17029 2020-01-28 - Rebuild for order of 'NAME' and 'VERSION' sections in the generated POD documentation (see 0.001004 in https://metacpan.org/changes/distribution/Pod-Weaver-PluginBundle-SHLOMIF ). - VERSION used to appear before NAME. " Signed-off-by: Tim Orling Signed-off-by: Richard Purdie (cherry picked from commit f4a520cc827187d83f2997614d893bba7d74a152) Signed-off-by: Armin Kuster --- .../perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} (89%) diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17028.bb b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb similarity index 89% rename from meta/recipes-devtools/perl/liberror-perl_0.17028.bb rename to meta/recipes-devtools/perl/liberror-perl_0.17029.bb index 8c6bbcb..038808f 100644 --- a/meta/recipes-devtools/perl/liberror-perl_0.17028.bb +++ b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb @@ -32,8 +32,8 @@ RDEPENDS_${PN}-ptest += " \ SRC_URI = "http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz" -SRC_URI[md5sum] = "ec3522c60a43a368f19c0f89e2205cb1" -SRC_URI[sha256sum] = "3ad85c5e58b31c8903006298424a51bba39f1840e324f5ae612eabc8b935e960" +SRC_URI[md5sum] = "6732b1c6207e4a9a3e2987c88368039a" +SRC_URI[sha256sum] = "1a23f7913032aed6d4b68321373a3899ca66590f4727391a091ec19c95bf7adc" S = "${WORKDIR}/Error-${PV}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:40 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:40 +0800 Subject: [OE-core] [zeus][PATCH 16/22] toolchain-shar-extract: ignore timestamp on decompress In-Reply-To: References: Message-ID: <2d61ef93383d49db43af144aa17a88dd250ceb95.1582902875.git.anuj.mittal@intel.com> From: Jeremy Puhlman Installing on centos7, which the extended version of the buildtools tarball is supposed to fix and with reproducable builds turned on, all the time stamps are for epoch. This results in the following output for every file: tar: ./sysroots/x86_64-pokysdk-linux/usr/include/c++/9.2.0/cstdalign: implausibly old time stamp 1969-12-31 16:00:00 tar: ./sysroots/x86_64-pokysdk-linux/usr/lib/libstdc++.so.6: implausibly old time stamp 1969-12-31 16:00:00 Ignore the timestamps during the uncompession step. Signed-off-by: Jeremy Puhlman Signed-off-by: Richard Purdie (cherry picked from commit 319ca22ea4465c56c63730847378a7aee4f5935a) Signed-off-by: Armin Kuster --- meta/files/toolchain-shar-extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index ccc4f4e..4c4b4de 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -249,7 +249,7 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then rm sdk.zip && exit 1 fi else - tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 + tail -n +$payload_offset $0| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:41 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:41 +0800 Subject: [OE-core] [zeus][PATCH 17/22] qemu: Fix CVE-2020-1711 In-Reply-To: References: Message-ID: <3e65ad67995874c363863280e40457acc3f479e9.1582902875.git.anuj.mittal@intel.com> From: Lee Chee Yang see https://git.qemu.org/?p=qemu.git;a=commit;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc Signed-off-by: Lee Chee Yang Signed-off-by: Armin Kuster --- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index bb444b6..d394db8 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://CVE-2019-15890.patch \ file://CVE-2019-12068.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch new file mode 100644 index 0000000..aa7bc82 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch @@ -0,0 +1,64 @@ +From 693fd2acdf14dd86c0bf852610f1c2cca80a74dc Mon Sep 17 00:00:00 2001 +From: Felipe Franciosi +Date: Thu, 23 Jan 2020 12:44:59 +0000 +Subject: [PATCH] iscsi: Cap block count from GET LBA STATUS (CVE-2020-1711) + +When querying an iSCSI server for the provisioning status of blocks (via +GET LBA STATUS), Qemu only validates that the response descriptor zero's +LBA matches the one requested. Given the SCSI spec allows servers to +respond with the status of blocks beyond the end of the LUN, Qemu may +have its heap corrupted by clearing/setting too many bits at the end of +its allocmap for the LUN. + +A malicious guest in control of the iSCSI server could carefully program +Qemu's heap (by selectively setting the bitmap) and then smash it. + +This limits the number of bits that iscsi_co_block_status() will try to +update in the allocmap so it can't overflow the bitmap. + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=693fd2acdf14dd86c0bf852610f1c2cca80a74dc] +CVE: CVE-2020-1711 + +Fixes: CVE-2020-1711 +Cc: qemu-stable at nongnu.org +Signed-off-by: Felipe Franciosi +Signed-off-by: Peter Turschmid +Signed-off-by: Raphael Norwitz +Signed-off-by: Kevin Wolf +Signed-off-by: Lee Chee Yang +--- + block/iscsi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/block/iscsi.c b/block/iscsi.c +index 2aea7e3..cbd5729 100644 +--- a/block/iscsi.c ++++ b/block/iscsi.c +@@ -701,7 +701,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + struct scsi_get_lba_status *lbas = NULL; + struct scsi_lba_status_descriptor *lbasd = NULL; + struct IscsiTask iTask; +- uint64_t lba; ++ uint64_t lba, max_bytes; + int ret; + + iscsi_co_init_iscsitask(iscsilun, &iTask); +@@ -721,6 +721,7 @@ static int coroutine_fn iscsi_co_block_status(BlockDriverState *bs, + } + + lba = offset / iscsilun->block_size; ++ max_bytes = (iscsilun->num_blocks - lba) * iscsilun->block_size; + + qemu_mutex_lock(&iscsilun->mutex); + retry: +@@ -764,7 +765,7 @@ retry: + goto out_unlock; + } + +- *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size; ++ *pnum = MIN((int64_t) lbasd->num_blocks * iscsilun->block_size, max_bytes); + + if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED || + lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) { +-- +1.8.3.1 -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:42 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:42 +0800 Subject: [OE-core] [zeus][PATCH 18/22] ncurses: add CVE_VERSION In-Reply-To: References: Message-ID: <53b94d0bc839eda408d90e15937746871b7546e3.1582902875.git.anuj.mittal@intel.com> Include the version number in a format that is comparable to what we get from NVD. (From OE-Core rev: fdb2a95d5e0265de1172940b6dc71fc7d602e8d1) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- meta/recipes-core/ncurses/ncurses_6.1+20190803.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb b/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb index e638a37..c3a89f1 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb @@ -10,3 +10,5 @@ SRCREV = "3c9b2677c96c645496997321bf2fe465a5e7e21f" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" + +CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:43 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:43 +0800 Subject: [OE-core] [zeus][PATCH 19/22] ppp: Security fix CVE-2020-8597 In-Reply-To: References: Message-ID: From: Yi Zhao CVE-2020-8597: eap.c in pppd in ppp 2.4.2 through 2.4.8 has an rhostname buffer overflow in the eap_request and eap_response functions. References: https://nvd.nist.gov/vuln/detail/CVE-2020-8597 Patch from: https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426 (From OE-Core rev: b01505e018ff46f1af34f98219d55f4ca700cd5a) Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch new file mode 100644 index 0000000..b7ba7ba --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch @@ -0,0 +1,47 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras + +Upstream-Status: Backport +[https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] + +CVE: CVE-2020-8597 + +Signed-off-by: Yi Zhao +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f5..1b93db0 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +-- +2.17.1 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 644cde4..60c56dd 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -33,6 +33,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://0001-pppoe-include-netinet-in.h-before-linux-in.h.patch \ file://0001-ppp-Remove-unneeded-include.patch \ file://ppp-2.4.7-DES-openssl.patch \ + file://0001-pppd-Fix-bounds-check-in-EAP-code.patch \ " SRC_URI_append_libc-musl = "\ -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:44 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:44 +0800 Subject: [OE-core] [zeus][PATCH 20/22] libxml2: fix CVE-2020-7595 In-Reply-To: References: Message-ID: <72a747f77f9fd051e054e679deacf537b4b7116f.1582902875.git.anuj.mittal@intel.com> (From OE-Core rev: f2f7aa9a495774fe5a2e3947584cb3503bd1eaf1) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- .../libxml/libxml2/CVE-2020-7595.patch | 36 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch new file mode 100644 index 0000000..facfefd --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch @@ -0,0 +1,36 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Thu, 12 Dec 2019 17:30:55 +0800 +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities + +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef +return NULL which cause a infinite loop in xmlStringLenDecodeEntities + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076] +CVE: CVE-2020-7595 +Signed-off-by: Anuj Mittal +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index d1c31963..a34bb6cd 100644 +--- a/parser.c ++++ b/parser.c +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + else + c = 0; + while ((c != 0) && (c != end) && /* non input consuming loop */ +- (c != end2) && (c != end3)) { ++ (c != end2) && (c != end3) && ++ (ctxt->instate != XML_PARSER_EOF)) { + + if (c == 0) break; + if ((c == '&') && (str[1] == '#')) { +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index c44a90b..5797dd6 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ file://fix-execution-of-ptests.patch \ file://Fix-CVE-2019-19956.patch \ + file://CVE-2020-7595.patch \ " SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:45 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:45 +0800 Subject: [OE-core] [zeus][PATCH 21/22] libxml2: Fix CVE-2019-20388 In-Reply-To: References: Message-ID: <49131908e3510dc69e0f278889803a461c2d96c0.1582902875.git.anuj.mittal@intel.com> From: Lee Chee Yang see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 (From OE-Core rev: 12a5eb0ea6f530ad7be2e58d4091b4edadbf461b) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch diff --git a/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch new file mode 100644 index 0000000..4ee2d4f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch @@ -0,0 +1,37 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libxml2/commit/7ffcd44d7e6c46704f8af0321d9314cd26e0e18a] +CVE: CVE-2019-20388 + +Signed-off-by: Zhipeng Xie +Signed-off-by: Lee Chee Yang +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index 5797dd6..1d898ab 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb @@ -22,6 +22,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-execution-of-ptests.patch \ file://Fix-CVE-2019-19956.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.patch \ " SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6" -- 2.7.4 From anuj.mittal at intel.com Fri Feb 28 15:23:46 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Fri, 28 Feb 2020 23:23:46 +0800 Subject: [OE-core] [zeus][PATCH 22/22] linux-yocto/5.2: update to v5.2.32 In-Reply-To: References: Message-ID: From: Bruce Ashfield Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: ef3886a722c8 Linux 5.2.32 ce5a5accc87e dm thin: fix use-after-free in metadata_pre_commit_callback 9aafc6574336 cifs: Fix memory allocation in __smb2_handle_cancelled_cmd() e177f6d8471e drm/amd/display: add default clocks if not able to fetch them dba8b53f1ef4 drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() bd427585578d drm/radeon: fix r1xx/r2xx register checker for POT textures b56603ead990 drm/i915/fbc: Disable fbc by default on all glk+ 5ce9d8bdf796 drm/nouveau/kms/nv50-: Limit MST BPC to 8 86bdcc48feb0 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom b039a9b6d8f4 drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN 03e122dbc136 scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd 8bf5409573de scsi: qla2xxx: Correctly retrieve and interpret active flash region 7af719a2ca84 scsi: qla2xxx: Change discovery state before PLOGI 1fea09aa4b42 scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX 30205f999d12 scsi: qla2xxx: Initialize free_work before flushing it 39ec6bc75116 scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd 1f08dd5fa5c5 scsi: iscsi: Fix a potential deadlock in the timeout handler 42a2fbbc708f dm thin: Flush data device before committing metadata 56d35c21552b dm thin metadata: Add support for a pre-commit callback d658f6349a2f dm btree: increase rebalance threshold in __rebalance2() 3aca6fce0d4e dm mpath: remove harmful bio-based optimization 2363f92cde9c drm: meson: venc: cvbs: fix CVBS mode matching 2878bba5052a dma-buf: Fix memory leak in sync_file_merge() b10d7f86b5ca vfio/pci: call irq_bypass_unregister_producer() before freeing irq 099085c85deb ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() 674f30df2798 ARM: dts: s3c64xx: Fix init order of clock providers 7fe7993bd757 cifs: Fix retrieval of DFS referrals in cifs_mount() 6fef05311f57 CIFS: Fix NULL pointer dereference in mid callback 42d37a87a332 CIFS: Do not miss cancelled OPEN responses ca8deb792b01 CIFS: Close open handle after interrupted close df192003fb6b CIFS: Respect O_SYNC and O_DIRECT flags during reconnect 40ae22555ce3 cifs: Don't display RDMA transport on reconnect 969925ff652b cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state 82fe0b779a89 cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE d88fc76297a7 cifs: smbd: Add messages on RDMA session destroy and reconnection f1bede222a44 cifs: smbd: Only queue work for error recovery on memory registration 118c2599caf3 cifs: smbd: Return -EAGAIN when transport is reconnecting 2c3c6e2691ff rpmsg: glink: Free pending deferred work on remove 7286d52aa88c rpmsg: glink: Don't send pending rx_done during remove eed61c8c6667 rpmsg: glink: Fix rpmsg_register_device err handling 00b748a63488 rpmsg: glink: Put an extra reference during cleanup ebb78ad8b431 rpmsg: glink: Fix use after free in open_ack TIMEOUT case b3f09043fc81 rpmsg: glink: Fix reuse intents memory leak issue 5bfb2ef7a181 rpmsg: glink: Set tail pointer to 0 at end of FIFO 63045fa07fba xtensa: fix syscall_set_return_value 9247f95643ef xtensa: fix TLB sanity checker c848ea0969ce gfs2: fix glock reference problem in gfs2_trans_remove_revoke eb30a9e18f47 xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map adff286a3be5 PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 f28f30c5255c PCI: rcar: Fix missing MACCTLR register setting in initialization sequence cb5cb799bf0b PCI: Do not use bus number zero from EA capability d291c94f8e57 PCI/MSI: Fix incorrect MSI-X masking on resume eb24be2871ad PCI: Fix Intel ACS quirk UPDCR register address 06ad330304d2 PCI: pciehp: Avoid returning prematurely from sysfs requests 5d558c8b1439 PCI/PM: Always return devices to D0 when thawing 84dfe86a3851 PCI/switchtec: Read all 64 bits of part_event_bitmap 0db244d3995f mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response 845b2cbece34 mmc: block: Make card_busy_detect() a bit more generic 5db0e71cbee1 libertas: make lbs_ibss_join_existing() return error code on rates overflow 36e460a8c861 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 2aabb3fcd7fe libertas: Fix two buffer overflows at parsing bss descriptor 8866a53c5e7a Linux 5.2.31 33a9ecf23bdb hsr: fix a NULL pointer dereference in hsr_dev_xmit() c5eba532e308 gre: refetch erspan header from skb->data after pskb_may_pull() 8477c46262fa tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() d46e87f84fd4 tcp: tighten acceptance of ACKs not matching a child socket 06b27e9e4496 tcp: fix rejected syncookies due to stale timestamps d3ce127be5c7 net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup 31ecfe259fba net: ipv6: add net argument to ip6_dst_lookup_flow 1a45655b78c5 net/mlx5e: Query global pause state before setting prio2buffer 10ac0045c8a7 tipc: fix ordering of tipc module init and exit routine f8089e38f286 tcp: md5: fix potential overestimation of TCP option space c9b8428b8b42 openvswitch: support asymmetric conntrack ab45bc5d7c6f net/tls: Fix return values to avoid ENOTSUPP aaa20d4352a1 net: thunderx: start phy before starting autonegotiation aebf8e234674 net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 876e02c6b8de net: ethernet: ti: cpsw: fix extra rx interrupt 75b099157e3b net: dsa: fix flow dissection on Tx path b8c2a07d7fc9 net: bridge: deny dev_set_mac_address() when unregistering ef141fca118c mqprio: Fix out-of-bounds access in mqprio_dump a0484dba9932 inet: protect against too small mtu values. 7d923144ef6e net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add() c0f777b6c28d SUNRPC: Fix another issue with MIC buffer space cce35a47eb7c raid5: need to set STRIPE_HANDLE for batch head 2b15565d1a62 workqueue: Fix missing kfree(rescuer) in destroy_workqueue() 2fb67c1da0c0 blk-mq: make sure that line break can be printed 588d5a85b106 ext4: fix a bug in ext4_wait_for_tail_page_commit 87b234005394 splice: only read in as much information as there is pipe buffer space de86c841c81b rtc: disable uie before setting time and enable after d4e7102cc326 mm/shmem.c: cast the type of unmap_start to u64 922a48c3e94d s390/kaslr: store KASLR offset for early dumps 3b7d69248f06 s390/smp,vdso: fix ASCE handling 546e9a689d3e firmware: qcom: scm: Ensure 'a0' status code is treated as signed a9b6310e93a4 ext4: work around deleting a file with i_nlink == 0 safely 609a4e56145d mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction 3d5c91034234 mfd: rk808: Fix RK818 ID template fbac2f7aa1c3 mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings 118197756683 powerpc: Fix vDSO clock_getres() 9ba5c6dcb3b7 powerpc: Avoid clang warnings around setjmp and longjmp 7c36247732a2 omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 1eff30510478 omap: pdata-quirks: revert pandora specific gpiod additions 5dbe853560e4 iio: ad7949: fix channels mixups 7df6007288fd iio: ad7949: kill pointless "readback"-handling code 109dbc91c5a8 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw 6305866e630c iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings 9073b0be6589 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling 13f83b3a2688 reiserfs: fix extended attributes on the root directory e026fc523a75 ext4: Fix credit estimate for final inode freeing b09b4d152aa2 quota: fix livelock in dquot_writeback_dquots 513bcf5ee8e0 seccomp: avoid overflow in implicit constant conversion ae57738ec38a ext2: check err when partial != NULL b7c24d8c06b8 quota: Check that quota is not dirty before release 42e495b46f80 video/hdmi: Fix AVI bar unpack 6739872abdfd powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts 7d55c5e73263 powerpc: Allow flush_icache_range to work across ranges >4GB be0cd7e9b258 powerpc/xive: Prevent page fault issues in the machine crash handler 99d2164e4865 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB f0f08beb3fa0 stm class: Lose the protocol driver when dropping its reference c0919315b735 ppdev: fix PPGETTIME/PPSETTIME ioctls 86de25118e9c RDMA/core: Fix ib_dma_max_seg_size() f5aae41d4eac ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity 5cc72ba36683 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card f15fa36b9c6b pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init da352a4b5493 pinctrl: samsung: Fix device node refcount leaks in init code 738e8de6b8d2 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init 53149343fc98 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init 43cb61f4878b pinctrl: samsung: Add of_node_put() before return in error path 72f6c3180468 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type() e264e3ae1165 pinctrl: rza2: Fix gpio name typos 61a4f44dc075 ACPI: PM: Avoid attaching ACPI PM domain to certain devices 0a041ba2564a ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() b56eca6bf2e4 ACPI: OSL: only free map once in osl.c 2ba38c34447d ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge 0a4cab60dde2 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links 487afadea2fd ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links 9af85668040a ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links e055c1890429 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI 5eac1d4c2450 ALSA: oxfw: fix return value in error path of isochronous resources reservation 33e6efad9334 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs 7240e6e25891 PM / devfreq: Lock devfreq in trans_stat_show 92741be9a736 intel_th: pci: Add Tiger Lake CPU support 69d1163cd0f4 intel_th: pci: Add Ice Lake CPU support 5ac267cabcd9 intel_th: Fix a double put_device() in error path a3784ad079c6 powerpc/perf: Disable trace_imc pmu 08ded9339d52 cpuidle: teo: Fix "early hits" handling for disabled idle states 30b23caa5deb cpuidle: teo: Consider hits and misses metrics of disabled states 0df48241b6ab cpuidle: teo: Rename local variable in teo_select() db302e3bb162 cpuidle: teo: Ignore disabled idle states that are too deep ade564919a0c cpuidle: Do not unset the driver if it is there already f2a7f16026f9 media: cec.h: CEC_OP_REC_FLAG_ values were swapped 342c964a9895 media: radio: wl1273: fix interrupt masking on release 780fe9f19c38 media: bdisp: fix memleak on release 348cecf72f8e s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported 9ec8636ef00a ar5523: check NULL before memcpy() in ar5523_cmd() 6fc971f1d831 wil6210: check len before memcpy() calls ba29035eb4bc cgroup: pids: use atomic64_t for pids->limit 873f0623fcbe blk-mq: avoid sysfs buffer overflow with too many CPU cores 758af427f60f md: improve handling of bio with REQ_PREFLUSH in md_flush_request() 3882ad8fadb0 ASoC: fsl_audmix: Add spin lock to protect tdms 141bba39e422 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report a99f0045c434 ASoC: rt5645: Fixed typo for buddy jack support. 1ecdb55a6de6 ASoC: rt5645: Fixed buddy jack support. d78e1588f356 workqueue: Fix pwq ref leak in rescuer_thread() 86226c42d8f7 workqueue: Fix spurious sanity check failures in destroy_workqueue() 7b79872cb160 dm zoned: reduce overhead of backing device checks b7c4feffa872 dm writecache: handle REQ_FUA fa700de0abd2 hwrng: omap - Fix RNG wait loop timeout 903867fe506a ovl: relax WARN_ON() on rename to self 8b2e7fec9f26 ovl: fix corner case of non-unique st_dev;st_ino c73fe5396edf ovl: fix lookup failure on multi lower squashfs 15fe8b7f7962 lib: raid6: fix awk build warnings b8f32a0e26fb rtlwifi: rtl8192de: Fix missing enable interrupt flag 0917a96e2d3a rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer 32c6c1de1c05 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address f1da748f078d btrfs: record all roots for rename exchange on a subvol 017f00a09704 Btrfs: send, skip backreference walking for extents with many references f08e9d661548 btrfs: Remove btrfs_bio::flags member f01ca4344ffe btrfs: Avoid getting stuck during cyclic writebacks 07383f0fced7 Btrfs: fix negative subv_writers counter and data space leak after buffered write 69608bab8b1b Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc 6bab2f18b421 btrfs: use refcount_inc_not_zero in kill_all_nodes b703482bc2ec btrfs: check page->mapping when loading free space cache 11b102bc593e iwlwifi: pcie: fix support for transmitting SKBs with fraglist 7a569d85c92b usb: typec: fix use after free in typec_register_port() 254d37011ab2 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" 26593100f6a1 usb: dwc3: ep0: Clear started flag on completion d2e949f9d6c5 usb: dwc3: gadget: Clear started flag for non-IOC 077399428186 usb: dwc3: gadget: Fix logical condition 545da1614800 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant 393edc8f15ca virtio-balloon: fix managed page counts when migrating pages between zones 15c579c3d104 virt_wifi: fix use-after-free in virt_wifi_newlink() 3891c22e7b74 mtd: rawnand: Change calculating of position page containing BBM 175a15f4c288 mtd: spear_smi: Fix Write Burst mode 5738119a60ed brcmfmac: disable PCIe interrupts before bus reset ab35b8b9a235 EDAC/altera: Use fast register IO for S10 IRQs deda3f6b06dc tpm: add check after commands attribs tab allocation ebb7dae402e3 usb: mon: Fix a deadlock in usbmon between mmap and read 650d955bc548 usb: core: urb: fix URB structure initialization function d54daa869ed5 USB: adutux: fix interface sanity check 3e4a4cb54c04 usb: roles: fix a potential use after free 14fa9bcb6a07 USB: serial: io_edgeport: fix epic endpoint lookup 174f3783b4f0 USB: idmouse: fix interface sanity checks 6facde75d1c8 USB: atm: ueagle-atm: add missing endpoint check b4972eba6831 iio: adc: ad7124: Enable internal reference b609ee0b3024 iio: adc: ad7606: fix reading unnecessary data from device bc27d17532dd iio: imu: inv_mpu6050: fix temperature reporting using bad unit edfeae1a5a70 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting 76a78a37799d iio: adis16480: Fix scales factors a8f0c5837cca iio: adis16480: Add debugfs_reg_access entry a02348d262b3 ARM: dts: pandora-common: define wl1251 as child node of mmc3 43a05d85e421 interconnect: qcom: sdm845: Walk the list safely on node removal 3ea35e60e8c8 xhci: make sure interrupts are restored to correct state 0df691c29da9 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour. d10974513d17 xhci: Increase STS_HALT timeout in xhci_suspend() 40ccc7fb3125 xhci: fix USB3 device initiated resume race with roothub autosuspend 8f015d20b7d5 xhci: Fix memory leak in xhci_add_in_port() de53955ea0d3 usb: xhci: only set D3hot for pci device 13d723a6c22c staging: gigaset: add endpoint-type sanity check ed9145e7d4a4 staging: gigaset: fix illegal free on probe errors a193faef6209 staging: gigaset: fix general protection fault on probe a48994561cab staging: vchiq: call unregister_chrdev_region() when driver registration fails 38beaaec130c staging: rtl8712: fix interface sanity check 238af85b081b staging: rtl8188eu: fix interface sanity check 9517a9f133fd binder: fix incorrect calculation for num_valid a65c5b1d8762 usb: host: xhci-tegra: Correct phy enable sequence 0da1ca92c578 usb: Allow USB device to be warm reset in suspended state fa74b02fa20f USB: documentation: flags on usb-storage versus UAS 46f840a92233 USB: uas: heed CAPACITY_HEURISTICS 9cc58d6fb42e USB: uas: honor flag to avoid CAPACITY16 19ccc7083566 media: venus: remove invalid compat_ioctl32 handler 6f4b7b312148 scsi: zfcp: trace channel log even for FCP command responses 6975c6beb5f0 usb: gadget: pch_udc: fix use after free 6f10fa4a113c rpmsg: char: release allocated memory f01eedaf4e09 mac80211: Do not send Layer 2 Update frame before authorization 38b2d9bb7b57 libertas: fix a potential NULL pointer dereference 2789290efc0b mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() fd820abb0696 Linux 5.2.30 10f017c26642 spi: dw: Correct handling of native chipselect 9e79f5ae512f spi: cadence: Correct handling of native chipselect db91ee312ada drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model 9eeb986b4809 clk: samsung: exynos5420: Keep top G3D clocks enabled 99232a68c619 block: fix "check bi_size overflow before merge" f54449c00a10 EDAC/ghes: Do not warn when incrementing refcount on 0 4f18ed319605 ALSA: hda: Fix regression by strip mask fix a550c8d05657 io_uring: ensure req->submit is copied when req is deferred 7b57a96cf3b7 Input: Fix memory leak in psxpad_spi_probe a006a5ae6b91 ALSA: hda: hdmi - fix pin setup on Tigerlake 85435506e9e0 EDAC/ghes: Fix locking and memory barrier issues 81a005d25b01 watchdog: aspeed: Fix clock behaviour for ast2600 c3f6c163ac89 md/raid0: Fix an error message in raid0_make_request() e90488c1856c ALSA: hda - Fix pending unsol events at shutdown ac5a40962daf KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) 949540e93943 binder: Handle start==NULL in binder_update_page_range() 75a11437a803 binder: Prevent repeated use of ->mmap() via NULL mapping e0a0299acecb binder: Fix race between mmap() and binder_alloc_print_pages() ba5d71130445 thermal: Fix deadlock in thermal thermal_zone_device_check cf162b1f1d6f iomap: Fix pipe page leakage during splicing 1ede48d1d47e RDMA/qib: Validate ->show()/store() callbacks before calling them 6df074625c15 can: ucan: fix non-atomic allocation in completion handler 1233eadb99a9 spi: Fix NULL pointer when setting SPI_CS_HIGH for GPIO CS cad0ca361138 spi: Fix SPI_CS_HIGH setting when using native and GPIO CS 25ac2d29646a spi: atmel: Fix CS high support efd56e6b1fbd spi: stm32-qspi: Fix kernel oops when unbinding driver dfbd2a22d8b1 spi: spi-fsl-qspi: Clear TDH bits in FLSHCR register d7e9115f21e0 spi: spi-fsl-qspi: change i.MX7D RX FIFO size 76cde0d7ff39 crypto: ecdh - fix big endian bug in ECC library 36759ce37925 crypto: ccp - fix uninitialized list head 8ba8fa9fc2db crypto: geode-aes - switch to skcipher for cbc(aes) fallback 86a44e8938be crypto: af_alg - cast ki_complete ternary op to int 9ff009403999 crypto: atmel-aes - Fix IV handling when req->nbytes < ivsize 2cbf74169383 crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr f6981b364dae KVM: x86: Grab KVM's srcu lock when setting nested state c08ddad72e7b KVM: x86: Remove a spurious export of a static function 317fd0a0c93d KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES 7f70f6380882 KVM: x86: do not modify masked bits of shared MSRs 6384ad0ab29b KVM: arm/arm64: vgic: Don't rely on the wrong pending table bdcecb6dd8e8 KVM: nVMX: Always write vmcs02.GUEST_CR3 during nested VM-Enter 3600a4189d12 KVM: PPC: Book3S HV: XIVE: Set kvm->arch.xive when VPs are allocated 34e8d4a0ef05 KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path 4ebdbf4ff503 KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one cc73381579f9 arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 1d19cc75f715 drm/i810: Prevent underflow in ioctl 16f54bf33fce drm: damage_helper: Fix race checking plane->state->fb 20a0047cdca4 drm/msm: fix memleak on release 6c34f27046e3 jbd2: Fix possible overflow in jbd2_log_space_left() 5b1ab9f1a2c0 kernfs: fix ino wrap-around detection 910116ce4349 nfsd: restore NFSv3 ACL support 6589961e5ec7 nfsd: Ensure CLONE persists data and metadata changes to the target file 574498a02845 tty: vt: keyboard: reject invalid keycodes c75342d33dd5 CIFS: Fix SMB2 oplock break processing c8c867906145 CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks 2199093ff906 x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect 4d34c238f6ee x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all() 64a582385b92 media: rc: mark input device as pointing stick 70fd4e1972e8 coresight: etm4x: Fix input validation for sysfs. 55c0be64071e Input: goodix - add upside-down quirk for Teclast X89 tablet 2405495a00f8 Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers 868c29a7efd0 Input: synaptics-rmi4 - re-enable IRQs in f34v7_do_reflash 0e606e3626e6 Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus 94adc53b2c47 ALSA: hda: Modify stream stripe mask only when needed a527c3df9f54 ALSA: hda - Add mute led support for HP ProBook 645 G4 accc2add3da3 ALSA: pcm: oss: Avoid potential buffer overflows 55f6418b7ae3 ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236 bbad17075fe3 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop fcfb4bce22aa ALSA: hda/realtek - Enable internal speaker of ASUS UX431FLC 83753976cfae fuse: verify attributes a6f6439eb10f fuse: verify nlink 31aa652b9a69 i2c: core: fix use after free in of_i2c_notify 92084c0b356d net: ep93xx_eth: fix mismatch of request_mem_region in remove f75cb980f0ab afs: Fix race in commit bulk status fetch 26167b5cf5df net: hns3: fix ETS bandwidth validation bug 037e0cbe8863 net: hns3: reallocate SSU' buffer size when pfc_en changes 423f97775629 ravb: implement MTU change while device is up ba49aa6bccbb rsxx: add missed destroy_workqueue calls in remove 6dbf3b9cc169 selftests: kvm: fix build with glibc >= 2.30 334204bdbd89 drm/sun4i: tcon: Set min division of TCON0_DCLK to 1. d2001cf2e8d3 x86/resctrl: Fix potential lockdep warning 7bf14c3c120b ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() 57dbe72b9638 perf/core: Consistently fail fork on allocation failures 24a8ce6100ab sched/pelt: Fix update of blocked PELT ordering cadf46055b6f sched/core: Avoid spurious lock dependencies b8a654dde72b Input: cyttsp4_core - fix use after free bug 9bcb8316e536 block: check bi_size overflow before merge f05d37196a77 xfrm: release device reference for invalid state e630f0eab8b3 NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 14f8f24bfcbc ALSA: hda: Add Cometlake-S PCI ID 85deda956139 ecryptfs: fix unlink and rmdir in face of underlying fs modifications 7a7b13483234 audit_get_nd(): don't unlock parent too early 6f26d186c431 exportfs_decode_fh(): negative pinned may become positive without the parent locked d5a9bd7dc9c2 cgroup: don't put ERR_PTR() into fc->root 5490ae827b29 iwlwifi: pcie: don't consider IV len in A-MSDU 5bc1282dfb21 RDMA/hns: Correct the value of srq_desc_size 9b0df7c7e42c RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN bf7d03571100 MIPS: SGI-IP27: fix exception handler replication b578c711e5e7 autofs: fix a leak in autofs_expire_indirect() 81559b396efa aio: Fix io_pgetevents() struct __compat_aio_sigset layout 03bd68a92f82 signal: simplify set_user_sigmask/restore_user_sigmask 88300b370dbc serial: ifx6x60: add missed pm_runtime_disable 06eb5d963912 serial: serial_core: Perform NULL checks for break_ctl ops c811b133b3e7 serial: pl011: Fix DMA ->flush_buffer() d451358ffe85 tty: serial: msm_serial: Fix flow control 5b10978724e0 tty: serial: fsl_lpuart: use the sg count from dma_map_sg c38c3a52315f usb: gadget: u_serial: add missing port entry locking b30c295d649b time: Zero the upper 32-bits in __kernel_timespec on 32-bit 9f06fb5da07e lp: fix sparc64 LPSETTIMEOUT ioctl 068341cb7952 sparc64: implement ioremap_uc 932b771c65b6 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator edc3ff235784 net: fec: fix clock count mis-match ed9b79600a5d platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size 952328f5193b platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer da62cf911005 HID: core: check whether Usage Page item is after Usage ID items fb85a234fc39 tipc: fix link name length check 0867e153690e selftests: bpf: test_sockmap: handle file creation failures gracefully cd73a77a2288 net/tls: use sg_next() to walk sg entries 55c1ea6758d8 net/tls: remove the dead inplace_crypto code c824b8c9957b net: skmsg: fix TLS 1.3 crash with full sk_msg 45c795cbee84 net: sockmap: use bitmap for copy info c1c89460bda2 net/tls: free the record on encryption error 1468022cc8f2 net/tls: take into account that bpf_exec_tx_verdict() may free the record a3157970686f openvswitch: remove another BUG_ON() bacb11535532 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() 744916544dba sctp: cache netns in sctp_ep_common f4312b9ba27c sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook 8d442143ccd4 openvswitch: fix flow command message size b834278b4d0a net: sched: fix `tc -s class show` no bstats on class with nolock subqueues 2f47935914f8 net: psample: fix skb_over_panic 8fc3ccb35fba net: macb: add missed tasklet_kill 9243823cd73a net: dsa: sja1105: fix sja1105_parse_rgmii_delays() 1e7ff496e195 mdio_bus: don't use managed reset-controller f458119c914d macvlan: schedule bc_work even if error 442b4bac7514 xfrm: Fix memleak on xfrm state destroy d06561a292bf thunderbolt: Power cycle the router if NVM authentication fails 97a4d0528c98 mei: me: add comet point V device id aa6a4bfabb1a mei: bus: prefix device names on bus with the bus name fb94cd58ee14 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P 33c6adbab912 staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids 34820fb849a8 staging: rtl8723bs: Drop ACPI device ids 18ff3bb126fe staging: rtl8192e: fix potential use after free 955068eb7918 staging: wilc1000: fix illegal memory access in wilc_parse_join_bss_param() afe6f4526509 usb: dwc2: use a longer core rest timeout in dwc2_core_reset() 4b15bd43d8ed clk: at91: fix update bit maps on CFG_MOR write 6ed6cd2d7f8a i40e: Fix for ethtool -m issue on X722 NIC ddcdd3cc96f1 i40e: Fix for missing "link modes" info in ethtool ae4d08f3a69b iavf: initialize ITRN registers with correct values 12c0db2518f8 ice: fix potential infinite loop because loop counter being too small c105a4b2019d pwm: bcm-iproc: Prevent unloading the driver module while in use 66f3f3c4da1e block: drbd: remove a stray unlock in __drbd_send_protocol() 11748bed1eeb mac80211: fix station inactive_time shortly after boot 2df48b15a9ca net/fq_impl: Switch to kvmalloc() for memory allocation 1332a34432a5 ceph: return -EINVAL if given fsc mount option on kernel w/o support 218333cf3e5b net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV e8fec331b7e3 net: stmmac: xgmac: Fix TSA selection f7e0994188b2 net: stmmac: gmac4: bitrev32 returns u32 d99d2e2d5c7d drm/amdgpu: add warning for GRBM 1-cycle delay issue in gfx9 3db9d787fbbe net: mscc: ocelot: fix __ocelot_rmw_ix prototype 23d1a942d638 net/mlx5e: Fix eswitch debug print of max fdb flow c26064b7eda5 drm/amdgpu: dont schedule jobs while in reset d61b5d11db4b net: bcmgenet: reapply manual settings to the PHY 303f8e7b7d18 net: bcmgenet: use RGMII loopback for MAC reset 82077751014a scripts/gdb: fix debugging modules compiled with hot/cold partitioning 7b20840690f5 mm/gup_benchmark: fix MAP_HUGETLB case c7816d20058f ASoC: SOF: topology: Fix bytes control size checks 1b3afeddab4a ARM: dts: stm32: Fix CAN RAM mapping on stm32mp157c 4de26c8cbe50 ALSA: hda: hdmi - add Tigerlake support f43786eb3acb ASoC: stm32: sai: add restriction on mmap support 36fa7d5299c2 watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading f023dd202f6b watchdog: meson: Fix the wrong value of left time 9054f01030f8 watchdog: pm8916_wdt: fix pretimeout registration flow 2c25aa88640f nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths 6fdb636145b0 nvme-rdma: fix a segmentation fault during module unload 43bd0bf71860 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition 7091bcbccb6b perf scripting engines: Iterate on tep event arrays directly 7371326920db x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early 8efe12d76d7e can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 4a3333ea25b1 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error a26a27d53b40 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error 39b89fc6625f can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors f6b5da01db2f can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM acb9095493be can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max 189c1239632b can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak 7ac97e4ef4d9 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open 1ac0d4885a34 can: peak_usb: report bus recovery as well b542266496fa stacktrace: Don't skip first entry on noncurrent tasks afe7ff5be406 bridge: ebtables: don't crash when using dnat target in output chains a19d86990335 netfilter: ipset: Fix nla_policies to fully support NL_VALIDATE_STRICT 17db97a8e7d5 netfilter: ipset: Fix the last missing check of nla_parse_deprecated() 5f4ada6390b6 net: fec: add missed clk_disable_unprepare in remove 0b283b59a62f clk: ti: clkctrl: Fix failed to enable error with double udelay timeout b70eae1c4480 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call aab6b68e53eb ASoC: hdac_hda: fix race in device removal b23f8d6ca25f fbdev: c2p: Fix link failure on non-inlining 51c019bf2c42 arm64: dts: zii-ultra: fix ARM regulator GPIO handle 819ee4651182 x86/resctrl: Prevent NULL pointer dereference when reading mondata 4d71464d5830 idr: Fix idr_alloc_u32 on 32-bit systems 9956dbb774e4 idr: Fix integer overflow in idr_for_each_entry a530ec599a8a idr: Fix idr_get_next_ul race with idr_remove 6909ddf4276c powerpc/bpf: Fix tail call implementation 957928006316 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero d3a556320b11 bpf: Allow narrow loads of bpf_sysctl fields with offset > 0 4fd976da64d7 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend 1d6d86b21245 clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 440f439c1041 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup b4c8fc7dcab9 clk: at91: avoid sleeping early c42ce4122e86 ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names 32ea5f2ae3b6 arm64: dts: imx8mm: fix compatible string for sdma 4071d8976ac5 reset: fix reset_control_ops kerneldoc comment b178a6e8f8f3 soc: imx: gpc: fix initialiser format 0a751a005ded ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts 946654641741 pinctrl: cherryview: Allocate IRQ chip dynamic 66c7b484cae0 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume 30c758e0a731 arm64: dts: ls1028a: fix a compatible issue ba3e13683df7 ASoC: kirkwood: fix device remove ordering d7ee3bbc1085 ASoC: kirkwood: fix external clock probe defer 7a754f5e5751 clk: samsung: exynos542x: Move G3D subsystem clocks to its sub-CMU 2361cffc9775 clk: samsung: exynos5433: Fix error paths e1fc074e8178 reset: Fix memory leak in reset_control_array_put() b01838b0ca64 ASoC: compress: fix unsigned integer overflow check 41360b33fec2 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX e7fc8cc79377 soundwire: intel: fix intel_register_dai PDI offsets and numbers 82b111a092b1 clocksource/drivers/mediatek: Fix error handling 85c26d3b879d thunderbolt: Fix lockdep circular locking depedency warning a41faef2aef6 thunderbolt: Read DP IN adapter first two dwords in one go 0b4d76ea32e5 clk: at91: sam9x60: fix programmable clock 3ac5085a98ba clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate 922eddf892e2 XArray: Fix xas_next() with a single entry at 0 Signed-off-by: Bruce Ashfield Signed-off-by: Anuj Mittal (cherry picked from commit c37bf8287072ddf6005d5c3f419a6a77f673164c) Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 79da8c1..441545f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e1abc7e80e4df82d180aecd09e0d80b579d79c34" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index d88cb5d..6d49e00 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "f5a3e7e2c94b9d35d1b1933c503ffdaf1e9abec8" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 59cc08e..44516dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "6080c11f80fbba3ae018518af53564a226e7efcf" -SRCREV_machine_qemuarm64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips ?= "078d960b86b2b6539e6823f1da884e85b07e50f3" -SRCREV_machine_qemuppc ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemuriscv64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemux86-64 ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_machine_qemumips64 ?= "ad3efcb4a297394ceb0ab2357737bd8be9846fec" -SRCREV_machine ?= "6f93a47515b2008468437f2f655404906337c574" -SRCREV_meta ?= "9a13706c994275b544f78dbfc9ed8ff98cd94aef" +SRCREV_machine_qemuarm ?= "1ed2236e622e5b79d910fc1db37ec6eec5a94fdc" +SRCREV_machine_qemuarm64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips ?= "e669e4307d07072458904ac0fda56f7192e2880d" +SRCREV_machine_qemuppc ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuriscv64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemux86-64 ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemumips64 ?= "217cada95bbe7eb4c3a6d40ee141ea4cea3bc1b6" +SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.29" +LINUX_VERSION ?= "5.2.32" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -- 2.7.4 From patchwork at patchwork.openembedded.org Fri Feb 28 15:32:18 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Fri, 28 Feb 2020 15:32:18 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_zeus_revie?= =?utf-8?q?w_request?= In-Reply-To: References: Message-ID: <20200228153218.2273.49237@do> == Series Details == Series: zeus review request Revision: 1 URL : https://patchwork.openembedded.org/series/23013/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch [zeus,22/22] linux-yocto/5.2: update to v5.2.32 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX" If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From akuster808 at gmail.com Fri Feb 28 15:37:42 2020 From: akuster808 at gmail.com (akuster808) Date: Fri, 28 Feb 2020 07:37:42 -0800 Subject: [OE-core] [zeus][PATCH 00/22] zeus review request In-Reply-To: References: Message-ID: On 2/28/20 7:23 AM, Anuj Mittal wrote: > Next set of changes for zeus. Please review. > > Clean a-full on autobuilder except a single unrelated fetch failure for esdk test. > > https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/751 Great. When do you want responses back by ? - armin > > Thanks, > > Anuj > > The following changes since commit f39285bb82e68945a81034b84da09ca1078d6719: > > Revert "bash: Fix CVE-2019-18276" (2020-02-19 18:53:10 +0000) > > are available in the git repository at: > > git://push.openembedded.org/openembedded-core-contrib stable/zeus-next > > Alexander Kanavin (5): > perl: update to 5.30.1 > perl: package Config.pm from arch directory into the main perl package > perl: install typemap and other extutils metadata as part of perl-core > libmodule-build-perl: fix ptests > perl: fix failing ptests > > Anuj Mittal (3): > openssh: backport patch to fix "cert not yet valid" test > ncurses: add CVE_VERSION > libxml2: fix CVE-2020-7595 > > Bruce Ashfield (2): > linux-yocto/5.2: update to v5.2.29 > linux-yocto/5.2: update to v5.2.32 > > Jeremy Puhlman (1): > toolchain-shar-extract: ignore timestamp on decompress > > Kevin Hao (1): > xserver-nodm-init: Fix the start failure for non-root user > > Lee Chee Yang (2): > qemu: Fix CVE-2020-1711 > libxml2: Fix CVE-2019-20388 > > Nathan Rossi (2): > glibc-testsuite: Remove the do_install task > glibc-testsuite: Exclude this recipe from world builds > > Richard Purdie (2): > perl: Fix encode module reproducibility issues > perl: Fix makefile race causing configuration differences > > Ross Burton (1): > perl: improve reproducibility > > Tim Orling (1): > liberror-perl: upgrade 0.17028 -> 0.17029 > > Trevor Gamblin (1): > qemurunner.py: add try/except for pid handling race > > Yi Zhao (1): > ppp: Security fix CVE-2020-8597 > > meta/files/toolchain-shar-extract.sh | 2 +- > meta/lib/oeqa/utils/qemurunner.py | 5 +- > ...at-bozo-decided-to-use-2020-as-a-future-d.patch | 46 ++++++++++++++++ > meta/recipes-connectivity/openssh/openssh_8.0p1.bb | 1 + > .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++++++++++++ > meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + > meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 3 + > .../libxml/libxml2/CVE-2019-20388.patch | 37 +++++++++++++ > .../libxml/libxml2/CVE-2020-7595.patch | 36 ++++++++++++ > meta/recipes-core/libxml/libxml2_2.9.9.bb | 2 + > meta/recipes-core/ncurses/ncurses_6.1+20190803.bb | 2 + > ...t-to-correctly-exclude-unbuilt-extensions.patch | 27 +++++++++ > meta/recipes-devtools/perl/files/encodefix.patch | 20 +++++++ > .../recipes-devtools/perl/files/fix-setgroup.patch | 49 ----------------- > .../perl/files/perl-configpm-switch.patch | 4 +- > meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++ > ...or-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 +- > .../perl/libmodule-build-perl/run-ptest | 2 - > .../perl/libmodule-build-perl_0.4229.bb | 3 + > .../perl/{perl_5.30.0.bb => perl_5.30.1.bb} | 31 ++++++++--- > meta/recipes-devtools/qemu/qemu.inc | 3 +- > .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ > .../x11-common/xserver-nodm-init/capability.conf | 2 + > .../x11-common/xserver-nodm-init/xserver-nodm | 8 +++ > .../x11-common/xserver-nodm-init_3.0.bb | 7 ++- > meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 6 +- > meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 8 +-- > meta/recipes-kernel/linux/linux-yocto_5.2.bb | 22 ++++---- > 28 files changed, 379 insertions(+), 87 deletions(-) > create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch > create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch > create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch > create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch > create mode 100644 meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch > create mode 100644 meta/recipes-devtools/perl/files/encodefix.patch > delete mode 100644 meta/recipes-devtools/perl/files/fix-setgroup.patch > create mode 100644 meta/recipes-devtools/perl/files/racefix.patch > rename meta/recipes-devtools/perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} (89%) > rename meta/recipes-devtools/perl/{perl_5.30.0.bb => perl_5.30.1.bb} (93%) > create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch > create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/capability.conf > From richard.purdie at linuxfoundation.org Fri Feb 28 16:58:21 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 28 Feb 2020 16:58:21 +0000 Subject: [OE-core] [PATCH] rng-tools: only print the success message when initialize entropy sources In-Reply-To: <1582863612-310553-1-git-send-email-mingli.yu@windriver.com> References: <1582863612-310553-1-git-send-email-mingli.yu@windriver.com> Message-ID: <5f4a8b6691dbf40a2058b5a94f265541049f0733.camel@linuxfoundation.org> On Fri, 2020-02-28 at 12:20 +0800, mingli.yu at windriver.com wrote: > From: Mingli Yu > > There is below message when check rngd service status > in qemu env. > [rdrand]: Initialization Failed It looks like upstream aren't keen on the patch and I'm not sure we'd want to carry it. Whitelist this "error" instead? Cheers, Richard From petr.vorel at gmail.com Fri Feb 28 17:57:30 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Fri, 28 Feb 2020 18:57:30 +0100 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 Message-ID: <20200228175731.10604-1-petr.vorel@gmail.com> Removed ffsb copying file and associated runtest file fs_ext4 (both removed in this release). Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch IMHO this one shouldn't be needed not, but CI still fails without it Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Changes v4->v5: * Put back 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch as it still needed on MUSL (although it should not be needed, strange). Reported by Anuj Mittal * Remove fs_ext4 to fix build error. https://autobuilder.yoctoproject.org/typhoon/#/builders/95/builds/574 Reported by Richard Purdie @Anuj, @Richard: could you please test this version? (at least on MUSL)? Kind regards, Petr meta/lib/oeqa/runtime/cases/ltp.py | 2 +- .../ltp/0001-Add-more-musl-exclusions.patch | 37 +------ ...option-to-select-libc-implementation.patch | 103 +++++------------- ...udevadm-trigger-before-swap-verifica.patch | 35 ------ ...ix-zeros-of-the-addresses-output-by-.patch | 43 -------- ...or-time64-unsafe-syscalls-before-usi.patch | 41 +++++-- ...es-fix-an-absent-format-string-issue.patch | 24 ---- ...rs-Link-with-libfts-explicitly-on-mu.patch | 20 ++-- ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 ------ ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- 11 files changed, 95 insertions(+), 282 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (89%) diff --git a/meta/lib/oeqa/runtime/cases/ltp.py b/meta/lib/oeqa/runtime/cases/ltp.py index b8b7300435..6dc5ef22ad 100644 --- a/meta/lib/oeqa/runtime/cases/ltp.py +++ b/meta/lib/oeqa/runtime/cases/ltp.py @@ -59,7 +59,7 @@ class LtpTest(LtpTestBase): ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched", "nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds", "fcntl-locktests", "connectors", "commands", "net.ipv6_lib", "input","fs_perms_simple"] - ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"] + ltp_fs = ["fs", "fsx", "fs_bind"] # skip kernel cpuhotplug ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc", "hugetlb"] ltp_groups += ltp_fs diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS := accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..0598046b28 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3ad3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e7314e0..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669716..ecc6660f93 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844509..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch index eff9ed0741..412025017b 100644 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch @@ -1,21 +1,27 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 +From 2f6f356a49e28eb597df063e31770632e69a93aa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 +Date: Fri, 28 Feb 2020 14:55:26 +0100 Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl musl does not implement fts like glibc and therefore it depends on external implementation for all fts APIs -Upstream-Status: Pending +Upstream-Status: not acceptible Signed-off-by: Khem Raj +[ pvorel: rebased for 20200120 +IMHO this patch should not be needed as commits +22f510de8 ("Fix static linking with musl-fts") and +b24f3d32c ("cpuset: Detect missing fts.h") should handle it +but CI still report failures ] +Signed-off-by: Petr Vorel --- testcases/kernel/controllers/Makefile.inc | 3 +++ testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 +index 4ca0b5ac3..1d85e4d86 100644 --- a/testcases/kernel/controllers/Makefile.inc +++ b/testcases/kernel/controllers/Makefile.inc @@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) @@ -29,13 +35,13 @@ index 4ca0b5a..1d85e4d 100644 INSTALL_TARGETS ?= *.sh diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 +index c03dd77d7..6dd4ee619 100644 --- a/testcases/kernel/controllers/cpuset/Makefile.inc +++ b/testcases/kernel/controllers/cpuset/Makefile.inc @@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - LDLIBS += -lcpu_set -lcontrollers -lltp + LDLIBS := -lcpu_set -lcontrollers -lltp $(LDLIBS) +ifeq ($(LIBC),musl) +LDLIBS += -lfts +endif @@ -43,5 +49,5 @@ index db6a843..86dd2a8 100644 INSTALL_TARGETS ?= *.sh -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa1b4..0000000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325eaf3..350091a70c 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 89% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc9c6..312eeca114 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +26,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From petr.vorel at gmail.com Fri Feb 28 17:57:31 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Fri, 28 Feb 2020 18:57:31 +0100 Subject: [OE-core] [PATCH v5 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <20200228175731.10604-1-petr.vorel@gmail.com> References: <20200228175731.10604-1-petr.vorel@gmail.com> Message-ID: <20200228175731.10604-2-petr.vorel@gmail.com> Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Changes v4->v5: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 312eeca114..847f267b0b 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From raj.khem at gmail.com Fri Feb 28 18:00:01 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 28 Feb 2020 10:00:01 -0800 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> <20200227000603.14252-4-timothy.t.orling@linux.intel.com> <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> <7956231e-1523-6213-b757-633b75eb2eb2@gmail.com> Message-ID: On 2/28/20 1:30 AM, Alexander Kanavin wrote: > I actually have a number of patches I have to hold because they don't > build or don't work on centos 7. > Latest atk and friends included: > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates-later > > Something ought to be done about centos 7, I'm all for dropping it asap, > if the newer compiler installation turns out unfeasible. > centos7 is just showing the problem that other distros are not. This problem seems to be due to missing header includes Can we try to add #include in tests/atk_test_util.h and perhaps this should fix it. > Alex > > On Fri, 28 Feb 2020 at 05:35, Tim Orling > wrote: > > All those build failures are on CentOS-7. > Grumble grumble. > > On Thu, Feb 27, 2020 at 8:32 PM Tim Orling > wrote: > > Strange. I built it in new environment, tip of master, on > Debian-10 and no problems. I?ll look into it tomorrow. > > Thank you for the information. > > On Thu, Feb 27, 2020 at 8:28 PM Khem Raj > wrote: > > > > On 2/27/20 7:54 PM, Anuj Mittal wrote: > > Hi Tim, > > > > On 27-Feb-20 08:06 AM, Tim Orling wrote: > >> Release notes: > >> > https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS > > >> > >> > >> License-Update: Changed to LGPL-2.1+ > >> > >> Signed-off-by: Tim Orling > > > >> --- > >> ? .../atk/{at-spi2-atk_2.32.0.bb > => at-spi2-atk_2.34.1.bb > }? | 8 ++++---- > >> ? 1 file changed, 4 insertions(+), 4 deletions(-) > >> ? rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb > => > >> at-spi2-atk_2.34.1.bb } (66%) > > > > This is failing on musl-qemu86: > > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 > > > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: > unknown field > > ?tv_sec? specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: > warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: > warning: (near > > initialization for ?timeout?) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: > unknown field > > ?tv_nsec? specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: > warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: > warning: (near > > initialization for ?timeout?) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: > storage size > > of ?timeout? isn?t known > >? ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = > 10 * 1000000 }; > >? ?????????????????? ^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: > warning: implicit > > declaration of function ?nanosleep? > [-Wimplicit-function-declaration] > >? ???? nanosleep(&timeout, NULL); > >? ???? ^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function > ?terminate_app?: > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: > error: variable > > ?timeout? has initializer but incomplete type > >? ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = > 10 * 1000000 }; > >? ????????? ^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: > error: unknown field > > ?tv_sec? specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: > warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: > warning: (near > > initialization for ?timeout?) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: > error: unknown field > > ?tv_nsec? specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: > warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: > warning: (near > > initialization for ?timeout?) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: > error: storage size > > of ?timeout? isn?t known > >? ?? struct timespec timeout = { .tv_sec = 0, .tv_nsec = > 10 * 1000000 }; > > > > yeah this is exposing a bug in use if time_t struct in this > component. > there are several patches done to address that, we will > perhaps need one > of these patches here. > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > From timothy.t.orling at linux.intel.com Fri Feb 28 18:33:41 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Fri, 28 Feb 2020 10:33:41 -0800 Subject: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 In-Reply-To: References: <20200227000603.14252-1-timothy.t.orling@linux.intel.com> <20200227000603.14252-4-timothy.t.orling@linux.intel.com> <2c3ea5cc-29e6-0ce6-f9b3-c720e835e363@intel.com> <7956231e-1523-6213-b757-633b75eb2eb2@gmail.com> Message-ID: > On Feb 28, 2020, at 10:00 AM, Khem Raj wrote: > > > > On 2/28/20 1:30 AM, Alexander Kanavin wrote: >> I actually have a number of patches I have to hold because they don't build or don't work on centos 7. >> Latest atk and friends included: >> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates-later >> Something ought to be done about centos 7, I'm all for dropping it asap, if the newer compiler installation turns out unfeasible. > > centos7 is just showing the problem that other distros are not. > This problem seems to be due to missing header includes > Can we try to add > > #include > > in tests/atk_test_util.h and perhaps this should fix it. > Thank you Khem! https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/14 I?ll prepare a v2 with patch. > >> Alex >> On Fri, 28 Feb 2020 at 05:35, Tim Orling >> wrote: >> All those build failures are on CentOS-7. >> Grumble grumble. >> On Thu, Feb 27, 2020 at 8:32 PM Tim Orling >> >> wrote: >> Strange. I built it in new environment, tip of master, on >> Debian-10 and no problems. I?ll look into it tomorrow. >> Thank you for the information. >> On Thu, Feb 27, 2020 at 8:28 PM Khem Raj >> >> wrote: >> On 2/27/20 7:54 PM, Anuj Mittal wrote: >> > Hi Tim, >> > >> > On 27-Feb-20 08:06 AM, Tim Orling wrote: >> >> Release notes: >> >> >> https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS >> >> >> >> >> >> License-Update: Changed to LGPL-2.1+ >> >> >> >> Signed-off-by: Tim Orling >> >> >> >> >> --- >> >> .../atk/{at-spi2-atk_2.32.0.bb >> > => at-spi2-atk_2.34.1.bb >> >} | 8 ++++---- >> >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb >> > => >> >> at-spi2-atk_2.34.1.bb >} (66%) >> > >> > This is failing on musl-qemu86: >> > >> > >> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 >> > >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: >> unknown field >> > ?tv_sec? specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: >> warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: >> warning: (near >> > initialization for ?timeout?) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: >> unknown field >> > ?tv_nsec? specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: >> warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: >> warning: (near >> > initialization for ?timeout?) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: >> storage size >> > of ?timeout? isn?t known >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = >> 10 * 1000000 }; >> > ^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: >> warning: implicit >> > declaration of function ?nanosleep? >> [-Wimplicit-function-declaration] >> > nanosleep(&timeout, NULL); >> > ^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function >> ?terminate_app?: >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: >> error: variable >> > ?timeout? has initializer but incomplete type >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = >> 10 * 1000000 }; >> > ^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: >> error: unknown field >> > ?tv_sec? specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: >> warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: >> warning: (near >> > initialization for ?timeout?) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: >> error: unknown field >> > ?tv_nsec? specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: >> warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: >> warning: (near >> > initialization for ?timeout?) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: >> error: storage size >> > of ?timeout? isn?t known >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = >> 10 * 1000000 }; >> > >> yeah this is exposing a bug in use if time_t struct in this >> component. >> there are several patches done to address that, we will >> perhaps need one >> of these patches here. >> -- _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> -- _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core at lists.openembedded.org >> > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -------------- next part -------------- An HTML attachment was scrubbed... URL: From jpuhlman at mvista.com Fri Feb 28 22:51:16 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 28 Feb 2020 14:51:16 -0800 Subject: [OE-core] [PATCH] libxcrypt: add native to BBCLASSEXTEND Message-ID: <20200228225116.27918-1-jpuhlman@mvista.com> buildtools-extended does not provide libcrypt, and some native applications require it, like clang. While it would likely make sense to include nativesdk-libxcrypt in the buildtools it would also likely make sense to remove the dependancy on the host libcrypt for those applications that need it. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 416205cd5c..e59a096573 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -32,4 +32,4 @@ CFLAGS += "-fcommon" API = "--disable-obsolete-api" EXTRA_OECONF += "${API}" -BBCLASSEXTEND = "nativesdk" +BBCLASSEXTEND = "native nativesdk" -- 2.20.1 From jpuhlman at mvista.com Fri Feb 28 22:51:51 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 28 Feb 2020 14:51:51 -0800 Subject: [OE-core] [PATCH] mesa: add fix for arm6 Message-ID: <20200228225151.28015-1-jpuhlman@mvista.com> From: Jeremy Puhlman We have had similar problems with missing atomics on arm6 that arm5 has. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-graphics/mesa/mesa.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 87f167c507..54d7ea8961 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -161,6 +161,7 @@ EXTRA_OEMESON_append = " -Dasm=false" FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" +CFLAGS_append_armv6 = " -DMISSING_64BIT_ATOMICS" # Remove the mesa dependency on mesa-dev, as mesa is empty RDEPENDS_${PN}-dev = "" -- 2.20.1 From jpuhlman at mvista.com Fri Feb 28 22:53:33 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 28 Feb 2020 14:53:33 -0800 Subject: [OE-core] [PATCH 1/3] apr: add mulitlib scripts apr-1-config, apr_rules.mk Message-ID: <20200228225335.28139-1-jpuhlman@mvista.com> From: Jeremy Puhlman apr_rules.mk encodes build options in to file 35c35 < CC=x86_64-montavista-linux-gcc -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 --sysroot= Signed-off-by: Jeremy A. Puhlman --- meta/recipes-support/apr/apr_1.7.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index eca9cdea48..8a9b780593 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.0.bb @@ -23,7 +23,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea" -inherit autotools-brokensep lib_package binconfig multilib_header ptest +inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" @@ -51,6 +51,9 @@ do_configure_prepend() { ./buildconf 2 } +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \ + ${PN}-dev:${datadir}/build-1/apr_rules.mk" + FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" RDEPENDS_${PN}-dev += "bash" -- 2.20.1 From jpuhlman at mvista.com Fri Feb 28 22:53:34 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 28 Feb 2020 14:53:34 -0800 Subject: [OE-core] [PATCH 2/3] apr-util: add multilib script for apu-1-config In-Reply-To: <20200228225335.28139-1-jpuhlman@mvista.com> References: <20200228225335.28139-1-jpuhlman@mvista.com> Message-ID: <20200228225335.28139-2-jpuhlman@mvista.com> From: Jeremy Puhlman apu-1-config encodes library path in to script 27c27 < libdir="/usr/lib64" Signed-off-by: Jeremy A. Puhlman --- meta/recipes-support/apr/apr-util_1.6.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.1.bb index 1f9fea25d8..3896c924f0 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -28,7 +28,9 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-expat=${STAGING_DIR_HOST}${prefix}" -inherit autotools lib_package binconfig +inherit autotools lib_package binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config" OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" -- 2.20.1 From jpuhlman at mvista.com Fri Feb 28 22:53:35 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 28 Feb 2020 14:53:35 -0800 Subject: [OE-core] [PATCH 3/3] cups: make cups-config a multilib script In-Reply-To: <20200228225335.28139-1-jpuhlman@mvista.com> References: <20200228225335.28139-1-jpuhlman@mvista.com> Message-ID: <20200228225335.28139-3-jpuhlman@mvista.com> From: Jeremy Puhlman cups-config encodes the library dir in the script. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-extended/cups/cups.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 34982819b9..c5a60bde12 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -22,7 +22,7 @@ LEAD_SONAME = "libcupsdriver.so" CLEANBROKEN = "1" -inherit autotools-brokensep binconfig useradd systemd pkgconfig +inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system lpadmin" @@ -100,6 +100,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \ " CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" + SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" cups_sysroot_preprocess () { sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' -- 2.20.1 From jpuhlman at mvista.com Fri Feb 28 22:54:09 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 28 Feb 2020 14:54:09 -0800 Subject: [OE-core] [PATCH] binutils: fix multilib header difference Message-ID: <20200228225409.28256-1-jpuhlman@mvista.com> From: Jeremy Puhlman bfd_stdint.h encodes the name of the compiler in the header which is different between mutlilibs. Remvoe target prefix to make the headers match. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-devtools/binutils/binutils.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 6ed40a1486..b0937e62fc 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -163,6 +163,8 @@ do_install () { done oe_multilib_header bfd.h + # bfd_stdint.h encodes the compiler name in the header + sed -i ${D}${includedir}/bfd_stdint.h -e "s,${TARGET_PREFIX},," } inherit update-alternatives -- 2.20.1 From richard.purdie at linuxfoundation.org Fri Feb 28 22:58:53 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 28 Feb 2020 22:58:53 +0000 Subject: [OE-core] [PATCH 0/2 v4] Add ptest support for coreutils In-Reply-To: <20200228144929.164927-1-trevor.gamblin@windriver.com> References: <20200228144929.164927-1-trevor.gamblin@windriver.com> Message-ID: <6c66a236197cfa2b432646cfff2a22e3e181a579.camel@linuxfoundation.org> On Fri, 2020-02-28 at 06:49 -0800, Trevor Gamblin wrote: > v4 fixes a multilib issue - do_install_ptest was previously > using sed to make the d_type-check test point at python3 > instead of python, but hard-coded the path for the test file. > > Sample test results: > > core-image-minimal: > MACHINE | PASS | FAIL | SKIP | TOTAL | TIME (m) | > qemux86-64 | 472 | 0 | 143 | 615 | 2.5 | > qemuarm64 | 472 | 0 | 143 | 615 | 51 | > > core-image-sato: > MACHINE | PASS | FAIL | SKIP | TOTAL | Time (m) | > qemux86-64 | 472 | 0 | 143 | 615 | 2.4 | > qemuarm64 | 472 | 0 | 143 | 615 | 52 | Sorry Trevor but I think there is an issue here: https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/735/steps/8/logs/step2d (and on all the other builders) Its still causing the reproducible build failures for libmodule-build. The reason it triggers on this patch is without this it isn't included in the reproducible builds test. I was blaming Tim's upgrade patch! Cheers, Richard From jpuhlman at mvista.com Fri Feb 28 23:00:06 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Fri, 28 Feb 2020 15:00:06 -0800 Subject: [OE-core] [PATCH] xorgproto: move pc files to libdir Message-ID: <20200228230006.28594-1-jpuhlman@mvista.com> From: Jeremy Puhlman We fixed this two years go: http://lists.openembedded.org/pipermail/openembedded-core/2018-June/151922.html However xorgproto moved to meson and uses pkgconfig module to generate the .pc which does not provide a method of omitting the libdir, which now means any pc generated from meson using the module will always be mulitlib incompatible. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb index fb3f3aed3d..c0785ccd64 100644 --- a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb +++ b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb @@ -19,6 +19,8 @@ inherit meson PACKAGECONFIG ??= "" PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false" +# Datadir only used to install pc files, $datadir/pkgconfig +datadir="${libdir}" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -- 2.20.1 From richard.purdie at linuxfoundation.org Fri Feb 28 23:02:04 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Fri, 28 Feb 2020 23:02:04 +0000 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: <20200228175731.10604-1-petr.vorel@gmail.com> References: <20200228175731.10604-1-petr.vorel@gmail.com> Message-ID: Hi Petr, On Fri, 2020-02-28 at 18:57 +0100, Petr Vorel wrote: > Removed ffsb copying file and associated runtest file fs_ext4 > (both removed in this release). > > Added LIBS=-lfts for MUSL. > > Removed patches (accepted upstream) > * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > * 0001-testcases-fix-an-absent-format-string-issue.patch > * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > > Merged patches > * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > (into 0001-build-Add-option-to-select-libc-implementation.patch as > they > touch the same files) > > Refreshed patches (some tests have been fixed for musl) > * 0001-Add-more-musl-exclusions.patch > * 0001-build-Add-option-to-select-libc-implementation.patch > * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > IMHO this one shouldn't be needed not, but CI still fails without it > > Updated status > * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > > Signed-off-by: Petr Vorel > --- > Changes v4->v5: > * Put back 0002-kernel-controllers-Link-with-libfts-explicitly-on- > mu.patch > as it still needed on MUSL (although it should not be needed, > strange). > Reported by Anuj Mittal I'm sorry to say that this still isn't quite right for musl: https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1634 https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1630 Still having the fts issue :( Cheers, Richard From mhalstead at linuxfoundation.org Sat Feb 29 02:12:38 2020 From: mhalstead at linuxfoundation.org (Michael Halstead) Date: Fri, 28 Feb 2020 18:12:38 -0800 Subject: [OE-core] [PATCH] yocto-uninative.inc: version 2.8 updates glibc to 2.31 Message-ID: <20200229021238.8810-1-mhalstead@linuxfoundation.org> Allow sstate use in Tumbleweed and other distros as they update glibc. --- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index ad75d3e2a3..889695eae3 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -6,9 +6,9 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.30" +UNINATIVE_MAXGLIBCVERSION = "2.31" -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.7/" -UNINATIVE_CHECKSUM[aarch64] ?= "e76a45886ee8a0b3904b761c17ac8ff91edf9811ee455f1832d10763ba794dfc" -UNINATIVE_CHECKSUM[i686] ?= "810d027dfb1c7675226afbcec07808770516c969ee7378f6d8240281083f8924" -UNINATIVE_CHECKSUM[x86_64] ?= "9498d8bba047499999a7310ac2576d0796461184965351a56f6d32c888a1f216" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.8/" +UNINATIVE_CHECKSUM[aarch64] ?= "989187344bf9539b464fb7ed9c223e51f4bdb4c7a677d2c314e6fed393176efe" +UNINATIVE_CHECKSUM[i686] ?= "cc3e45bc8594488b407363e3fa9af5a099279dab2703c64342098719bd674990" +UNINATIVE_CHECKSUM[x86_64] ?= "a09922172c3a439105e0ae6b943daad2d83505b17da0aba97961ff433b8c21ab" -- 2.24.1 From patchwork at patchwork.openembedded.org Sat Feb 29 02:31:52 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sat, 29 Feb 2020 02:31:52 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_yocto-unin?= =?utf-8?q?ative=2Einc=3A_version_2=2E8_updates_glibc_to_2=2E31?= In-Reply-To: <20200229021238.8810-1-mhalstead@linuxfoundation.org> References: <20200229021238.8810-1-mhalstead@linuxfoundation.org> Message-ID: <20200229023152.2274.78502@do> == Series Details == Series: yocto-uninative.inc: version 2.8 updates glibc to 2.31 Revision: 1 URL : https://patchwork.openembedded.org/series/23020/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch yocto-uninative.inc: version 2.8 updates glibc to 2.31 Issue Patch is missing Signed-off-by [test_signed_off_by_presence] Suggested fix Sign off the patch (either manually or with "git commit --amend -s") If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From armccurdy at gmail.com Sat Feb 29 05:02:03 2020 From: armccurdy at gmail.com (Andre McCurdy) Date: Fri, 28 Feb 2020 21:02:03 -0800 Subject: [OE-core] [PATCH v2 2/4] systemd: Do not force removing resolved from PACKAGECONFIG In-Reply-To: <20200228000437.1848815-1-raj.khem@gmail.com> References: <20200228000437.1848815-1-raj.khem@gmail.com> Message-ID: On Thu, Feb 27, 2020 at 4:04 PM Khem Raj wrote: > > This needs __UAPI_DEF_ETHHDR to be set to 0 which now > taken care by CFLAGS > > Signed-off-by: Khem Raj > --- > v2: Fix typo in append Looks like this arrived too late. The v1 patch is already in master. > meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb > index 5d863410b8..a56a28a189 100644 > --- a/meta/recipes-core/systemd/systemd_244.3.bb > +++ b/meta/recipes-core/systemd/systemd_244.3.bb > @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ > nss \ > nss-mymachines \ > nss-resolve \ > - resolved \ > smack \ > sysusers \ > utmp \ > " > > +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0" > + > # Use the upstream systemd serial-getty at .service and rely on > # systemd-getty-generator instead of using the OE-core specific > # systemd-serialgetty.bb - not enabled by default. > -- > 2.25.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From timothy.t.orling at linux.intel.com Sat Feb 29 05:03:59 2020 From: timothy.t.orling at linux.intel.com (Tim Orling) Date: Fri, 28 Feb 2020 21:03:59 -0800 Subject: [OE-core] [PATCH v2] at-spi2-atk: upgrade 2.32.0 -> 2.34.1 Message-ID: <20200229050359.12933-1-timothy.t.orling@linux.intel.com> Add patch to fix missing sys/time.h include in tests/atk_test_util.h Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ Signed-off-by: Tim Orling --- ...til.h-add-missing-sys-time.h-include.patch | 61 +++++++++++++++++++ ...i2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 11 ++-- 2 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (53%) diff --git a/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch b/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch new file mode 100644 index 0000000000..f64e46eccd --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch @@ -0,0 +1,61 @@ +From a8f9b2d36dc887216e8923047dc309435dd8b254 Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Fri, 28 Feb 2020 10:49:41 -0800 +Subject: [PATCH] atk_test_util.h: add missing sys/time.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On centos-7, we see errors likei [1]: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ?tv_sec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ?tv_nsec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ?timeout? isn?t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ?nanosleep? [-Wimplicit-function-declaration] + nanosleep(&timeout, NULL); + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ?terminate_app?: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ?timeout? has initializer but incomplete type + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ?tv_sec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ?tv_nsec? specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ?timeout?) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ?timeout? isn?t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + +This is because of missing sys/time.h in tests/atk_test_util.h [2] + +Thanks go to Khem Raj for pointing this out [3] + +[1] http://errors.yoctoproject.org/Errors/Details/392974/ +[2] https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/14 +[3] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293707.html + +Upstream-Status: Pending + +Signed-off-by: Tim Orling +--- + tests/atk_test_util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/atk_test_util.h b/tests/atk_test_util.h +index d69e650..98a2c01 100644 +--- a/tests/atk_test_util.h ++++ b/tests/atk_test_util.h +@@ -26,6 +26,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb similarity index 53% rename from meta/recipes-support/atk/at-spi2-atk_2.32.0.bb rename to meta/recipes-support/atk/at-spi2-atk_2.34.1.bb index b717a9c7f7..6947559200 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb @@ -1,16 +1,19 @@ SUMMARY = "AT-SPI 2 Toolkit Bridge" HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291" -SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c" +SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" +SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase features_check upstream-version-is-even +# gnomebase.bbclass sets SRC_URI = , so we need to append after, at least for -native +SRC_URI += " file://0001-atk_test_util.h-add-missing-sys-time.h-include.patch" + PACKAGES =+ "${PN}-gnome ${PN}-gtk2" FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" -- 2.24.0 From raj.khem at gmail.com Sat Feb 29 06:34:53 2020 From: raj.khem at gmail.com (Khem Raj) Date: Fri, 28 Feb 2020 22:34:53 -0800 Subject: [OE-core] [PATCH v2 2/4] systemd: Do not force removing resolved from PACKAGECONFIG In-Reply-To: References: <20200228000437.1848815-1-raj.khem@gmail.com> Message-ID: On Fri, Feb 28, 2020 at 9:02 PM Andre McCurdy wrote: > On Thu, Feb 27, 2020 at 4:04 PM Khem Raj wrote: > > > > This needs __UAPI_DEF_ETHHDR to be set to 0 which now > > taken care by CFLAGS > > > > Signed-off-by: Khem Raj > > --- > > v2: Fix typo in append > > Looks like this arrived too late. The v1 patch is already in master. > No worries will rebase and resend > > meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/meta/recipes-core/systemd/systemd_244.3.bb > b/meta/recipes-core/systemd/systemd_244.3.bb > > index 5d863410b8..a56a28a189 100644 > > --- a/meta/recipes-core/systemd/systemd_244.3.bb > > +++ b/meta/recipes-core/systemd/systemd_244.3.bb > > @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ > > nss \ > > nss-mymachines \ > > nss-resolve \ > > - resolved \ > > smack \ > > sysusers \ > > utmp \ > > " > > > > +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0" > > + > > # Use the upstream systemd serial-getty at .service and rely on > > # systemd-getty-generator instead of using the OE-core specific > > # systemd-serialgetty.bb - not enabled by default. > > -- > > 2.25.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core at lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From petr.vorel at gmail.com Sat Feb 29 06:46:56 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 29 Feb 2020 07:46:56 +0100 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: References: <20200228175731.10604-1-petr.vorel@gmail.com> Message-ID: <20200229064656.GA4045619@x230> Hi Richard, Khem, > > Changes v4->v5: > > * Put back 0002-kernel-controllers-Link-with-libfts-explicitly-on- > > mu.patch > > as it still needed on MUSL (although it should not be needed, > > strange). > > Reported by Anuj Mittal > I'm sorry to say that this still isn't quite right for musl: > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1634 > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1630 > Still having the fts issue :( OK, step1b is still problematic: /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: undefined reference to `fts_close' /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: undefined reference to `fts_close' At least we know, that once we solve this problem, we can remove 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch Please, how to reproduce this build locally? Is it: . oe-init-build-env TCLIBC=musl bitbake ltp Or do I need to put something into config files conf/local.conf or conf/bblayers.conf ? I need to double check if musl-fts is really built and whether the order of -lfts is correct. But all this has been solved even for static build for Buildroot, so I guess it's some issue related to openembedded. Unfortunately, I'm not much experienced in openembedded (stepped in, because nobody else has updated LTP package yet). Khem, any idea, what can be wrong? Kind regards, Petr From kamensky at cisco.com Sat Feb 29 07:55:17 2020 From: kamensky at cisco.com (Victor Kamensky (kamensky)) Date: Sat, 29 Feb 2020 07:55:17 +0000 Subject: [OE-core] [PATCH v3] make: 4.2.1 -> 4.3 In-Reply-To: <3bdcf798302bbb0ce1de37eca82223dd8c3778e3.camel@linuxfoundation.org> References: <20200224143920.19383-1-sno@netbsd.org>, <3bdcf798302bbb0ce1de37eca82223dd8c3778e3.camel@linuxfoundation.org> Message-ID: [sorry for the top post: bad email client at work] Hi Richard, Jens, I was able to reproduce and debugged the mips new make issue. Workaround patch attached. In summary: kernelmodule.KernelModuleTest.test_kernel_module fails with 'fatal error: opening dependency file scripts/basic/.fixdep.d: Permission denied' New make-4.3 started using posix_spawn glibc call, that happens to be broken on mips. On mips during posix_spawn call __spawni_child function that is executed after clone makes setresuid call with spurious/wrong value of ruid. Instead of -1 it passes 127, effectively switching real user id since test runs under root. Subsequent gcc runs under wrong ruid and it fails to write into /usr/src/kernel/scripts/basic directory. __spawni_child uses direct system call invocation for setresuid rather calling glibc function. And there is wrong code generation issue somewhere in inline assembly for direct system call and/or way how compiler processes it. I did not dig into it yet, it looks as quite hard problem and needs more time. For now I've made workaround patch that just through configure ac_cv_func_posix_spawn=no parameter tells make configure not to use posix_spawn on mips. I will also send suggested patch through 'git send-mail' Tested workaround on qemumips64, did not have time for qemumips full test, verified build only and made sure that posix_spawn is not used. But I believe it is the same issue. Detailed debugging notes ================= Running 'bitbake core-image-sato-sdk -c testimage' fails on qemumips64 ---------------------------------------------------------------------- RESULTS - kernelmodule.KernelModuleTest.test_kernel_module: FAILED (36.71s) Reproducing issue manually -------------------------- root at qemumips64:~# cd /usr/src/kernel && make scripts prepare HOSTCC scripts/basic/fixdep scripts/basic/fixdep.c:410:1: fatal error: opening dependency file scripts/basic/.fixdep.d: Permission denied 410 | } | ^ compilation terminated. make[2]: *** [scripts/Makefile.host:107: scripts/basic/fixdep] Error 1 make[1]: *** [Makefile:500: scripts_basic] Error 2 make: *** [Makefile:678: include/config/auto.conf.cmd] Error 2 make: *** [include/config/auto.conf.cmd] Deleting file 'include/config/tristate.conf' root at qemumips64:/usr/src/kernel# ls -al scripts/basic/.fixdep.d ls: cannot access 'scripts/basic/.fixdep.d': No such file or directory Calling the same gcc command manually from shell ------------------------------------------------ It works, no problem. root at qemumips64:/usr/src/kernel# gcc -Wp,-MD,scripts/basic/.fixdep.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89 -o scripts/basic/fixdep scripts/basic/fixdep.c root at qemumips64:/usr/src/kernel# Means make changes context in such way that prevents gcc command execution. Looking at strace result ------------------------ Run the same make command under strace. In log see that getuid return 127! I.e it is different user. It does not have permission to write into scripts/basic/.fixdep.d 1144 getuid() = 127 1144 getgid() = 127 and earlier: 1144 getuid() = 0 1144 setresuid(127, 0, -1) = 0 1144 getgid() = 0 1144 setresgid(127, 0, -1) = 0 1144 dup2(6, 1) = 1 1144 rt_sigprocmask(SIG_SETMASK, [], NULL, 16) = 0 1144 execve("/bin/sh", ["/bin/sh", "-c", "uname -m | sed -e s/i.86/x86/ -e"...], 0xfffbb2e1d0 /* 16 vars */ There is call to setresuid that sets real user id to 127. Why? Running make under gdb ---------------------- (gdb) set args scripts (gdb) b main Breakpoint 1 at 0x9d80: file ../make-4.3/src/main.c, line 1056. (gdb) set follow-fork-mode child (gdb) run Starting program: /usr/bin/make scripts Breakpoint 1, main (argc=2, argv=0xffffffac78, envp=0xffffffac90) at ../make-4.3/src/main.c:1056 1056 ../make-4.3/src/main.c: No such file or directory. (gdb) b getuid Breakpoint 2 at 0xfff7eb5a00: file ../sysdeps/unix/syscall-template.S, line 59. (gdb) b setresuid Breakpoint 3 at 0xfff7eb5eb0: file ../sysdeps/unix/sysv/linux/setresuid.c, line 29. (gdb) b execve Breakpoint 4 at 0xfff7eb4f10: file ../sysdeps/unix/syscall-template.S, line 78. (gdb) b clone Breakpoint 5 at 0xfff7ef3c90: file ../sysdeps/unix/sysv/linux/mips/clone.S, line 45. (gdb) b posix_spawn Breakpoint 6 at 0xfff7edd790: posix_spawn. (2 locations) (gdb) b __spawni_child Breakpoint 7 at 0xfff7eddac0: file ../sysdeps/unix/sysv/linux/spawni.c, line 123. (gdb) c Continuing. Breakpoint 2, getuid () at ../sysdeps/unix/syscall-template.S:59 59 ../sysdeps/unix/syscall-template.S: No such file or directory. (gdb) bt #0 getuid () at ../sysdeps/unix/syscall-template.S:59 #1 0x000000fff7edfa7c in __euidaccess (path=0xaaaab21b30 "/bin/sh", mode=1) at ../sysdeps/posix/euidaccess.c:159 #2 0x000000aaaaadecdc in find_in_given_path (progname=0xaaaab25440 "/bin/sh", path=, optimize_for_exec=) at ../../make-4.3/lib/findprog-in.c:137 #3 0x000000aaaaac7680 in child_execute_job (child=0xffffff8770, good_stdin=, argv=0xaaaab26cb0) at ../make-4.3/src/job.c:2384 #4 0x000000aaaaac2678 in func_shell_base (o=0xaaaab1e350 "", argv=, trim_newlines=) at ../make-4.3/src/function.c:1790 #5 0x000000aaaaac2c38 in handle_function (op=0xffffff8930, stringp=) at ../make-4.3/src/function.c:2544 #6 0x000000aaaaabaa10 in variable_expand_string (line=, string=, length=) at ../make-4.3/src/expand.c:262 #7 0x000000aaaaabb5b4 in allocated_variable_expand_for_file (line=, file=) at ../make-4.3/src/expand.c:566 #8 0x000000aaaaadc11c in do_variable_definition (flocp=0xffffff8d70, varname=0xaaaab1fca0 "SUBARCH", value=0xaaaab24e6b "$(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/s390x/s390/ -e s/parisc64/parisc/ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ -e s/sh[234].*/s"..., origin=, flavor=, target_var=) at ../make-4.3/src/variable.c:1187 #9 0x000000aaaaadccac in try_variable_definition (flocp=0xffffff8d70, line=, origin=, target_var=) at ../make-4.3/src/variable.c:1633 #10 0x000000aaaaad2dfc in eval (ebuf=, set_default=) at ../make-4.3/src/read.c:750 #11 0x000000aaaaad451c in eval_makefile (filename=, flags=) at ../make-4.3/src/read.c:436 #12 0x000000aaaaad3cc4 in eval (ebuf=, set_default=) at ../make-4.3/src/read.c:908 #13 0x000000aaaaad451c in eval_makefile (filename=, flags=) at ../make-4.3/src/read.c:436 #14 0x000000aaaaad4a70 in read_all_makefiles (makefiles=) at ../make-4.3/src/read.c:258 #15 0x000000aaaaab4f9c in main (argc=, argv=, envp=) at ../make-4.3/src/main.c:1945 (gdb) c Continuing. Breakpoint 6, __GI___posix_spawn (pid=0xffffff84b4, path=0xaaaab25440 "/bin/sh", file_actions=0xffffff84b8, attrp=0xffffff8588, argv=0xaaaab26cb0, envp=0xffffffac90) at spawn.c:30 30 spawn.c: No such file or directory. (gdb) bt #0 __GI___posix_spawn (pid=0xffffff84b4, path=0xaaaab25440 "/bin/sh", file_actions=0xffffff84b8, attrp=0xffffff8588, argv=0xaaaab26cb0, envp=0xffffffac90) at spawn.c:30 #1 0x000000aaaaac76b0 in child_execute_job (child=0xffffff8770, good_stdin=, argv=0xaaaab26cb0) at ../make-4.3/src/job.c:2396 #2 0x000000aaaaac2678 in func_shell_base (o=0xaaaab1e350 "", argv=, trim_newlines=) at ../make-4.3/src/function.c:1790 #3 0x000000aaaaac2c38 in handle_function (op=0xffffff8930, stringp=) at ../make-4.3/src/function.c:2544 #4 0x000000aaaaabaa10 in variable_expand_string (line=, string=, length=) at ../make-4.3/src/expand.c:262 #5 0x000000aaaaabb5b4 in allocated_variable_expand_for_file (line=, file=) at ../make-4.3/src/expand.c:566 #6 0x000000aaaaadc11c in do_variable_definition (flocp=0xffffff8d70, varname=0xaaaab1fca0 "SUBARCH", value=0xaaaab24e6b "$(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/s390x/s390/ -e s/parisc64/parisc/ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ -e s/sh[234].*/s"..., origin=, flavor=, target_var=) at ../make-4.3/src/variable.c:1187 #7 0x000000aaaaadccac in try_variable_definition (flocp=0xffffff8d70, line=, origin=, target_var=) at ../make-4.3/src/variable.c:1633 #8 0x000000aaaaad2dfc in eval (ebuf=, set_default=) at ../make-4.3/src/read.c:750 #9 0x000000aaaaad451c in eval_makefile (filename=, flags=) at ../make-4.3/src/read.c:436 #10 0x000000aaaaad3cc4 in eval (ebuf=, set_default=) at ../make-4.3/src/read.c:908 #11 0x000000aaaaad451c in eval_makefile (filename=, flags=) at ../make-4.3/src/read.c:436 #12 0x000000aaaaad4a70 in read_all_makefiles (makefiles=) at ../make-4.3/src/read.c:258 #13 0x000000aaaaab4f9c in main (argc=, argv=, envp=) at ../make-4.3/src/main.c:1945 (gdb) c Continuing. Breakpoint 5, clone () at ../sysdeps/unix/sysv/linux/mips/clone.S:45 45 ../sysdeps/unix/sysv/linux/mips/clone.S: No such file or directory. (gdb) bt #0 clone () at ../sysdeps/unix/sysv/linux/mips/clone.S:45 #1 0x000000fff7edd938 in __spawnix (pid=0xffffff84b4, file=0xaaaab25440 "/bin/sh", file_actions=, attrp=, argv=0xaaaab26cb0, envp=0xffffffac90, xflags=, exec=0xfff7eb4f10 ) at ../sysdeps/unix/sysv/linux/spawni.c:382 #2 0x000000aaaaac76b0 in child_execute_job (child=0xffffff8770, good_stdin=, argv=0xaaaab26cb0) at ../make-4.3/src/job.c:2396 #3 0x000000aaaaac2678 in func_shell_base (o=0xaaaab1e350 "", argv=, trim_newlines=) at ../make-4.3/src/function.c:1790 #4 0x000000aaaaac2c38 in handle_function (op=0xffffff8930, stringp=) at ../make-4.3/src/function.c:2544 #5 0x000000aaaaabaa10 in variable_expand_string (line=, string=, length=) at ../make-4.3/src/expand.c:262 #6 0x000000aaaaabb5b4 in allocated_variable_expand_for_file (line=, file=) at ../make-4.3/src/expand.c:566 #7 0x000000aaaaadc11c in do_variable_definition (flocp=0xffffff8d70, varname=0xaaaab1fca0 "SUBARCH", value=0xaaaab24e6b "$(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/s390x/s390/ -e s/parisc64/parisc/ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ -e s/sh[234].*/s"..., origin=, flavor=, target_var=) at ../make-4.3/src/variable.c:1187 #8 0x000000aaaaadccac in try_variable_definition (flocp=0xffffff8d70, line=, origin=, target_var=) at ../make-4.3/src/variable.c:1633 #9 0x000000aaaaad2dfc in eval (ebuf=, set_default=) at ../make-4.3/src/read.c:750 #10 0x000000aaaaad451c in eval_makefile (filename=, flags=) at ../make-4.3/src/read.c:436 #11 0x000000aaaaad3cc4 in eval (ebuf=, set_default=) at ../make-4.3/src/read.c:908 #12 0x000000aaaaad451c in eval_makefile (filename=, flags=) at ../make-4.3/src/read.c:436 #13 0x000000aaaaad4a70 in read_all_makefiles (makefiles=) at ../make-4.3/src/read.c:258 #14 0x000000aaaaab4f9c in main (argc=, argv=, envp=) at ../make-4.3/src/main.c:1945 (gdb) c Continuing. [Attaching after process 3441 vfork to child process 3444] [New inferior 2 (process 3444)] [Switching to process 3444] Thread 2.1 "make" hit Breakpoint 7, __spawni_child (arguments=0xffffff8350) at ../sysdeps/unix/sysv/linux/spawni.c:123 123 ../sysdeps/unix/sysv/linux/spawni.c: No such file or directory. (gdb) bt #0 __spawni_child (arguments=0xffffff8350) at ../sysdeps/unix/sysv/linux/spawni.c:123 #1 0x000000fff7ef3d28 in __thread_start () at ../sysdeps/unix/sysv/linux/mips/clone.S:135 (gdb) c Continuing. Thread 2.1 "make" hit Breakpoint 2, getuid () at ../sysdeps/unix/syscall-template.S:59 59 ../sysdeps/unix/syscall-template.S: No such file or directory. (gdb) bt #0 getuid () at ../sysdeps/unix/syscall-template.S:59 #1 0x000000fff7eddedc in __spawni_child (arguments=0xffffff8350) at ../sysdeps/unix/sysv/linux/spawni.c:189 #2 0x000000fff7ef3d28 in __thread_start () at ../sysdeps/unix/sysv/linux/mips/clone.S:135 (gdb) c Continuing. Thread 2.1 "make" hit Breakpoint 4, 0x000000fff7eb4f10 in execve () at ../sysdeps/unix/syscall-template.S:78 78 ../sysdeps/unix/syscall-template.S: No such file or directory. (gdb) bt #0 0x000000fff7eb4f10 in execve () at ../sysdeps/unix/syscall-template.S:78 #1 0x000000fff7eddd10 in __spawni_child (arguments=0xffffff8350) at ../sysdeps/unix/sysv/linux/spawni.c:292 #2 0x000000fff7ef3d28 in __thread_start () at ../sysdeps/unix/sysv/linux/mips/clone.S:135 It looks like we did not hit setresuid breakpoint but reached execve ... strange Looking at glibc __spawni_child code ------------------------------------ >From cat -n ./2.31-r0/git/sysdeps/unix/sysv/linux/spawni.c 187 /* Set the effective user and group IDs. */ 188 if ((attr->__flags & POSIX_SPAWN_RESETIDS) != 0 189 && (local_seteuid (__getuid ()) != 0 190 || local_setegid (__getgid ()) != 0)) 191 goto fail; 192 What is local_seteuid --------------------- >From cat -n 2.31-r0/git/sysdeps/unix/sysv/linux/local-setxid.h 8 # define local_seteuid(id) INLINE_SYSCALL (setresuid, 3, -1, id, -1) 15 # define local_setegid(id) INLINE_SYSCALL (setresgid, 3, -1, id, -1) That explains why setresuid breakpoint was not hit. Code calls directly system call. What is internal_syscall3 ------------------------- >From cat -n 2.31-r0/git/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h 181 #define internal_syscall3(v0_init, input, number, err, \ 182 arg1, arg2, arg3) \ 183 ({ \ 184 long _sys_result; \ 185 \ 186 { \ 187 register long __s0 asm ("$16") __attribute__ ((unused)) \ 188 = (number); \ 189 register long __v0 asm ("$2"); \ 190 register long __a0 asm ("$4") = (long) (arg1); \ 191 register long __a1 asm ("$5") = (long) (arg2); \ 192 register long __a2 asm ("$6") = (long) (arg3); \ 193 register long __a3 asm ("$7"); \ 194 __asm__ volatile ( \ 195 ".set\tnoreorder\n\t" \ 196 v0_init \ 197 "syscall\n\t" \ 198 ".set\treorder" \ 199 : "=r" (__v0), "=r" (__a3) \ 200 : input, "r" (__a0), "r" (__a1), "r" (__a2) \ 201 : __SYSCALL_CLOBBERS); \ 202 err = __a3; \ 203 _sys_result = __v0; \ 204 } \ 205 _sys_result; \ 206 }) In gdb again ------------ (gdb) bt #0 getuid () at ../sysdeps/unix/syscall-template.S:59 #1 0x000000fff7eddedc in __spawni_child (arguments=0xffffff8350) at ../sysdeps/unix/sysv/linux/spawni.c:189 #2 0x000000fff7ef3d28 in __thread_start () at ../sysdeps/unix/sysv/linux/mips/clone.S:135 (gdb) up #1 0x000000fff7eddedc in __spawni_child (arguments=0xffffff8350) at ../sysdeps/unix/sysv/linux/spawni.c:189 189 ../sysdeps/unix/sysv/linux/spawni.c: No such file or directory. (gdb) x /20i $pc - 20 0xfff7eddec8 <__spawni_child+1032>: nop 0xfff7eddecc <__spawni_child+1036>: b 0xfff7eddcc0 <__spawni_child+512> 0xfff7edded0 <__spawni_child+1040>: lw a0,4(s1) 0xfff7edded4 <__spawni_child+1044>: jalr t9 0xfff7edded8 <__spawni_child+1048>: nop => 0xfff7eddedc <__spawni_child+1052>: li a2,-1 0xfff7eddee0 <__spawni_child+1056>: dext a1,v0,0x0,0x20 0xfff7eddee4 <__spawni_child+1060>: li v0,5115 0xfff7eddee8 <__spawni_child+1064>: syscall 0xfff7eddeec <__spawni_child+1068>: bnez a3,0xfff7ede000 <__spawni_child+1344> 0xfff7eddef0 <__spawni_child+1072>: nop 0xfff7eddef4 <__spawni_child+1076>: bnez v0,0xfff7edde00 <__spawni_child+832> 0xfff7eddef8 <__spawni_child+1080>: ld t9,-26712(gp) 0xfff7eddefc <__spawni_child+1084>: jalr t9 0xfff7eddf00 <__spawni_child+1088>: nop 0xfff7eddf04 <__spawni_child+1092>: li a2,-1 0xfff7eddf08 <__spawni_child+1096>: dext a1,v0,0x0,0x20 0xfff7eddf0c <__spawni_child+1100>: li v0,5117 0xfff7eddf10 <__spawni_child+1104>: syscall 0xfff7eddf14 <__spawni_child+1108>: bnez a3,0xfff7ede000 <__spawni_child+1344> 0xfff7eddf18 <__spawni_child+1112>: nop (gdb) display /i $pc 1: x/i $pc => 0xfff7eddedc <__spawni_child+1052>: li a2,-1 (gdb) si 0x000000fff7eb5a04 59 ../sysdeps/unix/syscall-template.S: No such file or directory. 1: x/i $pc => 0xfff7eb5a04 : syscall (gdb) info reg zero at v0 v1 R0 0000000000000000 000000001400a4e1 00000000000013ec 0000000000000000 a0 a1 a2 a3 R4 000000000000007f 000000fff7ff2d80 0000000000000000 0000000000000000 a4 a5 a6 a7 R8 0000000000000000 0000000000000000 0000000000000000 0000000000000000 t0 t1 t2 t3 R12 0000000000000000 ffffffff84080018 ffffffff801554b8 0000000000000000 s0 s1 s2 s3 R16 000000ffffff8588 000000ffffff84b8 0000000000000001 000000ffffff8350 s4 s5 s6 s7 R20 000000fff7e2ef80 000000fff7eb4f10 000000000000007f 000000000000007f t8 t9 k0 k1 R24 0000000000000000 000000fff7eb5a00 0000000000000010 0000000000000000 gp sp s8 ra R28 000000fff7f9f5e0 000000fff7ff2e20 000000fff7ff2e20 000000fff7eddedc status lo hi badvaddr 000000000400a4f3 1b6ee11164e1e246 eb05325e15c10102 000000fff7ff2fe0 cause pc 0000000010800024 000000fff7eb5a04 fcsr fir restart 00000000 007f0000 0000000000000000 (gdb) p /d $a0 $1 = 127 a0 value is 127! But it should be -1 according to local_seteuid call. Why is that? This code looks quite wrong: 0xfff7edded0 <__spawni_child+1040>: lw a0,4(s1) 0xfff7edded4 <__spawni_child+1044>: jalr t9 0xfff7edded8 <__spawni_child+1048>: nop => 0xfff7eddedc <__spawni_child+1052>: li a2,-1 0xfff7eddee0 <__spawni_child+1056>: dext a1,v0,0x0,0x20 0xfff7eddee4 <__spawni_child+1060>: li v0,5115 0xfff7eddee8 <__spawni_child+1064>: syscall There is not load of -1 into a0 before jumping to setresuid system call. In disassembly at certain point one can see: 0x000000fff7edde1c <+860>: li a0,127 It seems either internal_syscall3 is wrong or compiler does not process it correctly ... quite bad ... Looking at make make-4.3/src/job.c ---------------------------------- It seems that posix_spawn would be used only if USE_POSIX_SPAWN defined. Test for USE_POSIX_SPAWN is in configure.ac ------------------------------------------- >From cat -n make-4.3/configure.ac 382 AS_IF([test "$make_cv_posix_spawn" = yes], 383 AC_CACHE_CHECK([for posix_spawn that fails synchronously], 384 [make_cv_synchronous_posix_spawn], 385 [make_cv_synchronous_posix_spawn=no 386 AC_RUN_IFELSE([AC_LANG_SOURCE([[ 387 #include 388 #include 389 390 extern char **environ; 391 392 int main() { 393 char* path = strdup("./non-existent"); 394 char *argv[[2]]; 395 argv[[0]] = path; 396 argv[[1]] = 0; 397 return posix_spawn(0, path, 0, 0, argv, environ); 398 }]])], 399 [make_cv_synchronous_posix_spawn=no], 400 [make_cv_synchronous_posix_spawn=yes], 401 [make_cv_synchronous_posix_spawn="no (cross-compiling)"])])) 402 403 AS_CASE([/$user_posix_spawn/$make_cv_posix_spawn/$make_cv_synchronous_posix_spawn/], 404 [*/no/*], [make_cv_posix_spawn=no], 405 [AC_DEFINE(USE_POSIX_SPAWN, 1, [Define to 1 to use posix_spawn().]) 406 ]) Note USE_POSIX_SPAWN code was not present in make-4.2.1 ------------------------------------------------------- Workaround ----------- In case of mips disable use of posix_spawn through ac_cv_func_posix_spawn=no configure option. Testing ------- Tested 'bitbake core-image-sato-sdk -c testimage' all tested are passed. Thanks, Victor ________________________________________ From: Richard Purdie Sent: Thursday, February 27, 2020 11:45 PM To: Jens Rehsack; openembedded-core at lists.openembedded.org Cc: Bruce Ashfield; Victor Kamensky (kamensky) Subject: Re: [OE-core] [PATCH v3] make: 4.2.1 -> 4.3 On Mon, 2020-02-24 at 15:39 +0100, Jens Rehsack wrote: > Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html > > 1) Remove upstream provided patches 0001-glob-Do-not-assume-glibc-glob-internals.patch > and 0002-glob-Do-not-assume-glibc-glob-internals.patch. > > 2) License has been changed to GPLv3 only > > 3) Important bug-fix is > * https://lists.gnu.org/archive/html/bug-make/2018-09/msg00006.html > > 4) Backward-incompatibilities: > * Number signs (#) appearing inside a macro reference or function invocation > no longer introduce comments and should not be escaped with backslashes > * Previously appending using '+=' to an empty variable would result in a value > starting with a space. Now the initial space is only added if the variable > already contains some value. Similarly, appending an empty string does not > add a trailing space. > > Fix incompatibility issues between gnulib bundled with updated make fix issues > in w32 compat sources. > > Signed-off-by: Jens Rehsack From kamensky at cisco.com Sat Feb 29 07:55:46 2020 From: kamensky at cisco.com (Victor Kamensky) Date: Fri, 28 Feb 2020 23:55:46 -0800 Subject: [OE-core] [PATCH] make: disable use of posix_spawn on mips Message-ID: <20200229075546.12713-1-kamensky@cisco.com> After make-4.3 migration child_execute_job function started using posix_spawn function, which happens to be broken on mips. It manifests itself as when make executed by root, it switches real user id to wrong value because of some issues with direct setresuid system call done in glibc __spawni_child function through inline assemble and/or gcc compiling it produces wrong code. I.e instead of passing -1 posix_spawn function incorrectly passes 127 as ruid. Subsequently job started by make can fail with permission issue because they run under wrong user. For now workaround is used by explicitly disabling posix_spawn call use by make on mips through configure variable. Signed-off-by: Victor Kamensky --- meta/recipes-devtools/make/make_4.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index 70caf0ae16..5fa7059169 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,6 +12,9 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" +EXTRA_OECONF_append_mips=" ac_cv_func_posix_spawn=no" +EXTRA_OECONF_append_mips64=" ac_cv_func_posix_spawn=no" + SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" -- 2.21.1 From patchwork at patchwork.openembedded.org Sat Feb 29 08:32:13 2020 From: patchwork at patchwork.openembedded.org (Patchwork) Date: Sat, 29 Feb 2020 08:32:13 -0000 Subject: [OE-core] =?utf-8?q?=E2=9C=97_patchtest=3A_failure_for_make=3A_di?= =?utf-8?q?sable_use_of_posix=5Fspawn_on_mips?= In-Reply-To: <20200229075546.12713-1-kamensky@cisco.com> References: <20200229075546.12713-1-kamensky@cisco.com> Message-ID: <20200229083213.2276.4409@do> == Series Details == Series: make: disable use of posix_spawn on mips Revision: 1 URL : https://patchwork.openembedded.org/series/23022/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at a5beb977a5) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core at lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe From bunk at stusta.de Sat Feb 29 09:21:03 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sat, 29 Feb 2020 11:21:03 +0200 Subject: [OE-core] [PATCH] make: disable use of posix_spawn on mips In-Reply-To: <20200229075546.12713-1-kamensky@cisco.com> References: <20200229075546.12713-1-kamensky@cisco.com> Message-ID: <20200229092103.GA27521@localhost> On Fri, Feb 28, 2020 at 11:55:46PM -0800, Victor Kamensky via Openembedded-core wrote: > After make-4.3 migration child_execute_job function started > using posix_spawn function, which happens to be broken on mips. > > It manifests itself as when make executed by root, it switches > real user id to wrong value because of some issues with direct > setresuid system call done in glibc __spawni_child function > through inline assemble and/or gcc compiling it produces wrong > code. I.e instead of passing -1 posix_spawn function incorrectly > passes 127 as ruid. Subsequently job started by make can fail > with permission issue because they run under wrong user. Thanks for looking into this. > For now workaround is used by explicitly disabling posix_spawn > call use by make on mips through configure variable. The proper fix would be to upgrade to the latest glibc 2.31 branch, which has backported the fixes for the bug [1] on mips/risc-v/microblaze. cu Adrian [1] https://sourceware.org/bugzilla/show_bug.cgi?id=25523 From bunk at stusta.de Sat Feb 29 09:51:04 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sat, 29 Feb 2020 11:51:04 +0200 Subject: [OE-core] [PATCH] ncurses: Comment out version parsing that broke CVE checking Message-ID: <20200229095104.31724-1-bunk@stusta.de> This will be needed again when using patchlevel versions again. Also make it more generic. Signed-off-by: Adrian Bunk --- meta/recipes-core/ncurses/ncurses_6.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb index b6d899c878..723e685a9b 100644 --- a/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -10,4 +10,5 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}" +# This is needed when using patchlevel versions like 6.1+20181013 +#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" -- 2.17.1 From richard.purdie at linuxfoundation.org Sat Feb 29 10:12:36 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 10:12:36 +0000 Subject: [OE-core] [PATCH v3] make: 4.2.1 -> 4.3 In-Reply-To: References: <20200224143920.19383-1-sno@netbsd.org> ,<3bdcf798302bbb0ce1de37eca82223dd8c3778e3.camel@linuxfoundation.org> Message-ID: Hi Victor, On Sat, 2020-02-29 at 07:55 +0000, Victor Kamensky (kamensky) wrote: > I was able to reproduce and debugged the mips new make issue. > Workaround patch attached. > > In summary: kernelmodule.KernelModuleTest.test_kernel_module > fails with 'fatal error: opening dependency file > scripts/basic/.fixdep.d: Permission denied' > > New make-4.3 started using posix_spawn glibc call, > that happens to be broken on mips. On mips during posix_spawn call > __spawni_child function that is executed after clone makes > setresuid call with spurious/wrong value of ruid. Instead of -1 > it passes 127, effectively switching real user id since test > runs under root. Subsequent gcc runs under wrong ruid and it > fails to write into /usr/src/kernel/scripts/basic directory. > > __spawni_child uses direct system call invocation for setresuid > rather calling glibc function. And there is wrong code generation > issue somewhere in inline assembly for direct system call and/or > way how compiler processes it. I did not dig into it yet, it > looks as quite hard problem and needs more time. > > For now I've made workaround patch that just through configure > ac_cv_func_posix_spawn=no parameter tells make configure not to use > posix_spawn on mips. > > I will also send suggested patch through 'git send-mail' > > Tested workaround on qemumips64, did not have time for > qemumips full test, verified build only and made sure that > posix_spawn is not used. But I believe it is the same issue. Thanks for the quick turnaround on this, sounds like good progress on a workaround! It does massively help with the preparation for 3.1 and is much appreciated. I've put the patch in for testing. It sounds like there may be an upstream glibc patch which might be the fix of the underlying issue. I'll probably look to merge the workaround and then we could look at the glibc upgrade next. I'll report back on how the testing goes. Cheers, Richard From alex.kanavin at gmail.com Sat Feb 29 10:14:32 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 29 Feb 2020 11:14:32 +0100 Subject: [OE-core] [PATCH 1/2] piglit: move to meta-oe Message-ID: <20200229101433.30787-1-alex.kanavin@gmail.com> This recipe is build-heavy, yet is not part of any images and isn't runtime tesed as part of oe-core. There's no evidence of anyone using it, as all commits are revision updates. It also pulls in NumPy, which is also a significant support item, and wouldn't otherwise be part of core. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 1 - ...-bash-completions-in-the-right-place.patch | 35 ---------- ...proper-WAYLAND_INCLUDE_DIRS-variable.patch | 32 ---------- meta/recipes-graphics/piglit/piglit_git.bb | 64 ------------------- 4 files changed, 132 deletions(-) delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch delete mode 100644 meta/recipes-graphics/piglit/piglit_git.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 10095ffe76..97860676cc 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -551,7 +551,6 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi " RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin " RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield " RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-piglit = "Ross Burton " RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia " RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster " RECIPE_MAINTAINER_pn-pixman = "Anuj Mittal " diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch deleted file mode 100644 index e07e810a73..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Wed, 13 Jul 2016 19:19:02 +0300 -Subject: [PATCH] cmake: install bash-completions in the right place - -The completionsdir variable is a full path and should not be -prefixed. - -This does mean the files may be installed outside of -CMAKE_INSTALL_PREFIX -- the alternative is more difficult and -means that bash completion files may be installed where -bash-completion can't find them. - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Submitted [mailing list] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8e2abba..784a8f9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -532,7 +532,7 @@ install ( - if (BASH_COMPLETION_FOUND) - install( - FILES completions/bash/piglit -- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/ -+ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/ - ) - endif (BASH_COMPLETION_FOUND) - --- -2.8.1 - diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch deleted file mode 100644 index 5d6ec368ba..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Thu, 4 Oct 2018 14:43:17 +0200 -Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable - -WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly -set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even -when cross compiling. - -Signed-off-by: Pascal Bach - -Upstream-Status: Submitted [piglit at lists.freedesktop.org] ---- - tests/util/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt -index a5f080156..a303a9f58 100644 ---- a/tests/util/CMakeLists.txt -+++ b/tests/util/CMakeLists.txt -@@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE) - piglit-framework-gl/piglit_wl_framework.c - ) - list(APPEND UTIL_GL_INCLUDES -- ${WAYLAND_wayland-client_INCLUDEDIR} -+ ${WAYLAND_INCLUDE_DIRS} - ) - endif() - if(PIGLIT_HAS_X11) --- -2.11.0 - diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb deleted file mode 100644 index 58d10d6b9b..0000000000 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "OpenGL driver testing framework" -DESCRIPTION = "Piglit is an open-source test suite for OpenGL and OpenCL \ -implementations." -LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" - -SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ - file://0001-cmake-install-bash-completions-in-the-right-place.patch \ - file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ - " -UPSTREAM_CHECK_COMMITS = "1" - -SRCREV = "6126c2d4e476c7770d216ffa1932c10e2a5a7813" -# (when PV goes above 1.0 remove the trailing r) -PV = "1.0+gitr${SRCPV}" - -S = "${WORKDIR}/git" - -X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}" -X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}" - -DEPENDS = "libpng waffle libxkbcommon virtual/libgl python3-mako-native python3-numpy-native python3-six-native virtual/egl" - -inherit cmake pkgconfig python3native features_check bash-completion - -# depends on virtual/libgl -REQUIRED_DISTRO_FEATURES += "opengl" - -# The built scripts go into the temporary directory according to tempfile -# (typically /tmp) which can race if multiple builds happen on the same machine, -# so tell it to use a directory in ${B} to avoid overwriting. -export TEMP = "${B}/temp/" -do_compile[dirs] =+ "${B}/temp/" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," -PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" - - -do_configure_prepend() { - if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then - sed -i -e "/^#.*include $/d" ${S}/src/piglit/glut_wrap.h - sed -i -e "/^#.*include.*$/d" ${S}/src/piglit/glut_wrap.h - fi -} - -# Forcibly strip because Piglit is *huge* -OECMAKE_TARGET_INSTALL = "install/strip" - -RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ - python3-misc \ - python3-unixadmin python3-xml python3-multiprocessing \ - python3-six python3-shell python3-io \ - python3-netserver bash \ - " - -INSANE_SKIP_${PN} += "dev-so already-stripped" - -# As nothing builds against Piglit we don't need to have anything in the -# sysroot, especially when this is ~2GB of test suite -SYSROOT_DIRS_remove = "${libdir}" - -# Can't be built with ccache -CCACHE_DISABLE = "1" -- 2.25.1 From alex.kanavin at gmail.com Sat Feb 29 10:14:33 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 29 Feb 2020 11:14:33 +0100 Subject: [OE-core] [PATCH 2/2] python3-numpy: move to meta-python In-Reply-To: <20200229101433.30787-1-alex.kanavin@gmail.com> References: <20200229101433.30787-1-alex.kanavin@gmail.com> Message-ID: <20200229101433.30787-2-alex.kanavin@gmail.com> This recipe is in core only to enable piglit, and isn't otherwise eligible for inclusion. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 1 - ...-and-so-on-for-libraries-by-default-.patch | 70 ------------------- ...up.py-remove-the-detection-of-x86-ta.patch | 32 --------- .../python-numpy/python-numpy.inc | 52 -------------- .../python-numpy/python3-numpy_1.17.4.bb | 3 - 5 files changed, 158 deletions(-) delete mode 100644 meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch delete mode 100644 meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch delete mode 100644 meta/recipes-devtools/python-numpy/python-numpy.inc delete mode 100644 meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 97860676cc..502636ec3d 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -584,7 +584,6 @@ RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt " RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt " RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk " -RECIPE_MAINTAINER_pn-python3-numpy = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3-pbr = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3-pip = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3-pycairo = "Oleksandr Kravchuk " diff --git a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch deleted file mode 100644 index 98a9705831..0000000000 --- a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 10 Dec 2015 13:20:30 +0200 -Subject: [PATCH] Don't search /usr and so on for libraries by default to - - avoid host contamination. - -Upstream-Status: Inappropriate (As the code stands, this is a hack) -Signed-off-by: Ross Burton -Signed-off-by: Alexander Kanavin - ---- - numpy/distutils/system_info.py | 42 ++++------------------------------ - 1 file changed, 5 insertions(+), 37 deletions(-) - -diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index ba2b1f4..f94dce1 100644 ---- a/numpy/distutils/system_info.py -+++ b/numpy/distutils/system_info.py -@@ -278,45 +278,13 @@ if sys.platform == 'win32': - add_system_root(os.path.join(conda_dir, 'Library')) - - else: -- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', -- '/opt/local/lib', '/sw/lib'], platform_bits) - default_runtime_dirs = [] -- default_include_dirs = ['/usr/local/include', -- '/opt/include', '/usr/include', -- # path of umfpack under macports -- '/opt/local/include/ufsparse', -- '/opt/local/include', '/sw/include', -- '/usr/include/suitesparse'] -- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src'] -- -- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', -- '/usr/lib'], platform_bits) -- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', -- '/usr/include'] -- -- if os.path.exists('/usr/lib/X11'): -- globbed_x11_dir = glob('/usr/lib/*/libX11.so') -- if globbed_x11_dir: -- x11_so_dir = os.path.split(globbed_x11_dir[0])[0] -- default_x11_lib_dirs.extend([x11_so_dir, '/usr/lib/X11']) -- default_x11_include_dirs.extend(['/usr/lib/X11/include', -- '/usr/include/X11']) -- -- with open(os.devnull, 'w') as tmp: -- try: -- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE, -- stderr=tmp) -- except (OSError, DistutilsError): -- # OSError if gcc is not installed, or SandboxViolation (DistutilsError -- # subclass) if an old setuptools bug is triggered (see gh-3160). -- pass -- else: -- triplet = str(p.communicate()[0].decode().strip()) -- if p.returncode == 0: -- # gcc supports the "-print-multiarch" option -- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] -- default_lib_dirs += [os.path.join("/usr/lib/", triplet)] -+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) -+ default_include_dirs = ['/deaddir/include'] -+ default_src_dirs = ['.', '/deaddir/src'] - -+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) -+ default_x11_include_dirs = ['/deaddir/include'] - - if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: - default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) diff --git a/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch b/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch deleted file mode 100644 index 9da6a2b3da..0000000000 --- a/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 12 Aug 2019 15:37:36 +0200 -Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets - via uname() - -This was badly breaking compilation for ARM targets (and possibly -other non-x86 targets); if -msse2 is desirable for x86 builds it has -to be passed through another channel. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - numpy/random/setup.py | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/numpy/random/setup.py b/numpy/random/setup.py -index a1bf3b8..60fb534 100644 ---- a/numpy/random/setup.py -+++ b/numpy/random/setup.py -@@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None): - elif not is_msvc: - # Some bit generators require c99 - EXTRA_COMPILE_ARGS += ['-std=c99'] -- INTEL_LIKE = any(arch in platform.machine() -- for arch in ('x86', 'i686', 'i386', 'amd64')) -- if INTEL_LIKE: -- # Assumes GCC or GCC-like compiler -- EXTRA_COMPILE_ARGS += ['-msse2'] - - # Use legacy integer variable sizes - LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')] diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc deleted file mode 100644 index 8413434af9..0000000000 --- a/meta/recipes-devtools/python-numpy/python-numpy.inc +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "A sophisticated Numeric Processing Package for Python" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1" - -SRCNAME = "numpy" - -SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ - file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ - file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \ - " -SRC_URI[md5sum] = "9147c3ee75e58d657b5b8b5a4f3564e0" -SRC_URI[sha256sum] = "fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9" - -UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" - -# Needed for building with gcc 4.x from centos 7 -CFLAGS_append_class-native = " -std=c99" - -S = "${WORKDIR}/numpy-${PV}" - -CLEANBROKEN = "1" - -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" - -# install what is needed for numpy.test() -RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-nose \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-mmap \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pydoc \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-multiprocessing \ -" - -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb deleted file mode 100644 index d388e88d25..0000000000 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools3 -require python-numpy.inc - -- 2.25.1 From richard.purdie at linuxfoundation.org Sat Feb 29 10:40:34 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 10:40:34 +0000 Subject: [OE-core] [PATCH 1/2] piglit: move to meta-oe In-Reply-To: <20200229101433.30787-1-alex.kanavin@gmail.com> References: <20200229101433.30787-1-alex.kanavin@gmail.com> Message-ID: <23132fd4872488b259751cdf8bcd8335d703b205.camel@linuxfoundation.org> On Sat, 2020-02-29 at 11:14 +0100, Alexander Kanavin wrote: > This recipe is build-heavy, yet is not part of any images and isn't > runtime tesed as > part of oe-core. There's no evidence of anyone using it, as all > commits are revision updates. It also pulls in NumPy, which is also > a significant support item, and wouldn't otherwise be part of core. I'm not sure about this. The intent was to use piglit as a way of improving our graphics testing, particularly allowing it to be automated. Whilst we've had to focus on getting the basics right, I'm not sure that objective isn't still a worthy goal over time? Cheers, Richard From ross at burtonini.com Sat Feb 29 11:33:30 2020 From: ross at burtonini.com (Ross Burton) Date: Sat, 29 Feb 2020 11:33:30 +0000 Subject: [OE-core] [PATCH] xorgproto: move pc files to libdir In-Reply-To: <20200228230006.28594-1-jpuhlman@mvista.com> References: <20200228230006.28594-1-jpuhlman@mvista.com> Message-ID: Can you file a bug upstream so they can fix this? Ross On Fri, 28 Feb 2020 at 23:00, Jeremy A. Puhlman wrote: > > From: Jeremy Puhlman > > We fixed this two years go: > http://lists.openembedded.org/pipermail/openembedded-core/2018-June/151922.html > > However xorgproto moved to meson and uses pkgconfig module to generate the .pc > which does not provide a method of omitting the libdir, which now means any > pc generated from meson using the module will always be mulitlib incompatible. > > Signed-off-by: Jeremy A. Puhlman > --- > meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb > index fb3f3aed3d..c0785ccd64 100644 > --- a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb > +++ b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb > @@ -19,6 +19,8 @@ inherit meson > PACKAGECONFIG ??= "" > PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false" > > +# Datadir only used to install pc files, $datadir/pkgconfig > +datadir="${libdir}" > # ${PN} is empty so we need to tweak -dev and -dbg package dependencies > RDEPENDS_${PN}-dev = "" > RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" > -- > 2.20.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From richard.purdie at linuxfoundation.org Sat Feb 29 12:54:55 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 12:54:55 +0000 Subject: [OE-core] [PATCH] psplash: Update to latest git revision Message-ID: <20200229125455.487874-1-richard.purdie@linuxfoundation.org> Image files are always generated now so make the gdk-pixbuf dependency required. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/psplash_git.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 6ff0393194a..779f0f6da83 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" +DEPENDS = "gdk-pixbuf-native" -SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" +SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" PV = "0.1+git${SRCPV}" PR = "r15" @@ -13,6 +14,7 @@ SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ file://psplash-start.service \ file://psplash-systemd.service \ + file://fix.patch \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" @@ -49,9 +51,6 @@ python __anonymous() { d.setVar("SPLASH_INSTALL", " ".join(pkgs)) d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) - if haspng: - d.appendVar("DEPENDS", " gdk-pixbuf-native") - d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) mlprefix = d.getVar('MLPREFIX') or '' pn = d.getVar('PN') or '' -- 2.25.0 From richard.purdie at linuxfoundation.org Sat Feb 29 12:56:54 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 12:56:54 +0000 Subject: [OE-core] [PATCH] psplash: Update to latest git revision Message-ID: <20200229125654.488036-1-richard.purdie@linuxfoundation.org> Image files are always generated now so make the gdk-pixbuf dependency required. Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/psplash_git.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 6ff0393194a..875adb13fc2 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" +DEPENDS = "gdk-pixbuf-native" -SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1" +SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" PV = "0.1+git${SRCPV}" PR = "r15" @@ -49,9 +50,6 @@ python __anonymous() { d.setVar("SPLASH_INSTALL", " ".join(pkgs)) d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) - if haspng: - d.appendVar("DEPENDS", " gdk-pixbuf-native") - d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) mlprefix = d.getVar('MLPREFIX') or '' pn = d.getVar('PN') or '' -- 2.25.0 From richard.purdie at linuxfoundation.org Sat Feb 29 13:01:00 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 13:01:00 +0000 Subject: [OE-core] [PATCH v3] make: 4.2.1 -> 4.3 In-Reply-To: References: <20200224143920.19383-1-sno@netbsd.org> ,<3bdcf798302bbb0ce1de37eca82223dd8c3778e3.camel@linuxfoundation.org> Message-ID: <52ea156e263b169b5d2581ab5d6df8918c824215.camel@linuxfoundation.org> On Sat, 2020-02-29 at 10:12 +0000, Richard Purdie wrote: > Hi Victor, > > On Sat, 2020-02-29 at 07:55 +0000, Victor Kamensky (kamensky) wrote: > > I was able to reproduce and debugged the mips new make issue. > > Workaround patch attached. > > > > In summary: kernelmodule.KernelModuleTest.test_kernel_module > > fails with 'fatal error: opening dependency file > > scripts/basic/.fixdep.d: Permission denied' > > > > New make-4.3 started using posix_spawn glibc call, > > that happens to be broken on mips. On mips during posix_spawn call > > __spawni_child function that is executed after clone makes > > setresuid call with spurious/wrong value of ruid. Instead of -1 > > it passes 127, effectively switching real user id since test > > runs under root. Subsequent gcc runs under wrong ruid and it > > fails to write into /usr/src/kernel/scripts/basic directory. > > > > __spawni_child uses direct system call invocation for setresuid > > rather calling glibc function. And there is wrong code generation > > issue somewhere in inline assembly for direct system call and/or > > way how compiler processes it. I did not dig into it yet, it > > looks as quite hard problem and needs more time. > > > > For now I've made workaround patch that just through configure > > ac_cv_func_posix_spawn=no parameter tells make configure not to use > > posix_spawn on mips. > > > > I will also send suggested patch through 'git send-mail' > > > > Tested workaround on qemumips64, did not have time for > > qemumips full test, verified build only and made sure that > > posix_spawn is not used. But I believe it is the same issue. > > Thanks for the quick turnaround on this, sounds like good progress on > a > workaround! It does massively help with the preparation for 3.1 and > is > much appreciated. > > I've put the patch in for testing. It sounds like there may be an > upstream glibc patch which might be the fix of the underlying issue. > I'll probably look to merge the workaround and then we could look at > the glibc upgrade next. > > I'll report back on how the testing goes. Looks good, thanks! I'll merge with a comment about the issue and likely fix when we can drop it. Cheers, Richard From alex.kanavin at gmail.com Sat Feb 29 13:11:20 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 29 Feb 2020 14:11:20 +0100 Subject: [OE-core] [PATCH 1/2] piglit: move to meta-oe In-Reply-To: <23132fd4872488b259751cdf8bcd8335d703b205.camel@linuxfoundation.org> References: <20200229101433.30787-1-alex.kanavin@gmail.com> <23132fd4872488b259751cdf8bcd8335d703b205.camel@linuxfoundation.org> Message-ID: On Sat 29. Feb 2020 at 11.40, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > On Sat, 2020-02-29 at 11:14 +0100, Alexander Kanavin wrote: > > This recipe is build-heavy, yet is not part of any images and isn't > > runtime tesed as > > part of oe-core. There's no evidence of anyone using it, as all > > commits are revision updates. It also pulls in NumPy, which is also > > a significant support item, and wouldn't otherwise be part of core. > > I'm not sure about this. The intent was to use piglit as a way of > improving our graphics testing, particularly allowing it to be > automated. > > Whilst we've had to focus on getting the basics right, I'm not sure > that objective isn't still a worthy goal over time? Piglit is meant for testing and validating OpenGL drivers for real hardware. While we can put it on top of software Mesa driver or virgl, I am not sure there is much value in that? Software rendering might even be too slow to run in practice. Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Sat Feb 29 13:13:01 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 13:13:01 +0000 Subject: [OE-core] M3 build status Message-ID: Just to quickly update everyone, a number of patches we probably wanted in 3.1 have had issues but have had the issues resolved and the patches have now merged. Thanks to all who dived in and helped with those! The patches/issues I'm aware of that are left: * ltp upgrade (musl issue) * util-linux upgrade (breaks wic test, probably simple fix) * coreutils ptest addition (blocked on libmodule-build-per reproducibility issue) * psplash systemd race (smurray may have a fix) * autobuilder new branch handling for initial run test comparisons (open high bug with RP) * tinfoil race (open high bug, struggling for owner) * LockedSigs intermittent test failure (RP has open high bug, no clue how to reproduce or why, total mystery) * Intermittent selftest failure with SystemExit (High open bug, Kai owns) As ever, help with any of these welcome. We'll build M3 when a majority of the above are ready. Cheers, Richard From richard.purdie at linuxfoundation.org Sat Feb 29 13:14:36 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 13:14:36 +0000 Subject: [OE-core] [PATCH 1/2] piglit: move to meta-oe In-Reply-To: References: <20200229101433.30787-1-alex.kanavin@gmail.com> <23132fd4872488b259751cdf8bcd8335d703b205.camel@linuxfoundation.org> Message-ID: On Sat, 2020-02-29 at 14:11 +0100, Alexander Kanavin wrote: > On Sat 29. Feb 2020 at 11.40, Richard Purdie < > richard.purdie at linuxfoundation.org> wrote: > > On Sat, 2020-02-29 at 11:14 +0100, Alexander Kanavin wrote: > > > This recipe is build-heavy, yet is not part of any images and > > isn't > > > runtime tesed as > > > part of oe-core. There's no evidence of anyone using it, as all > > > commits are revision updates. It also pulls in NumPy, which is > > also > > > a significant support item, and wouldn't otherwise be part of > > core. > > > > I'm not sure about this. The intent was to use piglit as a way of > > improving our graphics testing, particularly allowing it to be > > automated. > > > > Whilst we've had to focus on getting the basics right, I'm not sure > > that objective isn't still a worthy goal over time? > > Piglit is meant for testing and validating OpenGL drivers for real > hardware. While we can put it on top of software Mesa driver or > virgl, I am not sure there is much value in that? Software rendering > might even be too slow to run in practice. OE-Core is meant to be usable for validating BSPs amongst other things though. Testing virgl does prove the graphics stack is working too from a software perspective so does have some value. Cheers, Richard From richard.purdie at linuxfoundation.org Sat Feb 29 13:22:02 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 13:22:02 +0000 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: <20200229064656.GA4045619@x230> References: <20200228175731.10604-1-petr.vorel@gmail.com> <20200229064656.GA4045619@x230> Message-ID: <4db943be8cba440551847721156d22f9664cca0a.camel@linuxfoundation.org> On Sat, 2020-02-29 at 07:46 +0100, Petr Vorel wrote: > At least we know, that once we solve this problem, we can remove > 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > > Please, how to reproduce this build locally? Is it: > . oe-init-build-env > TCLIBC=musl bitbake ltp Yes, that should be enough. > Or do I need to put something into config files conf/local.conf > or conf/bblayers.conf ? > > I need to double check if musl-fts is really built and whether the > order of > -lfts is correct. But all this has been solved even for static build > for Buildroot, > so I guess it's some issue related to openembedded. Unfortunately, > I'm not much > experienced in openembedded (stepped in, because nobody else has > updated LTP > package yet). > > Khem, any idea, what can be wrong? FWIW I'll run a build here and see if I can spot anything but I'm trying to do other things today! Cheers, Richard From pjtexier at koncepto.io Sat Feb 29 13:35:08 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Sat, 29 Feb 2020 14:35:08 +0100 Subject: [OE-core] [PATCH v2] util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: References: <1582738506-3389-1-git-send-email-pjtexier@koncepto.io> Message-ID: Hello Richard, Le 28/02/2020 ? 13:25, Richard Purdie a ?crit?: > Unfortately this does seem to expose a problem with wic, e.g.: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/732 > > which can be reproduced with: > > oe-selftest -r wic.Wic2.test_expand_mbr_image Afer a quick check, it seems the failure is related to the commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options") [1] in the version 2.35.1. ERROR: _exec_cmd: /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-4047/tmp/work/core2-64-poky-linux/wic-tools/1.0-r0/recipe-sysroot-native/usr/sbin/sfdisk -dJ /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-4047/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic returned '1' instead of 0 output: sfdisk: mutually exclusive arguments: --list-free --json --dump So, I think we have to update this command [2] in order to drop the '-J' option. I will investigate, and I will send a v3 to fix this issue. Thanks ! [1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12 [2] - https://git.openembedded.org/openembedded-core/tree/scripts/lib/wic/engine.py#n442 -- Pierre-Jean Texier Embedded Linux Engineer https://koncepto.io From richard.purdie at linuxfoundation.org Sat Feb 29 13:42:03 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 13:42:03 +0000 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: <4db943be8cba440551847721156d22f9664cca0a.camel@linuxfoundation.org> References: <20200228175731.10604-1-petr.vorel@gmail.com> <20200229064656.GA4045619@x230> <4db943be8cba440551847721156d22f9664cca0a.camel@linuxfoundation.org> Message-ID: On Sat, 2020-02-29 at 13:22 +0000, Richard Purdie wrote: > On Sat, 2020-02-29 at 07:46 +0100, Petr Vorel wrote: > > At least we know, that once we solve this problem, we can remove > > 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > > > > Please, how to reproduce this build locally? Is it: > > . oe-init-build-env > > TCLIBC=musl bitbake ltp > > Yes, that should be enough. > > > Or do I need to put something into config files conf/local.conf > > or conf/bblayers.conf ? > > > > I need to double check if musl-fts is really built and whether the > > order of > > -lfts is correct. But all this has been solved even for static > > build > > for Buildroot, > > so I guess it's some issue related to openembedded. Unfortunately, > > I'm not much > > experienced in openembedded (stepped in, because nobody else has > > updated LTP > > package yet). > > > > Khem, any idea, what can be wrong? > > FWIW I'll run a build here and see if I can spot anything but I'm > trying to do other things today! I was able to confirm that fts is in the recipe sysroot and that the compile step is running "make -j 88 LIBC=musl LIBS=-lfts", i.e. its being passed in to ltp. Beyond that I'm a little out my depth to know how/why its not ending up where it should unfortunately. At least the issue does appear to reproduce though... Cheers, Richard From alex.kanavin at gmail.com Sat Feb 29 13:42:23 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 29 Feb 2020 14:42:23 +0100 Subject: [OE-core] [PATCH 1/2] piglit: move to meta-oe In-Reply-To: References: <20200229101433.30787-1-alex.kanavin@gmail.com> <23132fd4872488b259751cdf8bcd8335d703b205.camel@linuxfoundation.org> Message-ID: On Sat 29. Feb 2020 at 14.14, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > On Sat, 2020-02-29 at 14:11 +0100, Alexander Kanavin wrote: > > On Sat 29. Feb 2020 at 11.40, Richard Purdie < > > richard.purdie at linuxfoundation.org> wrote: > > > On Sat, 2020-02-29 at 11:14 +0100, Alexander Kanavin wrote: > > > > This recipe is build-heavy, yet is not part of any images and > > > isn't > > > > runtime tesed as > > > > part of oe-core. There's no evidence of anyone using it, as all > > > > commits are revision updates. It also pulls in NumPy, which is > > > also > > > > a significant support item, and wouldn't otherwise be part of > > > core. > > > > > > I'm not sure about this. The intent was to use piglit as a way of > > > improving our graphics testing, particularly allowing it to be > > > automated. > > > > > > Whilst we've had to focus on getting the basics right, I'm not sure > > > that objective isn't still a worthy goal over time? > > > > Piglit is meant for testing and validating OpenGL drivers for real > > hardware. While we can put it on top of software Mesa driver or > > virgl, I am not sure there is much value in that? Software rendering > > might even be too slow to run in practice. > > OE-Core is meant to be usable for validating BSPs amongst other things > though. Testing virgl does prove the graphics stack is working too from > a software perspective so does have some value. Right, I can put Piglit on top of virgl and see how well that works. It would be good to enable virgl ?out of the box? at some point, I?ve been proposing that for a while :) Alex > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Sat Feb 29 13:53:00 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 13:53:00 +0000 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: References: <20200228175731.10604-1-petr.vorel@gmail.com> <20200229064656.GA4045619@x230> <4db943be8cba440551847721156d22f9664cca0a.camel@linuxfoundation.org> Message-ID: On Sat, 2020-02-29 at 13:42 +0000, Richard Purdie wrote: > On Sat, 2020-02-29 at 13:22 +0000, Richard Purdie wrote: > > On Sat, 2020-02-29 at 07:46 +0100, Petr Vorel wrote: > > > At least we know, that once we solve this problem, we can remove > > > 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > > > > > > Please, how to reproduce this build locally? Is it: > > > . oe-init-build-env > > > TCLIBC=musl bitbake ltp > > > > Yes, that should be enough. > > > > > Or do I need to put something into config files conf/local.conf > > > or conf/bblayers.conf ? > > > > > > I need to double check if musl-fts is really built and whether > > > the > > > order of > > > -lfts is correct. But all this has been solved even for static > > > build > > > for Buildroot, > > > so I guess it's some issue related to openembedded. > > > Unfortunately, > > > I'm not much > > > experienced in openembedded (stepped in, because nobody else has > > > updated LTP > > > package yet). > > > > > > Khem, any idea, what can be wrong? > > > > FWIW I'll run a build here and see if I can spot anything but I'm > > trying to do other things today! > > I was able to confirm that fts is in the recipe sysroot and that the > compile step is running "make -j 88 LIBC=musl LIBS=-lfts", i.e. its > being passed in to ltp. Beyond that I'm a little out my depth to know > how/why its not ending up where it should unfortunately. At least the > issue does appear to reproduce though... Grep suggests LIBS is a configure option, not a makefile one. I tried: diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 847f267b0b7..5be9489a756 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -16,7 +16,8 @@ LIC_FILES_CHKSUM = "\ DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation and this does seem to build for musl. Might be worth runtime testing that on the autobuilder? Cheers, Richard From pjtexier at koncepto.io Sat Feb 29 14:16:42 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Sat, 29 Feb 2020 15:16:42 +0100 Subject: [OE-core] [PATCH v3 1/2] util-linux: upgrade 2.34 -> 2.35.1 Message-ID: <1582985803-21068-1-git-send-email-pjtexier@koncepto.io> License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier --- Changes v2 -> v3 - NONE Changes v1 -> v2 - bump to 2.35.1 instead of 2.35 - use disable-hwclock-gplv3 option to not use datetime parsing GPLv3 code FYI, hwclock will be made GPLv2-only again in v2.36, see: - https://lore.kernel.org/util-linux/20200127202152.4jh2w4chch37wgee at ws.net.home/T/#e0c176440ca3f7b10693ff8f0afaf114b4b94405d meta/recipes-core/util-linux/util-linux.inc | 3 +- ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ---------------------- meta/recipes-core/util-linux/util-linux_2.34.bb | 14 --------- meta/recipes-core/util-linux/util-linux_2.35.1.bb | 13 ++++++++ 4 files changed, 15 insertions(+), 51 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch delete mode 100644 meta/recipes-core/util-linux/util-linux_2.34.bb create mode 100644 meta/recipes-core/util-linux/util-linux_2.35.1.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb deleted file mode 100644 index 557449d..0000000 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ /dev/null @@ -1,14 +0,0 @@ -require util-linux.inc - -SRC_URI += "file://configure-sbindir.patch \ - file://runuser.pamd \ - file://runuser-l.pamd \ - file://ptest.patch \ - file://run-ptest \ - file://display_testname_for_subtest.patch \ - file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ - file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ -" -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" diff --git a/meta/recipes-core/util-linux/util-linux_2.35.1.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb new file mode 100644 index 0000000..03afd2a --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -0,0 +1,13 @@ +require util-linux.inc + +SRC_URI += "file://configure-sbindir.patch \ + file://runuser.pamd \ + file://runuser-l.pamd \ + file://ptest.patch \ + file://run-ptest \ + file://display_testname_for_subtest.patch \ + file://avoid_parallel_tests.patch \ + file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ +" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- 2.7.4 From pjtexier at koncepto.io Sat Feb 29 14:16:43 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Sat, 29 Feb 2020 15:16:43 +0100 Subject: [OE-core] [PATCH v3 2/2] wic/engine: dump the partition table in JSON format only In-Reply-To: <1582985803-21068-1-git-send-email-pjtexier@koncepto.io> References: <1582985803-21068-1-git-send-email-pjtexier@koncepto.io> Message-ID: <1582985803-21068-2-git-send-email-pjtexier@koncepto.io> since commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options") in util-linux [1], the '-J' can't be used with the '-d' option anymore. So, since we're using json format output, drop the '-d' option. Fixes: ERROR: _exec_cmd: /usr/sbin/sfdisk -dJ /core-image-minimal-qemux86-64.wic returned '1' instead of 0 output: sfdisk: mutually exclusive arguments: --list-free --json --dump [1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12 Signed-off-by: Pierre-Jean Texier --- Changes v2 -> v3 - NONE scripts/lib/wic/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 2479751..83c42c9 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -439,7 +439,7 @@ class Disk: outf.flush() def read_ptable(path): - out = exec_cmd("{} -dJ {}".format(self.sfdisk, path)) + out = exec_cmd("{} -J {}".format(self.sfdisk, path)) return json.loads(out) def write_ptable(parts, target): -- 2.7.4 From raj.khem at gmail.com Sat Feb 29 14:37:56 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 06:37:56 -0800 Subject: [OE-core] [PATCH] systemd: Add missing leading space for CFLAGS append Message-ID: <20200229143756.1653266-1-raj.khem@gmail.com> Signed-off-by: Khem Raj --- meta/recipes-core/systemd/systemd_244.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index dfb7ad59c0..c5c0ce4bad 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -102,7 +102,7 @@ PACKAGECONFIG_remove_libc-musl = " \ utmp \ " -CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " # Use the upstream systemd serial-getty at .service and rely on # systemd-getty-generator instead of using the OE-core specific -- 2.25.1 From raj.khem at gmail.com Sat Feb 29 15:00:35 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 07:00:35 -0800 Subject: [OE-core] [PATCH v6 1/2] ltp: Update to 20200120 Message-ID: <20200229150036.1900777-1-raj.khem@gmail.com> From: Petr Vorel Removed ffsb copying file and associated runtest file fs_ext4 (both removed in this release). Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch IMHO this one shouldn't be needed not, but CI still fails without it Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel Signed-off-by: Khem Raj --- Changes v5->v6: * LIBS is specified for configure instead of make meta/lib/oeqa/runtime/cases/ltp.py | 2 +- .../ltp/0001-Add-more-musl-exclusions.patch | 37 +------ ...option-to-select-libc-implementation.patch | 103 +++++------------- ...udevadm-trigger-before-swap-verifica.patch | 35 ------ ...ix-zeros-of-the-addresses-output-by-.patch | 43 -------- ...or-time64-unsafe-syscalls-before-usi.patch | 41 +++++-- ...es-fix-an-absent-format-string-issue.patch | 24 ---- ...rs-Link-with-libfts-explicitly-on-mu.patch | 20 ++-- ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 ------ ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 9 +- 11 files changed, 95 insertions(+), 281 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%) diff --git a/meta/lib/oeqa/runtime/cases/ltp.py b/meta/lib/oeqa/runtime/cases/ltp.py index b8b7300435..6dc5ef22ad 100644 --- a/meta/lib/oeqa/runtime/cases/ltp.py +++ b/meta/lib/oeqa/runtime/cases/ltp.py @@ -59,7 +59,7 @@ class LtpTest(LtpTestBase): ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched", "nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds", "fcntl-locktests", "connectors", "commands", "net.ipv6_lib", "input","fs_perms_simple"] - ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"] + ltp_fs = ["fs", "fsx", "fs_bind"] # skip kernel cpuhotplug ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc", "hugetlb"] ltp_groups += ltp_fs diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS := accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..0598046b28 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3ad3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e7314e0..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669716..ecc6660f93 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844509..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch index eff9ed0741..412025017b 100644 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch @@ -1,21 +1,27 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 +From 2f6f356a49e28eb597df063e31770632e69a93aa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 +Date: Fri, 28 Feb 2020 14:55:26 +0100 Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl musl does not implement fts like glibc and therefore it depends on external implementation for all fts APIs -Upstream-Status: Pending +Upstream-Status: not acceptible Signed-off-by: Khem Raj +[ pvorel: rebased for 20200120 +IMHO this patch should not be needed as commits +22f510de8 ("Fix static linking with musl-fts") and +b24f3d32c ("cpuset: Detect missing fts.h") should handle it +but CI still report failures ] +Signed-off-by: Petr Vorel --- testcases/kernel/controllers/Makefile.inc | 3 +++ testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 +index 4ca0b5ac3..1d85e4d86 100644 --- a/testcases/kernel/controllers/Makefile.inc +++ b/testcases/kernel/controllers/Makefile.inc @@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) @@ -29,13 +35,13 @@ index 4ca0b5a..1d85e4d 100644 INSTALL_TARGETS ?= *.sh diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 +index c03dd77d7..6dd4ee619 100644 --- a/testcases/kernel/controllers/cpuset/Makefile.inc +++ b/testcases/kernel/controllers/cpuset/Makefile.inc @@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - LDLIBS += -lcpu_set -lcontrollers -lltp + LDLIBS := -lcpu_set -lcontrollers -lltp $(LDLIBS) +ifeq ($(LIBC),musl) +LDLIBS += -lfts +endif @@ -43,5 +49,5 @@ index db6a843..86dd2a8 100644 INSTALL_TARGETS ?= *.sh -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa1b4..0000000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325eaf3..350091a70c 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 90% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc9c6..3cc10afa0c 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,12 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +27,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From raj.khem at gmail.com Sat Feb 29 15:00:36 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 07:00:36 -0800 Subject: [OE-core] [PATCH v6 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <20200229150036.1900777-1-raj.khem@gmail.com> References: <20200229150036.1900777-1-raj.khem@gmail.com> Message-ID: <20200229150036.1900777-2-raj.khem@gmail.com> From: Petr Vorel Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel Signed-off-by: Khem Raj --- Changes v5->v6: Rebase ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 3cc10afa0c..5be9489a75 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 From raj.khem at gmail.com Sat Feb 29 15:10:55 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 07:10:55 -0800 Subject: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120 In-Reply-To: <20200228120849.GA31133@dell5510> References: <20200228061225.32003-1-petr.vorel@gmail.com> <6558d8c05b858a831ecd4dd79df70f4764b10c6c.camel@linuxfoundation.org> <20200228120849.GA31133@dell5510> Message-ID: On 2/28/20 4:08 AM, Petr Vorel wrote: > Hi Richard, > >>> Changes v3->v4: >>> * Fix musl build with LIBS=-lfts > >> Unfortunately the musl build is still failing with this version: > >> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 >> https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 > Any idea, how to fix it? libcgroup uses the same flag LIBS=-lfts. > Maybe the variable isn't propagated. > Or is the dependency expressed enough? > > DEPENDS_append_libc-musl = " fts " > EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " > > I'll have to put back patch > 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch, but that's bad, > buildroot works without it. > yeah in OE we fixed it differently so far, by patching makefiles, but I agree its perhaps suboptimal since the patch will not go upstream, we should pass -lfts via LIBS to configure > Kind regards, > Petr > From raj.khem at gmail.com Sat Feb 29 15:12:05 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 07:12:05 -0800 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: <20200229064656.GA4045619@x230> References: <20200228175731.10604-1-petr.vorel@gmail.com> <20200229064656.GA4045619@x230> Message-ID: <0147f807-be3c-27e0-e05c-73ac0311045e@gmail.com> On 2/28/20 10:46 PM, Petr Vorel wrote: > Hi Richard, Khem, > >>> Changes v4->v5: >>> * Put back 0002-kernel-controllers-Link-with-libfts-explicitly-on- >>> mu.patch >>> as it still needed on MUSL (although it should not be needed, >>> strange). >>> Reported by Anuj Mittal > >> I'm sorry to say that this still isn't quite right for musl: > >> https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1634 >> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1630 > >> Still having the fts issue :( > OK, step1b is still problematic: > /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' > /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' > /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: undefined reference to `fts_close' > /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: undefined reference to `fts_close' > > At least we know, that once we solve this problem, we can remove > 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > > Please, how to reproduce this build locally? Is it: > . oe-init-build-env > TCLIBC=musl bitbake ltp > > Or do I need to put something into config files conf/local.conf > or conf/bblayers.conf ? > > I need to double check if musl-fts is really built and whether the order of > -lfts is correct. But all this has been solved even for static build for Buildroot, > so I guess it's some issue related to openembedded. Unfortunately, I'm not much > experienced in openembedded (stepped in, because nobody else has updated LTP > package yet). > > Khem, any idea, what can be wrong? I have added -lfts to LIBS and sent v6 of this patch > > Kind regards, > Petr > From raj.khem at gmail.com Sat Feb 29 15:13:24 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 07:13:24 -0800 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: References: <20200228175731.10604-1-petr.vorel@gmail.com> <20200229064656.GA4045619@x230> <4db943be8cba440551847721156d22f9664cca0a.camel@linuxfoundation.org> Message-ID: <7719eee9-9635-c7dc-2f48-56d574c539ed@gmail.com> On 2/29/20 5:53 AM, Richard Purdie wrote: > On Sat, 2020-02-29 at 13:42 +0000, Richard Purdie wrote: >> On Sat, 2020-02-29 at 13:22 +0000, Richard Purdie wrote: >>> On Sat, 2020-02-29 at 07:46 +0100, Petr Vorel wrote: >>>> At least we know, that once we solve this problem, we can remove >>>> 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch >>>> >>>> Please, how to reproduce this build locally? Is it: >>>> . oe-init-build-env >>>> TCLIBC=musl bitbake ltp >>> >>> Yes, that should be enough. >>> >>>> Or do I need to put something into config files conf/local.conf >>>> or conf/bblayers.conf ? >>>> >>>> I need to double check if musl-fts is really built and whether >>>> the >>>> order of >>>> -lfts is correct. But all this has been solved even for static >>>> build >>>> for Buildroot, >>>> so I guess it's some issue related to openembedded. >>>> Unfortunately, >>>> I'm not much >>>> experienced in openembedded (stepped in, because nobody else has >>>> updated LTP >>>> package yet). >>>> >>>> Khem, any idea, what can be wrong? >>> >>> FWIW I'll run a build here and see if I can spot anything but I'm >>> trying to do other things today! >> >> I was able to confirm that fts is in the recipe sysroot and that the >> compile step is running "make -j 88 LIBC=musl LIBS=-lfts", i.e. its >> being passed in to ltp. Beyond that I'm a little out my depth to know >> how/why its not ending up where it should unfortunately. At least the >> issue does appear to reproduce though... > > Grep suggests LIBS is a configure option, not a makefile one. I tried: > > diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb > index 847f267b0b7..5be9489a756 100644 > --- a/meta/recipes-extended/ltp/ltp_20200120.bb > +++ b/meta/recipes-extended/ltp/ltp_20200120.bb > @@ -16,7 +16,8 @@ LIC_FILES_CHKSUM = "\ > > DEPENDS = "attr libaio libcap acl openssl zip-native" > DEPENDS_append_libc-musl = " fts " > -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " > +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " > +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " > > # since ltp contains x86-64 assembler which uses the frame-pointer register, > # set -fomit-frame-pointer x86-64 to handle cases where optimisation > > and this does seem to build for musl. Might be worth runtime testing > that on the autobuilder? yes thats right fix, I have sent v6 of original patch including above fix, please give it a try > > Cheers, > > Richard > From raj.khem at gmail.com Sat Feb 29 15:23:52 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 07:23:52 -0800 Subject: [OE-core] [PATCH] glibc: Syscall fixes for mips/risc-v/mucroblaze Message-ID: <20200229152352.1993520-1-raj.khem@gmail.com> Should fix the mips make 4.3 issue on target Changes in this delta * 71f2b249a2 malloc/tst-mallocfork2: Kill lingering process for unexpected failures * 5d31b083e4 riscv: Avoid clobbering register parameters in syscall * f4f8843515 microblaze: Avoid clobbering register parameters in syscall * aa638b86b2 mips: Fix argument passing for inlined syscalls on Linux [BZ #25523] * ae1b6b13d4 mips: Use 'long int' and 'long long int' in linux syscall code Signed-off-by: Khem Raj --- meta/recipes-core/glibc/glibc-version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index f489650f70..f7acf99752 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.31/master" PV = "2.31" -SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" +SRCREV_glibc ?= "71f2b249a28e17eac0e47c53af44d5c5b65101aa" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- 2.25.1 From anuj.mittal at intel.com Sat Feb 29 15:30:05 2020 From: anuj.mittal at intel.com (Anuj Mittal) Date: Sat, 29 Feb 2020 23:30:05 +0800 Subject: [OE-core] [PATCH v6 1/2] ltp: Update to 20200120 In-Reply-To: <20200229150036.1900777-1-raj.khem@gmail.com> References: <20200229150036.1900777-1-raj.khem@gmail.com> Message-ID: On 29-Feb-20 11:00 PM, Khem Raj wrote: > From: Petr Vorel > > Removed ffsb copying file and associated runtest file fs_ext4 > (both removed in this release). > > Added LIBS=-lfts for MUSL. > > Removed patches (accepted upstream) > * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > * 0001-testcases-fix-an-absent-format-string-issue.patch > * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > > Merged patches > * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > (into 0001-build-Add-option-to-select-libc-implementation.patch as they > touch the same files) > > Refreshed patches (some tests have been fixed for musl) > * 0001-Add-more-musl-exclusions.patch > * 0001-build-Add-option-to-select-libc-implementation.patch > * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > IMHO this one shouldn't be needed not, but CI still fails without it Is this patch still needed after the change in v6? Thanks, Anuj > > Updated status > * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > > Signed-off-by: Petr Vorel > Signed-off-by: Khem Raj > --- > Changes v5->v6: > * LIBS is specified for configure instead of make > > meta/lib/oeqa/runtime/cases/ltp.py | 2 +- > .../ltp/0001-Add-more-musl-exclusions.patch | 37 +------ > ...option-to-select-libc-implementation.patch | 103 +++++------------- > ...udevadm-trigger-before-swap-verifica.patch | 35 ------ > ...ix-zeros-of-the-addresses-output-by-.patch | 43 -------- > ...or-time64-unsafe-syscalls-before-usi.patch | 41 +++++-- > ...es-fix-an-absent-format-string-issue.patch | 24 ---- > ...rs-Link-with-libfts-explicitly-on-mu.patch | 20 ++-- > ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 ------ > ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- > .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 9 +- > 11 files changed, 95 insertions(+), 281 deletions(-) > delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%) > > diff --git a/meta/lib/oeqa/runtime/cases/ltp.py b/meta/lib/oeqa/runtime/cases/ltp.py > index b8b7300435..6dc5ef22ad 100644 > --- a/meta/lib/oeqa/runtime/cases/ltp.py > +++ b/meta/lib/oeqa/runtime/cases/ltp.py > @@ -59,7 +59,7 @@ class LtpTest(LtpTestBase): > > ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched", "nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds", "fcntl-locktests", "connectors", "commands", "net.ipv6_lib", "input","fs_perms_simple"] > > - ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"] > + ltp_fs = ["fs", "fsx", "fs_bind"] > # skip kernel cpuhotplug > ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc", "hugetlb"] > ltp_groups += ltp_fs > diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch > index d3af31f34a..773844d442 100644 > --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch > +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch > @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions > > Upstream-Status: Pending > Signed-off-by: Alexander Kanavin > +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] > +Signed-off-by: Petr Vorel > --- > testcases/kernel/syscalls/accept4/Makefile | 4 ++++ > - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ > - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ > testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ > - 4 files changed, 18 insertions(+) > + 2 files changed, 8 insertions(+) > > diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile > index 504042e11..94db06266 100644 > @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 > +ifeq ($(LIBC),musl) > +FILTER_OUT_MAKE_TARGETS := accept4_01 > +endif > -+ > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile > -index 5d01b4825..0263a6e20 100644 > ---- a/testcases/kernel/syscalls/fanotify/Makefile > -+++ b/testcases/kernel/syscalls/fanotify/Makefile > -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. > - fanotify11: CFLAGS+=-pthread > - include $(top_srcdir)/include/mk/testcases.mk > - > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 > -+endif > -+ > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > -+ > -+ > -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile > -index 72544c13e..7f20b2780 100644 > ---- a/testcases/kernel/syscalls/setxattr/Makefile > -+++ b/testcases/kernel/syscalls/setxattr/Makefile > -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. > - > - include $(top_srcdir)/include/mk/testcases.mk > - > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := setxattr03 > -+endif > + > include $(top_srcdir)/include/mk/generic_leaf_target.mk > diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile > @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 > CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include > > LDLIBS += -lpthread -lrt > +-- > +2.25.1 > + > diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch > index 1705abcf19..0598046b28 100644 > --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch > +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch > @@ -1,7 +1,7 @@ > -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 > +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Thu, 7 Jan 2016 18:19:03 +0000 > -Subject: [PATCH] build: Add option to select libc implementation > +Subject: [PATCH 1/6] build: Add option to select libc implementation > > There are more than glibc for C library implementation available on > linux now a days, uclibc cloaked like glibc but musl e.g. is very > @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems > > Upstream-Status: Pending > > -Signed-off-by: Khem Raj > +rt_tgsigqueueinfo fails with: > +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': > +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? > + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; > + | ^~~~~~~~~ > + | __si_fields > > +Signed-off-by: Khem Raj > +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, > +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, > +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo > +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] > +Signed-off-by: Petr Vorel > +Signed-off-by: Petr Vorel > --- > - Makefile | 5 +++++ > - testcases/kernel/Makefile | 5 ++++- > - testcases/kernel/sched/Makefile | 4 +++- > - testcases/kernel/syscalls/Makefile | 5 +++++ > - testcases/network/nfsv4/acl/Makefile | 4 ++++ > - testcases/network/rpc/basic_tests/Makefile | 5 +++++ > - testcases/realtime/func/pi-tests/Makefile | 4 ++++ > - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ > - 8 files changed, 35 insertions(+), 2 deletions(-) > + Makefile | 5 +++++ > + testcases/kernel/Makefile | 5 ++++- > + testcases/kernel/sched/Makefile | 4 +++- > + testcases/kernel/syscalls/Makefile | 4 ++++ > + 4 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 768ca4606..e9d679a71 100644 > @@ -76,73 +84,20 @@ index 6a57d79ee..74bb93370 100644 > +endif > include $(top_srcdir)/include/mk/generic_trunk_target.mk > diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile > -index 45a00cf7d..d1becd054 100644 > +index 45a00cf7d..af5a591a0 100644 > --- a/testcases/kernel/syscalls/Makefile > +++ b/testcases/kernel/syscalls/Makefile > -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) > - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ > +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ > mincore mprotect nftw profil remap_file_pages sbrk > endif > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ > -+ rt_sigsuspend setdomainname sethostname sigsuspend \ > -+ ustat > -+endif > - > - ifeq ($(UCLIBC),1) > - FILTER_OUT_DIRS += profil > -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile > -index 8c55a6bbd..f7cda621d 100644 > ---- a/testcases/network/nfsv4/acl/Makefile > -+++ b/testcases/network/nfsv4/acl/Makefile > -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk > - > - LDLIBS += $(ACL_LIBS) > - > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := acl1 > -+endif > -+ > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile > -index 66e9d5675..ea8eb8a98 100644 > ---- a/testcases/network/rpc/basic_tests/Makefile > -+++ b/testcases/network/rpc/basic_tests/Makefile > -@@ -23,4 +23,9 @@ > - top_srcdir ?= ../../../.. > - > - include $(top_srcdir)/include/mk/env_pre.mk > -+ > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_DIRS += rpc01 > -+endif > -+ > - include $(top_srcdir)/include/mk/generic_trunk_target.mk > -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile > -index 68616a711..748754bb4 100644 > ---- a/testcases/realtime/func/pi-tests/Makefile > -+++ b/testcases/realtime/func/pi-tests/Makefile > -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk > - include $(abs_srcdir)/../../config.mk > > - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex > +ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex > ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo > +endif > + > - > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile > -index 1881f7565..266e0b815 100644 > ---- a/testcases/realtime/stress/pi-tests/Makefile > -+++ b/testcases/realtime/stress/pi-tests/Makefile > -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. > - > - include $(top_srcdir)/include/mk/env_pre.mk > - include $(abs_srcdir)/../../config.mk > -+ > -+ifeq ($(LIBC),musl) > -+FILTER_OUT_MAKE_TARGETS := testpi-3 > -+endif > -+ > - include $(top_srcdir)/include/mk/generic_leaf_target.mk > + ifeq ($(UCLIBC),1) > + FILTER_OUT_DIRS += profil > + endif > +-- > +2.25.1 > + > diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > deleted file mode 100644 > index 1b433d3ad3..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 > -From: Yongxin Liu > -Date: Tue, 12 Nov 2019 11:33:50 +0800 > -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification > - > -Fix: https://github.com/linux-test-project/ltp/issues/458 > - > -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ > -or /dev/disk/by-lable/ due to the issue #458. When this issue > -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show > -different UUID of the device. > - > -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] > - > -Signed-off-by: Yongxin Liu > ---- > - testcases/commands/mkswap/mkswap01.sh | 2 ++ > - 1 file changed, 2 insertions(+) > - > -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh > -index 3a348c6e6..9437c4a4e 100755 > ---- a/testcases/commands/mkswap/mkswap01.sh > -+++ b/testcases/commands/mkswap/mkswap01.sh > -@@ -129,6 +129,8 @@ mkswap_test() > - return > - fi > - > -+ udevadm trigger --name-match=$TST_DEVICE > -+ > - if [ -n "$device" ]; then > - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" > - if [ $? -ne 0 ]; then > --- > -2.14.4 > - > diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > deleted file mode 100644 > index fe5e7314e0..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 > -From: He Zhe > -Date: Tue, 31 Dec 2019 15:02:48 +0800 > -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm > - before comparing > - > -The latest nm v2.33.1 outputs symbols addresses without prefix zeros > -for "nm -f posix", which causes the following error. > -nm01 5 TFAIL: Got wrong format with -f bsd > - > -Let's remove the prefix zeros before comparing. > - > -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] > - > -Signed-off-by: He Zhe > -Reviewed-by: Li Wang > -Reviewed-by: Petr Vorel > -Tested-by: Petr Vorel > ---- > - testcases/commands/nm/nm01.sh | 7 +++++-- > - 1 file changed, 5 insertions(+), 2 deletions(-) > - > -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh > -index 30c41bd..fd9d3d9 100755 > ---- a/testcases/commands/nm/nm01.sh > -+++ b/testcases/commands/nm/nm01.sh > -@@ -84,8 +84,11 @@ test5() > - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out > - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out > - > -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out > -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out > -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out > -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out > -+ > -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out > -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out > - > - if diff nm1.out nm2.out > /dev/null; then > - tst_res TPASS "Got BSD format with -f bsd" > --- > -2.7.4 > - > diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > index c431669716..ecc6660f93 100644 > --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch > @@ -1,28 +1,40 @@ > -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 > +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 > From: Khem Raj > -Date: Wed, 12 Feb 2020 22:22:17 -0800 > +Date: Wed, 19 Feb 2020 22:52:04 -0800 > Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them > > musl is using 64bit time_t now on 32bit architectures and these syscalls > no longer exist, therefore its better to check for them being available > before using them > > -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] > Signed-off-by: Khem Raj > +Reviewed-by: Yang Xu > +Reviewed-by: Petr Vorel > +Signed-off-by: Petr Vorel > +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 > --- > - lib/tst_clocks.c | 9 +++++---- > - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- > - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- > - 3 files changed, 10 insertions(+), 13 deletions(-) > + lib/tst_clocks.c | 16 ++++++---------- > + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- > + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- > + 3 files changed, 11 insertions(+), 19 deletions(-) > > +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c > +index 5195da38f..fa2f1cb84 100644 > --- a/lib/tst_clocks.c > +++ b/lib/tst_clocks.c > -@@ -22,21 +22,22 @@ > - #define _GNU_SOURCE > - #include > +@@ -3,28 +3,24 @@ > + * Copyright (c) 2017 Cyril Hrubis > + */ > + > +-/* > +- * clock_gettime() and clock_getres() functions > +- */ > +- > +-#define _GNU_SOURCE > +-#include > #include > -#include > -- > + > +#define TST_NO_DEFAULT_MAIN > +#include "tst_test.h" > #include "tst_clocks.h" > @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj > - return syscall(SYS_clock_settime, clk_id, ts); > + return tst_syscall(__NR_clock_settime, clk_id, ts); > } > +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c > +index 583d8f7b9..08ea1673a 100644 > --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c > +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c > @@ -38,10 +38,8 @@ > @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj > > /* gettimeofday returns an int, so we need to turn the long > * TEST_RETURN into an int to test with */ > +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c > +index 1d60f448e..5170ad2f7 100644 > --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c > +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c > @@ -16,14 +16,12 @@ > @@ -102,3 +118,6 @@ Signed-off-by: Khem Raj > tst_res(TBROK | TERRNO, "gettimeofday() failed"); > return; > } > +-- > +2.25.1 > + > diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch > deleted file mode 100644 > index 9330844509..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch > +++ /dev/null > @@ -1,24 +0,0 @@ > -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin > -Date: Thu, 12 Dec 2019 17:56:02 +0100 > -Subject: [PATCH] testcases: fix an absent format string issue > - > -Upstream-Status: Pending > -Signed-off-by: Alexander Kanavin > ---- > - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c > -index 27dbc6626..19d943d06 100644 > ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c > -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c > -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) > - > - /* Manipulate PID for next process */ > - sprintf(pid_str, "%d", pid - 1); > -- SAFE_FILE_PRINTF(last_pid_file, pid_str); > -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); > - > - new_pid = SAFE_FORK(); > - if (new_pid == 0) { > diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > index eff9ed0741..412025017b 100644 > --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > +++ b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > @@ -1,21 +1,27 @@ > -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 > +From 2f6f356a49e28eb597df063e31770632e69a93aa Mon Sep 17 00:00:00 2001 > From: Khem Raj > -Date: Thu, 7 Jan 2016 18:22:38 +0000 > +Date: Fri, 28 Feb 2020 14:55:26 +0100 > Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl > > musl does not implement fts like glibc and therefore it depends on > external implementation for all fts APIs > > -Upstream-Status: Pending > +Upstream-Status: not acceptible > > Signed-off-by: Khem Raj > +[ pvorel: rebased for 20200120 > +IMHO this patch should not be needed as commits > +22f510de8 ("Fix static linking with musl-fts") and > +b24f3d32c ("cpuset: Detect missing fts.h") should handle it > +but CI still report failures ] > +Signed-off-by: Petr Vorel > --- > testcases/kernel/controllers/Makefile.inc | 3 +++ > testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc > -index 4ca0b5a..1d85e4d 100644 > +index 4ca0b5ac3..1d85e4d86 100644 > --- a/testcases/kernel/controllers/Makefile.inc > +++ b/testcases/kernel/controllers/Makefile.inc > @@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) > @@ -29,13 +35,13 @@ index 4ca0b5a..1d85e4d 100644 > INSTALL_TARGETS ?= *.sh > > diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc > -index db6a843..86dd2a8 100644 > +index c03dd77d7..6dd4ee619 100644 > --- a/testcases/kernel/controllers/cpuset/Makefile.inc > +++ b/testcases/kernel/controllers/cpuset/Makefile.inc > @@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) > LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) > > - LDLIBS += -lcpu_set -lcontrollers -lltp > + LDLIBS := -lcpu_set -lcontrollers -lltp $(LDLIBS) > +ifeq ($(LIBC),musl) > +LDLIBS += -lfts > +endif > @@ -43,5 +49,5 @@ index db6a843..86dd2a8 100644 > INSTALL_TARGETS ?= *.sh > > -- > -2.7.4 > +2.25.1 > > diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > deleted file mode 100644 > index 804edfa1b4..0000000000 > --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 > -From: Yi Zhao > -Date: Thu, 18 Jul 2019 15:23:15 +0800 > -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl > - > -Fix build error with musl: > -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': > -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? > - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; > - | ^~~~~~~~~ > - | __si_fields > - > -Upstream-Status: Pending > - > -Signed-off-by: Yi Zhao > ---- > - testcases/kernel/syscalls/Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile > -index d1becd0..1f3ff34 100644 > ---- a/testcases/kernel/syscalls/Makefile > -+++ b/testcases/kernel/syscalls/Makefile > -@@ -31,7 +31,7 @@ endif > - ifeq ($(LIBC),musl) > - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ > - rt_sigsuspend setdomainname sethostname sigsuspend \ > -- ustat > -+ ustat rt_tgsigqueueinfo > - endif > - > - ifeq ($(UCLIBC),1) > --- > -2.7.4 > - > diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > index b46325eaf3..350091a70c 100644 > --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch > @@ -1,33 +1,34 @@ > -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 > +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= > Date: Fri, 13 May 2016 11:11:28 -0500 > -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on > - string printf > +Subject: [PATCH] acl: Security fix on string printf > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > -Fixes: > +Fixes build error when compiled with -Werror=format-security: > > -acl1.c: In function 'test_acl_default': > -acl1.c:317:2: error: format not a string literal and no format arguments > -[-Werror=format-security] > - printf(cmd); > +acl1.c: In function ?test_acl_default?: > +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] > + 305 | printf(cmd); > > -[YOCTO #9548] > +Patch taken from openembedded-core, > +original bug report: https://bugzilla.yoctoproject.org/9548 > > -Upstream-Status: Pending > +[YOCTO #9548] > > Signed-off-by: An?bal Lim?n > +Signed-off-by: Petr Vorel > +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 > --- > testcases/network/nfsv4/acl/acl1.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c > -index bdf0180..898b7ca 100644 > +index aae9484e5..ad778cd33 100644 > --- a/testcases/network/nfsv4/acl/acl1.c > +++ b/testcases/network/nfsv4/acl/acl1.c > -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) > +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) > char *cmd = malloc(256); > > strcpy(cmd, "chmod 7777 "); > @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 > system(cmd); > acl2 = acl_get_file(path, ACL_TYPE_ACCESS); > -- > -2.7.4 > +2.25.1 > > diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb > similarity index 90% > rename from meta/recipes-extended/ltp/ltp_20190930.bb > rename to meta/recipes-extended/ltp/ltp_20200120.bb > index 19bd7bc9c6..3cc10afa0c 100644 > --- a/meta/recipes-extended/ltp/ltp_20190930.bb > +++ b/meta/recipes-extended/ltp/ltp_20200120.bb > @@ -12,12 +12,12 @@ LIC_FILES_CHKSUM = "\ > file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ > file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ > file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ > - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ > " > > DEPENDS = "attr libaio libcap acl openssl zip-native" > DEPENDS_append_libc-musl = " fts " > EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " > +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " > > # since ltp contains x86-64 assembler which uses the frame-pointer register, > # set -fomit-frame-pointer x86-64 to handle cases where optimisation > @@ -27,21 +27,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" > > CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" > CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" > -SRCREV = "c9707b465a08397569920b676345474f44327200" > +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" > > SRC_URI = "git://github.com/linux-test-project/ltp.git \ > file://0001-build-Add-option-to-select-libc-implementation.patch \ > - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ > file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ > file://0004-guard-mallocopt-with-__GLIBC__.patch \ > - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ > file://0007-Fix-test_proc_kill-hanging.patch \ > file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ > file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ > - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ > - file://0001-testcases-fix-an-absent-format-string-issue.patch \ > file://0001-Add-more-musl-exclusions.patch \ > - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ > file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ > " > > From bunk at stusta.de Sat Feb 29 15:32:19 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sat, 29 Feb 2020 17:32:19 +0200 Subject: [OE-core] [PATCH] glibc: Syscall fixes for mips/risc-v/mucroblaze In-Reply-To: <20200229152352.1993520-1-raj.khem@gmail.com> References: <20200229152352.1993520-1-raj.khem@gmail.com> Message-ID: <20200229153219.GA25145@localhost> On Sat, Feb 29, 2020 at 07:23:52AM -0800, Khem Raj wrote: > Should fix the mips make 4.3 issue on target > > Changes in this delta > > * 71f2b249a2 malloc/tst-mallocfork2: Kill lingering process for unexpected failures > * 5d31b083e4 riscv: Avoid clobbering register parameters in syscall > * f4f8843515 microblaze: Avoid clobbering register parameters in syscall > * aa638b86b2 mips: Fix argument passing for inlined syscalls on Linux [BZ #25523] > * ae1b6b13d4 mips: Use 'long int' and 'long long int' in linux syscall code > > Signed-off-by: Khem Raj > --- > meta/recipes-core/glibc/glibc-version.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc > index f489650f70..f7acf99752 100644 > --- a/meta/recipes-core/glibc/glibc-version.inc > +++ b/meta/recipes-core/glibc/glibc-version.inc > @@ -1,6 +1,6 @@ > SRCBRANCH ?= "release/2.31/master" > PV = "2.31" > -SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" > +SRCREV_glibc ?= "71f2b249a28e17eac0e47c53af44d5c5b65101aa" >... I have the same locally, but then PV should be "2.31+git${SRCPV}" and I haven't yet sorted out everything afterwards. cu Adrian From bunk at stusta.de Sat Feb 29 15:37:05 2020 From: bunk at stusta.de (Adrian Bunk) Date: Sat, 29 Feb 2020 17:37:05 +0200 Subject: [OE-core] [PATCH] mesa: add fix for arm6 In-Reply-To: <20200228225151.28015-1-jpuhlman@mvista.com> References: <20200228225151.28015-1-jpuhlman@mvista.com> Message-ID: <20200229153705.GB25145@localhost> On Fri, Feb 28, 2020 at 02:51:51PM -0800, Jeremy A. Puhlman wrote: > From: Jeremy Puhlman > > We have had similar problems with missing atomics on arm6 that arm5 > has. How are you able to reproduce this problem? I was wondering why the upstream fixes that happened in the meantime didn't fix it for armv5, but a qemuarmv5 build of mesa on master worked even after commenting out this line. >... > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -161,6 +161,7 @@ EXTRA_OEMESON_append = " -Dasm=false" > FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" > > CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" > +CFLAGS_append_armv6 = " -DMISSING_64BIT_ATOMICS" >... cu Adrian BTW: armv6, not arm6 - arm6 is armv3 From akuster808 at gmail.com Sat Feb 29 15:38:51 2020 From: akuster808 at gmail.com (akuster808) Date: Sat, 29 Feb 2020 07:38:51 -0800 Subject: [OE-core] M3 build status In-Reply-To: References: Message-ID: On 2/29/20 5:13 AM, Richard Purdie wrote: > Just to quickly update everyone, a number of patches we probably wanted > in 3.1 have had issues but have had the issues resolved and the patches > have now merged. Thanks to all who dived in and helped with those! So no Bind update? > > The patches/issues I'm aware of that are left: > > * ltp upgrade (musl issue) > * util-linux upgrade (breaks wic test, probably simple fix) I can look at the two above but can't start until Sunday so if someone else grabs them today, have at it. > * coreutils ptest addition (blocked on libmodule-build-per > reproducibility issue) > * psplash systemd race (smurray may have a fix) > * autobuilder new branch handling for initial run test comparisons > (open high bug with RP) > * tinfoil race (open high bug, struggling for owner) > * LockedSigs intermittent test failure (RP has open high bug, no clue > how to reproduce or why, total mystery) > * Intermittent selftest failure with SystemExit (High open bug, Kai > owns) > > As ever, help with any of these welcome. We'll build M3 when a majority > of the above are ready. So where are patches going doing this time that will be in after the release? - armin > Cheers, > > Richard > > > > > From raj.khem at gmail.com Sat Feb 29 15:40:52 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 07:40:52 -0800 Subject: [OE-core] [PATCH v2] glibc: Syscall fixes for mips/risc-v/mucroblaze Message-ID: <20200229154052.1996618-1-raj.khem@gmail.com> Should fix the mips make 4.3 issue on target Changes in this delta * 71f2b249a2 malloc/tst-mallocfork2: Kill lingering process for unexpected failures * 5d31b083e4 riscv: Avoid clobbering register parameters in syscall * f4f8843515 microblaze: Avoid clobbering register parameters in syscall * aa638b86b2 mips: Fix argument passing for inlined syscalls on Linux [BZ #25523] * ae1b6b13d4 mips: Use 'long int' and 'long long int' in linux syscall code Signed-off-by: Khem Raj --- v2: Bump SRCREV to reflect patches on 2.31 meta/recipes-core/glibc/glibc-version.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index f489650f70..4c72eedf41 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.31/master" -PV = "2.31" -SRCREV_glibc ?= "9ea3686266dca3f004ba874745a4087a89682617" +PV = "2.31+git${SRCPV}" +SRCREV_glibc ?= "71f2b249a28e17eac0e47c53af44d5c5b65101aa" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" -- 2.25.1 From richard.purdie at linuxfoundation.org Sat Feb 29 16:16:03 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 16:16:03 +0000 Subject: [OE-core] [PATCH] python3-scons: Fix license file collision Message-ID: <20200229161603.495994-1-richard.purdie@linuxfoundation.org> Downloading a file called "LICENSE" into DL_DIR is 'problematic' and collides with the file from other versions of the recipe at best. Rename it to something more specific to avoid collision problems. Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3-scons_3.1.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb index aa7a2a8300d..ce117a92d4f 100644 --- a/meta/recipes-devtools/python/python3-scons_3.1.2.bb +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -1,10 +1,10 @@ SUMMARY = "Software Construction tool (make/autotools replacement)" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0" # pypi package does not have a valid license file -SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license" SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" -- 2.25.0 From petr.vorel at gmail.com Sat Feb 29 16:51:45 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 29 Feb 2020 17:51:45 +0100 Subject: [OE-core] [PATCH v7 1/2] ltp: Update to 20200120 Message-ID: <20200229165146.1446912-1-petr.vorel@gmail.com> Removed ffsb copying file and associated runtest file fs_ext4 (both removed in this release). Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch IMHO this one shouldn't be needed not, but CI still fails without it Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel Signed-off-by: Khem Raj --- Changes v6->v7: * Drop 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch Patch was in v5 and v6, but I forget to put it back into SRC_URI, so it wasn't actually used. Could anybody once more verify it's working on musl? Hope this is a last version. Khem, thanks a lot for fixing fts issue! Kind regards, Petr meta/lib/oeqa/runtime/cases/ltp.py | 2 +- .../ltp/0001-Add-more-musl-exclusions.patch | 36 +------ ...option-to-select-libc-implementation.patch | 102 +++++------------- ...udevadm-trigger-before-swap-verifica.patch | 35 ------ ...ix-zeros-of-the-addresses-output-by-.patch | 43 -------- ...or-time64-unsafe-syscalls-before-usi.patch | 40 +++++-- ...es-fix-an-absent-format-string-issue.patch | 24 ----- ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 -------- ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 ------ ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 9 +- 11 files changed, 79 insertions(+), 321 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%) diff --git a/meta/lib/oeqa/runtime/cases/ltp.py b/meta/lib/oeqa/runtime/cases/ltp.py index b8b7300435..6dc5ef22ad 100644 --- a/meta/lib/oeqa/runtime/cases/ltp.py +++ b/meta/lib/oeqa/runtime/cases/ltp.py @@ -59,7 +59,7 @@ class LtpTest(LtpTestBase): ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched", "nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds", "fcntl-locktests", "connectors", "commands", "net.ipv6_lib", "input","fs_perms_simple"] - ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"] + ltp_fs = ["fs", "fsx", "fs_bind"] # skip kernel cpuhotplug ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc", "hugetlb"] ltp_groups += ltp_fs diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..02c2fef55b 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 ++++ - testcases/kernel/syscalls/fanotify/Makefile | 6 ++++++ - testcases/kernel/syscalls/setxattr/Makefile | 4 ++++ testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS := accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 ---- a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 ---- a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,5 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS += -lpthread -lrt +-- +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..b1a99959d3 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @@ -1,7 +1,7 @@ -From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 +From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation +Subject: [PATCH 1/6] build: Add option to select libc implementation There are more than glibc for C library implementation available on linux now a days, uclibc cloaked like glibc but musl e.g. is very @@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems Upstream-Status: Pending -Signed-off-by: Khem Raj +rt_tgsigqueueinfo fails with: +rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': +rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? + 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; + | ^~~~~~~~~ + | __si_fields +Signed-off-by: Khem Raj +[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, +rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, +testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo +from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] +Signed-off-by: Petr Vorel +Signed-off-by: Petr Vorel --- - Makefile | 5 +++++ - testcases/kernel/Makefile | 5 ++++- - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 5 +++++ - testcases/network/nfsv4/acl/Makefile | 4 ++++ - testcases/network/rpc/basic_tests/Makefile | 5 +++++ - testcases/realtime/func/pi-tests/Makefile | 4 ++++ - testcases/realtime/stress/pi-tests/Makefile | 5 +++++ - 8 files changed, 35 insertions(+), 2 deletions(-) + Makefile | 5 +++++ + testcases/kernel/Makefile | 5 ++++- + testcases/kernel/sched/Makefile | 4 +++- + testcases/kernel/syscalls/Makefile | 4 ++++ + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 768ca4606..e9d679a71 100644 @@ -76,73 +84,19 @@ index 6a57d79ee..74bb93370 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 45a00cf7d..d1becd054 100644 +index 45a00cf7d..af5a591a0 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile -@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) - FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ +@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ -+ rt_sigsuspend setdomainname sethostname sigsuspend \ -+ ustat -+endif - - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8c55a6bbd..f7cda621d 100644 ---- a/testcases/network/nfsv4/acl/Makefile -+++ b/testcases/network/nfsv4/acl/Makefile -@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk - - LDLIBS += $(ACL_LIBS) +ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := acl1 ++FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo +endif + - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile -index 66e9d5675..ea8eb8a98 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile -@@ -23,4 +23,9 @@ - top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += rpc01 -+endif -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile -index 68616a711..748754bb4 100644 ---- a/testcases/realtime/func/pi-tests/Makefile -+++ b/testcases/realtime/func/pi-tests/Makefile -@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk - - MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex -+endif -+ - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile -index 1881f7565..266e0b815 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile -@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk - include $(abs_srcdir)/../../config.mk -+ -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := testpi-3 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil + endif +-- +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch deleted file mode 100644 index 1b433d3ad3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001 -From: Yongxin Liu -Date: Tue, 12 Nov 2019 11:33:50 +0800 -Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification - -Fix: https://github.com/linux-test-project/ltp/issues/458 - -Sometimes the swap device cannot show up in /dev/disk/by-uuid/ -or /dev/disk/by-lable/ due to the issue #458. When this issue -happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show -different UUID of the device. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414] - -Signed-off-by: Yongxin Liu ---- - testcases/commands/mkswap/mkswap01.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh -index 3a348c6e6..9437c4a4e 100755 ---- a/testcases/commands/mkswap/mkswap01.sh -+++ b/testcases/commands/mkswap/mkswap01.sh -@@ -129,6 +129,8 @@ mkswap_test() - return - fi - -+ udevadm trigger --name-match=$TST_DEVICE -+ - if [ -n "$device" ]; then - mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file" - if [ $? -ne 0 ]; then --- -2.14.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch b/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch deleted file mode 100644 index fe5e7314e0..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 31 Dec 2019 15:02:48 +0800 -Subject: [PATCH] nm01: Remove prefix zeros of the addresses output by nm - before comparing - -The latest nm v2.33.1 outputs symbols addresses without prefix zeros -for "nm -f posix", which causes the following error. -nm01 5 TFAIL: Got wrong format with -f bsd - -Let's remove the prefix zeros before comparing. - -Upstream-Status: Backport [59cb0dd9f8e65b2d398fcaf4d163cbc8e1d0ae45] - -Signed-off-by: He Zhe -Reviewed-by: Li Wang -Reviewed-by: Petr Vorel -Tested-by: Petr Vorel ---- - testcases/commands/nm/nm01.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testcases/commands/nm/nm01.sh b/testcases/commands/nm/nm01.sh -index 30c41bd..fd9d3d9 100755 ---- a/testcases/commands/nm/nm01.sh -+++ b/testcases/commands/nm/nm01.sh -@@ -84,8 +84,11 @@ test5() - EXPECT_PASS $NM -f bsd $TST_DATAROOT/f1 \> nm_bsd.out - EXPECT_PASS $NM -f posix $TST_DATAROOT/f1 \> nm_posix.out - -- ROD awk '{print $3 $2 $1}' nm_bsd.out \> nm1.out -- ROD awk '{print $1 $2 $3}' nm_posix.out \> nm2.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_bsd.out \> trimmed_nm_bsd.out -+ ROD awk '{print gensub(/\y(0+)([0-9a-fA-F]+)\y/, "\\2", "g")}' nm_posix.out \> trimmed_nm_posix.out -+ -+ ROD awk '{print $3 $2 $1}' trimmed_nm_bsd.out \> nm1.out -+ ROD awk '{print $1 $2 $3}' trimmed_nm_posix.out \> nm2.out - - if diff nm1.out nm2.out > /dev/null; then - tst_res TPASS "Got BSD format with -f bsd" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch index c431669716..ac8f08ef5a 100644 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch +++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch @@ -1,28 +1,40 @@ -From b66905b094e08a84c30bc135003c3611f65d53ec Mon Sep 17 00:00:00 2001 +From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 12 Feb 2020 22:22:17 -0800 +Date: Wed, 19 Feb 2020 22:52:04 -0800 Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them musl is using 64bit time_t now on 32bit architectures and these syscalls no longer exist, therefore its better to check for them being available before using them -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1241258/] Signed-off-by: Khem Raj +Reviewed-by: Yang Xu +Reviewed-by: Petr Vorel +Signed-off-by: Petr Vorel +Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812 --- - lib/tst_clocks.c | 9 +++++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - testcases/kernel/syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 10 insertions(+), 13 deletions(-) + lib/tst_clocks.c | 16 ++++++---------- + .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- + .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- + 3 files changed, 11 insertions(+), 19 deletions(-) +diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c +index 5195da38f..fa2f1cb84 100644 --- a/lib/tst_clocks.c +++ b/lib/tst_clocks.c -@@ -22,21 +22,22 @@ - #define _GNU_SOURCE - #include +@@ -3,28 +3,24 @@ + * Copyright (c) 2017 Cyril Hrubis + */ + +-/* +- * clock_gettime() and clock_getres() functions +- */ +- +-#define _GNU_SOURCE +-#include #include -#include -- + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" #include "tst_clocks.h" @@ -45,6 +57,8 @@ Signed-off-by: Khem Raj - return syscall(SYS_clock_settime, clk_id, ts); + return tst_syscall(__NR_clock_settime, clk_id, ts); } +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +index 583d8f7b9..08ea1673a 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -38,10 +38,8 @@ @@ -68,6 +82,8 @@ Signed-off-by: Khem Raj /* gettimeofday returns an int, so we need to turn the long * TEST_RETURN into an int to test with */ +diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +index 1d60f448e..5170ad2f7 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -16,14 +16,12 @@ @@ -102,3 +118,5 @@ Signed-off-by: Khem Raj tst_res(TBROK | TERRNO, "gettimeofday() failed"); return; } +-- +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch deleted file mode 100644 index 9330844509..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 17:56:02 +0100 -Subject: [PATCH] testcases: fix an absent format string issue - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -index 27dbc6626..19d943d06 100644 ---- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -+++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c -@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) - - /* Manipulate PID for next process */ - sprintf(pid_str, "%d", pid - 1); -- SAFE_FILE_PRINTF(last_pid_file, pid_str); -+ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); - - new_pid = SAFE_FORK(); - if (new_pid == 0) { diff --git a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch deleted file mode 100644 index eff9ed0741..0000000000 --- a/meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 81e5bd5442337a4a648a0dbbff47eaac0d351287 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 18:22:38 +0000 -Subject: [PATCH] kernel/controllers: Link with libfts explicitly on musl - -musl does not implement fts like glibc and therefore it depends on -external implementation for all fts APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - testcases/kernel/controllers/Makefile.inc | 3 +++ - testcases/kernel/controllers/cpuset/Makefile.inc | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc -index 4ca0b5a..1d85e4d 100644 ---- a/testcases/kernel/controllers/Makefile.inc -+++ b/testcases/kernel/controllers/Makefile.inc -@@ -36,6 +36,9 @@ MAKE_DEPS := $(LIB) - CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR) - - LDFLAGS += -L$(abs_builddir)/../$(LIBDIR) -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - -diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc -index db6a843..86dd2a8 100644 ---- a/testcases/kernel/controllers/cpuset/Makefile.inc -+++ b/testcases/kernel/controllers/cpuset/Makefile.inc -@@ -42,6 +42,9 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) - LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) - - LDLIBS += -lcpu_set -lcontrollers -lltp -+ifeq ($(LIBC),musl) -+LDLIBS += -lfts -+endif - - INSTALL_TARGETS ?= *.sh - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch b/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch deleted file mode 100644 index 804edfa1b4..0000000000 --- a/meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 60054686e2c1a4bedf1d507af97ebbb7ff491e77 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 18 Jul 2019 15:23:15 +0800 -Subject: [PATCH] rt_tgsigqueueinfo: disable test on musl - -Fix build error with musl: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao ---- - testcases/kernel/syscalls/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index d1becd0..1f3ff34 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -31,7 +31,7 @@ endif - ifeq ($(LIBC),musl) - FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ - rt_sigsuspend setdomainname sethostname sigsuspend \ -- ustat -+ ustat rt_tgsigqueueinfo - endif - - ifeq ($(UCLIBC),1) --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index b46325eaf3..350091a70c 100644 --- a/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch @@ -1,33 +1,34 @@ -From aa7a9185a037ad59012bd46713ac340458e95209 Mon Sep 17 00:00:00 2001 +From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Fri, 13 May 2016 11:11:28 -0500 -Subject: [PATCH] testcases/network/nfsv4/acl/acl1.c: Security fix on - string printf +Subject: [PATCH] acl: Security fix on string printf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fixes: +Fixes build error when compiled with -Werror=format-security: -acl1.c: In function 'test_acl_default': -acl1.c:317:2: error: format not a string literal and no format arguments -[-Werror=format-security] - printf(cmd); +acl1.c: In function ?test_acl_default?: +acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security] + 305 | printf(cmd); -[YOCTO #9548] +Patch taken from openembedded-core, +original bug report: https://bugzilla.yoctoproject.org/9548 -Upstream-Status: Pending +[YOCTO #9548] Signed-off-by: An?bal Lim?n +Signed-off-by: Petr Vorel +Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 --- testcases/network/nfsv4/acl/acl1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c -index bdf0180..898b7ca 100644 +index aae9484e5..ad778cd33 100644 --- a/testcases/network/nfsv4/acl/acl1.c +++ b/testcases/network/nfsv4/acl/acl1.c -@@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) +@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl) char *cmd = malloc(256); strcpy(cmd, "chmod 7777 "); @@ -37,5 +38,5 @@ index bdf0180..898b7ca 100644 system(cmd); acl2 = acl_get_file(path, ACL_TYPE_ACCESS); -- -2.7.4 +2.25.1 diff --git a/meta/recipes-extended/ltp/ltp_20190930.bb b/meta/recipes-extended/ltp/ltp_20200120.bb similarity index 90% rename from meta/recipes-extended/ltp/ltp_20190930.bb rename to meta/recipes-extended/ltp/ltp_20200120.bb index 19bd7bc9c6..3cc10afa0c 100644 --- a/meta/recipes-extended/ltp/ltp_20190930.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -12,12 +12,12 @@ LIC_FILES_CHKSUM = "\ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ " DEPENDS = "attr libaio libcap acl openssl zip-native" DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation @@ -27,21 +27,16 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "c9707b465a08397569920b676345474f44327200" +SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0006-rt_tgsigqueueinfo-disable-test-on-musl.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ - file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \ - file://0001-testcases-fix-an-absent-format-string-issue.patch \ file://0001-Add-more-musl-exclusions.patch \ - file://0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.0 From petr.vorel at gmail.com Sat Feb 29 16:51:46 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 29 Feb 2020 17:51:46 +0100 Subject: [OE-core] [PATCH v7 2/2] ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <20200229165146.1446912-1-petr.vorel@gmail.com> References: <20200229165146.1446912-1-petr.vorel@gmail.com> Message-ID: <20200229165146.1446912-2-petr.vorel@gmail.com> Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel Signed-off-by: Khem Raj --- Changes v6->v7: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ------------------- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { - /* Even MAP_FIXED mappings must reside within TASK_SIZE */ - if (TASK_SIZE - len < addr) - return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song ---- - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 ---- a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - * rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 3cc10afa0c..5be9489a75 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.0 From petr.vorel at gmail.com Sat Feb 29 16:53:43 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 29 Feb 2020 17:53:43 +0100 Subject: [OE-core] [PATCH v6 1/2] ltp: Update to 20200120 In-Reply-To: References: <20200229150036.1900777-1-raj.khem@gmail.com> Message-ID: <20200229165343.GA832653@x230> Hi Khem, Anuj, > > * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > > IMHO this one shouldn't be needed not, but CI still fails without it Khem, thanks for fixing it! It'd take me long time. > Is this patch still needed after the change in v6? I've sent v7 where I removed it. It actually wasn't used, because although I put the file itself back in v5 (+ it was in v6 from Khem), it wasn't actually listed in SRC_URI, so I expect it wasn't used. Kind regards, Petr From petr.vorel at gmail.com Sat Feb 29 17:00:40 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 29 Feb 2020 18:00:40 +0100 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: References: <20200228175731.10604-1-petr.vorel@gmail.com> <20200229064656.GA4045619@x230> <4db943be8cba440551847721156d22f9664cca0a.camel@linuxfoundation.org> Message-ID: <20200229170040.GB832653@x230> Hi Richard, > Grep suggests LIBS is a configure option, not a makefile one. I tried: > diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb > index 847f267b0b7..5be9489a756 100644 > --- a/meta/recipes-extended/ltp/ltp_20200120.bb > +++ b/meta/recipes-extended/ltp/ltp_20200120.bb > @@ -16,7 +16,8 @@ LIC_FILES_CHKSUM = "\ > DEPENDS = "attr libaio libcap acl openssl zip-native" > DEPENDS_append_libc-musl = " fts " > -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " > +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " > +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " Thanks a lot for an explanation. Next time I need to read carefully. Kind regards, Petr From pjtexier at koncepto.io Sat Feb 29 17:10:06 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Sat, 29 Feb 2020 18:10:06 +0100 Subject: [OE-core] [PATCH] libarchive: support mbedtls in PACKAGECONFIG Message-ID: <1582996206-4795-1-git-send-email-pjtexier@koncepto.io> The version 3.4.2 of libarchive add support for mbed TLS [1]. So, add PACKAGECONFIG for mbedtls. [1] - https://github.com/libarchive/libarchive/releases/tag/v3.4.2 Signed-off-by: Pierre-Jean Texier --- meta/recipes-extended/libarchive/libarchive_3.4.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.2.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb index c3edb57..0ab40fc 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -28,6 +28,7 @@ PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat," PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo," PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," +PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls," EXTRA_OECONF += "--enable-largefile" -- 2.7.4 From jpuhlman at mvista.com Sat Feb 29 18:10:40 2020 From: jpuhlman at mvista.com (Jeremy A. Puhlman) Date: Sat, 29 Feb 2020 10:10:40 -0800 Subject: [OE-core] [PATCH] mesa: add fix for arm6 In-Reply-To: <20200229153705.GB25145@localhost> References: <20200228225151.28015-1-jpuhlman@mvista.com> <20200229153705.GB25145@localhost> Message-ID: <05af0b1f-08c2-ee55-dd96-0261a1234d4a@mvista.com> This was in my queue from a previous yotco version. I haven't gotten my arm bsp up and running yet. I will double check. On 2/29/2020 7:37 AM, Adrian Bunk wrote: > On Fri, Feb 28, 2020 at 02:51:51PM -0800, Jeremy A. Puhlman wrote: >> From: Jeremy Puhlman >> >> We have had similar problems with missing atomics on arm6 that arm5 >> has. > How are you able to reproduce this problem? > > I was wondering why the upstream fixes that happened in the meantime > didn't fix it for armv5, but a qemuarmv5 build of mesa on master worked > even after commenting out this line. > >> ... >> --- a/meta/recipes-graphics/mesa/mesa.inc >> +++ b/meta/recipes-graphics/mesa/mesa.inc >> @@ -161,6 +161,7 @@ EXTRA_OEMESON_append = " -Dasm=false" >> FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" >> >> CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" >> +CFLAGS_append_armv6 = " -DMISSING_64BIT_ATOMICS" >> ... > cu > Adrian > > BTW: armv6, not arm6 - arm6 is armv3 > -- Jeremy A. Puhlman jpuhlman at mvista.com From petr.vorel at gmail.com Sat Feb 29 18:40:06 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 29 Feb 2020 19:40:06 +0100 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: References: <20200228175731.10604-1-petr.vorel@gmail.com> <20200229064656.GA4045619@x230> <4db943be8cba440551847721156d22f9664cca0a.camel@linuxfoundation.org> Message-ID: <20200229184006.GB13422@dell5510> Hi Richard, Khem, > I was able to confirm that fts is in the recipe sysroot and that the > compile step is running "make -j 88 LIBC=musl LIBS=-lfts", i.e. its > being passed in to ltp. Beyond that I'm a little out my depth to know > how/why its not ending up where it should unfortunately. At least the > issue does appear to reproduce though... Is there a way to compile only LTP and the necessary build dependencies? if I run this: . oe-init-build-env MACHINE=qemuarm TCLIBC=musl bitbake ltp It takes ages and compiles many things (gnutls, iptables, expat, procps, tar, ...). Kind regards, Petr From petr.vorel at gmail.com Sat Feb 29 18:41:23 2020 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 29 Feb 2020 19:41:23 +0100 Subject: [OE-core] [PATCH v7 1/2] ltp: Update to 20200120 In-Reply-To: <20200229165146.1446912-1-petr.vorel@gmail.com> References: <20200229165146.1446912-1-petr.vorel@gmail.com> Message-ID: <20200229184123.GC13422@dell5510> Hi, > Removed ffsb copying file and associated runtest file fs_ext4 > (both removed in this release). It compiles OK on my workstation. $ MACHINE=qemuarm TCLIBC=musl bitbake ltp ... Loaded 1305 entries from dependency cache. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.44.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "opensusetumbleweed-20200226" TARGET_SYS = "arm-oe-linux-musleabi" MACHINE = "qemuarm" DISTRO = "nodistro" DISTRO_VERSION = "nodistro.0" TUNE_FEATURES = "arm armv7ve vfp thumb neon callconvention-hard" TARGET_FPU = "hard" meta = "ltp/20200120.v7:adbe622d75374a2dcba803c509ad6d43515c40d8" Initialising tasks: 100% |########################################################################################################################################################################################################################################| Time: 0:00:00 Sstate summary: Wanted 299 Found 1 Missed 298 Current 99 (0% match, 25% complete) NOTE: Executing Tasks NOTE: Setscene tasks completed NOTE: Tasks Summary: Attempted 1512 tasks of which 878 didn't need to be rerun and all succeeded. Kind regards, Petr From raj.khem at gmail.com Sat Feb 29 18:53:36 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 10:53:36 -0800 Subject: [OE-core] [PATCH] tcmode-default: Add wildcard to GLIBCVERSION Message-ID: <20200229185336.3904938-1-raj.khem@gmail.com> glibc version has moved on to 2.31.x Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index fce2662c1f..ab4333144b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?= "10.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" -GLIBCVERSION ?= "2.31" +GLIBCVERSION ?= "2.31%" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" GOVERSION ?= "1.14%" -- 2.25.1 From raj.khem at gmail.com Sat Feb 29 19:18:41 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 11:18:41 -0800 Subject: [OE-core] [PATCH] qemuarm64: Add -machine gic-version=3 with kvm Message-ID: <20200229191841.3910424-1-raj.khem@gmail.com> qemuarm64 on aarch64 host errors out when using kvm qemu-system-aarch64: PMU: KVM_SET_DEVICE_ATTR: Invalid argument qemu-system-aarch64: failed to set irq for PMU Aborted machines with GICv3 that don?t support GICv2 guests you must have ?-machine gic-version=3? on the QEMU command line. Signed-off-by: Khem Raj Cc: Jon Mason --- meta/conf/machine/qemuarm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index ec2a887bdd..1e2d4f018d 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -13,7 +13,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" -QB_CPU_KVM = "-cpu host" +QB_CPU_KVM = "-cpu host -machine gic-version=3" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -- 2.25.1 From ticotimo at gmail.com Sat Feb 29 19:42:55 2020 From: ticotimo at gmail.com (Tim Orling) Date: Sat, 29 Feb 2020 11:42:55 -0800 Subject: [OE-core] [PATCH] python3-scons: Fix license file collision In-Reply-To: <20200229161603.495994-1-richard.purdie@linuxfoundation.org> References: <20200229161603.495994-1-richard.purdie@linuxfoundation.org> Message-ID: Thank you. It bothered me but I didn?t think if this rather simple solution. On Sat, Feb 29, 2020 at 8:16 AM Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > Downloading a file called "LICENSE" into DL_DIR is 'problematic' and > collides with the > file from other versions of the recipe at best. > > Rename it to something more specific to avoid collision problems. > > Signed-off-by: Richard Purdie > --- > meta/recipes-devtools/python/python3-scons_3.1.2.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb > b/meta/recipes-devtools/python/python3-scons_3.1.2.bb > index aa7a2a8300d..ce117a92d4f 100644 > --- a/meta/recipes-devtools/python/python3-scons_3.1.2.bb > +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb > @@ -1,10 +1,10 @@ > SUMMARY = "Software Construction tool (make/autotools replacement)" > SECTION = "devel/python" > LICENSE = "MIT" > -LIC_FILES_CHKSUM = > "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" > +LIC_FILES_CHKSUM = > "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0" > > # pypi package does not have a valid license file > -SRC_URI += " > https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license" > +SRC_URI += " > https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license > " > > SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a" > SRC_URI[sha256sum] = > "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f" > -- > 2.25.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core at lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alex.kanavin at gmail.com Sat Feb 29 19:47:07 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 29 Feb 2020 20:47:07 +0100 Subject: [OE-core] [PATCH] selftest/tinfoil: fix a race condition Message-ID: <20200229194707.14400-1-alex.kanavin@gmail.com> Both test_parse_recipe_initial_datastore and the preceding test operate on the same recipe, and both change recipe metadata and re-parse it. In some situations bitbake backend from the first test is catching the change done by the second test and interprets it as non-deterministic metadata (not sure if this sentence is entirely technically correct though :). The easiest way to avoid is to make the tests operate on two different recipes. [YOCTO #13812] Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/tinfoil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py index 42a1b6b4f4..1bbb7eeec7 100644 --- a/meta/lib/oeqa/selftest/cases/tinfoil.py +++ b/meta/lib/oeqa/selftest/cases/tinfoil.py @@ -68,7 +68,7 @@ class TinfoilTests(OESelftestTestCase): def test_parse_recipe_initial_datastore(self): with bb.tinfoil.Tinfoil() as tinfoil: tinfoil.prepare(config_only=False, quiet=2) - testrecipe = 'mdadm' + testrecipe = 'psplash' best = tinfoil.find_best_provider(testrecipe) if not best: self.fail('Unable to find recipe providing %s' % testrecipe) -- 2.25.1 From pjtexier at koncepto.io Sat Feb 29 20:38:02 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Sat, 29 Feb 2020 21:38:02 +0100 Subject: [OE-core] [PATCH v4 2/2] wic/engine: dump the partition table in JSON format only In-Reply-To: <1583008682-4650-1-git-send-email-pjtexier@koncepto.io> References: <1583008682-4650-1-git-send-email-pjtexier@koncepto.io> Message-ID: <1583008682-4650-2-git-send-email-pjtexier@koncepto.io> since commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options") in util-linux [1], the '-J' can't be used with the '-d' option anymore. So, since we're using json format output, drop the '-d' option. Fixes: ERROR: _exec_cmd: /usr/sbin/sfdisk -dJ /core-image-minimal-qemux86-64.wic returned '1' instead of 0 output: sfdisk: mutually exclusive arguments: --list-free --json --dump [1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12 Signed-off-by: Pierre-Jean Texier --- Changes v3 -> v4 - NONE Changes v2 -> v3 - New scripts/lib/wic/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 2479751..83c42c9 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -439,7 +439,7 @@ class Disk: outf.flush() def read_ptable(path): - out = exec_cmd("{} -dJ {}".format(self.sfdisk, path)) + out = exec_cmd("{} -J {}".format(self.sfdisk, path)) return json.loads(out) def write_ptable(parts, target): -- 2.7.4 From pjtexier at koncepto.io Sat Feb 29 20:38:01 2020 From: pjtexier at koncepto.io (Pierre-Jean Texier) Date: Sat, 29 Feb 2020 21:38:01 +0100 Subject: [OE-core] [PATCH v4 1/2] util-linux: upgrade 2.34 -> 2.35.1 Message-ID: <1583008682-4650-1-git-send-email-pjtexier@koncepto.io> License-Update: add GPLv3 text in README.licensing Also: - Drop upstreamed patch - Backport an upstream patch to fix an issue with 'sfdisk' - Use 'disable-hwclock-gplv3' explicitly. Since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use parse_date function") hwclock is linked with parse_date.y from gnullib. This gnulib code is distributed with GPLv3. So, we have to use '--disable-hwclock-gplv3' to exclude this code. See full changelog https://lore.kernel.org/util-linux/20200131095846.ogjtqrs7ai774tka at ws.net.home/T/#u Signed-off-by: Pierre-Jean Texier --- Changes v3 -> v4 - Backport an upstream patch to fix an issue with 'sfdisk' Changes v2 -> v3 - NONE Changes v1 -> v2 - bump to 2.35.1 instead of 2.35 - use disable-hwclock-gplv3 option to not use datetime parsing GPLv3 code FYI, hwclock will be made GPLv2-only again in v2.36, see: - https://lore.kernel.org/util-linux/20200127202152.4jh2w4chch37wgee at ws.net.home/T/#e0c176440ca3f7b10693ff8f0afaf114b4b94405d meta/recipes-core/util-linux/util-linux.inc | 3 +- ...ript-accept-sector-size-ignore-unknown-he.patch | 137 +++++++++++++++++++++ ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ------ meta/recipes-core/util-linux/util-linux_2.34.bb | 14 --- meta/recipes-core/util-linux/util-linux_2.35.1.bb | 14 +++ 5 files changed, 153 insertions(+), 51 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch delete mode 100644 meta/recipes-core/util-linux/util-linux_2.34.bb create mode 100644 meta/recipes-core/util-linux/util-linux_2.35.1.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 179cb3d..0566569 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -8,7 +8,7 @@ SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -105,6 +105,7 @@ EXTRA_OECONF = "\ EXTRA_OECONF_append_class-target = " --enable-setpriv" EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF_append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or diff --git a/meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch b/meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch new file mode 100644 index 0000000..911f70b --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch @@ -0,0 +1,137 @@ +From 00e53f17c8462cb34ece08cc10db60a7da29a305 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 4 Feb 2020 15:11:19 +0100 +Subject: [PATCH] libfdisk: (script) accept sector-size, ignore unknown headers + +- add sector-size between supported headers (already in --dump output) + +- report unknown headers by -ENOTSUP + +- ignore ENOTSUP in sfdisk (but print warning) and in fdisk_script_read_file() + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/00e53f17c8462cb34ece08cc10db60a7da29a305] + +Addresses: https://github.com/karelzak/util-linux/issues/949 +Signed-off-by: Karel Zak +Signed-off-by: Pierre-Jean Texier +--- + disk-utils/sfdisk.c | 6 +++++- + libfdisk/src/script.c | 49 ++++++++++++++++++++++++++----------------------- + 2 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c +index bb6e1c6..c0bea70 100644 +--- a/disk-utils/sfdisk.c ++++ b/disk-utils/sfdisk.c +@@ -1782,7 +1782,11 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv) + } + + rc = fdisk_script_read_line(dp, stdin, buf, sizeof(buf)); +- if (rc < 0) { ++ if (rc == -ENOTSUP) { ++ buf[sizeof(buf) - 1] = '\0'; ++ fdisk_warnx(sf->cxt, _("Unknown script header '%s' -- ignore."), buf); ++ continue; ++ } else if (rc < 0) { + DBG(PARSE, ul_debug("script parsing failed, trying sfdisk specific commands")); + buf[sizeof(buf) - 1] = '\0'; + rc = loop_control_commands(sf, dp, buf); +diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c +index a21771b..d3e67fa 100644 +--- a/libfdisk/src/script.c ++++ b/libfdisk/src/script.c +@@ -805,8 +805,12 @@ static inline int is_header_line(const char *s) + /* parses ": value", note modifies @s*/ + static int parse_line_header(struct fdisk_script *dp, char *s) + { +- int rc = -EINVAL; ++ size_t i; + char *name, *value; ++ static const char *supported[] = { ++ "label", "unit", "label-id", "device", "grain", ++ "first-lba", "last-lba", "table-length", "sector-size" ++ }; + + DBG(SCRIPT, ul_debugobj(dp, " parse header '%s'", s)); + +@@ -816,7 +820,7 @@ static int parse_line_header(struct fdisk_script *dp, char *s) + name = s; + value = strchr(s, ':'); + if (!value) +- goto done; ++ return -EINVAL; + *value = '\0'; + value++; + +@@ -825,32 +829,30 @@ static int parse_line_header(struct fdisk_script *dp, char *s) + ltrim_whitespace((unsigned char *) value); + rtrim_whitespace((unsigned char *) value); + ++ if (!*name || !*value) ++ return -EINVAL; ++ ++ /* check header name */ ++ for (i = 0; i < ARRAY_SIZE(supported); i++) { ++ if (strcmp(name, supported[i]) == 0) ++ break; ++ } ++ if (i == ARRAY_SIZE(supported)) ++ return -ENOTSUP; ++ ++ /* header specific actions */ + if (strcmp(name, "label") == 0) { + if (dp->cxt && !fdisk_get_label(dp->cxt, value)) +- goto done; /* unknown label name */ ++ return -EINVAL; /* unknown label name */ + dp->force_label = 1; ++ + } else if (strcmp(name, "unit") == 0) { + if (strcmp(value, "sectors") != 0) +- goto done; /* only "sectors" supported */ +- } else if (strcmp(name, "label-id") == 0 +- || strcmp(name, "device") == 0 +- || strcmp(name, "grain") == 0 +- || strcmp(name, "first-lba") == 0 +- || strcmp(name, "last-lba") == 0 +- || strcmp(name, "table-length") == 0) { +- ; /* whatever is possible */ +- } else +- goto done; /* unknown header */ ++ return -EINVAL; /* only "sectors" supported */ + +- if (*name && *value) +- rc = fdisk_script_set_header(dp, name, value); +-done: +- if (rc) +- DBG(SCRIPT, ul_debugobj(dp, "header parse error: " +- "[rc=%d, name='%s', value='%s']", +- rc, name, value)); +- return rc; ++ } + ++ return fdisk_script_set_header(dp, name, value); + } + + /* returns zero terminated string with next token and @str is updated */ +@@ -1363,7 +1365,8 @@ int fdisk_script_set_fgets(struct fdisk_script *dp, + * + * Reads next line into dump. + * +- * Returns: 0 on success, <0 on error, 1 when nothing to read. ++ * Returns: 0 on success, <0 on error, 1 when nothing to read. For unknown headers ++ * returns -ENOTSUP, it's usually safe to ignore this error. + */ + int fdisk_script_read_line(struct fdisk_script *dp, FILE *f, char *buf, size_t bufsz) + { +@@ -1428,7 +1431,7 @@ int fdisk_script_read_file(struct fdisk_script *dp, FILE *f) + + while (!feof(f)) { + rc = fdisk_script_read_line(dp, f, buf, sizeof(buf)); +- if (rc) ++ if (rc && rc != -ENOTSUP) + break; + } + +-- +2.7.4 + diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch deleted file mode 100644 index 5d4c148..0000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak -Signed-off-by: Liwei Song ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0256..3ce6da730264 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; --- -2.17.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb deleted file mode 100644 index 557449d..0000000 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ /dev/null @@ -1,14 +0,0 @@ -require util-linux.inc - -SRC_URI += "file://configure-sbindir.patch \ - file://runuser.pamd \ - file://runuser-l.pamd \ - file://ptest.patch \ - file://run-ptest \ - file://display_testname_for_subtest.patch \ - file://avoid_parallel_tests.patch \ - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ - file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ -" -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" -SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" diff --git a/meta/recipes-core/util-linux/util-linux_2.35.1.bb b/meta/recipes-core/util-linux/util-linux_2.35.1.bb new file mode 100644 index 0000000..51964c9 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.35.1.bb @@ -0,0 +1,14 @@ +require util-linux.inc + +SRC_URI += "file://configure-sbindir.patch \ + file://runuser.pamd \ + file://runuser-l.pamd \ + file://ptest.patch \ + file://run-ptest \ + file://display_testname_for_subtest.patch \ + file://avoid_parallel_tests.patch \ + file://0001-hwclock-fix-for-glibc-2.31-settimeofday.patch \ + file://0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch \ +" +SRC_URI[md5sum] = "7f64882f631225f0295ca05080cee1bf" +SRC_URI[sha256sum] = "d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9" -- 2.7.4 From raj.khem at gmail.com Sat Feb 29 20:44:40 2020 From: raj.khem at gmail.com (Khem Raj) Date: Sat, 29 Feb 2020 12:44:40 -0800 Subject: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120 In-Reply-To: <20200229184006.GB13422@dell5510> References: <20200228175731.10604-1-petr.vorel@gmail.com> <20200229064656.GA4045619@x230> <4db943be8cba440551847721156d22f9664cca0a.camel@linuxfoundation.org> <20200229184006.GB13422@dell5510> Message-ID: On Sat, Feb 29, 2020 at 10:40 AM Petr Vorel wrote: > Hi Richard, Khem, > > > I was able to confirm that fts is in the recipe sysroot and that the > > compile step is running "make -j 88 LIBC=musl LIBS=-lfts", i.e. its > > being passed in to ltp. Beyond that I'm a little out my depth to know > > how/why its not ending up where it should unfortunately. At least the > > issue does appear to reproduce though... > Is there a way to compile only LTP and the necessary build dependencies? > > if I run this: > . oe-init-build-env > MACHINE=qemuarm TCLIBC=musl bitbake ltp > > It takes ages and compiles many things (gnutls, iptables, expat, procps, > tar, ...). Yeah first time it will have to build all the dependencies unfortunately but thereafter it should be incremental Your command is right to build ltp only for musl > > > Kind regards, > Petr > -------------- next part -------------- An HTML attachment was scrubbed... URL: From richard.purdie at linuxfoundation.org Sat Feb 29 21:39:29 2020 From: richard.purdie at linuxfoundation.org (Richard Purdie) Date: Sat, 29 Feb 2020 21:39:29 +0000 Subject: [OE-core] [PATCH] selftest/tinfoil: fix a race condition In-Reply-To: <20200229194707.14400-1-alex.kanavin@gmail.com> References: <20200229194707.14400-1-alex.kanavin@gmail.com> Message-ID: On Sat, 2020-02-29 at 20:47 +0100, Alexander Kanavin wrote: > Both test_parse_recipe_initial_datastore and the preceding test > operate on the same recipe, and both change recipe metadata and re- > parse > it. In some situations bitbake backend from the first test is > catching the change done by the second test and interprets it as > non-deterministic metadata (not sure if this sentence is entirely > technically correct though :). > > The easiest way to avoid is to make the tests operate on two > different recipes. > > [YOCTO #13812] I'm not sure its this simple unfortunately. The big question is whether injected changes from the first "session" should persist into the second "session" or whether things should be reset to a consistent state between them. Yes, this will fix the test but I'm not sure its fixing the underlying problem :( Cheers, Richard > Signed-off-by: Alexander Kanavin > --- > meta/lib/oeqa/selftest/cases/tinfoil.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py > b/meta/lib/oeqa/selftest/cases/tinfoil.py > index 42a1b6b4f4..1bbb7eeec7 100644 > --- a/meta/lib/oeqa/selftest/cases/tinfoil.py > +++ b/meta/lib/oeqa/selftest/cases/tinfoil.py > @@ -68,7 +68,7 @@ class TinfoilTests(OESelftestTestCase): > def test_parse_recipe_initial_datastore(self): > with bb.tinfoil.Tinfoil() as tinfoil: > tinfoil.prepare(config_only=False, quiet=2) > - testrecipe = 'mdadm' > + testrecipe = 'psplash' > best = tinfoil.find_best_provider(testrecipe) > if not best: > self.fail('Unable to find recipe providing %s' % > testrecipe) > -- > 2.25.1 > From alex.kanavin at gmail.com Sat Feb 29 21:48:00 2020 From: alex.kanavin at gmail.com (Alexander Kanavin) Date: Sat, 29 Feb 2020 22:48:00 +0100 Subject: [OE-core] [PATCH] selftest/tinfoil: fix a race condition In-Reply-To: References: <20200229194707.14400-1-alex.kanavin@gmail.com> Message-ID: On Sat, 29 Feb 2020 at 22:39, Richard Purdie < richard.purdie at linuxfoundation.org> wrote: > I'm not sure its this simple unfortunately. > > The big question is whether injected changes from the first "session" > should persist into the second "session" or whether things should be > reset to a consistent state between them. > > Yes, this will fix the test but I'm not sure its fixing the underlying > problem :( > There's nothing else that can be done on the test side, and what goes on in the backend is way over my head, I'm afraid :-( Alex -------------- next part -------------- An HTML attachment was scrubbed... URL: From matt.ranostay at konsulko.com Sat Feb 29 23:47:42 2020 From: matt.ranostay at konsulko.com (Matt Ranostay) Date: Sun, 1 Mar 2020 01:47:42 +0200 Subject: [OE-core] freetype: add pixmap to PACKAGECONFIG Message-ID: <20200229234742.3780-1-matt.ranostay@konsulko.com> Add pixmap to PACKAGECONFIG defaults to allow consumers to render color emojis without distro changes. Signed-off-by: Matt Ranostay --- meta/recipes-graphics/freetype/freetype_2.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/freetype/freetype_2.10.1.bb b/meta/recipes-graphics/freetype/freetype_2.10.1.bb index b179a0ed47..d1c093054b 100644 --- a/meta/recipes-graphics/freetype/freetype_2.10.1.bb +++ b/meta/recipes-graphics/freetype/freetype_2.10.1.bb @@ -27,7 +27,7 @@ AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix" CONFIGURE_SCRIPT = "${S}/configure" EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake" -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "zlib pixmap" PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" # harfbuzz results in a circular dependency so enabling is non-trivial -- 2.20.1